diff --git a/include/overlay013/struct_ov13_02221ED0.h b/include/overlay013/struct_ov13_02221ED0.h
index 66edaaecbd..465dae4632 100644
--- a/include/overlay013/struct_ov13_02221ED0.h
+++ b/include/overlay013/struct_ov13_02221ED0.h
@@ -1,6 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV13_02221ED0_H
 #define POKEPLATINUM_STRUCT_OV13_02221ED0_H
 
+#include "applications/pokemon_summary_screen/main.h"
 #include "overlay013/struct_ov13_022236B8.h"
 
 #include "pokemon.h"
@@ -13,14 +14,14 @@ typedef struct {
     u16 unk_0A;
     u16 unk_0C;
     u16 unk_0E;
-    u16 unk_10;
+    u16 curHP;
     u16 unk_12;
     u8 unk_14;
     u8 unk_15;
     u8 unk_16_0 : 7;
     u8 unk_16_7 : 1;
     u8 unk_17_0 : 3;
-    u8 unk_17_3 : 4;
+    u8 summaryStatus : 4;
     u8 unk_17_7 : 1;
     u16 unk_18;
     u16 unk_1A;
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index 4f5fe48aef..8a348de925 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -30,14 +30,14 @@ typedef struct {
     u16 unk_324[96];
     u16 unk_3E4[96];
     u16 unk_4A4[128];
-    PartyManagementData *unk_5A4;
+    PartyManagementData *partyManagementData;
     SpriteSystem *unk_5A8;
     SpriteManager *unk_5AC;
     Sprite *unk_5B0[29];
     ManagedSprite *unk_624[29];
     UnkStruct_0200C440 *unk_698;
-    MessageLoader *unk_69C;
-    StringTemplate *unk_6A0;
+    MessageLoader *messageLoader;
+    StringTemplate *template;
     Strbuf *unk_6A4;
     Strbuf *unk_6A8;
     Strbuf *unk_6AC[20];
@@ -54,11 +54,11 @@ typedef struct {
     u8 unk_B0F_0 : 6;
     u8 unk_B0F_6 : 1;
     u8 unk_B0F_7 : 1;
-    u8 unk_B10;
-    u8 unk_B11;
+    u8 textPrinterID;
+    u8 partySlot;
     u8 unk_B12;
     u8 unk_B13;
-    u16 unk_B14[6];
+    u16 monStats[6];
     HeightWeightData *unk_B20;
     OverlayMetadata *unk_B24;
     GenericPointerData *unk_B28;
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index f297cb509e..640e176000 100644
--- a/include/struct_defs/struct_020831B4.h
+++ b/include/struct_defs/struct_020831B4.h
@@ -7,9 +7,9 @@
 typedef struct {
     Strbuf *unk_00;
     u16 unk_04;
-    u16 unk_06;
-    u16 unk_08;
-    u16 unk_0A;
+    u16 curHP;
+    u16 maxHP;
+    u16 level;
     u16 unk_0C;
     u16 unk_0E_0 : 12;
     u16 unk_0E_12 : 1;
diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h
index 7af2504e4a..0dbc4291b8 100644
--- a/include/struct_defs/struct_02098C44.h
+++ b/include/struct_defs/struct_02098C44.h
@@ -1,36 +1,44 @@
 #ifndef POKEPLATINUM_STRUCT_02098C44_H
 #define POKEPLATINUM_STRUCT_02098C44_H
 
+#include "struct_defs/struct_0202440C.h"
+#include "struct_defs/struct_0202610C.h"
+#include "struct_defs/struct_02028430.h"
+
+#include "field/field_system_decl.h"
+
+#include "bag.h"
+#include "field_move_tasks.h"
 #include "game_options.h"
 #include "party.h"
 
 typedef struct {
-    Party *unk_00;
-    void *unk_04;
-    void *unk_08;
-    Options *unk_0C;
-    void *unk_10;
-    void *unk_14;
-    void *unk_18;
-    void *unk_1C;
+    Party *party;
+    Bag *bag;
+    MailBox *mailBox;
+    Options *options;
+    TVBroadcast *broadcast;
+    BattleRegulation *battleRegulation;
+    FieldMoveContext *fieldMoveContext;
+    FieldSystem *fieldSystem;
     u8 unk_20;
     u8 unk_21;
     u8 selectedMonSlot;
-    u8 unk_23;
-    u16 unk_24;
-    u16 unk_26;
-    u8 unk_28;
-    u8 unk_29;
-    u8 unk_2A;
+    u8 menuSelectionResult;
+    u16 usedItemID;
+    u16 learnedMove;
+    u8 selectedMoveSlot;
+    u8 unk_29; // These three fields (unk_29, unk_2A, unk_2B) are used exactly once in the code (sub_0203D578) which is itself only used once.
+    u8 unk_2A; // sub_0203D578 is used by ScrCmd_194 which is contest related so these fields are likely contest related too.
     u8 unk_2B;
     u8 unk_2C[6];
     u8 unk_32_0 : 4;
     u8 unk_32_4 : 4;
     u8 unk_33;
     int unk_34;
-    u16 unk_38;
+    u16 evoTargetSpecies;
     u8 padding_3A[2];
-    int unk_3C;
+    int evoType;
 } PartyManagementData;
 
 #endif // POKEPLATINUM_STRUCT_02098C44_H
diff --git a/include/unk_0207E0B8.h b/include/unk_0207E0B8.h
index 5c561e1e5c..7ffa206439 100644
--- a/include/unk_0207E0B8.h
+++ b/include/unk_0207E0B8.h
@@ -3,15 +3,15 @@
 
 #include "struct_defs/struct_0207F248.h"
 
-void sub_0207EA74(GameWindowLayout *param0, int param1);
-u8 sub_0207EF04(GameWindowLayout *param0, u8 param1);
-u8 sub_0207EF14(GameWindowLayout *param0, u8 param1);
-const u16 *sub_0207F248(GameWindowLayout *param0);
-void sub_0207F8F8(GameWindowLayout *param0, u8 param1);
-void sub_0207FD68(GameWindowLayout *param0, u8 param1);
-u8 sub_02080354(GameWindowLayout *param0, u8 param1);
-u8 sub_02080404(GameWindowLayout *param0, u8 param1);
-u8 sub_02080488(GameWindowLayout *param0, u8 param1);
+void sub_0207EA74(GameWindowLayout *windowLayout, int param1);
+u8 sub_0207EF04(GameWindowLayout *windowLayout, u8 param1);
+u8 sub_0207EF14(GameWindowLayout *windowLayout, u8 partySlot);
+const u16 *sub_0207F248(GameWindowLayout *windowLayout);
+void sub_0207F8F8(GameWindowLayout *windowLayout, u8 partySlot);
+void sub_0207FD68(GameWindowLayout *windowLayout, u8 partySlot);
+u8 sub_02080354(GameWindowLayout *windowLayout, u8 partySlot);
+u8 sub_02080404(GameWindowLayout *windowLayout, u8 partySlot);
+u8 sub_02080488(GameWindowLayout *windowLayout, u8 partySlot);
 u8 sub_020805D0(u8 param0, u8 param1);
 u8 GetElementIndex(u16 param0);
 u32 sub_02081930(void);
@@ -19,7 +19,7 @@ u32 sub_02081934(void);
 u32 sub_02081938(void);
 u32 sub_0208193C(void);
 void LoadScreenDataFromNARC(u32 param0, u16 *param1, u16 *param2, u16 *param3);
-void LoadOverlay118(GameWindowLayout *param0);
-void UnloadOverlay118(GameWindowLayout *param0);
+void LoadOverlay118(GameWindowLayout *windowLayout);
+void UnloadOverlay118(GameWindowLayout *windowLayout);
 
 #endif // POKEPLATINUM_UNK_0207E0B8_H
diff --git a/include/unk_02084B70.h b/include/unk_02084B70.h
index 58f339bca4..77c2ef67d7 100644
--- a/include/unk_02084B70.h
+++ b/include/unk_02084B70.h
@@ -7,7 +7,7 @@
 
 void sub_020852B8(GameWindowLayout *param0);
 int sub_02085348(void *param0);
-BOOL sub_020857A8(u16 param0);
+BOOL CheckItemSacredAsh(u16 param0);
 int sub_02085804(GameWindowLayout *param0);
 int sub_02085EF4(GameWindowLayout *param0);
 u8 sub_02086104(GameWindowLayout *param0, Pokemon *param1);
diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c
index 71428211d0..144b3dc1d8 100644
--- a/src/overlay013/ov13_0221FC20.c
+++ b/src/overlay013/ov13_0221FC20.c
@@ -267,6 +267,7 @@ static void ov13_0221FCAC(SysTask *param0, void *param1)
         v0->unk_2074 = ov13_0222088C(v0);
         break;
     case 23:
+        // this one returns 23 as well
         v0->unk_2074 = ov13_022208A4(v0);
         break;
     case 24:
@@ -389,7 +390,7 @@ static u8 ov13_0221FFDC(UnkStruct_ov13_022213F0 *param0)
                 ov13_02221A54(v0->unk_08, v0->unk_22, v0->unk_33, v0->heapID);
                 param0->unk_04[v0->unk_11].unk_00 = BattleSystem_PartyPokemon(v0->unk_08, v0->unk_28, v0->unk_2C[v0->unk_11]);
                 v0->unk_20 = Pokemon_GetValue(param0->unk_04[v0->unk_11].unk_00, MON_DATA_CURRENT_HP, NULL);
-                v0->unk_20 -= param0->unk_04[v0->unk_11].unk_10;
+                v0->unk_20 -= param0->unk_04[v0->unk_11].curHP;
                 param0->unk_2075 = 25;
             } else {
                 param0->unk_2075 = 23;
@@ -874,16 +875,17 @@ static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0)
     switch (param0->unk_2078) {
     case 0:
         param0->unk_04[v0->unk_11].unk_00 = BattleSystem_PartyPokemon(v0->unk_08, v0->unk_28, v0->unk_2C[v0->unk_11]);
+        // StrBuf stuff
         ov13_02224144(param0);
 
         if (param0->unk_2076 == 5) {
             param0->unk_207C[0] = (u16)Pokemon_GetValue(param0->unk_04[v0->unk_11].unk_00, MON_DATA_MOVE1_CUR_PP + v0->unk_34, NULL);
             param0->unk_2078 = 2;
         } else {
-            param0->unk_04[v0->unk_11].unk_17_3 = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0->unk_11].unk_00);
+            param0->unk_04[v0->unk_11].summaryStatus = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0->unk_11].unk_00);
 
-            if (param0->unk_04[v0->unk_11].unk_17_3 == 7) {
-                ManagedSprite_SetDrawFlag(param0->unk_1FB4[13 + v0->unk_11], 0);
+            if (param0->unk_04[v0->unk_11].summaryStatus == SUMMARY_CONDITION_NONE) {
+                ManagedSprite_SetDrawFlag(param0->unk_1FB4[13 + v0->unk_11], FALSE);
                 ov13_022234A8(param0, v0->unk_11);
             }
 
@@ -894,8 +896,8 @@ static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0)
         Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
         break;
     case 1:
-        if (param0->unk_04[v0->unk_11].unk_10 != param0->unk_207A) {
-            param0->unk_04[v0->unk_11].unk_10++;
+        if (param0->unk_04[v0->unk_11].curHP != param0->unk_207A) {
+            param0->unk_04[v0->unk_11].curHP++;
             ov13_02223448(param0, v0->unk_11);
             break;
         }
@@ -917,8 +919,8 @@ static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0)
         param0->unk_2075 = 25;
         return 17;
     case 4:
-        if (param0->unk_04[v0->unk_11].unk_10 != param0->unk_207A) {
-            param0->unk_04[v0->unk_11].unk_10++;
+        if (param0->unk_04[v0->unk_11].curHP != param0->unk_207A) {
+            param0->unk_04[v0->unk_11].curHP++;
             ov13_02223448(param0, v0->unk_11);
             ov13_022264C4(param0);
         }
@@ -1205,7 +1207,7 @@ static void ov13_02220F98(UnkStruct_ov13_022213F0 *param0)
         param0->unk_04[v0].unk_0A = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_SPEED, NULL);
         param0->unk_04[v0].unk_0C = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_SP_ATK, NULL);
         param0->unk_04[v0].unk_0E = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_SP_DEF, NULL);
-        param0->unk_04[v0].unk_10 = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_CURRENT_HP, NULL);
+        param0->unk_04[v0].curHP = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_CURRENT_HP, NULL);
         param0->unk_04[v0].unk_12 = Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_MAX_HP, NULL);
         param0->unk_04[v0].unk_14 = (u8)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_TYPE_1, NULL);
         param0->unk_04[v0].unk_15 = (u8)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_TYPE_2, NULL);
@@ -1218,7 +1220,7 @@ static void ov13_02220F98(UnkStruct_ov13_022213F0 *param0)
         }
 
         param0->unk_04[v0].unk_17_0 = Pokemon_GetGender(param0->unk_04[v0].unk_00);
-        param0->unk_04[v0].unk_17_3 = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0].unk_00);
+        param0->unk_04[v0].summaryStatus = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0].unk_00);
         param0->unk_04[v0].unk_17_7 = (u8)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_IS_EGG, NULL);
         param0->unk_04[v0].unk_18 = (u16)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_ABILITY, NULL);
         param0->unk_04[v0].unk_1A = (u16)Pokemon_GetValue(param0->unk_04[v0].unk_00, MON_DATA_HELD_ITEM, NULL);
@@ -1606,7 +1608,7 @@ static u8 ov13_022217A4(UnkStruct_ov13_022213F0 *param0)
         return 0;
     }
 
-    if (v0->unk_10 == 0) {
+    if (v0->curHP == 0) {
         v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 77);
         StringTemplate_SetNickname(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0->unk_00));
         StringTemplate_Format(param0->unk_1FA8, param0->unk_1FAC, v1);
diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c
index 4f65093cf8..9750ad5de9 100644
--- a/src/overlay013/ov13_02221A88.c
+++ b/src/overlay013/ov13_02221A88.c
@@ -369,7 +369,7 @@ static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
 {
     UnkStruct_ov13_02221ED0 *v0 = &param0->unk_04[param2];
 
-    sub_0200C5BC(param0->unk_1FA0, v0->unk_10, 3, 1, &param0->unk_206C[param1], param3, param4);
+    sub_0200C5BC(param0->unk_1FA0, v0->curHP, 3, 1, &param0->unk_206C[param1], param3, param4);
     sub_0200C578(param0->unk_1FA0, 0, &param0->unk_206C[param1], param3 + 8 * 3, param4);
     sub_0200C5BC(param0->unk_1FA0, v0->unk_12, 3, 0, &param0->unk_206C[param1], param3 + 8 * 3 + 8, param4);
     Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
@@ -383,9 +383,9 @@ static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
 
     v0 = &param0->unk_04[param2];
     v1 = 1;
-    v2 = App_PixelCount(v0->unk_10, v0->unk_12, 48);
+    v2 = App_PixelCount(v0->curHP, v0->unk_12, 48);
 
-    switch (HealthBar_Color(v0->unk_10, v0->unk_12, 48)) {
+    switch (HealthBar_Color(v0->curHP, v0->unk_12, 48)) {
     case 0:
         Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
         return;
@@ -753,7 +753,7 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 29);
     v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->heapID);
 
-    StringTemplate_SetNumber(param0->unk_1FA8, 0, v0->unk_10, 3, 0, 1);
+    StringTemplate_SetNumber(param0->unk_1FA8, 0, v0->curHP, 3, 0, 1);
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
@@ -1587,15 +1587,15 @@ void ov13_02224144(UnkStruct_ov13_022213F0 *param0)
         v5 |= 0x40;
     }
 
-    if ((param0->unk_04[v1->unk_11].unk_10 == 0) && (v4 != 0)) {
+    if ((param0->unk_04[v1->unk_11].curHP == 0) && (v4 != 0)) {
         v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 88);
         StringTemplate_SetNickname(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0));
         StringTemplate_Format(param0->unk_1FA8, param0->unk_1FAC, v3);
         Strbuf_Free(v3);
-    } else if (param0->unk_04[v1->unk_11].unk_10 != v4) {
+    } else if (param0->unk_04[v1->unk_11].curHP != v4) {
         v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 82);
         StringTemplate_SetNickname(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0));
-        StringTemplate_SetNumber(param0->unk_1FA8, 1, v4 - param0->unk_04[v1->unk_11].unk_10, 3, 0, 1);
+        StringTemplate_SetNumber(param0->unk_1FA8, 1, v4 - param0->unk_04[v1->unk_11].curHP, 3, 0, 1);
         StringTemplate_Format(param0->unk_1FA8, param0->unk_1FAC, v3);
         Strbuf_Free(v3);
     } else if ((Item_Get(v2, 36) != 0) || (Item_Get(v2, 37) != 0)) {
diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c
index a36d6cf947..34bb7ea9aa 100644
--- a/src/overlay013/ov13_02224500.c
+++ b/src/overlay013/ov13_02224500.c
@@ -498,7 +498,7 @@ static void ov13_02224C14(UnkStruct_ov13_022213F0 *param0)
         }
 
         ov13_022249AC(param0->unk_1FB4[7 + v0], Unk_ov13_02229404[v0][0], Unk_ov13_02229404[v0][1]);
-        ov13_02224AB0(param0->unk_04[v0].unk_17_3, param0->unk_1FB4[13 + v0], Unk_ov13_02229434[v0][0], Unk_ov13_02229434[v0][1]);
+        ov13_02224AB0(param0->unk_04[v0].summaryStatus, param0->unk_1FB4[13 + v0], Unk_ov13_02229434[v0][0], Unk_ov13_02229434[v0][1]);
         ov13_02224B28(param0->unk_04[v0].unk_1A, param0->unk_1FB4[0 + v0], Unk_ov13_02229404[v0][0] + 8, Unk_ov13_02229404[v0][1] + 8);
         ov13_02224B5C(param0->unk_04[v0].unk_2D, param0->unk_1FB4[32 + v0], Unk_ov13_02229404[v0][0] + 16, Unk_ov13_02229404[v0][1] + 8);
     }
@@ -524,7 +524,7 @@ static void ov13_02224D08(UnkStruct_ov13_022213F0 *param0)
     v0 = &param0->unk_04[param0->unk_00->unk_11];
 
     ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_0222923C[0], Unk_ov13_0222923C[1]);
-    ov13_02224AB0(v0->unk_17_3, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_0222924C[0], Unk_ov13_0222924C[1]);
+    ov13_02224AB0(v0->summaryStatus, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_0222924C[0], Unk_ov13_0222924C[1]);
     ov13_02224AD4(param0, v0, &Unk_ov13_022292C4[0][0]);
     ov13_02224B28(v0->unk_1A, param0->unk_1FB4[0 + param0->unk_00->unk_11], Unk_ov13_0222923C[0] + 8, Unk_ov13_0222923C[1] + 8);
     ov13_02224B5C(v0->unk_2D, param0->unk_1FB4[32 + param0->unk_00->unk_11], Unk_ov13_0222923C[0] + 16, Unk_ov13_0222923C[1] + 8);
@@ -539,7 +539,7 @@ static void ov13_02224DA0(UnkStruct_ov13_022213F0 *param0)
     v0 = &param0->unk_04[param0->unk_00->unk_11];
 
     ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_02229244[0], Unk_ov13_02229244[1]);
-    ov13_02224AB0(v0->unk_17_3, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_02229254[0], Unk_ov13_02229254[1]);
+    ov13_02224AB0(v0->summaryStatus, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_02229254[0], Unk_ov13_02229254[1]);
     ov13_02224AD4(param0, v0, &Unk_ov13_022292A4[0][0]);
     ov13_02224B28(v0->unk_1A, param0->unk_1FB4[0 + param0->unk_00->unk_11], Unk_ov13_02229244[0] + 8, Unk_ov13_02229244[1] + 8);
     ov13_02224B5C(v0->unk_2D, param0->unk_1FB4[32 + param0->unk_00->unk_11], Unk_ov13_02229244[0] + 16, Unk_ov13_02229244[1] + 8);
@@ -559,7 +559,7 @@ static void ov13_02224E78(UnkStruct_ov13_022213F0 *param0)
     UnkStruct_ov13_02221ED0 *v0 = &param0->unk_04[param0->unk_00->unk_11];
 
     ov13_022249AC(param0->unk_1FB4[7 + param0->unk_00->unk_11], Unk_ov13_02229264[0], Unk_ov13_02229264[1]);
-    ov13_02224AB0(v0->unk_17_3, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_02229224[0], Unk_ov13_02229224[1]);
+    ov13_02224AB0(v0->summaryStatus, param0->unk_1FB4[13 + param0->unk_00->unk_11], Unk_ov13_02229224[0], Unk_ov13_02229224[1]);
     ov13_02224AD4(param0, v0, &Unk_ov13_022292B4[0][0]);
     ov13_022249AC(param0->unk_1FB4[21 + param0->unk_00->unk_34], Unk_ov13_0222922C[0], Unk_ov13_0222922C[1]);
     ov13_02224B28(v0->unk_1A, param0->unk_1FB4[0 + param0->unk_00->unk_11], Unk_ov13_02229264[0] + 8, Unk_ov13_02229264[1] + 8);
@@ -700,28 +700,28 @@ static void ov13_02225304(ManagedSprite *param0, u8 param1)
     ManagedSprite_SetAnim(param0, param1);
 }
 
-static u8 ov13_02225324(UnkStruct_ov13_02221ED0 *param0)
+static u8 PartyScreen_GetHealthBarColor(UnkStruct_ov13_02221ED0 *param0)
 {
-    if (param0->unk_10 == 0) {
-        return 0;
+    if (param0->curHP == 0) {
+        return BARCOLOR_EMPTY;
     }
 
-    if ((param0->unk_17_3 != 7) && (param0->unk_17_3 != 6)) {
+    if ((param0->summaryStatus != SUMMARY_CONDITION_NONE) && (param0->summaryStatus != SUMMARY_CONDITION_FAINTED)) {
         return 5;
     }
 
-    switch (HealthBar_Color(param0->unk_10, param0->unk_12, 48)) {
+    switch (HealthBar_Color(param0->curHP, param0->unk_12, 48)) {
     case 4:
-        return 1;
+        return BARCOLOR_RED;
     case 3:
-        return 2;
+        return BARCOLOR_YELLOW;
     case 2:
-        return 3;
+        return BARCOLOR_GREEN;
     case 1:
-        return 4;
+        return BARCOLOR_MAX;
     }
 
-    return 0;
+    return BARCOLOR_EMPTY;
 }
 
 void ov13_0222537C(UnkStruct_ov13_022213F0 *param0)
@@ -734,7 +734,7 @@ void ov13_0222537C(UnkStruct_ov13_022213F0 *param0)
             continue;
         }
 
-        v1 = ov13_02225324(&param0->unk_04[v0]);
+        v1 = PartyScreen_GetHealthBarColor(&param0->unk_04[v0]);
 
         ov13_02225304(param0->unk_1FB4[7 + v0], v1);
         ManagedSprite_TickNFrames(param0->unk_1FB4[7 + v0], FX32_ONE);
diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c
index b0058e2895..b285f6d6ef 100644
--- a/src/overlay013/ov13_02225710.c
+++ b/src/overlay013/ov13_02225710.c
@@ -413,7 +413,7 @@ static void ov13_02225C4C(UnkStruct_ov13_022213F0 *param0, u16 *param1, u8 param
                 }
             }
         } else {
-            if (param0->unk_04[param2 - 0].unk_10 == 0) {
+            if (param0->unk_04[param2 - 0].curHP == 0) {
                 for (v3 = 0; v3 < v1 * v2; v3++) {
                     param1[v3] = (param1[v3] & 0xfff) | (2 << 12);
                 }
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index cf0598ad84..9b9afea719 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -111,10 +111,10 @@ static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
     param1->unk_A8 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
     MI_CpuClearFast(param1->unk_A8, sizeof(PartyManagementData));
 
-    param1->unk_A8->unk_00 = SaveData_GetParty(param1->saveData);
-    param1->unk_A8->unk_04 = SaveData_GetBag(param1->saveData);
-    param1->unk_A8->unk_08 = SaveData_GetMailBox(param1->saveData);
-    param1->unk_A8->unk_0C = SaveData_GetOptions(param1->saveData);
+    param1->unk_A8->party = SaveData_GetParty(param1->saveData);
+    param1->unk_A8->bag = SaveData_GetBag(param1->saveData);
+    param1->unk_A8->mailBox = SaveData_GetMailBox(param1->saveData);
+    param1->unk_A8->options = SaveData_GetOptions(param1->saveData);
     param1->unk_A8->unk_21 = 0;
 
     if (param1->unk_A0 == 1) {
@@ -129,7 +129,7 @@ static void ov104_02239D1C(UnkStruct_0209B75C *param0, UnkStruct_0209BBA4 *param
         GF_ASSERT(0);
     }
 
-    param1->unk_A8->unk_1C = fieldSystem;
+    param1->unk_A8->fieldSystem = fieldSystem;
     param1->unk_A8->selectedMonSlot = param1->unk_9F;
 
     for (v0 = 0; v0 < 2; v0++) {
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index d06ebc4417..1e285dbb36 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -63,13 +63,13 @@ void ov118_021D0D80(GameWindowLayout *param0)
 
     param0->unk_B24 = Heap_AllocFromHeap(HEAP_ID_12, sizeof(OverlayMetadata));
     MI_CpuClear8(param0->unk_B24, sizeof(OverlayMetadata));
-    param0->unk_B24->unk_14 = param0->unk_B11;
+    param0->unk_B24->unk_14 = param0->partySlot;
 }
 
 int ov118_021D0DBC(GameWindowLayout *param0)
 {
     OverlayMetadata *v0 = param0->unk_B24;
-    Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
 
     switch (v0->unk_00) {
     case 0: {
@@ -92,7 +92,7 @@ int ov118_021D0DBC(GameWindowLayout *param0)
             break;
         }
 
-        Pokedex_Capture(SaveData_GetPokedex(FieldSystem_GetSaveData(param0->unk_5A4->unk_1C)), v1);
+        Pokedex_Capture(SaveData_GetPokedex(FieldSystem_GetSaveData(param0->partyManagementData->fieldSystem)), v1);
     }
         v0->unk_00++;
         break;
@@ -113,7 +113,7 @@ int ov118_021D0DBC(GameWindowLayout *param0)
         v0->unk_04++;
 
         if (v0->unk_04 == v0->unk_08) {
-            sub_02082DA8(param0, param0->unk_B11);
+            sub_02082DA8(param0, param0->partySlot);
         }
 
         ov118_021D10E8();
@@ -138,19 +138,19 @@ int ov118_021D0DBC(GameWindowLayout *param0)
     case 9: {
         Strbuf *v2;
 
-        v2 = MessageLoader_GetNewStrbuf(param0->unk_69C, 202);
+        v2 = MessageLoader_GetNewStrbuf(param0->messageLoader, 202);
 
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1));
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v2);
+        StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v1));
+        StringTemplate_Format(param0->template, param0->unk_6A4, v2);
         Strbuf_Free(v2);
         sub_02082708(param0, 0xffffffff, 1);
     }
         v0->unk_00++;
         break;
     case 10:
-        if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+        if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
             ov118_021D0F70(param0);
-            param0->unk_5A4->unk_23 = 0;
+            param0->partyManagementData->menuSelectionResult = 0;
             return 1;
         }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index a824c981c8..247d3d3cff 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -3477,7 +3477,7 @@ static BOOL ScrCmd_2D0(ScriptContext *ctx)
     u16 *v3 = ScriptContext_GetVarPointer(ctx);
     u16 *v4 = ScriptContext_GetVarPointer(ctx);
     void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    PartyManagementData *v5 = *v2;
+    PartyManagementData *partyMan = *v2;
 
     GF_ASSERT(*v2 != 0);
 
@@ -3486,10 +3486,10 @@ static BOOL ScrCmd_2D0(ScriptContext *ctx)
     if (v1 == MAX_PARTY_SIZE + 1) {
         *v3 = 0xff;
     } else if (v1 == MAX_PARTY_SIZE) {
-        u16 v0 = v5->unk_2C[0];
+        u16 v0 = partyMan->unk_2C[0];
         *v3 = v0;
         *v3 -= 1;
-        v0 = v5->unk_2C[1];
+        v0 = partyMan->unk_2C[1];
         *v4 = v0;
 
         if (*v4 > 0) {
@@ -3509,7 +3509,7 @@ static BOOL ScrCmd_2D4(ScriptContext *ctx)
     u16 *v4 = ScriptContext_GetVarPointer(ctx);
     u16 *v5 = ScriptContext_GetVarPointer(ctx);
     void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    PartyManagementData *v6 = *v2;
+    PartyManagementData *partyMan = *v2;
 
     GF_ASSERT(*v2 != 0);
 
@@ -3518,13 +3518,13 @@ static BOOL ScrCmd_2D4(ScriptContext *ctx)
     if (v1 == MAX_PARTY_SIZE + 1) {
         *v3 = 0xff;
     } else if (v1 == MAX_PARTY_SIZE) {
-        *v3 = v6->unk_2C[0];
+        *v3 = partyMan->unk_2C[0];
         *v3 -= 1;
 
-        *v4 = v6->unk_2C[1];
+        *v4 = partyMan->unk_2C[1];
         *v4 -= 1;
 
-        *v5 = v6->unk_2C[2];
+        *v5 = partyMan->unk_2C[2];
 
         if (*v5 > 0) {
             *v5 -= 1;
@@ -3543,7 +3543,7 @@ static BOOL ScrCmd_2DB(ScriptContext *ctx)
     u16 *v4 = ScriptContext_GetVarPointer(ctx);
     u16 *v5 = ScriptContext_GetVarPointer(ctx);
     void **v2 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-    PartyManagementData *v6 = *v2;
+    PartyManagementData *partyMan = *v2;
 
     GF_ASSERT(*v2 != 0);
 
@@ -3552,13 +3552,13 @@ static BOOL ScrCmd_2DB(ScriptContext *ctx)
     if (v1 == MAX_PARTY_SIZE + 1) {
         *v3 = 0xff;
     } else if (v1 == MAX_PARTY_SIZE) {
-        *v3 = v6->unk_2C[0];
+        *v3 = partyMan->unk_2C[0];
         *v3 -= 1;
 
-        *v4 = v6->unk_2C[1];
+        *v4 = partyMan->unk_2C[1];
         *v4 -= 1;
 
-        *v5 = v6->unk_2C[2];
+        *v5 = partyMan->unk_2C[2];
 
         if (*v5 > 0) {
             *v5 -= 1;
@@ -5147,8 +5147,8 @@ static BOOL ScrCmd_2BA(ScriptContext *ctx)
 
     if (*v2 != 0) {
         void **v1 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
-        PartyManagementData *v0 = *v1;
-        Heap_FreeToHeap(v0);
+        PartyManagementData *partyMan = *v1;
+        Heap_FreeToHeap(partyMan);
     }
 
     return FALSE;
diff --git a/src/start_menu.c b/src/start_menu.c
index cef9d7c9ba..59c9de9bb6 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1012,7 +1012,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
     memcpy(partyMan, menu->taskData, sizeof(PartyManagementData));
     Heap_FreeToHeap(menu->taskData);
 
-    switch (partyMan->unk_23) {
+    switch (partyMan->menuSelectionResult) {
     case 1: {
         PokemonSummary *summary = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PokemonSummary));
 
@@ -1043,7 +1043,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         summary->dataType = SUMMARY_DATA_PARTY_MON;
         summary->monIndex = partyMan->selectedMonSlot;
         summary->monMax = 1;
-        summary->move = partyMan->unk_26;
+        summary->move = partyMan->learnedMove;
         summary->mode = SUMMARY_MODE_SELECT_MOVE;
         summary->dexMode = SaveData_GetDexMode(fieldSystem->saveData);
         summary->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
@@ -1055,7 +1055,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
 
         UnkStruct_0203C1C8 *v5 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C1C8));
 
-        v5->unk_00 = partyMan->unk_24;
+        v5->unk_00 = partyMan->usedItemID;
         v5->unk_02 = 0;
         menu->unk_260 = v5;
 
@@ -1070,7 +1070,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         summary->dataType = SUMMARY_DATA_PARTY_MON;
         summary->monIndex = partyMan->selectedMonSlot;
         summary->monMax = 1;
-        summary->move = partyMan->unk_26;
+        summary->move = partyMan->learnedMove;
         summary->mode = SUMMARY_MODE_SELECT_MOVE;
         summary->dexMode = SaveData_GetDexMode(fieldSystem->saveData);
         summary->showContest = PokemonSummaryScreen_ShowContestData(fieldSystem->saveData);
@@ -1092,15 +1092,15 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
     case 6: {
         UnkStruct_02097728 *v8;
 
-        v8 = sub_0203D920(fieldSystem, 2, partyMan->selectedMonSlot, Item_MailNumber(partyMan->unk_24), 11);
+        v8 = sub_0203D920(fieldSystem, 2, partyMan->selectedMonSlot, Item_MailNumber(partyMan->usedItemID), 11);
         menu->taskData = v8;
 
         if (partyMan->unk_20 == 10) {
             menu->unk_260 = sub_0203C540(
-                partyMan->unk_24, 0, partyMan->selectedMonSlot);
+                partyMan->usedItemID, 0, partyMan->selectedMonSlot);
         } else {
             menu->unk_260 = sub_0203C540(
-                partyMan->unk_24, 1, partyMan->selectedMonSlot);
+                partyMan->usedItemID, 1, partyMan->selectedMonSlot);
         }
 
         sub_0203B674(menu, sub_0203C558);
@@ -1113,7 +1113,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         v9 = sub_0203D984(fieldSystem, v10, HEAP_ID_FIELDMAP);
 
         menu->taskData = v9;
-        menu->unk_260 = sub_0203C540(partyMan->unk_24, 2, partyMan->selectedMonSlot);
+        menu->unk_260 = sub_0203C540(partyMan->usedItemID, 2, partyMan->selectedMonSlot);
 
         sub_0203B674(menu, sub_0203C558);
     } break;
@@ -1134,11 +1134,11 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
     case 8: {
         UnkStruct_0203C7B8 *v14 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(UnkStruct_0203C7B8));
 
-        v14->unk_02 = partyMan->unk_24;
+        v14->unk_02 = partyMan->usedItemID;
         v14->unk_01 = 3;
         v14->unk_00 = partyMan->selectedMonSlot;
-        v14->unk_04 = partyMan->unk_38;
-        v14->unk_08 = partyMan->unk_3C;
+        v14->unk_04 = partyMan->evoTargetSpecies;
+        v14->unk_08 = partyMan->evoType;
 
         menu->taskData = v14;
         menu->state = START_MENU_STATE_EVOLVE_INIT;
@@ -1149,8 +1149,8 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         v15->unk_02 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId);
         v15->unk_01 = 0;
         v15->unk_00 = partyMan->selectedMonSlot;
-        v15->unk_04 = partyMan->unk_38;
-        v15->unk_08 = partyMan->unk_3C;
+        v15->unk_04 = partyMan->evoTargetSpecies;
+        v15->unk_08 = partyMan->evoType;
         menu->taskData = v15;
         menu->state = START_MENU_STATE_EVOLVE_INIT;
     } break;
@@ -1170,7 +1170,7 @@ BOOL sub_0203B7C0(FieldTask *taskMan)
         FieldMoveTaskContext v16;
         FieldMovePokemon fieldMoveMon;
 
-        fieldMoveMon.fieldMove = partyMan->unk_23 - 11;
+        fieldMoveMon.fieldMove = partyMan->menuSelectionResult - 11;
         fieldMoveMon.fieldMonId = partyMan->selectedMonSlot;
         fieldMoveMon.fieldTask = taskMan;
 
@@ -1262,23 +1262,23 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
         sub_0203C2D8(taskMan, sub_0207CB94(v2));
         break;
     case 2: {
-        PartyManagementData *v6;
+        PartyManagementData *partyMan;
 
-        v6 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
-        memset(v6, 0, sizeof(PartyManagementData));
+        partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+        memset(partyMan, 0, sizeof(PartyManagementData));
 
-        v6->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-        v6->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-        v6->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-        v6->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-        v6->unk_18 = &menu->fieldMoveContext;
-        v6->unk_21 = 0;
-        v6->unk_20 = 9;
-        v6->unk_24 = sub_0207CB94(v2);
-        v6->unk_1C = fieldSystem;
+        partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+        partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+        partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+        partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+        partyMan->fieldMoveContext = &menu->fieldMoveContext;
+        partyMan->unk_21 = 0;
+        partyMan->unk_20 = 9;
+        partyMan->usedItemID = sub_0207CB94(v2);
+        partyMan->fieldSystem = fieldSystem;
 
-        FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v6);
-        menu->taskData = v6;
+        FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+        menu->taskData = partyMan;
         sub_0203B674(menu, sub_0203B7C0);
     } break;
     case 4: {
@@ -1303,29 +1303,29 @@ static BOOL sub_0203BC5C(FieldTask *taskMan)
             menu->unk_260 = sub_0203C540(v10, 0, (u8)v9);
             sub_0203B674(menu, sub_0203C558);
         } else {
-            PartyManagementData *v13;
+            PartyManagementData *partyMan;
 
-            v13 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
-            memset(v13, 0, sizeof(PartyManagementData));
+            partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+            memset(partyMan, 0, sizeof(PartyManagementData));
 
-            v13->unk_00 = v7;
-            v13->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-            v13->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-            v13->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-            v13->unk_18 = &menu->fieldMoveContext;
-            v13->unk_21 = 0;
-            v13->unk_24 = sub_0207CB94(v2);
-            v13->selectedMonSlot = (u8)v9;
-            v13->unk_1C = fieldSystem;
+            partyMan->party = v7;
+            partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+            partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+            partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+            partyMan->fieldMoveContext = &menu->fieldMoveContext;
+            partyMan->unk_21 = 0;
+            partyMan->usedItemID = sub_0207CB94(v2);
+            partyMan->selectedMonSlot = (u8)v9;
+            partyMan->fieldSystem = fieldSystem;
 
-            if (v13->unk_24 == 0) {
-                v13->unk_20 = 0;
+            if (partyMan->usedItemID == 0) {
+                partyMan->unk_20 = 0;
             } else {
-                v13->unk_20 = 10;
+                partyMan->unk_20 = 10;
             }
 
-            FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v13);
-            menu->taskData = v13;
+            FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+            menu->taskData = partyMan;
             sub_0203B674(menu, sub_0203B7C0);
         }
     } break;
@@ -1581,38 +1581,38 @@ static BOOL sub_0203C1C8(FieldTask *taskMan)
 
     switch (v2->mode) {
     case SUMMARY_MODE_SELECT_MOVE: {
-        PartyManagementData *v3;
+        PartyManagementData *partyMan;
         UnkStruct_0203C1C8 *v4;
 
-        v3 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+        partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
         v4 = (UnkStruct_0203C1C8 *)menu->unk_260;
 
-        memset(v3, 0, sizeof(PartyManagementData));
+        memset(partyMan, 0, sizeof(PartyManagementData));
 
-        v3->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-        v3->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-        v3->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-        v3->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-        v3->unk_18 = &menu->fieldMoveContext;
-        v3->unk_21 = 0;
-        v3->unk_1C = fieldSystem;
+        partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+        partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+        partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+        partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+        partyMan->fieldMoveContext = &menu->fieldMoveContext;
+        partyMan->unk_21 = 0;
+        partyMan->fieldSystem = fieldSystem;
 
         if (v4->unk_00 != 0) {
-            v3->unk_20 = 7;
-            v3->unk_34 = 0;
+            partyMan->unk_20 = 7;
+            partyMan->unk_34 = 0;
         } else {
-            v3->unk_20 = 8;
-            v3->unk_34 = v4->unk_02;
+            partyMan->unk_20 = 8;
+            partyMan->unk_34 = v4->unk_02;
         }
 
-        v3->unk_24 = v4->unk_00;
-        v3->selectedMonSlot = v2->monIndex;
-        v3->unk_26 = v2->move;
-        v3->unk_28 = v2->selectedMoveSlot;
+        partyMan->usedItemID = v4->unk_00;
+        partyMan->selectedMonSlot = v2->monIndex;
+        partyMan->learnedMove = v2->move;
+        partyMan->selectedMoveSlot = v2->selectedMoveSlot;
 
-        FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v3);
+        FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
         Heap_FreeToHeap(menu->unk_260);
-        menu->taskData = v3;
+        menu->taskData = partyMan;
         sub_0203B674(menu, sub_0203B7C0);
     } break;
     default:
@@ -1809,18 +1809,18 @@ static void sub_0203C668(FieldSystem *fieldSystem, StartMenu *menu, u8 param2)
     partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
     memset(partyMan, 0, sizeof(PartyManagementData));
-    partyMan->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    partyMan->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    partyMan->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    partyMan->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    partyMan->unk_18 = &menu->fieldMoveContext;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->fieldMoveContext = &menu->fieldMoveContext;
     partyMan->unk_21 = 0;
-    partyMan->unk_24 = v0->unk_00;
+    partyMan->usedItemID = v0->unk_00;
     partyMan->selectedMonSlot = v0->unk_02;
     partyMan->unk_20 = param2;
-    partyMan->unk_1C = fieldSystem;
+    partyMan->fieldSystem = fieldSystem;
 
-    sub_02097750(menu->taskData, Party_GetPokemonBySlotIndex(partyMan->unk_00, v0->unk_02));
+    sub_02097750(menu->taskData, Party_GetPokemonBySlotIndex(partyMan->party, v0->unk_02));
     sub_02097770(menu->taskData);
     FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index ccadd4f6d9..abfd2161aa 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -377,47 +377,47 @@ void FieldSystem_OpenSummaryScreen(FieldSystem *fieldSystem, void *overlayArgs)
 
 static PartyManagementData *sub_0203D344(int heapID, FieldSystem *fieldSystem, int param2, int param3)
 {
-    PartyManagementData *v0 = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v0, sizeof(PartyManagementData));
+    MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
-    v0->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v0->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v0->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v0->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v0->unk_21 = param2;
-    v0->unk_20 = param3;
-    v0->unk_1C = fieldSystem;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->unk_21 = param2;
+    partyMan->unk_20 = param3;
+    partyMan->fieldSystem = fieldSystem;
 
-    return v0;
+    return partyMan;
 }
 
 void *sub_0203D390(FieldSystem *fieldSystem, FieldMoveContext *param1, u8 param2)
 {
-    PartyManagementData *v0 = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 0);
+    PartyManagementData *partyMan = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 0);
 
-    v0->unk_18 = param1;
-    v0->selectedMonSlot = param2;
+    partyMan->fieldMoveContext = param1;
+    partyMan->selectedMonSlot = param2;
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    return v0;
+    return partyMan;
 }
 
 void *sub_0203D3C0(int param0, FieldSystem *fieldSystem)
 {
-    PartyManagementData *v0 = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 3);
+    PartyManagementData *partyMan = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 3);
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
-    return v0;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    return partyMan;
 }
 
 void *sub_0203D3E4(int param0, FieldSystem *fieldSystem)
 {
-    PartyManagementData *v0 = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 19);
+    PartyManagementData *partyMan = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 19);
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
-    return v0;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    return partyMan;
 }
 
 int PartyManagementData_GetSelectedSlot(PartyManagementData *partyMan)
@@ -437,8 +437,8 @@ void *sub_0203D410(int param0, FieldSystem *fieldSystem, int param2)
 
 int sub_0203D438(void *param0)
 {
-    PartyManagementData *v0 = param0;
-    return v0->unk_23;
+    PartyManagementData *partyMan = param0;
+    return partyMan->menuSelectionResult;
 }
 
 int sub_0203D440(void *param0)
@@ -501,40 +501,40 @@ static BOOL sub_0203D444(FieldTask *param0)
 void *sub_0203D50C(FieldTask *taskMan, int heapID)
 {
     UnkStruct_0203D444 *v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
     FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan);
 
     v0 = Heap_AllocFromHeap(heapID, sizeof(UnkStruct_0203D444));
     v0->heapID = heapID;
-    v1 = sub_0203D344(heapID, fieldSystem, 0, 2);
-    v1->unk_32_0 = 2;
-    v1->unk_32_4 = 2;
-    v1->unk_33 = 30;
-    v1->unk_14 = NULL;
-    v0->unk_04 = v1;
+    partyMan = sub_0203D344(heapID, fieldSystem, 0, 2);
+    partyMan->unk_32_0 = 2;
+    partyMan->unk_32_4 = 2;
+    partyMan->unk_33 = 30;
+    partyMan->battleRegulation = NULL;
+    v0->unk_04 = partyMan;
 
     FieldTask_InitCall(taskMan, sub_0203D444, v0);
 
-    return v1;
+    return partyMan;
 }
 
 void *sub_0203D578(int param0, FieldSystem *fieldSystem, int param2, int param3, int param4, int param5)
 {
-    PartyManagementData *v0 = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 13);
+    PartyManagementData *partyMan = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 13);
 
-    v0->selectedMonSlot = param5;
-    v0->unk_29 = 2;
-    v0->unk_2A = param2;
+    partyMan->selectedMonSlot = param5;
+    partyMan->unk_29 = 2;
+    partyMan->unk_2A = param2;
 
     if (param4 == 0) {
-        v0->unk_2B = param3;
+        partyMan->unk_2B = param3;
     } else {
-        v0->unk_2B = 0;
+        partyMan->unk_2B = 0;
     }
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    return v0;
+    return partyMan;
 }
 
 void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2)
@@ -562,12 +562,12 @@ void *sub_0203D5C8(int param0, FieldSystem *fieldSystem, int param2)
 
 void *sub_0203D644(FieldSystem *fieldSystem, int param1)
 {
-    PartyManagementData *v0 = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 21);
+    PartyManagementData *partyMan = sub_0203D344(HEAP_ID_FIELDMAP, fieldSystem, 0, 21);
 
-    v0->selectedMonSlot = param1;
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
+    partyMan->selectedMonSlot = param1;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    return v0;
+    return partyMan;
 }
 
 PokemonSummary *sub_0203D670(FieldSystem *fieldSystem, int heapID, int mode)
@@ -1712,24 +1712,24 @@ void *sub_0203E564(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 param3, i
 
 PartyManagementData *sub_0203E598(FieldSystem *fieldSystem, int heapID, int param2)
 {
-    PartyManagementData *v0 = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
-    memset(v0, 0, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    memset(partyMan, 0, sizeof(PartyManagementData));
 
-    v0->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v0->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v0->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v0->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v0->unk_10 = SaveData_GetTVBroadcast(fieldSystem->saveData);
-    v0->unk_18 = NULL;
-    v0->unk_21 = 0;
-    v0->unk_20 = 5;
-    v0->unk_24 = param2;
-    v0->selectedMonSlot = 0;
-    v0->unk_1C = fieldSystem;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
+    partyMan->fieldMoveContext = NULL;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 5;
+    partyMan->usedItemID = param2;
+    partyMan->selectedMonSlot = 0;
+    partyMan->fieldSystem = fieldSystem;
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v0);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    return v0;
+    return partyMan;
 }
 
 void *sub_0203E608(FieldSystem *fieldSystem, int heapID)
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index b64668b126..6d271c36dc 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -428,11 +428,11 @@ void sub_0204A358(UnkStruct_0204AFC4 *param0, FieldTask *param1, void **param2)
 BOOL sub_0204A378(UnkStruct_0204AFC4 *param0, void **param1, SaveData *saveData)
 {
     u16 v0 = 0;
-    PartyManagementData *v1 = *param1;
+    PartyManagementData *partyMan = *param1;
     Party *v2;
     Pokemon *v3;
 
-    if ((v1->unk_23 != 0) || (v1->selectedMonSlot == 7)) {
+    if ((partyMan->menuSelectionResult != 0) || (partyMan->selectedMonSlot == 7)) {
         Heap_FreeToHeap(*param1);
         *param1 = NULL;
         return 0;
@@ -441,7 +441,7 @@ BOOL sub_0204A378(UnkStruct_0204AFC4 *param0, void **param1, SaveData *saveData)
     v2 = SaveData_GetParty(saveData);
 
     for (v0 = 0; v0 < param0->unk_0E; v0++) {
-        param0->unk_2A[v0] = v1->unk_2C[v0] - 1;
+        param0->unk_2A[v0] = partyMan->unk_2C[v0] - 1;
         v3 = Party_GetPokemonBySlotIndex(v2, param0->unk_2A[v0]);
         param0->unk_2E[v0] = Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL);
         param0->unk_36[v0] = Pokemon_GetValue(v3, MON_DATA_HELD_ITEM, NULL);
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index 3688551266..e426be595e 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -329,38 +329,38 @@ static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
 {
     u8 v0;
 
-    PartyManagementData *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
-    MI_CpuClearFast(v1, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
-    v1->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v1->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v1->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v1->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
 
-    v1->unk_21 = 0;
+    partyMan->unk_21 = 0;
 
-    v1->unk_20 = 22;
-    v1->unk_1C = fieldSystem;
+    partyMan->unk_20 = 22;
+    partyMan->fieldSystem = fieldSystem;
 
-    v1->selectedMonSlot = param0->unk_05;
+    partyMan->selectedMonSlot = param0->unk_05;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1->unk_2C[v0] = param0->unk_06[v0];
+        partyMan->unk_2C[v0] = param0->unk_06[v0];
     }
 
-    v1->unk_33 = 30;
+    partyMan->unk_33 = 30;
 
-    v1->unk_32_0 = 1;
-    v1->unk_32_4 = 1;
+    partyMan->unk_32_0 = 1;
+    partyMan->unk_32_4 = 1;
 
     if (param0->unk_04 == 1) {
-        v1->unk_32_0 = 2;
-        v1->unk_32_4 = 2;
+        partyMan->unk_32_0 = 2;
+        partyMan->unk_32_4 = 2;
     }
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v1);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    *(param0->unk_08) = v1;
+    *(param0->unk_08) = partyMan;
 
     return UnkEnum_0204F13C_2;
 }
@@ -368,15 +368,15 @@ static int sub_0204F50C(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem, in
 static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem)
 {
     int v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
 
     if (FieldSystem_IsRunningApplication(fieldSystem)) {
         return UnkEnum_0204F13C_2;
     }
 
-    v1 = *(param0->unk_08);
+    partyMan = *(param0->unk_08);
 
-    switch (v1->selectedMonSlot) {
+    switch (partyMan->selectedMonSlot) {
     case 7:
         return UnkEnum_0204F13C_5;
 
@@ -387,11 +387,11 @@ static int sub_0204F5D8(UnkStruct_0204F470 *param0, FieldSystem *fieldSystem)
         break;
     }
 
-    MI_CpuCopy8(v1->unk_2C, param0->unk_06, 2);
+    MI_CpuCopy8(partyMan->unk_2C, param0->unk_06, 2);
 
-    param0->unk_05 = v1->selectedMonSlot;
+    param0->unk_05 = partyMan->selectedMonSlot;
 
-    Heap_FreeToHeap(v1);
+    Heap_FreeToHeap(partyMan);
     *(param0->unk_08) = NULL;
     return UnkEnum_0204F13C_3;
 }
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index ebcbf3a7d9..f5055e8fa6 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -250,36 +250,36 @@ static BOOL sub_0204FDE8(FieldTask *param0)
 static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, int param2)
 {
     u8 v0;
-    PartyManagementData *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v1, sizeof(PartyManagementData));
+    MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
-    v1->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v1->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v1->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v1->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
 
-    v1->unk_21 = 0;
-    v1->unk_20 = 23;
-    v1->unk_1C = fieldSystem;
-    v1->selectedMonSlot = param0->unk_05;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 23;
+    partyMan->fieldSystem = fieldSystem;
+    partyMan->selectedMonSlot = param0->unk_05;
 
     for (v0 = 0; v0 < 3; v0++) {
-        v1->unk_2C[v0] = param0->unk_06[v0];
+        partyMan->unk_2C[v0] = param0->unk_06[v0];
     }
 
-    v1->unk_33 = 100;
-    v1->unk_32_0 = 3;
-    v1->unk_32_4 = 3;
+    partyMan->unk_33 = 100;
+    partyMan->unk_32_0 = 3;
+    partyMan->unk_32_4 = 3;
 
     if (param0->unk_04 == 2) {
-        v1->unk_32_0 = 2;
-        v1->unk_32_4 = 2;
+        partyMan->unk_32_0 = 2;
+        partyMan->unk_32_4 = 2;
     }
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v1);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    *(param0->unk_0C) = v1;
+    *(param0->unk_0C) = partyMan;
 
     return 1;
 }
@@ -287,15 +287,15 @@ static int sub_0204FE50(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem, in
 static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem)
 {
     int v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
 
     if (FieldSystem_IsRunningApplication(fieldSystem)) {
         return 1;
     }
 
-    v1 = *(param0->unk_0C);
+    partyMan = *(param0->unk_0C);
 
-    switch (v1->selectedMonSlot) {
+    switch (partyMan->selectedMonSlot) {
     case 7:
         return 4;
     case 6:
@@ -304,9 +304,9 @@ static int sub_0204FF1C(UnkStruct_0204FE50 *param0, FieldSystem *fieldSystem)
         break;
     }
 
-    MI_CpuCopy8(v1->unk_2C, param0->unk_06, 3);
-    param0->unk_05 = v1->selectedMonSlot;
-    Heap_FreeToHeap(v1);
+    MI_CpuCopy8(partyMan->unk_2C, param0->unk_06, 3);
+    param0->unk_05 = partyMan->selectedMonSlot;
+    Heap_FreeToHeap(partyMan);
 
     *(param0->unk_0C) = NULL;
     return 2;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index 1e3b9915c3..6560226413 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -240,34 +240,34 @@ static BOOL sub_02050314(FieldTask *param0)
 static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, int param2)
 {
     u8 v0;
-    PartyManagementData *v1 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v1, sizeof(PartyManagementData));
+    MI_CpuClearFast(partyMan, sizeof(PartyManagementData));
 
-    v1->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v1->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v1->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v1->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v1->unk_21 = 0;
-    v1->unk_20 = 23;
-    v1->unk_1C = fieldSystem;
-    v1->selectedMonSlot = param0->unk_05;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 23;
+    partyMan->fieldSystem = fieldSystem;
+    partyMan->selectedMonSlot = param0->unk_05;
 
     for (v0 = 0; v0 < 3; v0++) {
-        v1->unk_2C[v0] = param0->unk_06[v0];
+        partyMan->unk_2C[v0] = param0->unk_06[v0];
     }
 
-    v1->unk_33 = 100;
-    v1->unk_32_0 = 3;
-    v1->unk_32_4 = 3;
+    partyMan->unk_33 = 100;
+    partyMan->unk_32_0 = 3;
+    partyMan->unk_32_4 = 3;
 
     if (param0->unk_04 == 2) {
-        v1->unk_32_0 = 2;
-        v1->unk_32_4 = 2;
+        partyMan->unk_32_0 = 2;
+        partyMan->unk_32_4 = 2;
     }
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v1);
-    *(param0->unk_0C) = v1;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    *(param0->unk_0C) = partyMan;
 
     return 1;
 }
@@ -275,15 +275,15 @@ static int sub_0205037C(UnkStruct_0205037C *param0, FieldSystem *fieldSystem, in
 static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem)
 {
     int v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
 
     if (FieldSystem_IsRunningApplication(fieldSystem)) {
         return 1;
     }
 
-    v1 = *(param0->unk_0C);
+    partyMan = *(param0->unk_0C);
 
-    switch (v1->selectedMonSlot) {
+    switch (partyMan->selectedMonSlot) {
     case 7:
         return 4;
     case 6:
@@ -292,9 +292,9 @@ static int sub_02050448(UnkStruct_0205037C *param0, FieldSystem *fieldSystem)
         break;
     }
 
-    MI_CpuCopy8(v1->unk_2C, param0->unk_06, 3);
-    param0->unk_05 = v1->selectedMonSlot;
-    Heap_FreeToHeap(v1);
+    MI_CpuCopy8(partyMan->unk_2C, param0->unk_06, 3);
+    param0->unk_05 = partyMan->selectedMonSlot;
+    Heap_FreeToHeap(partyMan);
     *(param0->unk_0C) = NULL;
 
     return 2;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index f27feaf424..943221d428 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -149,34 +149,34 @@ static void sub_0205A0D8(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem, P
 static void sub_0205A164(UnkStruct_0205A0D8 *param0, int heapID)
 {
     int v0;
-    PartyManagementData *v1 = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeap(heapID, sizeof(PartyManagementData));
 
-    MI_CpuClear8(v1, sizeof(PartyManagementData));
+    MI_CpuClear8(partyMan, sizeof(PartyManagementData));
 
-    v1->unk_0C = SaveData_GetOptions(param0->fieldSystem->saveData);
-    v1->unk_14 = (void *)param0->fieldSystem->unk_B0;
-    v1->unk_00 = SaveData_GetParty(param0->fieldSystem->saveData);
-    v1->unk_04 = SaveData_GetBag(param0->fieldSystem->saveData);
-    v1->unk_21 = 0;
-    v1->unk_20 = 2;
+    partyMan->options = SaveData_GetOptions(param0->fieldSystem->saveData);
+    partyMan->battleRegulation = (void *)param0->fieldSystem->unk_B0;
+    partyMan->party = SaveData_GetParty(param0->fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(param0->fieldSystem->saveData);
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 2;
 
     if (param0->fieldSystem->unk_B0) {
-        v1->unk_32_0 = sub_02026074(param0->fieldSystem->unk_B0, 1);
-        v1->unk_32_4 = v1->unk_32_0;
+        partyMan->unk_32_0 = sub_02026074(param0->fieldSystem->unk_B0, 1);
+        partyMan->unk_32_4 = partyMan->unk_32_0;
     } else {
-        v1->unk_32_0 = 3;
-        v1->unk_32_4 = 3;
+        partyMan->unk_32_0 = 3;
+        partyMan->unk_32_4 = 3;
     }
 
-    v1->unk_33 = 100;
-    v1->selectedMonSlot = param0->unk_3C;
+    partyMan->unk_33 = 100;
+    partyMan->selectedMonSlot = param0->unk_3C;
 
     for (v0 = 0; v0 < 6; v0++) {
-        v1->unk_2C[v0] = param0->unk_3D[v0];
+        partyMan->unk_2C[v0] = param0->unk_3D[v0];
     }
 
-    FieldSystem_StartChildProcess(param0->fieldSystem, &Unk_020F1E88, v1);
-    param0->unk_04 = v1;
+    FieldSystem_StartChildProcess(param0->fieldSystem, &Unk_020F1E88, partyMan);
+    param0->unk_04 = partyMan;
 }
 
 static BOOL sub_0205A258(UnkStruct_0205A0D8 *param0, FieldSystem *fieldSystem)
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index 2e68054e85..a7458a8b17 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -331,28 +331,28 @@ static void sub_02068630(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *p
 {
     FieldSystem *fieldSystem;
     StartMenu *menu;
-    PartyManagementData *v2;
+    PartyManagementData *partyMan;
 
     fieldSystem = FieldTask_GetFieldSystem(param0->unk_00);
     menu = FieldTask_GetEnv(param0->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(PartyManagementData));
+    memset(partyMan, 0, sizeof(PartyManagementData));
 
-    v2->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v2->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v2->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v2->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v2->unk_10 = SaveData_GetTVBroadcast(fieldSystem->saveData);
-    v2->unk_18 = &menu->fieldMoveContext;
-    v2->unk_21 = 0;
-    v2->unk_20 = 5;
-    v2->unk_1C = fieldSystem;
-    v2->unk_24 = param0->unk_04;
-    v2->selectedMonSlot = param0->unk_06;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
+    partyMan->fieldMoveContext = &menu->fieldMoveContext;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 5;
+    partyMan->fieldSystem = fieldSystem;
+    partyMan->usedItemID = param0->unk_04;
+    partyMan->selectedMonSlot = param0->unk_06;
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v2);
-    menu->taskData = v2;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    menu->taskData = partyMan;
     sub_0203B674(menu, sub_0203B7C0);
 }
 
@@ -580,28 +580,28 @@ static void sub_02068A34(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *p
 {
     FieldSystem *fieldSystem;
     StartMenu *menu;
-    PartyManagementData *v2;
+    PartyManagementData *partyMan;
 
     fieldSystem = FieldTask_GetFieldSystem(param0->unk_00);
     menu = FieldTask_GetEnv(param0->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(PartyManagementData));
+    memset(partyMan, 0, sizeof(PartyManagementData));
 
-    v2->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v2->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v2->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v2->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v2->unk_18 = &menu->fieldMoveContext;
-    v2->unk_21 = 0;
-    v2->unk_20 = 6;
-    v2->unk_1C = fieldSystem;
-    v2->unk_24 = param0->unk_04;
-    v2->selectedMonSlot = param0->unk_06;
-    v2->unk_26 = Item_MoveForTMHM(param0->unk_04);
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->fieldMoveContext = &menu->fieldMoveContext;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 6;
+    partyMan->fieldSystem = fieldSystem;
+    partyMan->usedItemID = param0->unk_04;
+    partyMan->selectedMonSlot = param0->unk_06;
+    partyMan->learnedMove = Item_MoveForTMHM(param0->unk_04);
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v2);
-    menu->taskData = v2;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    menu->taskData = partyMan;
     sub_0203B674(menu, sub_0203B7C0);
 }
 
@@ -968,27 +968,27 @@ static void sub_02068FEC(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *p
 {
     FieldSystem *fieldSystem;
     StartMenu *menu;
-    PartyManagementData *v2;
+    PartyManagementData *partyMan;
 
     fieldSystem = FieldTask_GetFieldSystem(param0->unk_00);
     menu = FieldTask_GetEnv(param0->unk_00);
-    v2 = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
+    partyMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(PartyManagementData));
+    memset(partyMan, 0, sizeof(PartyManagementData));
 
-    v2->unk_00 = SaveData_GetParty(fieldSystem->saveData);
-    v2->unk_04 = SaveData_GetBag(fieldSystem->saveData);
-    v2->unk_08 = SaveData_GetMailBox(fieldSystem->saveData);
-    v2->unk_0C = SaveData_GetOptions(fieldSystem->saveData);
-    v2->unk_10 = SaveData_GetTVBroadcast(fieldSystem->saveData);
-    v2->unk_18 = &menu->fieldMoveContext;
-    v2->unk_21 = 0;
-    v2->unk_20 = 16;
-    v2->unk_24 = param0->unk_04;
-    v2->selectedMonSlot = param0->unk_06;
+    partyMan->party = SaveData_GetParty(fieldSystem->saveData);
+    partyMan->bag = SaveData_GetBag(fieldSystem->saveData);
+    partyMan->mailBox = SaveData_GetMailBox(fieldSystem->saveData);
+    partyMan->options = SaveData_GetOptions(fieldSystem->saveData);
+    partyMan->broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
+    partyMan->fieldMoveContext = &menu->fieldMoveContext;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 16;
+    partyMan->usedItemID = param0->unk_04;
+    partyMan->selectedMonSlot = param0->unk_06;
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v2);
-    menu->taskData = v2;
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
+    menu->taskData = partyMan;
     sub_0203B674(menu, sub_0203B7C0);
 }
 
@@ -1096,7 +1096,7 @@ static void sub_020691E0(UnkStruct_02068630 *param0, const UnkStruct_020684D0 *p
 {
     FieldSystem *fieldSystem;
     StartMenu *menu;
-    PartyManagementData *v2;
+    PartyManagementData *partyMan; // unused
 
     fieldSystem = FieldTask_GetFieldSystem(param0->unk_00);
     menu = FieldTask_GetEnv(param0->unk_00);
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 7e30d65bea..261b9f7c10 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -70,43 +70,43 @@ static int sub_0206B9D8(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem, in
 {
     u8 v0;
     SaveData *saveData;
-    PartyManagementData *v2 = Heap_AllocFromHeapAtEnd(heapID, sizeof(PartyManagementData));
+    PartyManagementData *partyMan = Heap_AllocFromHeapAtEnd(heapID, sizeof(PartyManagementData));
 
     saveData = fieldSystem->saveData;
-    MI_CpuClear8(v2, sizeof(PartyManagementData));
+    MI_CpuClear8(partyMan, sizeof(PartyManagementData));
 
-    v2->unk_0C = SaveData_GetOptions(saveData);
-    v2->unk_00 = SaveData_GetParty(saveData);
-    v2->unk_04 = SaveData_GetBag(saveData);
-    v2->unk_21 = 0;
-    v2->unk_20 = param0->unk_08;
-    v2->unk_32_0 = param0->unk_0A;
-    v2->unk_32_4 = param0->unk_0B;
-    v2->unk_33 = param0->unk_0C;
-    v2->selectedMonSlot = param0->unk_0D;
+    partyMan->options = SaveData_GetOptions(saveData);
+    partyMan->party = SaveData_GetParty(saveData);
+    partyMan->bag = SaveData_GetBag(saveData);
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = param0->unk_08;
+    partyMan->unk_32_0 = param0->unk_0A;
+    partyMan->unk_32_4 = param0->unk_0B;
+    partyMan->unk_33 = param0->unk_0C;
+    partyMan->selectedMonSlot = param0->unk_0D;
 
     for (v0 = 0; v0 < 6; v0++) {
-        v2->unk_2C[v0] = param0->unk_0E[v0];
+        partyMan->unk_2C[v0] = param0->unk_0E[v0];
     }
 
-    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, v2);
+    FieldSystem_StartChildProcess(fieldSystem, &Unk_020F1E88, partyMan);
 
-    *(param0->unk_14) = v2;
+    *(param0->unk_14) = partyMan;
     return 1;
 }
 
 static int sub_0206BA84(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem)
 {
     int v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
 
     if (FieldSystem_IsRunningApplication(fieldSystem)) {
         return 1;
     }
 
-    v1 = *(param0->unk_14);
+    partyMan = *(param0->unk_14);
 
-    switch (v1->selectedMonSlot) {
+    switch (partyMan->selectedMonSlot) {
     case 7:
         param0->unk_00 = 0;
         return 4;
@@ -117,9 +117,9 @@ static int sub_0206BA84(UnkStruct_0206B9D8 *param0, FieldSystem *fieldSystem)
         break;
     }
 
-    MI_CpuCopy8(v1->unk_2C, param0->unk_0E, 6);
-    param0->unk_0D = v1->selectedMonSlot;
-    Heap_FreeToHeap(v1);
+    MI_CpuCopy8(partyMan->unk_2C, param0->unk_0E, 6);
+    param0->unk_0D = partyMan->selectedMonSlot;
+    Heap_FreeToHeap(partyMan);
     *(param0->unk_14) = NULL;
 
     return 2;
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 6354d6c002..935cc7a7ad 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -501,7 +501,7 @@ static void sub_020726B4(SysTask *param0, void *param1)
 static void sub_02072754(SysTask *param0, void *param1)
 {
     u8 v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
     UnkStruct_02072334 *v2 = (UnkStruct_02072334 *)param1;
 
     switch (v2->unk_10) {
@@ -581,7 +581,7 @@ static void sub_02072878(SysTask *param0, void *param1)
 {
     int v0;
     u8 v1, v2;
-    PartyManagementData *v3;
+    PartyManagementData *partyMan;
     UnkStruct_02072334 *v4 = (UnkStruct_02072334 *)param1;
 
     switch (v4->unk_10) {
@@ -605,7 +605,7 @@ static void sub_02072878(SysTask *param0, void *param1)
         }
 
         v1 = v4->unk_1B4->selectedMonSlot;
-        v2 = v4->unk_1B4->unk_23;
+        v2 = v4->unk_1B4->menuSelectionResult;
 
         Heap_FreeToHeap(v4->unk_1B4);
 
@@ -1195,27 +1195,27 @@ static int sub_020734F4(UnkStruct_02072334 *param0, u8 param1)
 
 static int sub_02073524(UnkStruct_02072334 *param0, int param1)
 {
-    PartyManagementData *v0;
+    PartyManagementData *partyMan;
 
     switch (param0->unk_12) {
     case 0:
-        v0 = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
-        MI_CpuClear8(v0, sizeof(PartyManagementData));
+        partyMan = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
+        MI_CpuClear8(partyMan, sizeof(PartyManagementData));
 
-        v0->unk_00 = SaveData_GetParty(FieldSystem_GetSaveData(param0->fieldSystem));
-        v0->unk_04 = SaveData_GetBag(FieldSystem_GetSaveData(param0->fieldSystem));
-        v0->unk_0C = SaveData_GetOptions(FieldSystem_GetSaveData(param0->fieldSystem));
-        v0->unk_08 = SaveData_GetMailBox(param0->fieldSystem->saveData);
-        v0->unk_21 = 0;
-        v0->unk_20 = param1;
-        v0->unk_24 = param0->unk_1C[param0->unk_18].item;
+        partyMan->party = SaveData_GetParty(FieldSystem_GetSaveData(param0->fieldSystem));
+        partyMan->bag = SaveData_GetBag(FieldSystem_GetSaveData(param0->fieldSystem));
+        partyMan->options = SaveData_GetOptions(FieldSystem_GetSaveData(param0->fieldSystem));
+        partyMan->mailBox = SaveData_GetMailBox(param0->fieldSystem->saveData);
+        partyMan->unk_21 = 0;
+        partyMan->unk_20 = param1;
+        partyMan->usedItemID = param0->unk_1C[param0->unk_18].item;
 
         if (param1 == 11) {
-            v0->selectedMonSlot = param0->unk_17;
+            partyMan->selectedMonSlot = param0->unk_17;
         }
 
-        FieldSystem_StartChildProcess(param0->fieldSystem, &Unk_020F1E88, v0);
-        param0->unk_1B4 = v0;
+        FieldSystem_StartChildProcess(param0->fieldSystem, &Unk_020F1E88, partyMan);
+        param0->unk_1B4 = partyMan;
         param0->unk_12++;
         break;
     case 1:
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index bd238963ef..28c0e8052e 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -274,29 +274,29 @@ static int sub_0207E0B8(OverlayManager *param0, int *param1)
     sub_02082E58(v0);
     sub_0207EE14(v0);
     sub_0207F308(v0);
-    sub_02080500(v0, v0->unk_B11, 1);
+    sub_02080500(v0, v0->partySlot, 1);
 
-    if ((v0->unk_5A4->unk_20 == 5) || (v0->unk_5A4->unk_20 == 16)) {
-        if (sub_020857A8(v0->unk_5A4->unk_24) == 0) {
+    if ((v0->partyManagementData->unk_20 == 5) || (v0->partyManagementData->unk_20 == 16)) {
+        if (CheckItemSacredAsh(v0->partyManagementData->usedItemID) == 0) {
             sub_020826E0(v0, 32, 1);
         }
-    } else if (v0->unk_5A4->unk_20 == 6) {
+    } else if (v0->partyManagementData->unk_20 == 6) {
         sub_020826E0(v0, 33, 1);
-    } else if ((v0->unk_5A4->unk_20 == 9) || (v0->unk_5A4->unk_20 == 14)) {
+    } else if ((v0->partyManagementData->unk_20 == 9) || (v0->partyManagementData->unk_20 == 14)) {
         sub_020826E0(v0, 31, 1);
-    } else if ((v0->unk_5A4->unk_20 == 7) || (v0->unk_5A4->unk_20 == 8) || (v0->unk_5A4->unk_20 == 11) || (v0->unk_5A4->unk_20 == 12)) {
+    } else if ((v0->partyManagementData->unk_20 == 7) || (v0->partyManagementData->unk_20 == 8) || (v0->partyManagementData->unk_20 == 11) || (v0->partyManagementData->unk_20 == 12)) {
         Sprite_SetExplicitPalette2(v0->unk_5B0[6], 1);
-    } else if ((v0->unk_5A4->unk_20 == 2) || (v0->unk_5A4->unk_20 == 17)) {
+    } else if ((v0->partyManagementData->unk_20 == 2) || (v0->partyManagementData->unk_20 == 17)) {
         sub_020826E0(v0, 34, 1);
-    } else if (v0->unk_5A4->unk_20 == 15) {
+    } else if (v0->partyManagementData->unk_20 == 15) {
         sub_020826E0(v0, 34, 1);
-    } else if (v0->unk_5A4->unk_20 == 22) {
+    } else if (v0->partyManagementData->unk_20 == 22) {
         sub_020826E0(v0, 34, 1);
-    } else if (v0->unk_5A4->unk_20 == 23) {
+    } else if (v0->partyManagementData->unk_20 == 23) {
         sub_020826E0(v0, 34, 1);
-    } else if (v0->unk_5A4->unk_20 == 21) {
+    } else if (v0->partyManagementData->unk_20 == 21) {
         sub_020826E0(v0, 197, 1);
-    } else if (v0->unk_5A4->unk_20 != 10) {
+    } else if (v0->partyManagementData->unk_20 != 10) {
         sub_020826E0(v0, 29, 1);
     } else {
         Sprite_SetExplicitPalette2(v0->unk_5B0[6], 1);
@@ -438,7 +438,7 @@ static int sub_0207E2A8(OverlayManager *param0, int *param1)
         break;
     case 33:
         if (IsScreenTransitionDone() == 1) {
-            v0->unk_5A4->selectedMonSlot = v0->unk_B11;
+            v0->partyManagementData->selectedMonSlot = v0->partySlot;
             return 1;
         }
         break;
@@ -455,24 +455,24 @@ static int sub_0207E2A8(OverlayManager *param0, int *param1)
 static int sub_0207E490(GameWindowLayout *param0)
 {
     if (IsScreenTransitionDone() == 1) {
-        if ((param0->unk_5A4->unk_20 == 5) || (param0->unk_5A4->unk_20 == 16)) {
-            if (sub_020857A8(param0->unk_5A4->unk_24) == 1) {
+        if ((param0->partyManagementData->unk_20 == 5) || (param0->partyManagementData->unk_20 == 16)) {
+            if (CheckItemSacredAsh(param0->partyManagementData->usedItemID) == 1) {
                 param0->unk_B0E = 0;
                 return 7;
             }
 
             return 4;
-        } else if (param0->unk_5A4->unk_20 == 6) {
+        } else if (param0->partyManagementData->unk_20 == 6) {
             return 21;
-        } else if (param0->unk_5A4->unk_20 == 7) {
+        } else if (param0->partyManagementData->unk_20 == 7) {
             return sub_020862F8(param0);
-        } else if (param0->unk_5A4->unk_20 == 8) {
+        } else if (param0->partyManagementData->unk_20 == 8) {
             return sub_02085EF4(param0);
-        } else if ((param0->unk_5A4->unk_20 == 11) || (param0->unk_5A4->unk_20 == 12)) {
+        } else if ((param0->partyManagementData->unk_20 == 11) || (param0->partyManagementData->unk_20 == 12)) {
             return 14;
-        } else if (param0->unk_5A4->unk_20 == 9) {
+        } else if (param0->partyManagementData->unk_20 == 9) {
             return 8;
-        } else if (param0->unk_5A4->unk_20 == 10) {
+        } else if (param0->partyManagementData->unk_20 == 10) {
             return 16;
         } else {
             return 1;
@@ -487,13 +487,13 @@ static int sub_0207E518(GameWindowLayout *param0)
     u8 v0 = sub_0207FE98(param0);
 
     if (v0 == 0) {
-        if ((param0->unk_5A4->unk_20 == 3) || (param0->unk_5A4->unk_20 == 20)) {
-            param0->unk_5A4->unk_23 = 0;
+        if ((param0->partyManagementData->unk_20 == 3) || (param0->partyManagementData->unk_20 == 20)) {
+            param0->partyManagementData->menuSelectionResult = 0;
             return 32;
-        } else if (param0->unk_5A4->unk_20 == 14) {
+        } else if (param0->partyManagementData->unk_20 == 14) {
             sub_020868B0(param0);
             return 24;
-        } else if (param0->unk_5A4->unk_20 == 19) {
+        } else if (param0->partyManagementData->unk_20 == 19) {
             return CheckForItemApplication(param0);
         } else {
             return 2;
@@ -501,11 +501,11 @@ static int sub_0207E518(GameWindowLayout *param0)
     } else if (v0 == 4) {
         return HandleGameWindowEvent(param0);
     } else if (v0 == 3) {
-        param0->unk_5A4->unk_23 = 0;
+        param0->partyManagementData->menuSelectionResult = 0;
         return 32;
     } else if (v0 == 2) {
-        if (param0->unk_5A4->unk_20 != 15) {
-            param0->unk_5A4->unk_23 = 1;
+        if (param0->partyManagementData->unk_20 != 15) {
+            param0->partyManagementData->menuSelectionResult = 1;
             return 32;
         } else {
             Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
@@ -524,7 +524,7 @@ static int sub_0207E5B4(GameWindowLayout *param0)
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         return ApplyItemEffectOnPokemon(param0);
     } else if (v0 == 3) {
-        param0->unk_5A4->unk_23 = 0;
+        param0->partyManagementData->menuSelectionResult = 0;
         return 32;
     }
 
@@ -539,7 +539,7 @@ static int sub_0207E5F4(GameWindowLayout *param0)
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         return ProcessItemApplication(param0);
     } else if (v0 == 3) {
-        param0->unk_5A4->unk_23 = 0;
+        param0->partyManagementData->menuSelectionResult = 0;
         return 32;
     }
 
@@ -578,7 +578,7 @@ static int sub_0207E634(GameWindowLayout *param0)
 
 static int sub_0207E6C0(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         return param0->unk_B0E;
     }
 
@@ -620,17 +620,17 @@ static int sub_0207E750(GameWindowLayout *param0)
     if ((v0 == 0) || (v0 == 2)) {
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
-        if (param0->unk_704[param0->unk_B11].unk_10 != 1) {
+        if (param0->unk_704[param0->partySlot].unk_10 != 1) {
             return sub_0208615C(param0);
         } else {
             sub_02082708(param0, 0xffffffff, 1);
-            param0->unk_5A4->unk_23 = 0;
+            param0->partyManagementData->menuSelectionResult = 0;
             param0->unk_B0E = 25;
-            MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4);
+            MessageLoader_GetStrbuf(param0->messageLoader, 105, param0->unk_6A4);
             return 24;
         }
     } else if (v0 == 3) {
-        param0->unk_5A4->unk_23 = 0;
+        param0->partyManagementData->menuSelectionResult = 0;
         return 32;
     }
 
@@ -660,9 +660,9 @@ static int sub_0207E7E0(OverlayManager *param0, int *param1)
         Strbuf_Free(v0->unk_6AC[v1]);
     }
 
-    MessageLoader_Free(v0->unk_69C);
+    MessageLoader_Free(v0->messageLoader);
     sub_0200C560(v0->unk_698);
-    StringTemplate_Free(v0->unk_6A0);
+    StringTemplate_Free(v0->template);
 
     if (v0->unk_B20 != NULL) {
         sub_0207A2C0(v0->unk_B20);
@@ -862,21 +862,21 @@ static void sub_0207EA24(BgConfig *param0)
     Heap_FreeToHeapExplicit(HEAP_ID_12, param0);
 }
 
-void sub_0207EA74(GameWindowLayout *param0, int param1)
+void sub_0207EA74(GameWindowLayout *windowLayout, int param1)
 {
     if (param1 == 0) {
         Bg_ToggleLayer(0, 0);
-        Bg_FreeTilemapBuffer(param0->unk_00, 0);
+        Bg_FreeTilemapBuffer(windowLayout->unk_00, 0);
 
         GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
-        param0->unk_B28 = sub_0207EAD4(HEAP_ID_12);
+        windowLayout->unk_B28 = sub_0207EAD4(HEAP_ID_12);
     } else {
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
-        sub_0207EB64(param0->unk_B28);
+        sub_0207EB64(windowLayout->unk_B28);
 
         GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_2D);
 
-        sub_0207E8E0(param0->unk_00);
+        sub_0207E8E0(windowLayout->unk_00);
         Bg_ClearTilesRange(0, 32, 0, HEAP_ID_12);
     }
 }
@@ -924,7 +924,7 @@ static void sub_0207EB6C(GameWindowLayout *param0, NARC *param1)
 
     Font_LoadScreenIndicatorsPalette(0, 13 * 32, HEAP_ID_12);
     LoadStandardWindowGraphics(param0->unk_00, 0, 1, 14, 0, HEAP_ID_12);
-    LoadMessageBoxGraphics(param0->unk_00, 0, (1 + 9), 15, Options_Frame(param0->unk_5A4->unk_0C), HEAP_ID_12);
+    LoadMessageBoxGraphics(param0->unk_00, 0, (1 + 9), 15, Options_Frame(param0->partyManagementData->options), HEAP_ID_12);
     Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 3, param0->unk_00, 4, 0, 0, 0, HEAP_ID_12);
     Graphics_LoadPaletteFromOpenNARC(param1, 4, 4, 0x20, 0x20, HEAP_ID_12);
     Graphics_LoadTilesToBgLayerFromOpenNARC(param1, 12, param0->unk_00, 5, 0, 0, 0, HEAP_ID_12);
@@ -943,18 +943,18 @@ static GameWindowLayout *sub_0207ECC0(OverlayManager *param0)
     v0 = OverlayManager_NewData(param0, sizeof(GameWindowLayout), HEAP_ID_12);
     memset(v0, 0, sizeof(GameWindowLayout));
 
-    v0->unk_5A4 = OverlayManager_Args(param0);
+    v0->partyManagementData = OverlayManager_Args(param0);
     v0->unk_00 = BgConfig_New(HEAP_ID_12);
 
-    if ((v0->unk_5A4->unk_20 == 2) && (v0->unk_5A4->unk_14 != NULL)) {
+    if ((v0->partyManagementData->unk_20 == 2) && (v0->partyManagementData->battleRegulation != NULL)) {
         v0->unk_B20 = sub_0207A2A8(HEAP_ID_12);
     } else {
         v0->unk_B20 = NULL;
     }
 
-    v0->unk_69C = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0453, HEAP_ID_12);
+    v0->messageLoader = MessageLoader_Init(MESSAGE_LOADER_BANK_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0453, HEAP_ID_12);
     v0->unk_698 = sub_0200C440(15, 14, 0, HEAP_ID_12);
-    v0->unk_6A0 = StringTemplate_Default(HEAP_ID_12);
+    v0->template = StringTemplate_Default(HEAP_ID_12);
 
     for (v1 = 0; v1 < 6; v1++) {
         v0->unk_704[v1].unk_00 = Strbuf_Init(10 + 1, HEAP_ID_12);
@@ -967,18 +967,18 @@ static GameWindowLayout *sub_0207ECC0(OverlayManager *param0)
         v0->unk_6AC[v1] = Strbuf_Init(32, HEAP_ID_12);
     }
 
-    v0->unk_B11 = v0->unk_5A4->selectedMonSlot;
-    v0->unk_B12 = v0->unk_B11;
+    v0->partySlot = v0->partyManagementData->selectedMonSlot;
+    v0->unk_B12 = v0->partySlot;
 
     return v0;
 }
 
 static void sub_0207EDC0(GameWindowLayout *param0)
 {
-    if ((param0->unk_5A4->unk_20 & 0x80) != 0) {
+    if ((param0->partyManagementData->unk_20 & 0x80) != 0) {
         param0->unk_B0F_7 = 1;
-        param0->unk_5A4->unk_20 ^= 0x80;
-    } else if (param0->unk_5A4->unk_20 == 21) {
+        param0->partyManagementData->unk_20 ^= 0x80;
+    } else if (param0->partyManagementData->unk_20 == 21) {
         param0->unk_B0F_7 = 1;
     } else {
         param0->unk_B0F_7 = 0;
@@ -989,17 +989,17 @@ static void sub_0207EE14(GameWindowLayout *param0)
 {
     u8 v0 = 3;
 
-    if (param0->unk_5A4->unk_21 == 2) {
+    if (param0->partyManagementData->unk_21 == 2) {
         param0->unk_7F4 = Unk_020F1CF8;
-    } else if ((param0->unk_5A4->unk_20 == 2) || (param0->unk_5A4->unk_20 == 17) || (param0->unk_5A4->unk_20 == 23) || (param0->unk_5A4->unk_20 == 22)) {
+    } else if ((param0->partyManagementData->unk_20 == 2) || (param0->partyManagementData->unk_20 == 17) || (param0->partyManagementData->unk_20 == 23) || (param0->partyManagementData->unk_20 == 22)) {
         param0->unk_7F4 = Unk_020F1D38;
-    } else if (param0->unk_5A4->unk_20 == 21) {
+    } else if (param0->partyManagementData->unk_20 == 21) {
         param0->unk_7F4 = Unk_020F1D78;
     } else {
         param0->unk_7F4 = Unk_020F1DB8;
     }
 
-    if ((param0->unk_5A4->unk_20 != 2) && (param0->unk_5A4->unk_20 != 17) && (param0->unk_5A4->unk_20 != 23) && (param0->unk_5A4->unk_20 != 22)) {
+    if ((param0->partyManagementData->unk_20 != 2) && (param0->partyManagementData->unk_20 != 17) && (param0->partyManagementData->unk_20 != 23) && (param0->partyManagementData->unk_20 != 22)) {
         Sprite_SetDrawFlag(param0->unk_5B0[8], 0);
         Sprite_SetAnim(param0->unk_5B0[9], 0);
 
@@ -1013,7 +1013,7 @@ static void sub_0207EE14(GameWindowLayout *param0)
         v0 ^= 1;
     }
 
-    if ((param0->unk_5A4->unk_20 == 4) || (param0->unk_5A4->unk_20 == 21)) {
+    if ((param0->partyManagementData->unk_20 == 4) || (param0->partyManagementData->unk_20 == 21)) {
         Sprite_SetDrawFlag(param0->unk_5B0[9], 0);
         v0 ^= 2;
     }
@@ -1021,52 +1021,52 @@ static void sub_0207EE14(GameWindowLayout *param0)
     sub_020825B4(param0, v0);
 }
 
-u8 sub_0207EF04(GameWindowLayout *param0, u8 param1)
+u8 sub_0207EF04(GameWindowLayout *windowLayout, u8 param1)
 {
-    return param0->unk_704[param1].unk_29;
+    return windowLayout->unk_704[param1].unk_29;
 }
 
-u8 sub_0207EF14(GameWindowLayout *param0, u8 param1)
+u8 sub_0207EF14(GameWindowLayout *windowLayout, u8 partySlot)
 {
-    Pokemon *v0;
+    Pokemon *mon;
     u32 v1;
-    u16 v2;
+    u16 species;
 
-    param0->unk_704[param1].unk_29 = 0;
+    windowLayout->unk_704[partySlot].unk_29 = 0;
 
-    if (Party_GetCurrentCount(param0->unk_5A4->unk_00) <= param1) {
+    if (Party_GetCurrentCount(windowLayout->partyManagementData->party) <= partySlot) {
         return 0;
     }
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
-    v2 = (u16)Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL);
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, partySlot);
+    species = (u16)Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
 
-    if (v2 == 0) {
+    if (species == 0) {
         return 0;
     }
 
-    sub_02081ED8(param0, v0, param1);
+    sub_02081ED8(windowLayout, mon, partySlot);
 
-    param0->unk_704[param1].unk_04 = v2;
-    param0->unk_704[param1].unk_06 = (u16)Pokemon_GetValue(v0, MON_DATA_CURRENT_HP, NULL);
-    param0->unk_704[param1].unk_08 = (u16)Pokemon_GetValue(v0, MON_DATA_MAX_HP, NULL);
-    param0->unk_704[param1].unk_0A = (u16)Pokemon_GetValue(v0, MON_DATA_LEVEL, NULL);
-    param0->unk_704[param1].unk_0C = (u16)Pokemon_GetValue(v0, MON_DATA_HELD_ITEM, NULL);
-    param0->unk_704[param1].unk_12 = (u16)Pokemon_GetValue(v0, MON_DATA_BALL_CAPSULE_ID, NULL);
-    param0->unk_704[param1].unk_10 = (u8)Pokemon_GetValue(v0, MON_DATA_IS_EGG, NULL);
-    param0->unk_704[param1].unk_11 = (u8)Pokemon_GetValue(v0, MON_DATA_FORM, NULL);
+    windowLayout->unk_704[partySlot].unk_04 = species;
+    windowLayout->unk_704[partySlot].curHP = (u16)Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
+    windowLayout->unk_704[partySlot].maxHP = (u16)Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
+    windowLayout->unk_704[partySlot].level = (u16)Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL);
+    windowLayout->unk_704[partySlot].unk_0C = (u16)Pokemon_GetValue(mon, MON_DATA_HELD_ITEM, NULL);
+    windowLayout->unk_704[partySlot].unk_12 = (u16)Pokemon_GetValue(mon, MON_DATA_BALL_CAPSULE_ID, NULL);
+    windowLayout->unk_704[partySlot].unk_10 = (u8)Pokemon_GetValue(mon, MON_DATA_IS_EGG, NULL);
+    windowLayout->unk_704[partySlot].unk_11 = (u8)Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
 
-    if (Pokemon_GetValue(v0, MON_DATA_NIDORAN_HAS_NICKNAME, NULL) == 1) {
-        param0->unk_704[param1].unk_0E_12 = 0;
+    if (Pokemon_GetValue(mon, MON_DATA_NIDORAN_HAS_NICKNAME, NULL) == 1) {
+        windowLayout->unk_704[partySlot].unk_0E_12 = 0;
     } else {
-        param0->unk_704[param1].unk_0E_12 = 1;
+        windowLayout->unk_704[partySlot].unk_0E_12 = 1;
     }
 
-    param0->unk_704[param1].unk_0E_13 = Pokemon_GetGender(v0);
-    param0->unk_704[param1].unk_29 = 1;
-    param0->unk_704[param1].unk_0E_0 = (u8)PokemonSummaryScreen_StatusIconAnimIdx(v0);
+    windowLayout->unk_704[partySlot].unk_0E_13 = Pokemon_GetGender(mon);
+    windowLayout->unk_704[partySlot].unk_29 = 1;
+    windowLayout->unk_704[partySlot].unk_0E_0 = (u8)PokemonSummaryScreen_StatusIconAnimIdx(mon);
 
-    sub_0207F094(param0, v0, param1);
+    sub_0207F094(windowLayout, mon, partySlot);
 
     return 1;
 }
@@ -1076,16 +1076,16 @@ static void sub_0207F094(GameWindowLayout *param0, Pokemon *param1, u8 param2)
     u32 v0;
     u32 v1;
 
-    if (param0->unk_5A4->unk_20 != 13) {
+    if (param0->partyManagementData->unk_20 != 13) {
         return;
     }
 
-    if ((param0->unk_704[param2].unk_10 == 1) || (param0->unk_704[param2].unk_06 == 0)) {
+    if ((param0->unk_704[param2].unk_10 == 1) || (param0->unk_704[param2].curHP == 0)) {
         param0->unk_704[param2].unk_0E_15 = 0;
         return;
     }
 
-    v0 = sub_0207F134(param1, param0->unk_5A4->unk_2A);
+    v0 = sub_0207F134(param1, param0->partyManagementData->unk_2A);
 
     for (v1 = 0; v1 < 4; v1++) {
         if (Pokemon_GetValue(param1, MON_DATA_MOVE1 + v1, NULL) == 0) {
@@ -1093,7 +1093,7 @@ static void sub_0207F094(GameWindowLayout *param0, Pokemon *param1, u8 param2)
         }
     }
 
-    if ((param0->unk_5A4->unk_2B <= v0) && (v1 >= 2)) {
+    if ((param0->partyManagementData->unk_2B <= v0) && (v1 >= 2)) {
         param0->unk_704[param2].unk_0E_15 = 1;
     } else {
         param0->unk_704[param2].unk_0E_15 = 0;
@@ -1139,16 +1139,16 @@ static u32 sub_0207F134(Pokemon *param0, u8 param1)
     return v0;
 }
 
-const u16 *sub_0207F248(GameWindowLayout *param0)
+const u16 *sub_0207F248(GameWindowLayout *windowLayout)
 {
-    return &param0->unk_324[3 * 16 + 6];
+    return &windowLayout->unk_324[3 * 16 + 6];
 }
 
 static void sub_0207F250(GameWindowLayout *param0, u8 param1, u8 param2, u8 param3, u8 param4)
 {
     const u16 *v0;
 
-    if ((param1 == 0) || ((param0->unk_5A4->unk_21 != 0) && (param1 == 1))) {
+    if ((param1 == 0) || ((param0->partyManagementData->unk_21 != 0) && (param1 == 1))) {
         v0 = param0->unk_264;
     } else {
         v0 = param0->unk_324;
@@ -1172,19 +1172,19 @@ static void sub_0207F308(GameWindowLayout *param0)
 {
     const UnkStruct_020F1DF8 *v0;
 
-    if (param0->unk_5A4->unk_21 == 2) {
+    if (param0->partyManagementData->unk_21 == 2) {
         v0 = Unk_020F1DF8[1];
     } else {
         v0 = Unk_020F1DF8[0];
     }
 
-    if (param0->unk_5A4->unk_20 == 16) {
+    if (param0->partyManagementData->unk_20 == 16) {
         sub_0207F4AC(param0, v0);
-    } else if (param0->unk_5A4->unk_20 == 6) {
+    } else if (param0->partyManagementData->unk_20 == 6) {
         sub_0207F5A0(param0, v0);
-    } else if (param0->unk_5A4->unk_20 == 13) {
+    } else if (param0->partyManagementData->unk_20 == 13) {
         sub_0207F694(param0, v0);
-    } else if ((param0->unk_5A4->unk_20 == 2) || (param0->unk_5A4->unk_20 == 17) || (param0->unk_5A4->unk_20 == 23) || (param0->unk_5A4->unk_20 == 22)) {
+    } else if ((param0->partyManagementData->unk_20 == 2) || (param0->partyManagementData->unk_20 == 17) || (param0->partyManagementData->unk_20 == 23) || (param0->partyManagementData->unk_20 == 22)) {
         sub_0207F788(param0, v0);
     } else {
         sub_0207F388(param0, v0);
@@ -1334,37 +1334,37 @@ static void sub_0207F884(GameWindowLayout *param0, u8 param1, s16 param2, s16 pa
     sub_02083104(param0, param1);
 }
 
-void sub_0207F8F8(GameWindowLayout *param0, u8 param1)
+void sub_0207F8F8(GameWindowLayout *windowLayout, u8 partySlot)
 {
-    Pokemon *v0;
+    Pokemon *mon;
     u8 v1;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, partySlot);
 
-    if ((param0->unk_B0F_6 == 1) && ((param1 == param0->unk_B11) || (param1 == param0->unk_B0F_0))) {
+    if ((windowLayout->unk_B0F_6 == 1) && ((partySlot == windowLayout->partySlot) || (partySlot == windowLayout->unk_B0F_0))) {
         v1 = 3 + 4;
     } else {
-        if (param1 == param0->unk_B11) {
+        if (partySlot == windowLayout->partySlot) {
             v1 = 4;
         } else {
             v1 = 0;
         }
 
-        if (Pokemon_GetValue(v0, MON_DATA_CURRENT_HP, 0) == 0) {
+        if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, 0) == 0) {
             v1 += 2;
-        } else if (sub_0207F984(param0, param1) == 1) {
+        } else if (sub_0207F984(windowLayout, partySlot) == 1) {
             v1 += 1;
         } else {
             v1 += 0;
         }
     }
 
-    Bg_LoadPalette(2, &param0->unk_4A4[v1 * 16], 8 * 2, (3 + param1) * 32);
+    Bg_LoadPalette(2, &windowLayout->unk_4A4[v1 * 16], 8 * 2, (3 + partySlot) * 32);
 }
 
 static u8 sub_0207F984(GameWindowLayout *param0, u8 param1)
 {
-    if ((param0->unk_5A4->unk_21 == 2) && ((param1 & 1) != 0)) {
+    if ((param0->partyManagementData->unk_21 == 2) && ((param1 & 1) != 0)) {
         return 1;
     }
 
@@ -1375,8 +1375,8 @@ static void sub_0207F9A0(GameWindowLayout *param0)
 {
     u8 v0, v1;
 
-    GridMenuCursor_CheckNavigation(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
-    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+    GridMenuCursor_CheckNavigation(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->partySlot, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
+    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->partyManagementData->unk_21, param0->partySlot));
     Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
 }
 
@@ -1422,7 +1422,7 @@ static u8 sub_0207FA24(GameWindowLayout *param0)
         return 0;
     }
 
-    v0 = param0->unk_B11;
+    v0 = param0->partySlot;
 
     if (v0 == 6) {
         if (v1 == GRID_MENU_CURSOR_POSITION_DIRECTION_UP) {
@@ -1431,7 +1431,7 @@ static u8 sub_0207FA24(GameWindowLayout *param0)
             v0 = sub_0207FBE0(param0, &v2, &v3, v1);
         }
     } else if (v0 == 7) {
-        if ((param0->unk_5A4->unk_20 != 2) && (param0->unk_5A4->unk_20 != 17) && (param0->unk_5A4->unk_20 != 23) && (param0->unk_5A4->unk_20 != 22) && (v1 == 0)) {
+        if ((param0->partyManagementData->unk_20 != 2) && (param0->partyManagementData->unk_20 != 17) && (param0->partyManagementData->unk_20 != 23) && (param0->partyManagementData->unk_20 != 22) && (v1 == 0)) {
             v0 = sub_0207FC30(param0, &v2, &v3, Unk_020F1BD4[2 + (param0->unk_B12 & 1)]);
         } else if (v1 == 1) {
             v0 = sub_0207FC30(param0, &v2, &v3, Unk_020F1BD4[(param0->unk_B12 & 1)]);
@@ -1442,21 +1442,21 @@ static u8 sub_0207FA24(GameWindowLayout *param0)
         v0 = sub_0207FBE0(param0, &v2, &v3, v1);
     }
 
-    if ((v0 != param0->unk_B11) && (v0 != 0xff)) {
+    if ((v0 != param0->partySlot) && (v0 != 0xff)) {
         if ((v0 == 6) || (v0 == 7)) {
             Sprite_SetDrawFlag(param0->unk_5B0[6], 0);
         } else {
-            Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
+            Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->partyManagementData->unk_21, v0));
             Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
             Sprite_SetPositionXY(param0->unk_5B0[6], v2, v3);
         }
 
         {
-            u8 v4 = param0->unk_B11;
-            param0->unk_B11 = v0;
+            u8 v4 = param0->partySlot;
+            param0->partySlot = v0;
 
             sub_02080500(param0, v4, 0);
-            sub_02080500(param0, param0->unk_B11, 1);
+            sub_02080500(param0, param0->partySlot, 1);
             Sound_PlayEffect(SEQ_SE_CONFIRM);
 
             if (v4 < 6) {
@@ -1477,7 +1477,7 @@ static u8 sub_0207FA24(GameWindowLayout *param0)
 
 static u8 sub_0207FBE0(GameWindowLayout *param0, u8 *param1, u8 *param2, u8 param3)
 {
-    u8 v0 = param0->unk_B11;
+    u8 v0 = param0->partySlot;
 
     while (TRUE) {
         v0 = GridMenuCursor_CheckNavigation(param0->unk_7F4, param1, param2, NULL, NULL, v0, param3);
@@ -1523,23 +1523,23 @@ static u8 sub_0207FC94(GameWindowLayout *param0)
         u8 v1, v2;
         u8 v3;
 
-        v3 = param0->unk_B11;
-        param0->unk_B11 = (u8)v0;
+        v3 = param0->partySlot;
+        param0->partySlot = (u8)v0;
 
         sub_02080500(param0, v3, 0);
-        sub_02080500(param0, param0->unk_B11, 1);
+        sub_02080500(param0, param0->partySlot, 1);
 
         if (v3 < 6) {
             UpdateWindowLayout(param0, v3, 0);
         }
 
-        GridMenuCursor_CheckNavigation(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
-        Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+        GridMenuCursor_CheckNavigation(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->partySlot, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
+        Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->partyManagementData->unk_21, param0->partySlot));
         Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
         Sprite_SetPositionXY(param0->unk_5B0[6], v1, v2);
 
         param0->unk_B0C = 1;
-        param0->unk_B0D = param0->unk_B11;
+        param0->unk_B0D = param0->partySlot;
 
         Sound_PlayEffect(SEQ_SE_DP_BUTTON9);
 
@@ -1553,29 +1553,29 @@ static u8 sub_0207FC94(GameWindowLayout *param0)
     return 0;
 }
 
-void sub_0207FD68(GameWindowLayout *param0, u8 param1)
+void sub_0207FD68(GameWindowLayout *windowLayout, u8 partySlot)
 {
-    if ((param1 == 6) || (param1 == 7)) {
-        Sprite_SetDrawFlag(param0->unk_5B0[6], 0);
+    if ((partySlot == 6) || (partySlot == 7)) {
+        Sprite_SetDrawFlag(windowLayout->unk_5B0[6], 0);
     } else {
         u8 v0, v1;
 
-        GridMenuCursor_CheckNavigation(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
-        Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-        Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
-        Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
+        GridMenuCursor_CheckNavigation(windowLayout->unk_7F4, &v0, &v1, NULL, NULL, windowLayout->partySlot, GRID_MENU_CURSOR_POSITION_DIRECTION_NONE);
+        Sprite_SetAnim(windowLayout->unk_5B0[6], sub_020805D0(windowLayout->partyManagementData->unk_21, partySlot));
+        Sprite_SetDrawFlag(windowLayout->unk_5B0[6], 1);
+        Sprite_SetPositionXY(windowLayout->unk_5B0[6], v0, v1);
     }
 
     {
-        u8 v2 = param0->unk_B11;
-        param0->unk_B11 = param1;
+        u8 v2 = windowLayout->partySlot;
+        windowLayout->partySlot = partySlot;
 
-        sub_02080500(param0, v2, 0);
-        sub_02080500(param0, param0->unk_B11, 1);
+        sub_02080500(windowLayout, v2, 0);
+        sub_02080500(windowLayout, windowLayout->partySlot, 1);
 
         if (v2 < 6) {
-            UpdateWindowLayout(param0, v2, 0);
-            Bg_ScheduleTilemapTransfer(param0->unk_00, 4);
+            UpdateWindowLayout(windowLayout, v2, 0);
+            Bg_ScheduleTilemapTransfer(windowLayout->unk_00, 4);
         }
     }
 }
@@ -1610,27 +1610,27 @@ static u8 sub_0207FE98(GameWindowLayout *param0)
     u8 v0;
 
     if (gSystem.pressedKeys & PAD_BUTTON_A) {
-        if (param0->unk_B11 == 6) {
+        if (param0->partySlot == 6) {
             return 4;
-        } else if (param0->unk_B11 == 7) {
+        } else if (param0->partySlot == 7) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
 
             if (param0->unk_B0F_7 == 0) {
                 return 3;
             }
-        } else if ((param0->unk_5A4->unk_20 == 3) || (param0->unk_5A4->unk_20 == 19)) {
+        } else if ((param0->partyManagementData->unk_20 == 3) || (param0->partyManagementData->unk_20 == 19)) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
             return 0;
-        } else if ((param0->unk_5A4->unk_20 == 20) || (param0->unk_5A4->unk_20 == 14)) {
-            if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
+        } else if ((param0->partyManagementData->unk_20 == 20) || (param0->partyManagementData->unk_20 == 14)) {
+            if (param0->unk_704[param0->partySlot].unk_10 == 0) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
                 return 0;
             } else {
                 Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
                 return 5;
             }
-        } else if (param0->unk_5A4->unk_20 == 15) {
-            if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
+        } else if (param0->partyManagementData->unk_20 == 15) {
+            if (param0->unk_704[param0->partySlot].unk_10 == 0) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
                 sub_0207FFC8(param0);
                 return 0;
@@ -1638,7 +1638,7 @@ static u8 sub_0207FE98(GameWindowLayout *param0)
                 Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
                 return 5;
             }
-        } else if (param0->unk_5A4->unk_20 == 21) {
+        } else if (param0->partyManagementData->unk_20 == 21) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
             sub_0207FFC8(param0);
             return 0;
@@ -1652,7 +1652,7 @@ static u8 sub_0207FE98(GameWindowLayout *param0)
     if (gSystem.pressedKeys & PAD_BUTTON_B) {
         if (param0->unk_B0F_7 == 0) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
-            param0->unk_B11 = 7;
+            param0->partySlot = 7;
             return 3;
         }
     }
@@ -1660,8 +1660,8 @@ static u8 sub_0207FE98(GameWindowLayout *param0)
     v0 = sub_0207FA00(param0);
 
     if (v0 == 2) {
-        if ((param0->unk_5A4->unk_20 == 20) || (param0->unk_5A4->unk_20 == 14) || (param0->unk_5A4->unk_20 == 15)) {
-            if (param0->unk_704[param0->unk_B11].unk_10 != 0) {
+        if ((param0->partyManagementData->unk_20 == 20) || (param0->partyManagementData->unk_20 == 14) || (param0->partyManagementData->unk_20 == 15)) {
+            if (param0->unk_704[param0->partySlot].unk_10 != 0) {
                 Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
                 return 5;
             }
@@ -1679,7 +1679,7 @@ static void sub_0207FFC8(GameWindowLayout *param0)
     Window_EraseMessageBox(&param0->unk_04[32], 1);
     v0 = Heap_AllocFromHeap(HEAP_ID_12, 8);
 
-    switch (param0->unk_5A4->unk_20) {
+    switch (param0->partyManagementData->unk_20) {
     case 0:
         v1 = sub_020800B4(param0, v0);
         break;
@@ -1716,15 +1716,15 @@ static void sub_0207FFC8(GameWindowLayout *param0)
 
 static u8 sub_020800B4(GameWindowLayout *param0, u8 *param1)
 {
-    Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
     u16 v1;
     u8 v2 = 0, v3, v4 = 0, v5;
 
     param1[v4] = 1;
     v4++;
 
-    if (sub_0206C0D0(param0->unk_5A4->unk_1C) == 0) {
-        if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
+    if (sub_0206C0D0(param0->partyManagementData->fieldSystem) == 0) {
+        if (param0->unk_704[param0->partySlot].unk_10 == 0) {
             for (v3 = 0; v3 < 4; v3++) {
                 v1 = (u16)Pokemon_GetValue(v0, MON_DATA_MOVE1 + v3, NULL);
 
@@ -1745,7 +1745,7 @@ static u8 sub_020800B4(GameWindowLayout *param0, u8 *param1)
             param1[v4] = 0;
             v4++;
 
-            if (Item_IsMail(param0->unk_704[param0->unk_B11].unk_0C) == 1) {
+            if (Item_IsMail(param0->unk_704[param0->partySlot].unk_0C) == 1) {
                 param1[v4] = 5;
             } else {
                 param1[v4] = 2;
@@ -1774,7 +1774,7 @@ static u8 sub_020801AC(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_020801B8(GameWindowLayout *param0, u8 *param1)
 {
-    if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
+    if (param0->unk_704[param0->partySlot].unk_10 == 0) {
         param1[0] = 8;
         param1[1] = 1;
         param1[2] = 9;
@@ -1790,7 +1790,7 @@ static u8 sub_020801B8(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_020801F0(GameWindowLayout *param0, u8 *param1)
 {
-    if (param0->unk_704[param0->unk_B11].unk_0E_15 == 1) {
+    if (param0->unk_704[param0->partySlot].unk_0E_15 == 1) {
         param1[0] = 13;
         param1[1] = 1;
         param1[2] = 9;
@@ -1806,7 +1806,7 @@ static u8 sub_020801F0(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_0208022C(GameWindowLayout *param0, u8 *param1)
 {
-    switch (sub_02080354(param0, param0->unk_B11)) {
+    switch (sub_02080354(param0, param0->partySlot)) {
     case 0:
         param1[0] = 1;
         param1[1] = 9;
@@ -1828,7 +1828,7 @@ static u8 sub_0208022C(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_0208027C(GameWindowLayout *param0, u8 *param1)
 {
-    switch (sub_02080404(param0, param0->unk_B11)) {
+    switch (sub_02080404(param0, param0->partySlot)) {
     case 0:
         param1[0] = 1;
         param1[1] = 9;
@@ -1850,7 +1850,7 @@ static u8 sub_0208027C(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_020802CC(GameWindowLayout *param0, u8 *param1)
 {
-    switch (sub_02080488(param0, param0->unk_B11)) {
+    switch (sub_02080488(param0, param0->partySlot)) {
     case 0:
         param1[0] = 1;
         param1[1] = 9;
@@ -1872,7 +1872,7 @@ static u8 sub_020802CC(GameWindowLayout *param0, u8 *param1)
 
 static u8 sub_0208031C(GameWindowLayout *param0, u8 *param1)
 {
-    if (param0->unk_704[param0->unk_B11].unk_10 == 1) {
+    if (param0->unk_704[param0->partySlot].unk_10 == 1) {
         param1[0] = 1;
         param1[1] = 15;
         param1[2] = 9;
@@ -1885,77 +1885,77 @@ static u8 sub_0208031C(GameWindowLayout *param0, u8 *param1)
     return 2;
 }
 
-u8 sub_02080354(GameWindowLayout *param0, u8 param1)
+u8 sub_02080354(GameWindowLayout *windowLayout, u8 partySlot)
 {
     u8 v0;
 
-    if (param0->unk_5A4->unk_14 != NULL) {
-        Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    if (windowLayout->partyManagementData->battleRegulation != NULL) {
+        Pokemon *v1 = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, partySlot);
 
-        if (sub_0207A2D0(param0->unk_5A4->unk_14, v1, param0->unk_B20) == 0) {
+        if (sub_0207A2D0(windowLayout->partyManagementData->battleRegulation, v1, windowLayout->unk_B20) == 0) {
             return 0;
         }
     }
 
-    if (param0->unk_5A4->unk_20 == 17) {
-        if (sub_02078804(param0->unk_704[param1].unk_04) == 1) {
+    if (windowLayout->partyManagementData->unk_20 == 17) {
+        if (sub_02078804(windowLayout->unk_704[partySlot].unk_04) == 1) {
             return 0;
         }
     }
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == param1 + 1) {
+    for (v0 = 0; v0 < windowLayout->partyManagementData->unk_32_4; v0++) {
+        if (windowLayout->partyManagementData->unk_2C[v0] == partySlot + 1) {
             return 2;
         }
     }
 
-    if ((param0->unk_704[param1].unk_10 == 1) || (param0->unk_704[param1].unk_0A > param0->unk_5A4->unk_33)) {
+    if ((windowLayout->unk_704[partySlot].unk_10 == 1) || (windowLayout->unk_704[partySlot].level > windowLayout->partyManagementData->unk_33)) {
         return 0;
     }
 
     return 1;
 }
 
-u8 sub_02080404(GameWindowLayout *param0, u8 param1)
+u8 sub_02080404(GameWindowLayout *windowLayout, u8 partySlot)
 {
     u8 v0;
 
-    if (param0->unk_5A4->unk_20 == 22) {
-        if (sub_02078804(param0->unk_704[param1].unk_04) == 1) {
+    if (windowLayout->partyManagementData->unk_20 == 22) {
+        if (sub_02078804(windowLayout->unk_704[partySlot].unk_04) == 1) {
             return 0;
         }
     }
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == param1 + 1) {
+    for (v0 = 0; v0 < windowLayout->partyManagementData->unk_32_4; v0++) {
+        if (windowLayout->partyManagementData->unk_2C[v0] == partySlot + 1) {
             return 2;
         }
     }
 
-    if ((param0->unk_704[param1].unk_10 == 1) || (param0->unk_704[param1].unk_0A < param0->unk_5A4->unk_33)) {
+    if ((windowLayout->unk_704[partySlot].unk_10 == 1) || (windowLayout->unk_704[partySlot].level < windowLayout->partyManagementData->unk_33)) {
         return 0;
     }
 
     return 1;
 }
 
-u8 sub_02080488(GameWindowLayout *param0, u8 param1)
+u8 sub_02080488(GameWindowLayout *windowLayout, u8 partySlot)
 {
     u8 v0;
 
-    if (param0->unk_5A4->unk_20 == 23) {
-        if (sub_02078804(param0->unk_704[param1].unk_04) == 1) {
+    if (windowLayout->partyManagementData->unk_20 == 23) {
+        if (sub_02078804(windowLayout->unk_704[partySlot].unk_04) == 1) {
             return 0;
         }
     }
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == param1 + 1) {
+    for (v0 = 0; v0 < windowLayout->partyManagementData->unk_32_4; v0++) {
+        if (windowLayout->partyManagementData->unk_2C[v0] == partySlot + 1) {
             return 2;
         }
     }
 
-    if (param0->unk_704[param1].unk_10 == 1) {
+    if (windowLayout->unk_704[partySlot].unk_10 == 1) {
         return 0;
     }
 
@@ -2021,7 +2021,7 @@ static u8 sub_020805E4(GameWindowLayout *param0)
     if (gSystem.pressedKeys & PAD_BUTTON_A) {
         Sound_PlayEffect(SEQ_SE_CONFIRM);
 
-        if ((param0->unk_B11 >= 6) || (param0->unk_B11 == param0->unk_B0F_0)) {
+        if ((param0->partySlot >= 6) || (param0->partySlot == param0->unk_B0F_0)) {
             sub_02083B88(param0);
             return 3;
         } else {
@@ -2039,7 +2039,7 @@ static u8 sub_020805E4(GameWindowLayout *param0)
     v0 = sub_0207FA00(param0);
 
     if (v0 == 2) {
-        if (param0->unk_B11 == param0->unk_B0F_0) {
+        if (param0->partySlot == param0->unk_B0F_0) {
             sub_02083B88(param0);
             return 3;
         } else {
@@ -2055,9 +2055,9 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
 {
     u8 v0;
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_0; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == 0) {
-            switch (param0->unk_5A4->unk_32_4) {
+    for (v0 = 0; v0 < param0->partyManagementData->unk_32_0; v0++) {
+        if (param0->partyManagementData->unk_2C[v0] == 0) {
+            switch (param0->partyManagementData->unk_32_4) {
             case 2:
                 sub_02082708(param0, 107, 1);
                 break;
@@ -2084,8 +2084,8 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
         }
     }
 
-    if (param0->unk_5A4->unk_14 != NULL) {
-        switch (sub_0207A3AC(param0->unk_5A4->unk_14, param0->unk_5A4->unk_00, param0->unk_B20, param0->unk_5A4->unk_2C)) {
+    if (param0->partyManagementData->battleRegulation != NULL) {
+        switch (sub_0207A3AC(param0->partyManagementData->battleRegulation, param0->partyManagementData->party, param0->unk_B20, param0->partyManagementData->unk_2C)) {
         case 0:
             break;
 
@@ -2093,11 +2093,11 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
             Strbuf *v1;
             int v2;
 
-            v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 184);
-            v2 = sub_02026074(param0->unk_5A4->unk_14, 3);
+            v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 184);
+            v2 = sub_02026074(param0->partyManagementData->battleRegulation, 3);
 
-            StringTemplate_SetNumber(param0->unk_6A0, 0, v2, 3, 0, 1);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
+            StringTemplate_SetNumber(param0->template, 0, v2, 3, 0, 1);
+            StringTemplate_Format(param0->template, param0->unk_6A4, v1);
             Strbuf_Free(v1);
         }
             sub_02082708(param0, 0xffffffff, 1);
@@ -2117,7 +2117,7 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
         }
     }
 
-    if (param0->unk_5A4->unk_20 == 17) {
+    if (param0->partyManagementData->unk_20 == 17) {
         switch (CheckDuplicateValues(param0)) {
         case 0:
             break;
@@ -2134,7 +2134,7 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
         }
     }
 
-    if (param0->unk_5A4->unk_20 == 22) {
+    if (param0->partyManagementData->unk_20 == 22) {
         switch (CheckUniqueValues(param0)) {
         case 0:
             break;
@@ -2146,7 +2146,7 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
         }
     }
 
-    if (param0->unk_5A4->unk_20 == 23) {
+    if (param0->partyManagementData->unk_20 == 23) {
         switch (CheckEqualityInArray(param0)) {
         case 0:
             break;
@@ -2158,7 +2158,7 @@ static int HandleGameWindowEvent(GameWindowLayout *param0)
         }
     }
 
-    param0->unk_5A4->unk_23 = 0;
+    param0->partyManagementData->menuSelectionResult = 0;
     Sound_PlayEffect(SEQ_SE_CONFIRM);
     return 32;
 }
@@ -2168,20 +2168,20 @@ static u8 CheckDuplicateValues(GameWindowLayout *param0)
     u8 v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == 0) {
+        if (param0->partyManagementData->unk_2C[v0] == 0) {
             break;
         }
 
         for (v1 = v0 + 1; v1 < 6; v1++) {
-            if (param0->unk_5A4->unk_2C[v1] == 0) {
+            if (param0->partyManagementData->unk_2C[v1] == 0) {
                 break;
             }
 
-            if (param0->unk_704[param0->unk_5A4->unk_2C[v0] - 1].unk_04 == param0->unk_704[param0->unk_5A4->unk_2C[v1] - 1].unk_04) {
+            if (param0->unk_704[param0->partyManagementData->unk_2C[v0] - 1].unk_04 == param0->unk_704[param0->partyManagementData->unk_2C[v1] - 1].unk_04) {
                 return 1;
             }
 
-            if ((param0->unk_704[param0->unk_5A4->unk_2C[v0] - 1].unk_0C != 0) && (param0->unk_704[param0->unk_5A4->unk_2C[v0] - 1].unk_0C == param0->unk_704[param0->unk_5A4->unk_2C[v1] - 1].unk_0C)) {
+            if ((param0->unk_704[param0->partyManagementData->unk_2C[v0] - 1].unk_0C != 0) && (param0->unk_704[param0->partyManagementData->unk_2C[v0] - 1].unk_0C == param0->unk_704[param0->partyManagementData->unk_2C[v1] - 1].unk_0C)) {
                 return 2;
             }
         }
@@ -2195,16 +2195,16 @@ static u8 CheckUniqueValues(GameWindowLayout *param0)
     u8 v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == 0) {
+        if (param0->partyManagementData->unk_2C[v0] == 0) {
             break;
         }
 
         for (v1 = v0 + 1; v1 < 6; v1++) {
-            if (param0->unk_5A4->unk_2C[v1] == 0) {
+            if (param0->partyManagementData->unk_2C[v1] == 0) {
                 break;
             }
 
-            if (param0->unk_704[param0->unk_5A4->unk_2C[v0] - 1].unk_04 != param0->unk_704[param0->unk_5A4->unk_2C[v1] - 1].unk_04) {
+            if (param0->unk_704[param0->partyManagementData->unk_2C[v0] - 1].unk_04 != param0->unk_704[param0->partyManagementData->unk_2C[v1] - 1].unk_04) {
                 return 1;
             }
         }
@@ -2218,16 +2218,16 @@ static u8 CheckEqualityInArray(GameWindowLayout *param0)
     u8 v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == 0) {
+        if (param0->partyManagementData->unk_2C[v0] == 0) {
             break;
         }
 
         for (v1 = v0 + 1; v1 < 6; v1++) {
-            if (param0->unk_5A4->unk_2C[v1] == 0) {
+            if (param0->partyManagementData->unk_2C[v1] == 0) {
                 break;
             }
 
-            if (param0->unk_704[param0->unk_5A4->unk_2C[v0] - 1].unk_04 == param0->unk_704[param0->unk_5A4->unk_2C[v1] - 1].unk_04) {
+            if (param0->unk_704[param0->partyManagementData->unk_2C[v0] - 1].unk_04 == param0->unk_704[param0->partyManagementData->unk_2C[v1] - 1].unk_04) {
                 return 1;
             }
         }
@@ -2312,9 +2312,9 @@ static u8 HandleWindowInputEvent(GameWindowLayout *param0, int *param1)
         Window_EraseMessageBox(&param0->unk_04[33], 1);
         sub_0208337C(param0);
 
-        if ((param0->unk_5A4->unk_20 == 2) || (param0->unk_5A4->unk_20 == 17) || (param0->unk_5A4->unk_20 == 23) || (param0->unk_5A4->unk_20 == 22)) {
+        if ((param0->partyManagementData->unk_20 == 2) || (param0->partyManagementData->unk_20 == 17) || (param0->partyManagementData->unk_20 == 23) || (param0->partyManagementData->unk_20 == 22)) {
             sub_020826E0(param0, 34, 1);
-        } else if (param0->unk_5A4->unk_20 == 21) {
+        } else if (param0->partyManagementData->unk_20 == 21) {
             sub_020826E0(param0, 197, 1);
         } else {
             sub_020826E0(param0, 29, 1);
@@ -2346,10 +2346,10 @@ u8 GetElementIndex(u16 param0)
 
 static int ProcessWindowInput(GameWindowLayout *param0)
 {
-    switch (param0->unk_B14[1]) {
+    switch (param0->monStats[1]) {
     case 0:
         if (gSystem.pressedKeys & PAD_BUTTON_A) {
-            if (param0->unk_B11 >= 6) {
+            if (param0->partySlot >= 6) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
                 sub_02083B88(param0);
                 return 1;
@@ -2359,16 +2359,16 @@ static int ProcessWindowInput(GameWindowLayout *param0)
                     Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
                     Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
-                    if (param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06 < param0->unk_B14[0]) {
-                        param0->unk_B14[0] = param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06;
+                    if (param0->unk_704[param0->partySlot].maxHP - param0->unk_704[param0->partySlot].curHP < param0->monStats[0]) {
+                        param0->monStats[0] = param0->unk_704[param0->partySlot].maxHP - param0->unk_704[param0->partySlot].curHP;
                     }
 
-                    param0->unk_B14[1] = 2;
-                    param0->unk_B14[2] = 0;
+                    param0->monStats[1] = 2;
+                    param0->monStats[2] = 0;
                     break;
                 case 1:
                     Sound_PlayEffect(SEQ_SE_CONFIRM);
-                    param0->unk_B14[1] = 1;
+                    param0->monStats[1] = 1;
                     return 24;
                 case 2:
                     Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
@@ -2384,7 +2384,7 @@ static int ProcessWindowInput(GameWindowLayout *param0)
         }
 
         if (sub_0207FA00(param0) == 2) {
-            if (param0->unk_B11 == param0->unk_B0F_0) {
+            if (param0->partySlot == param0->unk_B0F_0) {
                 sub_02083B88(param0);
                 return 1;
             } else {
@@ -2393,15 +2393,15 @@ static int ProcessWindowInput(GameWindowLayout *param0)
                     Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
                     Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
-                    if (param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06 < param0->unk_B14[0]) {
-                        param0->unk_B14[0] = param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06;
+                    if (param0->unk_704[param0->partySlot].maxHP - param0->unk_704[param0->partySlot].curHP < param0->monStats[0]) {
+                        param0->monStats[0] = param0->unk_704[param0->partySlot].maxHP - param0->unk_704[param0->partySlot].curHP;
                     }
 
-                    param0->unk_B14[1] = 2;
-                    param0->unk_B14[2] = 0;
+                    param0->monStats[1] = 2;
+                    param0->monStats[2] = 0;
                     break;
                 case 1:
-                    param0->unk_B14[1] = 1;
+                    param0->monStats[1] = 1;
                     return 24;
                 case 2:
                     Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
@@ -2416,36 +2416,36 @@ static int ProcessWindowInput(GameWindowLayout *param0)
             Window_EraseMessageBox(&param0->unk_04[34], 1);
             Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
             sub_020826E0(param0, 36, 1);
-            param0->unk_B14[1] = 0;
+            param0->monStats[1] = 0;
         }
         break;
     case 2:
         if (UpdatePokemonStatus(param0, param0->unk_B0F_0, -1) == 1) {
             Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
-            param0->unk_B14[1] = 3;
-            param0->unk_B14[2] = 0;
+            param0->monStats[1] = 3;
+            param0->monStats[2] = 0;
         }
         break;
     case 3:
-        if (UpdatePokemonStatus(param0, param0->unk_B11, 1) == 1) {
+        if (UpdatePokemonStatus(param0, param0->partySlot, 1) == 1) {
             Pokemon *mon;
             Strbuf *v1;
             void *journalEntryLocationEvent;
             FieldSystem *fieldSystem;
 
-            mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-            v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 64);
+            mon = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
+            v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 64);
 
-            StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(mon));
-            StringTemplate_SetNumber(param0->unk_6A0, 1, param0->unk_B14[2], 3, 0, 1);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
+            StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(mon));
+            StringTemplate_SetNumber(param0->template, 1, param0->monStats[2], 3, 0, 1);
+            StringTemplate_Format(param0->template, param0->unk_6A4, v1);
             Strbuf_Free(v1);
             sub_02082708(param0, 0xffffffff, 1);
 
-            journalEntryLocationEvent = JournalEntry_CreateEventUsedMove((u8)param0->unk_B14[3], 0, 12);
-            fieldSystem = param0->unk_5A4->unk_1C;
+            journalEntryLocationEvent = JournalEntry_CreateEventUsedMove((u8)param0->monStats[3], 0, 12);
+            fieldSystem = param0->partyManagementData->fieldSystem;
             JournalEntry_SaveData(fieldSystem->journalEntry, journalEntryLocationEvent, JOURNAL_LOCATION);
-            param0->unk_B14[1] = 4;
+            param0->monStats[1] = 4;
             param0->unk_B0E = 30;
             return 24;
         }
@@ -2466,15 +2466,15 @@ static int ProcessWindowInput(GameWindowLayout *param0)
 
 static u8 CheckPokemonCondition(GameWindowLayout *param0)
 {
-    if (param0->unk_704[param0->unk_B11].unk_10 != 0) {
+    if (param0->unk_704[param0->partySlot].unk_10 != 0) {
         return 2;
     }
 
-    if ((param0->unk_B11 == param0->unk_B0F_0) || (param0->unk_704[param0->unk_B11].unk_06 == 0) || (param0->unk_704[param0->unk_B11].unk_06 == param0->unk_704[param0->unk_B11].unk_08)) {
+    if ((param0->partySlot == param0->unk_B0F_0) || (param0->unk_704[param0->partySlot].curHP == 0) || (param0->unk_704[param0->partySlot].curHP == param0->unk_704[param0->partySlot].maxHP)) {
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         sub_02082708(param0, 131, 1);
 
-        param0->unk_B14[1] = 1;
+        param0->monStats[1] = 1;
         param0->unk_B0E = 30;
 
         return 1;
@@ -2485,20 +2485,20 @@ static u8 CheckPokemonCondition(GameWindowLayout *param0)
 
 static BOOL UpdatePokemonStatus(GameWindowLayout *param0, u8 slot, s8 param2)
 {
-    param0->unk_704[slot].unk_06 += param2;
-    param0->unk_B14[2]++;
+    param0->unk_704[slot].curHP += param2;
+    param0->monStats[2]++;
 
     sub_02082098(param0, slot);
     Window_FillTilemap(&param0->unk_04[3 + slot * 5], 0);
     sub_02082058(param0, slot);
     sub_02082104(param0, slot);
 
-    if ((param0->unk_B14[0] == param0->unk_B14[2]) || (param0->unk_704[slot].unk_06 == param0->unk_704[slot].unk_08)) {
+    if ((param0->monStats[0] == param0->monStats[2]) || (param0->unk_704[slot].curHP == param0->unk_704[slot].maxHP)) {
         Pokemon *mon;
         u32 v1;
 
-        mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, slot);
-        v1 = param0->unk_704[slot].unk_06;
+        mon = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, slot);
+        v1 = param0->unk_704[slot].curHP;
         Pokemon_SetValue(mon, MON_DATA_CURRENT_HP, &v1);
         return 1;
     }
@@ -2511,13 +2511,13 @@ static u8 HandleSpecialInput(GameWindowLayout *param0)
     u8 v0;
 
     if (gSystem.pressedKeys & PAD_BUTTON_A) {
-        if (param0->unk_B11 == 7) {
+        if (param0->partySlot == 7) {
             if (param0->unk_B0F_7 == 0) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
                 return 3;
             }
         } else {
-            if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
+            if (param0->unk_704[param0->partySlot].unk_10 == 0) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
                 return 0;
             } else {
@@ -2531,7 +2531,7 @@ static u8 HandleSpecialInput(GameWindowLayout *param0)
     if (gSystem.pressedKeys & PAD_BUTTON_B) {
         if (param0->unk_B0F_7 == 0) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
-            param0->unk_B11 = 7;
+            param0->partySlot = 7;
             return 3;
         }
 
@@ -2541,7 +2541,7 @@ static u8 HandleSpecialInput(GameWindowLayout *param0)
     v0 = sub_0207FA00(param0);
 
     if (v0 == 2) {
-        if (param0->unk_704[param0->unk_B11].unk_10 != 0) {
+        if (param0->unk_704[param0->partySlot].unk_10 != 0) {
             Sound_PlayEffect(SEQ_SE_DP_CUSTOM06);
             return 5;
         }
@@ -2552,10 +2552,10 @@ static u8 HandleSpecialInput(GameWindowLayout *param0)
 
 static int ApplyItemEffectOnPokemon(GameWindowLayout *param0)
 {
-    ItemData *v0 = Item_Load(param0->unk_5A4->unk_24, 0, 12);
+    ItemData *v0 = Item_Load(param0->partyManagementData->usedItemID, 0, 12);
 
-    if ((param0->unk_5A4->unk_24 == 466) && (Pokemon_CanShayminSkyForm(Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11)) == 1)) {
-        param0->unk_5A4->unk_38 = 1;
+    if ((param0->partyManagementData->usedItemID == 466) && (Pokemon_CanShayminSkyForm(Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot)) == 1)) {
+        param0->partyManagementData->evoTargetSpecies = 1;
         Heap_FreeToHeap(v0);
         LoadOverlay118(param0);
         return 31;
@@ -2573,27 +2573,27 @@ static int ApplyItemEffectOnPokemon(GameWindowLayout *param0)
         return 6;
     }
 
-    if (Party_CheckItemEffectsOnMember(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, 0, 12) == 1) {
-        Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, HEAP_ID_12);
+    if (Party_CheckItemEffectsOnMember(param0->partyManagementData->party, param0->partyManagementData->usedItemID, param0->partySlot, 0, 12) == 1) {
+        Bag_TryRemoveItem(param0->partyManagementData->bag, param0->partyManagementData->usedItemID, 1, HEAP_ID_12);
 
         if (Item_Get(v0, 26) != 0) {
-            Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+            Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
 
-            param0->unk_5A4->unk_38 = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_ITEM, param0->unk_5A4->unk_24, &param0->unk_5A4->unk_3C);
-            param0->unk_5A4->unk_23 = 8;
+            param0->partyManagementData->evoTargetSpecies = Pokemon_GetEvolutionTargetSpecies(NULL, v1, EVO_CLASS_BY_ITEM, param0->partyManagementData->usedItemID, &param0->partyManagementData->evoType);
+            param0->partyManagementData->menuSelectionResult = 8;
             Heap_FreeToHeap(v0);
             return 32;
         }
 
-        if ((Item_IsHerbalMedicine(param0->unk_5A4->unk_24) == 1) && (param0->unk_5A4->unk_10 != NULL)) {
-            Pokemon *v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-            sub_0206D90C(param0->unk_5A4->unk_10, v2, param0->unk_5A4->unk_24);
+        if ((Item_IsHerbalMedicine(param0->partyManagementData->usedItemID) == 1) && (param0->partyManagementData->broadcast != NULL)) {
+            Pokemon *v2 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
+            sub_0206D90C(param0->partyManagementData->broadcast, v2, param0->partyManagementData->usedItemID);
         }
 
         sub_020852B8(param0);
     } else {
         sub_02082708(param0, 105, 1);
-        param0->unk_B11 = 7;
+        param0->partySlot = 7;
         param0->unk_B00 = sub_02085348;
     }
 
@@ -2603,9 +2603,9 @@ static int ApplyItemEffectOnPokemon(GameWindowLayout *param0)
 
 static u8 CheckItemUsageValidity(GameWindowLayout *param0)
 {
-    if (param0->unk_704[param0->unk_B11].unk_0C == 0) {
+    if (param0->unk_704[param0->partySlot].unk_0C == 0) {
         return 0;
-    } else if (Item_IsMail(param0->unk_704[param0->unk_B11].unk_0C) == 1) {
+    } else if (Item_IsMail(param0->unk_704[param0->partySlot].unk_0C) == 1) {
         return 2;
     }
 
@@ -2619,22 +2619,22 @@ static int ProcessItemApplication(GameWindowLayout *param0)
     int v2 = -1, v3;
     FieldSystem *fieldSystem;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
     v1 = &param0->unk_04[34];
-    fieldSystem = param0->unk_5A4->unk_1C;
+    fieldSystem = param0->partyManagementData->fieldSystem;
 
-    if (param0->unk_5A4->unk_24 == 112) {
+    if (param0->partyManagementData->usedItemID == 112) {
         if (Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL) != SPECIES_GIRATINA) {
-            MessageLoader_GetStrbuf(param0->unk_69C, 203, param0->unk_6A8);
-            StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-            StringTemplate_SetItemNameWithArticle(param0->unk_6A0, 1, param0->unk_5A4->unk_24);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 203, param0->unk_6A8);
+            StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v0));
+            StringTemplate_SetItemNameWithArticle(param0->template, 1, param0->partyManagementData->usedItemID);
+            StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
             v2 = 11;
         } else if (fieldSystem != NULL) {
             if (fieldSystem->location->mapId == 466) {
-                MessageLoader_GetStrbuf(param0->unk_69C, 204, param0->unk_6A8);
-                StringTemplate_SetItemName(param0->unk_6A0, 0, param0->unk_5A4->unk_24);
-                StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+                MessageLoader_GetStrbuf(param0->messageLoader, 204, param0->unk_6A8);
+                StringTemplate_SetItemName(param0->template, 0, param0->partyManagementData->usedItemID);
+                StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
                 v2 = 11;
             }
         }
@@ -2643,27 +2643,27 @@ static int ProcessItemApplication(GameWindowLayout *param0)
     if (v2 == -1) {
         switch (CheckItemUsageValidity(param0)) {
         case 0:
-            if (Item_IsMail(param0->unk_5A4->unk_24) == 1) {
-                param0->unk_5A4->unk_23 = 6;
+            if (Item_IsMail(param0->partyManagementData->usedItemID) == 1) {
+                param0->partyManagementData->menuSelectionResult = 6;
                 return 32;
             }
 
             v2 = UpdatePokemonWithItem(param0, v0, &v3);
 
-            MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8);
-            StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-            StringTemplate_SetItemName(param0->unk_6A0, 1, param0->unk_5A4->unk_24);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 118, param0->unk_6A8);
+            StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v0));
+            StringTemplate_SetItemName(param0->template, 1, param0->partyManagementData->usedItemID);
+            StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
             break;
         case 1:
-            MessageLoader_GetStrbuf(param0->unk_69C, 78, param0->unk_6A8);
-            StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-            StringTemplate_SetItemNameWithArticle(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 78, param0->unk_6A8);
+            StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v0));
+            StringTemplate_SetItemNameWithArticle(param0->template, 1, param0->unk_704[param0->partySlot].unk_0C);
+            StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
             v2 = 9;
             break;
         case 2:
-            MessageLoader_GetStrbuf(param0->unk_69C, 77, param0->unk_6A4);
+            MessageLoader_GetStrbuf(param0->messageLoader, 77, param0->unk_6A4);
             v2 = 11;
             break;
         }
@@ -2678,10 +2678,10 @@ static int ProcessItemApplication(GameWindowLayout *param0)
 
 static int UpdatePokemonWithItem(GameWindowLayout *param0, Pokemon *mon, int *param2)
 {
-    u32 item = param0->unk_5A4->unk_24;
-    FieldSystem *fieldSystem = param0->unk_5A4->unk_1C;
+    u32 item = param0->partyManagementData->usedItemID;
+    FieldSystem *fieldSystem = param0->partyManagementData->fieldSystem;
 
-    Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, HEAP_ID_12);
+    Bag_TryRemoveItem(param0->partyManagementData->bag, param0->partyManagementData->usedItemID, 1, HEAP_ID_12);
     Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &item);
     Pokemon_SetArceusForm(mon);
 
@@ -2691,8 +2691,8 @@ static int UpdatePokemonWithItem(GameWindowLayout *param0, Pokemon *mon, int *pa
         *param2 = -1;
     }
 
-    param0->unk_704[param0->unk_B11].unk_0C = param0->unk_5A4->unk_24;
-    sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C);
+    param0->unk_704[param0->partySlot].unk_0C = param0->partyManagementData->usedItemID;
+    sub_02083040(param0, param0->partySlot, param0->unk_704[param0->partySlot].unk_0C);
 
     if (item == ITEM_GRISEOUS_ORB && ((*param2) != -1)) {
         return 12;
@@ -2703,17 +2703,17 @@ static int UpdatePokemonWithItem(GameWindowLayout *param0, Pokemon *mon, int *pa
 
 static void SwapPokemonItem(GameWindowLayout *param0, Pokemon *mon, u32 param2, u32 param3)
 {
-    Bag_TryAddItem(param0->unk_5A4->unk_04, (u16)param2, 1, HEAP_ID_12);
+    Bag_TryAddItem(param0->partyManagementData->bag, (u16)param2, 1, HEAP_ID_12);
     Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &param3);
     Pokemon_SetArceusForm(mon);
     Pokemon_SetGiratinaFormByHeldItem(mon);
-    param0->unk_704[param0->unk_B11].unk_0C = (u16)param3;
-    sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C);
+    param0->unk_704[param0->partySlot].unk_0C = (u16)param3;
+    sub_02083040(param0, param0->partySlot, param0->unk_704[param0->partySlot].unk_0C);
 }
 
 static int HandleMessageCompletion(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             return ResetWindowOnInput(param0);
         }
@@ -2724,7 +2724,7 @@ static int HandleMessageCompletion(GameWindowLayout *param0)
 
 static int ProcessMessageResult(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Window_EraseMessageBox(&param0->unk_04[34], 1);
             LoadOverlay118(param0);
@@ -2748,7 +2748,7 @@ static int HandleOverlayCompletion(GameWindowLayout *param0)
 
 static int FinalizeMessageProcessing(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         sub_020827EC(param0);
         return 10;
     }
@@ -2767,28 +2767,28 @@ static int ProcessPokemonItemSwap(GameWindowLayout *param0)
         u32 v4;
         u32 v5;
 
-        v2 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+        v2 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
         v3 = &param0->unk_04[34];
-        v4 = param0->unk_5A4->unk_24;
-        v5 = param0->unk_704[param0->unk_B11].unk_0C;
+        v4 = param0->partyManagementData->usedItemID;
+        v5 = param0->unk_704[param0->partySlot].unk_0C;
         v0 = UpdatePokemonWithItem(param0, v2, &v1);
 
-        if (Bag_TryAddItem(param0->unk_5A4->unk_04, (u16)v5, 1, HEAP_ID_12) == FALSE) {
+        if (Bag_TryAddItem(param0->partyManagementData->bag, (u16)v5, 1, HEAP_ID_12) == FALSE) {
             SwapPokemonItem(param0, v2, v4, v5);
-            MessageLoader_GetStrbuf(param0->unk_69C, 83, param0->unk_6A4);
+            MessageLoader_GetStrbuf(param0->messageLoader, 83, param0->unk_6A4);
             v0 = 11;
         } else {
-            if (Item_IsMail(param0->unk_5A4->unk_24) == 1) {
-                Bag_TryRemoveItem(param0->unk_5A4->unk_04, (u16)v5, 1, HEAP_ID_12);
+            if (Item_IsMail(param0->partyManagementData->usedItemID) == 1) {
+                Bag_TryRemoveItem(param0->partyManagementData->bag, (u16)v5, 1, HEAP_ID_12);
                 SwapPokemonItem(param0, v2, v4, v5);
-                param0->unk_5A4->unk_23 = 6;
+                param0->partyManagementData->menuSelectionResult = 6;
                 return 32;
             }
 
-            MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8);
-            StringTemplate_SetItemName(param0->unk_6A0, 1, v5);
-            StringTemplate_SetItemName(param0->unk_6A0, 2, v4);
-            StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 84, param0->unk_6A8);
+            StringTemplate_SetItemName(param0->template, 1, v5);
+            StringTemplate_SetItemName(param0->template, 2, v4);
+            StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
 
             if ((v4 != 112) && (v5 == 112) && (v1 != -1)) {
                 v0 = 12;
@@ -2810,15 +2810,15 @@ static int ProcessPokemonItemSwap(GameWindowLayout *param0)
 
 static int ResetWindowOnInput(GameWindowLayout *param0)
 {
-    if (param0->unk_5A4->unk_20 == 10) {
+    if (param0->partyManagementData->unk_20 == 10) {
         Window_EraseMessageBox(&param0->unk_04[34], 1);
         sub_020826E0(param0, 29, 1);
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
-        param0->unk_5A4->unk_20 = 0;
+        param0->partyManagementData->unk_20 = 0;
         return 1;
     }
 
-    param0->unk_5A4->unk_23 = 10;
+    param0->partyManagementData->menuSelectionResult = 10;
     return 32;
 }
 
@@ -2830,10 +2830,10 @@ static int UpdatePokemonFormWithItem(GameWindowLayout *param0)
     u32 item;
     int v4, v5;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
     v1 = &param0->unk_04[34];
-    v2 = param0->unk_5A4->unk_24;
-    item = param0->unk_704[param0->unk_B11].unk_0C;
+    v2 = param0->partyManagementData->usedItemID;
+    item = param0->unk_704[param0->partySlot].unk_0C;
     v4 = UpdatePokemonWithItem(param0, v0, &v5);
 
     if ((item == ITEM_GRISEOUS_ORB) && (v4 == 11) && (v5 == 0)) {
@@ -2841,24 +2841,24 @@ static int UpdatePokemonFormWithItem(GameWindowLayout *param0)
     }
 
     if (item == ITEM_NONE) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8);
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-        StringTemplate_SetItemName(param0->unk_6A0, 1, param0->unk_5A4->unk_24);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+        MessageLoader_GetStrbuf(param0->messageLoader, 118, param0->unk_6A8);
+        StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v0));
+        StringTemplate_SetItemName(param0->template, 1, param0->partyManagementData->usedItemID);
+        StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
     } else {
-        Bag_TryAddItem(param0->unk_5A4->unk_04, (u16)item, 1, HEAP_ID_12);
-        MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8);
-        StringTemplate_SetItemName(param0->unk_6A0, 1, item);
-        StringTemplate_SetItemName(param0->unk_6A0, 2, v2);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+        Bag_TryAddItem(param0->partyManagementData->bag, (u16)item, 1, HEAP_ID_12);
+        MessageLoader_GetStrbuf(param0->messageLoader, 84, param0->unk_6A8);
+        StringTemplate_SetItemName(param0->template, 1, item);
+        StringTemplate_SetItemName(param0->template, 2, v2);
+        StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
     }
 
     Window_DrawMessageBoxWithScrollCursor(v1, 1, (1 + 9), 15);
     Window_FillTilemap(v1, 15);
     sub_0208274C(param0);
 
-    if (param0->unk_5A4->unk_20 == 12) {
-        param0->unk_5A4->unk_20 = 10;
+    if (param0->partyManagementData->unk_20 == 12) {
+        param0->partyManagementData->unk_20 = 10;
     }
 
     return v4;
@@ -2866,8 +2866,8 @@ static int UpdatePokemonFormWithItem(GameWindowLayout *param0)
 
 static int CheckForItemApplication(GameWindowLayout *param0)
 {
-    if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
-        param0->unk_5A4->unk_23 = 0;
+    if (param0->unk_704[param0->partySlot].unk_12 == 0) {
+        param0->partyManagementData->menuSelectionResult = 0;
         return 32;
     }
 
@@ -2881,7 +2881,7 @@ static int CheckForItemApplication(GameWindowLayout *param0)
 
 static BOOL ValidateGameWindowState(GameWindowLayout *param0)
 {
-    if ((param0->unk_5A4->unk_20 == 5) || (param0->unk_5A4->unk_20 == 6) || (param0->unk_5A4->unk_20 == 7) || (param0->unk_5A4->unk_20 == 8) || (param0->unk_5A4->unk_20 == 9) || (param0->unk_5A4->unk_20 == 11) || (param0->unk_5A4->unk_20 == 14) || (param0->unk_5A4->unk_20 == 16) || (param0->unk_5A4->unk_20 == 20)) {
+    if ((param0->partyManagementData->unk_20 == 5) || (param0->partyManagementData->unk_20 == 6) || (param0->partyManagementData->unk_20 == 7) || (param0->partyManagementData->unk_20 == 8) || (param0->partyManagementData->unk_20 == 9) || (param0->partyManagementData->unk_20 == 11) || (param0->partyManagementData->unk_20 == 14) || (param0->partyManagementData->unk_20 == 16) || (param0->partyManagementData->unk_20 == 20)) {
         return 0;
     }
 
@@ -2928,13 +2928,13 @@ void LoadScreenDataFromNARC(u32 param0, u16 *param1, u16 *param2, u16 *param3)
     Heap_FreeToHeap(v1);
 }
 
-void LoadOverlay118(GameWindowLayout *param0)
+void LoadOverlay118(GameWindowLayout *windowLayout)
 {
     Overlay_LoadByID(FS_OVERLAY_ID(overlay118), 2);
-    ov118_021D0D80(param0);
+    ov118_021D0D80(windowLayout);
 }
 
-void UnloadOverlay118(GameWindowLayout *param0)
+void UnloadOverlay118(GameWindowLayout *windowLayout)
 {
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay118));
 }
diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c
index dc725c07e7..59e6162202 100644
--- a/src/unk_020819DC.c
+++ b/src/unk_020819DC.c
@@ -117,7 +117,7 @@ void sub_02081A24(GameWindowLayout *param0)
     sub_020819DC(param0->unk_00, &param0->unk_04[10], &v0[10]);
     sub_020819DC(param0->unk_00, &param0->unk_04[20], &v0[20]);
 
-    if (param0->unk_5A4->unk_21 == 2) {
+    if (param0->partyManagementData->unk_21 == 2) {
         sub_020819DC(param0->unk_00, &param0->unk_04[5], &v0[30]);
         sub_020819DC(param0->unk_00, &param0->unk_04[15], &v0[35]);
         sub_020819DC(param0->unk_00, &param0->unk_04[25], &v0[40]);
@@ -127,7 +127,7 @@ void sub_02081A24(GameWindowLayout *param0)
         sub_020819DC(param0->unk_00, &param0->unk_04[25], &v0[25]);
     }
 
-    if ((param0->unk_5A4->unk_20 == 2) || (param0->unk_5A4->unk_20 == 17) || (param0->unk_5A4->unk_20 == 23) || (param0->unk_5A4->unk_20 == 22)) {
+    if ((param0->partyManagementData->unk_20 == 2) || (param0->partyManagementData->unk_20 == 17) || (param0->partyManagementData->unk_20 == 23) || (param0->partyManagementData->unk_20 == 22)) {
         WindowTemplate v2;
 
         v2 = Unk_020F1ED0[0];
@@ -162,30 +162,30 @@ void sub_02081B90(GameWindowLayout *param0)
 
 void sub_02081BC0(GameWindowLayout *param0)
 {
-    MessageLoader_GetStrbuf(param0->unk_69C, 145, param0->unk_6AC[0]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 146, param0->unk_6AC[1]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 147, param0->unk_6AC[2]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 160, param0->unk_6AC[3]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 161, param0->unk_6AC[4]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 148, param0->unk_6AC[5]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 149, param0->unk_6AC[6]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 150, param0->unk_6AC[7]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 151, param0->unk_6AC[8]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 152, param0->unk_6AC[9]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 153, param0->unk_6AC[10]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 154, param0->unk_6AC[11]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 155, param0->unk_6AC[12]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 154, param0->unk_6AC[13]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 166, param0->unk_6AC[14]);
-    MessageLoader_GetStrbuf(param0->unk_69C, 200, param0->unk_6AC[15]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 145, param0->unk_6AC[0]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 146, param0->unk_6AC[1]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 147, param0->unk_6AC[2]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 160, param0->unk_6AC[3]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 161, param0->unk_6AC[4]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 148, param0->unk_6AC[5]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 149, param0->unk_6AC[6]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 150, param0->unk_6AC[7]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 151, param0->unk_6AC[8]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 152, param0->unk_6AC[9]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 153, param0->unk_6AC[10]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 154, param0->unk_6AC[11]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 155, param0->unk_6AC[12]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 154, param0->unk_6AC[13]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 166, param0->unk_6AC[14]);
+    MessageLoader_GetStrbuf(param0->messageLoader, 200, param0->unk_6AC[15]);
 }
 
 void sub_02081CAC(GameWindowLayout *param0, u16 param1, u8 param2)
 {
-    Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 156 + param2);
+    Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->messageLoader, 156 + param2);
 
-    StringTemplate_SetMoveName(param0->unk_6A0, 0, param1);
-    StringTemplate_Format(param0->unk_6A0, param0->unk_6AC[16 + param2], v0);
+    StringTemplate_SetMoveName(param0->template, 0, param1);
+    StringTemplate_Format(param0->template, param0->unk_6AC[16 + param2], v0);
 
     Strbuf_Free(v0);
 }
@@ -232,16 +232,16 @@ void sub_02081E08(GameWindowLayout *param0)
     Pokemon *v0;
     Strbuf *v1;
 
-    if (param0->unk_5A4->unk_20 == 15) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 42, param0->unk_6A4);
-    } else if ((param0->unk_5A4->unk_20 == 21) && (param0->unk_704[param0->unk_B11].unk_10 == 1)) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 198, param0->unk_6A4);
+    if (param0->partyManagementData->unk_20 == 15) {
+        MessageLoader_GetStrbuf(param0->messageLoader, 42, param0->unk_6A4);
+    } else if ((param0->partyManagementData->unk_20 == 21) && (param0->unk_704[param0->partySlot].unk_10 == 1)) {
+        MessageLoader_GetStrbuf(param0->messageLoader, 198, param0->unk_6A4);
     } else {
-        v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 37);
+        v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 37);
 
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
+        StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(v0));
+        StringTemplate_Format(param0->template, param0->unk_6A4, v1);
         Strbuf_Free(v1);
     }
 }
@@ -262,10 +262,10 @@ static void sub_02081EAC(GameWindowLayout *param0, u8 param1)
 
 void sub_02081ED8(GameWindowLayout *param0, Pokemon *param1, u32 param2)
 {
-    Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, Unk_020F1EA0[param2][0]);
+    Strbuf *v0 = MessageLoader_GetNewStrbuf(param0->messageLoader, Unk_020F1EA0[param2][0]);
 
-    StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(param1));
-    StringTemplate_Format(param0->unk_6A0, param0->unk_704[param2].unk_00, v0);
+    StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(param1));
+    StringTemplate_Format(param0->template, param0->unk_704[param2].unk_00, v0);
     Strbuf_Free(v0);
 }
 
@@ -285,11 +285,11 @@ void sub_02081F2C(GameWindowLayout *param0, u8 param1)
 
     if (param0->unk_704[param1].unk_0E_12 == 0) {
         if (param0->unk_704[param1].unk_0E_13 == 0) {
-            MessageLoader_GetStrbuf(param0->unk_69C, 27, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 27, param0->unk_6A8);
             Text_AddPrinterWithParamsAndColor(
                 v0, FONT_SYSTEM, param0->unk_6A8, (9 * 8 - 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
         } else if (param0->unk_704[param1].unk_0E_13 == 1) {
-            MessageLoader_GetStrbuf(param0->unk_69C, 28, param0->unk_6A8);
+            MessageLoader_GetStrbuf(param0->messageLoader, 28, param0->unk_6A8);
             Text_AddPrinterWithParamsAndColor(
                 v0, FONT_SYSTEM, param0->unk_6A8, (9 * 8 - 8), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(5, 6, 0), NULL);
         }
@@ -310,7 +310,7 @@ void sub_02081FFC(GameWindowLayout *param0, u8 param1)
         return;
     }
 
-    sub_0200C648(param0->unk_698, 1, param0->unk_704[param1].unk_0A, 3, 0, v0, 5, 2);
+    sub_0200C648(param0->unk_698, 1, param0->unk_704[param1].level, 3, 0, v0, 5, 2);
     Window_ScheduleCopyToVRAM(v0);
 }
 
@@ -322,7 +322,7 @@ void sub_02082058(GameWindowLayout *param0, u8 param1)
 
     v0 = &param0->unk_04[2 + param1 * 5];
 
-    sub_0200C5BC(param0->unk_698, param0->unk_704[param1].unk_06, 3, 1, v0, (28 - 24), 2);
+    sub_0200C5BC(param0->unk_698, param0->unk_704[param1].curHP, 3, 1, v0, (28 - 24), 2);
     Window_ScheduleCopyToVRAM(v0);
 }
 
@@ -345,7 +345,7 @@ static void sub_020820C4(GameWindowLayout *param0, u8 param1)
 
     v0 = &param0->unk_04[2 + param1 * 5];
 
-    sub_0200C5BC(param0->unk_698, param0->unk_704[param1].unk_08, 3, 0, v0, (28 + 8), 2);
+    sub_0200C5BC(param0->unk_698, param0->unk_704[param1].maxHP, 3, 0, v0, (28 + 8), 2);
     Window_ScheduleCopyToVRAM(v0);
 }
 
@@ -356,7 +356,7 @@ void sub_02082104(GameWindowLayout *param0, u8 param1)
 
     v0 = &param0->unk_04[3 + param1 * 5];
 
-    switch (HealthBar_Color(param0->unk_704[param1].unk_06, param0->unk_704[param1].unk_08, 48)) {
+    switch (HealthBar_Color(param0->unk_704[param1].curHP, param0->unk_704[param1].maxHP, 48)) {
     case 0:
         Window_ScheduleCopyToVRAM(v0);
         return;
@@ -372,7 +372,7 @@ void sub_02082104(GameWindowLayout *param0, u8 param1)
         break;
     }
 
-    v1 = App_PixelCount(param0->unk_704[param1].unk_06, param0->unk_704[param1].unk_08, 48);
+    v1 = App_PixelCount(param0->unk_704[param1].curHP, param0->unk_704[param1].maxHP, 48);
 
     Window_FillRectWithColor(v0, 10, 0, 2, v1, 1);
     Window_FillRectWithColor(v0, 9, 0, 3, v1, 2);
@@ -434,9 +434,9 @@ void sub_0208232C(GameWindowLayout *param0, u8 param1)
 
     sub_02081FFC(param0, param1);
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param1);
 
-    if (Pokemon_GetEvolutionTargetSpecies(NULL, v0, EVO_CLASS_BY_ITEM, param0->unk_5A4->unk_24, NULL) == 0) {
+    if (Pokemon_GetEvolutionTargetSpecies(NULL, v0, EVO_CLASS_BY_ITEM, param0->partyManagementData->usedItemID, NULL) == 0) {
         sub_02082810(param0, param1, 1);
     } else {
         sub_02082810(param0, param1, 0);
@@ -459,7 +459,7 @@ void sub_020823C4(GameWindowLayout *param0, u8 param1)
 
     sub_02081FFC(param0, param1);
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param1);
     v1 = sub_02086104(param0, v0);
 
     if (v1 == 0xff) {
@@ -505,19 +505,19 @@ void sub_02082508(GameWindowLayout *param0, u8 param1)
 {
     u8 v0;
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == param1 + 1) {
+    for (v0 = 0; v0 < param0->partyManagementData->unk_32_4; v0++) {
+        if (param0->partyManagementData->unk_2C[v0] == param1 + 1) {
             sub_02082964(param0, param1, v0);
             return;
         }
     }
 
-    if (param0->unk_5A4->unk_20 == 22) {
+    if (param0->partyManagementData->unk_20 == 22) {
         if (sub_02080404(param0, param1) == 0) {
             sub_02082964(param0, param1, 8);
             return;
         }
-    } else if (param0->unk_5A4->unk_20 == 23) {
+    } else if (param0->partyManagementData->unk_20 == 23) {
         if (sub_02080488(param0, param1) == 0) {
             sub_02082964(param0, param1, 8);
             return;
@@ -547,14 +547,14 @@ void sub_020825B4(GameWindowLayout *param0, u8 param1)
     Window_FillTilemap(&param0->unk_04[31], 0);
 
     if (param1 & 1) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 0, param0->unk_6A8);
+        MessageLoader_GetStrbuf(param0->messageLoader, 0, param0->unk_6A8);
         v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[30].width * 8);
         Text_AddPrinterWithParamsAndColor(&param0->unk_04[30], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
         Window_ScheduleCopyToVRAM(&param0->unk_04[30]);
     }
 
     if (param1 & 2) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 1, param0->unk_6A8);
+        MessageLoader_GetStrbuf(param0->messageLoader, 1, param0->unk_6A8);
         v0 = sub_020825A4(0, param0->unk_6A8, param0->unk_04[31].width * 8);
         Text_AddPrinterWithParamsAndColor(&param0->unk_04[31], FONT_SYSTEM, param0->unk_6A8, v0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
         Window_ScheduleCopyToVRAM(&param0->unk_04[31]);
@@ -570,7 +570,7 @@ static void sub_02082680(GameWindowLayout *param0, Window *param1, u32 param2, u
     Window_FillTilemap(param1, 15);
 
     if (param2 != 0xffffffff) {
-        MessageLoader_GetStrbuf(param0->unk_69C, param2, param0->unk_6A4);
+        MessageLoader_GetStrbuf(param0->messageLoader, param2, param0->unk_6A4);
     }
 
     Text_AddPrinterWithParams(param1, FONT_MESSAGE, param0->unk_6A4, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
@@ -598,7 +598,7 @@ void sub_02082708(GameWindowLayout *param0, u32 param1, u8 param2)
     Window_FillTilemap(v0, 15);
 
     if (param1 != 0xffffffff) {
-        MessageLoader_GetStrbuf(param0->unk_69C, param1, param0->unk_6A4);
+        MessageLoader_GetStrbuf(param0->messageLoader, param1, param0->unk_6A4);
     }
 
     sub_0208274C(param0);
@@ -608,8 +608,8 @@ void sub_0208274C(GameWindowLayout *param0)
 {
     RenderControlFlags_SetCanABSpeedUpPrint(1);
     RenderControlFlags_SetAutoScrollFlags(0);
-    param0->unk_B10 = Text_AddPrinterWithParams(
-        &param0->unk_04[34], FONT_MESSAGE, param0->unk_6A4, 0, 0, Options_TextFrameDelay(param0->unk_5A4->unk_0C), sub_0208279C);
+    param0->textPrinterID = Text_AddPrinterWithParams(
+        &param0->unk_04[34], FONT_MESSAGE, param0->unk_6A4, 0, 0, Options_TextFrameDelay(param0->partyManagementData->options), sub_0208279C);
 }
 
 static BOOL sub_0208279C(TextPrinterTemplate *param0, u16 param1)
@@ -649,10 +649,10 @@ static void sub_02082810(GameWindowLayout *param0, u8 param1, u8 param2)
 
     switch (param2) {
     case 0:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 178);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 178);
         break;
     case 1:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 179);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 179);
         break;
     }
 
@@ -672,13 +672,13 @@ static void sub_02082880(GameWindowLayout *param0, u8 param1, u8 param2)
 
     switch (param2) {
     case 0:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 175);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 175);
         break;
     case 1:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 176);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 176);
         break;
     case 2:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 177);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 177);
         break;
     }
 
@@ -697,9 +697,9 @@ static void sub_02082900(GameWindowLayout *param0, u8 param1, u8 param2)
     Window_FillTilemap(v0, 0);
 
     if (param2 == 0) {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 181);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 181);
     } else {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 180);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 180);
     }
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
@@ -717,11 +717,11 @@ static void sub_02082964(GameWindowLayout *param0, u8 param1, u8 param2)
     Window_FillTilemap(v0, 0);
 
     if (param2 < 6) {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 169 + param2);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 169 + param2);
     } else if (param2 == 7) {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 167);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 167);
     } else {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 168);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 168);
     }
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
@@ -736,7 +736,7 @@ void sub_020829DC(GameWindowLayout *param0)
     u32 v2;
     u16 v3[6];
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
 
     v3[0] = (u16)Pokemon_GetValue(v0, MON_DATA_MAX_HP, NULL);
     v3[1] = (u16)Pokemon_GetValue(v0, MON_DATA_ATK, NULL);
@@ -750,14 +750,14 @@ void sub_020829DC(GameWindowLayout *param0)
     Window_FillTilemap(&param0->unk_254[0], 15);
 
     for (v2 = 0; v2 < 6; v2++) {
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 185 + v2);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 185 + v2);
         Text_AddPrinterWithParams(&param0->unk_254[0], FONT_SYSTEM, v1, 0, 16 * v2, TEXT_SPEED_NO_TRANSFER, NULL);
         Strbuf_Free(v1);
 
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 191);
+        v1 = MessageLoader_GetNewStrbuf(param0->messageLoader, 191);
 
-        StringTemplate_SetNumber(param0->unk_6A0, 0, v3[v2] - param0->unk_B14[v2], 2, 0, 1);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
+        StringTemplate_SetNumber(param0->template, 0, v3[v2] - param0->monStats[v2], 2, 0, 1);
+        StringTemplate_Format(param0->template, param0->unk_6A4, v1);
         Strbuf_Free(v1);
 
         {
@@ -765,7 +765,7 @@ void sub_020829DC(GameWindowLayout *param0)
             Text_AddPrinterWithParams(&param0->unk_254[0], FONT_SYSTEM, param0->unk_6A4, v4, 16 * v2, TEXT_SPEED_NO_TRANSFER, NULL);
         }
 
-        param0->unk_B14[v2] = v3[v2];
+        param0->monStats[v2] = v3[v2];
     }
 
     Window_ScheduleCopyToVRAM(&param0->unk_254[0]);
@@ -778,11 +778,11 @@ void sub_02082B58(GameWindowLayout *param0)
     u32 v2;
 
     Window_FillRectWithColor(&param0->unk_254[0], 15, 80, 0, 32, 14 * 8);
-    v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 192);
+    v0 = MessageLoader_GetNewStrbuf(param0->messageLoader, 192);
 
     for (v2 = 0; v2 < 6; v2++) {
-        StringTemplate_SetNumber(param0->unk_6A0, 0, param0->unk_B14[v2], 3, 0, 1);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v0);
+        StringTemplate_SetNumber(param0->template, 0, param0->monStats[v2], 3, 0, 1);
+        StringTemplate_Format(param0->template, param0->unk_6A4, v0);
 
         v1 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_6A4, 0);
 
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index 0bf03acbae..5c305c5c0d 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -76,7 +76,7 @@ void sub_02082CEC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3, N
     SpriteTemplateFromResourceHeader v1;
     u32 v2;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param1);
 
     param0->unk_704[param1].unk_16 = param2;
     param0->unk_704[param1].unk_18 = param3;
@@ -111,7 +111,7 @@ void sub_02082DA8(GameWindowLayout *param0, u8 param1)
     NNSG2dCharacterData *v6;
     BOOL v7;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
+    v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param1);
     v2 = Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL);
     v3 = Pokemon_GetValue(v0, MON_DATA_FORM, NULL);
     v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, HEAP_ID_12);
@@ -282,7 +282,7 @@ static void sub_02083138(Sprite *param0, u8 param1)
 
 static u8 sub_02083158(StrBufWrapper *param0)
 {
-    if (param0->unk_06 == 0) {
+    if (param0->curHP == 0) {
         return 0;
     }
 
@@ -290,7 +290,7 @@ static u8 sub_02083158(StrBufWrapper *param0)
         return 5;
     }
 
-    switch (HealthBar_Color(param0->unk_06, param0->unk_08, 48)) {
+    switch (HealthBar_Color(param0->curHP, param0->maxHP, 48)) {
     case 4:
         return 1;
     case 3:
@@ -326,7 +326,7 @@ void sub_020831B4(GameWindowLayout *param0)
         sub_02083138(v0->unk_24, v2);
         Sprite_UpdateAnim(v0->unk_24, FX32_ONE);
 
-        if ((param0->unk_B11 == v1) && (v2 != 0) && (v2 != 5)) {
+        if ((param0->partySlot == v1) && (v2 != 0) && (v2 != 5)) {
             if (Sprite_GetAnimFrame(v0->unk_24) == 0) {
                 Sprite_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 - 3);
             } else {
@@ -345,7 +345,7 @@ void sub_0208327C(GameWindowLayout *param0, u8 param1, u8 param2)
     u8 v0, v1;
 
     GridMenuCursor_GetFirstCoords(&param0->unk_7F4[param1], &v0, &v1);
-    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->partyManagementData->unk_21, param1));
     Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
     Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
     Sprite_SetExplicitPalette2(param0->unk_5B0[6], param2);
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index c4cdf0bc0d..6733db6739 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -156,7 +156,7 @@ static void sub_0208347C(GameWindowLayout *param0, int *param1)
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
 
-    param0->unk_5A4->unk_23 = 3;
+    param0->partyManagementData->menuSelectionResult = 3;
     *param1 = 32;
 }
 
@@ -171,17 +171,17 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1)
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
 
-    fieldSystem = param0->unk_5A4->unk_1C;
+    fieldSystem = param0->partyManagementData->fieldSystem;
 
-    if (param0->unk_704[param0->unk_B11].unk_0C == 0) {
-        mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-        MessageLoader_GetStrbuf(param0->unk_69C, 81, param0->unk_6A8);
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(mon));
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
-    } else if (Bag_TryAddItem(param0->unk_5A4->unk_04, param0->unk_704[param0->unk_B11].unk_0C, 1, HEAP_ID_12) == TRUE) {
+    if (param0->unk_704[param0->partySlot].unk_0C == 0) {
+        mon = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
+        MessageLoader_GetStrbuf(param0->messageLoader, 81, param0->unk_6A8);
+        StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(mon));
+        StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
+    } else if (Bag_TryAddItem(param0->partyManagementData->bag, param0->unk_704[param0->partySlot].unk_0C, 1, HEAP_ID_12) == TRUE) {
         u32 v4;
 
-        mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+        mon = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
         v4 = 0;
 
         Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &v4);
@@ -190,21 +190,21 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1)
         if ((fieldSystem == NULL) || (fieldSystem->location->mapId < 573) || (fieldSystem->location->mapId > 583)) {
             v1 = Pokemon_SetGiratinaFormByHeldItem(mon);
 
-            if ((param0->unk_704[param0->unk_B11].unk_0C == ITEM_GRISEOUS_ORB) && (v1 == 0)) {
+            if ((param0->unk_704[param0->partySlot].unk_0C == ITEM_GRISEOUS_ORB) && (v1 == 0)) {
                 v2 = 18;
             }
         }
 
-        MessageLoader_GetStrbuf(param0->unk_69C, 82, param0->unk_6A8);
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(mon));
-        StringTemplate_SetItemName(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8);
+        MessageLoader_GetStrbuf(param0->messageLoader, 82, param0->unk_6A8);
+        StringTemplate_SetNickname(param0->template, 0, Pokemon_GetBoxPokemon(mon));
+        StringTemplate_SetItemName(param0->template, 1, param0->unk_704[param0->partySlot].unk_0C);
+        StringTemplate_Format(param0->template, param0->unk_6A4, param0->unk_6A8);
 
-        param0->unk_704[param0->unk_B11].unk_0C = 0;
+        param0->unk_704[param0->partySlot].unk_0C = 0;
 
-        sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C);
+        sub_02083040(param0, param0->partySlot, param0->unk_704[param0->partySlot].unk_0C);
     } else {
-        MessageLoader_GetStrbuf(param0->unk_69C, 83, param0->unk_6A4);
+        MessageLoader_GetStrbuf(param0->messageLoader, 83, param0->unk_6A4);
     }
 
     Window_DrawMessageBoxWithScrollCursor(&param0->unk_04[34], 1, (1 + 9), 15);
@@ -216,7 +216,7 @@ static void sub_020834B0(GameWindowLayout *param0, int *param1)
 
 int sub_02083658(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Window_EraseMessageBox(&param0->unk_04[34], 1);
             sub_020826E0(param0, 29, 1);
@@ -230,7 +230,7 @@ int sub_02083658(GameWindowLayout *param0)
 
 int sub_020836A8(GameWindowLayout *param0)
 {
-    if (Text_IsPrinterActive(param0->unk_B10) == 0) {
+    if (Text_IsPrinterActive(param0->textPrinterID) == 0) {
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Window_EraseMessageBox(&param0->unk_04[34], 1);
             LoadOverlay118(param0);
@@ -284,7 +284,7 @@ static void sub_020837C0(GameWindowLayout *param0, int *param1)
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
 
-    param0->unk_5A4->unk_23 = 7;
+    param0->partyManagementData->menuSelectionResult = 7;
     *param1 = 32;
 }
 
@@ -307,11 +307,11 @@ static int sub_0208384C(void *param0)
     Pokemon *v1;
 
     v0 = param0;
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+    v1 = Party_GetPokemonBySlotIndex(v0->partyManagementData->party, v0->partySlot);
 
-    if (sub_02097788(v0->unk_5A4->unk_08, v1, HEAP_ID_12) != 0xFFFFFFFF) {
-        v0->unk_704[v0->unk_B11].unk_0C = 0;
-        sub_02083040(v0, v0->unk_B11, v0->unk_704[v0->unk_B11].unk_0C);
+    if (sub_02097788(v0->partyManagementData->mailBox, v1, HEAP_ID_12) != 0xFFFFFFFF) {
+        v0->unk_704[v0->partySlot].unk_0C = 0;
+        sub_02083040(v0, v0->partySlot, v0->unk_704[v0->partySlot].unk_0C);
         sub_02082708(v0, 46, 0);
     } else {
         sub_02082708(v0, 50, 0);
@@ -339,20 +339,20 @@ static int sub_020838F4(void *param0)
 {
     GameWindowLayout *v0 = param0;
 
-    if (Bag_TryAddItem(v0->unk_5A4->unk_04, v0->unk_704[v0->unk_B11].unk_0C, 1, HEAP_ID_12) == TRUE) {
+    if (Bag_TryAddItem(v0->partyManagementData->bag, v0->unk_704[v0->partySlot].unk_0C, 1, HEAP_ID_12) == TRUE) {
         Pokemon *mon;
         u32 item;
 
-        mon = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+        mon = Party_GetPokemonBySlotIndex(v0->partyManagementData->party, v0->partySlot);
         item = 0;
 
         Pokemon_SetValue(mon, MON_DATA_HELD_ITEM, &item);
         Pokemon_SetArceusForm(mon);
         Pokemon_SetGiratinaFormByHeldItem(mon);
 
-        v0->unk_704[v0->unk_B11].unk_0C = 0;
+        v0->unk_704[v0->partySlot].unk_0C = 0;
 
-        sub_02083040(v0, v0->unk_B11, v0->unk_704[v0->unk_B11].unk_0C);
+        sub_02083040(v0, v0->partySlot, v0->unk_704[v0->partySlot].unk_0C);
         sub_02082708(v0, 51, 0);
     } else {
         sub_02082708(v0, 83, 0);
@@ -388,10 +388,10 @@ int sub_020839BC(GameWindowLayout *param0)
 
 static void sub_020839FC(GameWindowLayout *param0, int *param1)
 {
-    if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
+    if (param0->unk_704[param0->partySlot].unk_12 == 0) {
         Menu_Free(param0->unk_700, NULL);
         StringList_Free(param0->unk_6FC);
-        param0->unk_5A4->unk_23 = 0;
+        param0->partyManagementData->menuSelectionResult = 0;
         *param1 = 32;
         return;
     }
@@ -411,11 +411,11 @@ int sub_02083A78(void *param0)
     Pokemon *v1;
 
     v0 = param0;
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+    v1 = Party_GetPokemonBySlotIndex(v0->partyManagementData->party, v0->partySlot);
 
     sub_0207893C(v1);
 
-    v0->unk_5A4->unk_23 = 0;
+    v0->partyManagementData->menuSelectionResult = 0;
     return 32;
 }
 
@@ -435,12 +435,12 @@ static void sub_02083AD0(GameWindowLayout *param0, int *param1)
     s16 v0, v1;
 
     param0->unk_B0F_6 = 1;
-    param0->unk_B0F_0 = param0->unk_B11;
+    param0->unk_B0F_0 = param0->partySlot;
 
     Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
     Sprite_GetPositionXY(param0->unk_5B0[6], &v0, &v1);
     Sprite_SetPositionXY(param0->unk_5B0[7], v0, v1);
-    Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+    Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->partyManagementData->unk_21, param0->unk_B0F_0) + 2);
     Sprite_SetDrawFlag(param0->unk_5B0[7], 1);
     sub_0207F8F8(param0, param0->unk_B0F_0);
     Window_EraseMessageBox(&param0->unk_04[33], 1);
@@ -455,8 +455,8 @@ void sub_02083B88(GameWindowLayout *param0)
     param0->unk_B0F_6 = 0;
     Sprite_SetDrawFlag(param0->unk_5B0[7], 0);
 
-    if (param0->unk_B11 < 6) {
-        sub_0207F8F8(param0, param0->unk_B11);
+    if (param0->partySlot < 6) {
+        sub_0207F8F8(param0, param0->partySlot);
     }
 
     sub_0207F8F8(param0, param0->unk_B0F_0);
@@ -470,7 +470,7 @@ void sub_02083BD4(GameWindowLayout *param0)
     s8 v2, v3, v4, v5;
     u16 v6;
 
-    param0->unk_7F8.unk_300[0] = param0->unk_B11;
+    param0->unk_7F8.unk_300[0] = param0->partySlot;
     param0->unk_7F8.unk_300[1] = param0->unk_B0F_0;
     param0->unk_7F8.unk_304 = 1;
     param0->unk_7F8.unk_306 = 0;
@@ -552,13 +552,13 @@ BOOL sub_02083D1C(GameWindowLayout *param0)
         break;
 
     case 4:
-        Party_SwapSlots(param0->unk_5A4->unk_00, v0->unk_300[0], v0->unk_300[1]);
+        Party_SwapSlots(param0->partyManagementData->party, v0->unk_300[0], v0->unk_300[1]);
         Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
 
         v0->unk_304 = 0;
         param0->unk_B0F_6 = 0;
 
-        sub_0207F8F8(param0, param0->unk_B11);
+        sub_0207F8F8(param0, param0->partySlot);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 29, 0);
 
@@ -717,18 +717,18 @@ static void sub_020844B0(GameWindowLayout *param0, int *param1)
     Window_EraseMessageBox(&param0->unk_04[33], 1);
     sub_0208337C(param0);
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] != 0) {
+    for (v0 = 0; v0 < param0->partyManagementData->unk_32_4; v0++) {
+        if (param0->partyManagementData->unk_2C[v0] != 0) {
             continue;
         }
 
-        param0->unk_5A4->unk_2C[v0] = param0->unk_B11 + 1;
+        param0->partyManagementData->unk_2C[v0] = param0->partySlot + 1;
 
-        sub_02082508(param0, param0->unk_B11);
+        sub_02082508(param0, param0->partySlot);
         sub_020826E0(param0, 34, 1);
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
 
-        if (v0 == param0->unk_5A4->unk_32_4 - 1) {
+        if (v0 == param0->partyManagementData->unk_32_4 - 1) {
             sub_0207FD68(param0, 6);
         }
 
@@ -736,7 +736,7 @@ static void sub_020844B0(GameWindowLayout *param0, int *param1)
         return;
     }
 
-    switch (param0->unk_5A4->unk_32_4) {
+    switch (param0->partyManagementData->unk_32_4) {
     case 1:
         sub_02082708(param0, 123, 1);
         break;
@@ -774,13 +774,13 @@ static void sub_020845E8(GameWindowLayout *param0, int *param1)
 {
     u8 v0;
 
-    for (v0 = 0; v0 < param0->unk_5A4->unk_32_4; v0++) {
-        if (param0->unk_5A4->unk_2C[v0] == param0->unk_B11 + 1) {
-            param0->unk_5A4->unk_2C[v0] = 0;
+    for (v0 = 0; v0 < param0->partyManagementData->unk_32_4; v0++) {
+        if (param0->partyManagementData->unk_2C[v0] == param0->partySlot + 1) {
+            param0->partyManagementData->unk_2C[v0] = 0;
 
-            for (v0 = v0; v0 < param0->unk_5A4->unk_32_4 - 1; v0++) {
-                param0->unk_5A4->unk_2C[v0] = param0->unk_5A4->unk_2C[v0 + 1];
-                param0->unk_5A4->unk_2C[v0 + 1] = 0;
+            for (v0 = v0; v0 < param0->partyManagementData->unk_32_4 - 1; v0++) {
+                param0->partyManagementData->unk_2C[v0] = param0->partyManagementData->unk_2C[v0 + 1];
+                param0->partyManagementData->unk_2C[v0 + 1] = 0;
             }
             break;
         }
@@ -804,7 +804,7 @@ static void sub_020845E8(GameWindowLayout *param0, int *param1)
 
 static void sub_020846CC(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 0;
+    param0->partyManagementData->menuSelectionResult = 0;
 
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
@@ -814,7 +814,7 @@ static void sub_020846CC(GameWindowLayout *param0, int *param1)
 
 static void sub_020846FC(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 0;
+    param0->partyManagementData->menuSelectionResult = 0;
 
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
@@ -824,7 +824,7 @@ static void sub_020846FC(GameWindowLayout *param0, int *param1)
 
 static void sub_0208472C(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 1;
+    param0->partyManagementData->menuSelectionResult = 1;
 
     Menu_Free(param0->unk_700, NULL);
     StringList_Free(param0->unk_6FC);
@@ -842,42 +842,42 @@ static void sub_02084760(GameWindowLayout *param0, int *param1)
 
 int sub_02084780(GameWindowLayout *param0)
 {
-    Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+    Pokemon *v0 = Party_GetPokemonBySlotIndex(param0->partyManagementData->party, param0->partySlot);
 
     if (Pokemon_GetValue(v0, MON_DATA_BALL_CAPSULE_ID, NULL) == 0) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 129, param0->unk_6A4);
-        Sprite_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
+        MessageLoader_GetStrbuf(param0->messageLoader, 129, param0->unk_6A4);
+        Sprite_SetDrawFlag(param0->unk_5B0[22 + param0->partySlot], 1);
     } else {
-        MessageLoader_GetStrbuf(param0->unk_69C, 130, param0->unk_6A4);
-        param0->unk_B11 = 7;
+        MessageLoader_GetStrbuf(param0->messageLoader, 130, param0->unk_6A4);
+        param0->partySlot = 7;
     }
 
     sub_02082708(param0, 0xffffffff, 1);
 
-    param0->unk_5A4->unk_23 = 0;
+    param0->partyManagementData->menuSelectionResult = 0;
     param0->unk_B0E = 25;
 
     return 24;
 }
 
-static void sub_02084808(GameWindowLayout *param0, int *param1)
+static void sub_02084808(GameWindowLayout *windowLayout, int *param1)
 {
-    FieldMoveErrContext v0;
+    FieldMoveErrContext fieldMoveErrorCtx;
     u32 v1;
     u32 v2;
 
-    v0 = (FieldMoveErrContext)FieldMove_GetTaskOrError(FIELD_MOVE_ERROR, param0->unk_5A4->unk_23 - 11);
+    fieldMoveErrorCtx = (FieldMoveErrContext)FieldMove_GetTaskOrError(FIELD_MOVE_ERROR, windowLayout->partyManagementData->menuSelectionResult - 11);
 
-    if (v0 != NULL) {
-        v1 = v0(param0->unk_5A4->unk_18);
+    if (fieldMoveErrorCtx != NULL) {
+        v1 = fieldMoveErrorCtx(windowLayout->partyManagementData->fieldMoveContext);
     } else {
         v1 = 1;
     }
 
     switch (v1) {
     case 0:
-        Menu_Free(param0->unk_700, NULL);
-        StringList_Free(param0->unk_6FC);
+        Menu_Free(windowLayout->unk_700, NULL);
+        StringList_Free(windowLayout->unk_6FC);
         *param1 = 32;
         return;
     case 1:
@@ -894,89 +894,89 @@ static void sub_02084808(GameWindowLayout *param0, int *param1)
         break;
     }
 
-    Window_EraseMessageBox(&param0->unk_04[33], 1);
-    sub_0208337C(param0);
-    sub_02082708(param0, v2, 1);
+    Window_EraseMessageBox(&windowLayout->unk_04[33], 1);
+    sub_0208337C(windowLayout);
+    sub_02082708(windowLayout, v2, 1);
 
-    param0->unk_B0E = 3;
+    windowLayout->unk_B0E = 3;
     *param1 = 24;
 }
 
 static void sub_020848A8(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 11;
+    param0->partyManagementData->menuSelectionResult = 11;
     sub_02084808(param0, param1);
 }
 
 static void sub_020848C0(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 16;
+    param0->partyManagementData->menuSelectionResult = 16;
     sub_02084808(param0, param1);
 }
 
 static void sub_020848D8(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 14;
+    param0->partyManagementData->menuSelectionResult = 14;
     sub_02084808(param0, param1);
 }
 
 static void sub_020848F0(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 13;
+    param0->partyManagementData->menuSelectionResult = 13;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084908(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 15;
+    param0->partyManagementData->menuSelectionResult = 15;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084920(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 18;
+    param0->partyManagementData->menuSelectionResult = 18;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084938(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 12;
+    param0->partyManagementData->menuSelectionResult = 12;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084950(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 17;
+    param0->partyManagementData->menuSelectionResult = 17;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084968(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 19;
+    param0->partyManagementData->menuSelectionResult = 19;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084980(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 20;
+    param0->partyManagementData->menuSelectionResult = 20;
     sub_02084808(param0, param1);
 }
 
 static void sub_02084998(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 21;
+    param0->partyManagementData->menuSelectionResult = 21;
     sub_02084808(param0, param1);
 }
 
 static void sub_020849B0(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 22;
+    param0->partyManagementData->menuSelectionResult = 22;
     sub_02084808(param0, param1);
 }
 
 static void sub_020849C8(GameWindowLayout *param0, int *param1)
 {
-    param0->unk_5A4->unk_23 = 23;
+    param0->partyManagementData->menuSelectionResult = 23;
     sub_02084808(param0, param1);
 }
 
@@ -985,7 +985,7 @@ static void sub_020849E0(GameWindowLayout *param0, int *param1)
     *param1 = sub_02084A18(param0);
 
     if (*param1 == 30) {
-        param0->unk_B14[3] = 24 - 11;
+        param0->monStats[3] = 24 - 11;
     }
 }
 
@@ -994,7 +994,7 @@ static void sub_020849FC(GameWindowLayout *param0, int *param1)
     *param1 = sub_02084A18(param0);
 
     if (*param1 == 30) {
-        param0->unk_B14[3] = 25 - 11;
+        param0->monStats[3] = 25 - 11;
     }
 }
 
@@ -1003,9 +1003,9 @@ static int sub_02084A18(GameWindowLayout *param0)
     Window_EraseMessageBox(&param0->unk_04[33], 1);
     sub_0208337C(param0);
 
-    param0->unk_B14[0] = param0->unk_704[param0->unk_B11].unk_08 / 5;
+    param0->monStats[0] = param0->unk_704[param0->partySlot].maxHP / 5;
 
-    if (param0->unk_704[param0->unk_B11].unk_06 <= param0->unk_B14[0]) {
+    if (param0->unk_704[param0->partySlot].curHP <= param0->monStats[0]) {
         sub_02082708(param0, 138, 1);
         param0->unk_B0E = 3;
         return 24;
@@ -1013,17 +1013,17 @@ static int sub_02084A18(GameWindowLayout *param0)
         s16 v0, v1;
 
         param0->unk_B0F_6 = 1;
-        param0->unk_B0F_0 = param0->unk_B11;
+        param0->unk_B0F_0 = param0->partySlot;
 
         Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         Sprite_GetPositionXY(param0->unk_5B0[6], &v0, &v1);
         Sprite_SetPositionXY(param0->unk_5B0[7], v0, v1);
-        Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+        Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->partyManagementData->unk_21, param0->unk_B0F_0) + 2);
         Sprite_SetDrawFlag(param0->unk_5B0[7], 1);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 36, 1);
 
-        param0->unk_B14[1] = 0;
+        param0->monStats[1] = 0;
         return 30;
     }
 }
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index 37479206e0..a2bf296ae1 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -3,6 +3,9 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "constants/heap.h"
+#include "constants/scrcmd.h"
+
 #include "struct_defs/struct_0207F248.h"
 
 #include "applications/pokemon_summary_screen/main.h"
@@ -31,338 +34,338 @@
 #include "unk_020819DC.h"
 #include "unk_02082C2C.h"
 
-static int sub_02085384(void *param0);
-static int sub_02085424(void *param0);
-static int sub_020855C4(void *param0);
-static int sub_02085704(void *param0);
-static int sub_02085A70(void *param0);
-static int sub_02085C50(void *param0);
-static void sub_02086590(GameWindowLayout *param0, Pokemon *param1, u32 param2);
-static int sub_02086438(void *param0);
-static int sub_0208648C(void *param0);
-static int sub_020864E4(void *param0);
-static int sub_02086538(void *param0);
-static u16 sub_02086930(GameWindowLayout *param0);
-static int sub_02085FB4(void *param0);
-static int sub_02086008(void *param0);
-static int sub_02086060(void *param0);
-static int sub_020860AC(void *param0);
+static int sub_02085384(void *windowLayoutPtr);
+static int sub_02085424(void *windowLayoutPtr);
+static int sub_020855C4(void *windowLayoutPtr);
+static int PokemonSummaryScreen_UpdateHPBar(GameWindowLayout *windowLayoutPtr);
+static int sub_02085A70(void *windowLayoutPtr);
+static int sub_02085C50(void *windowLayoutPtr);
+static void TeachMove(GameWindowLayout *windowLayout, Pokemon *mon, u32 moveSlot);
+static int sub_02086438(void *windowLayoutPtr);
+static int sub_0208648C(void *windowLayoutPtr);
+static int sub_020864E4(void *windowLayoutPtr);
+static int sub_02086538(void *windowLayoutPtr);
+static u16 GetCurrentMapLabel(GameWindowLayout *windowLayout);
+static int sub_02085FB4(void *windowLayoutPtr);
+static int sub_02086008(void *windowLayoutPtr);
+static int sub_02086060(void *windowLayoutPtr);
+static int sub_020860AC(void *windowLayoutPtr);
 
-static u8 sub_02084B70(u16 param0)
+static u8 sub_02084B70(u16 itemID)
 {
-    ItemData *v0;
-    s32 v1;
+    ItemData *itemData;
+    s32 itemParam;
 
-    v0 = Item_Load(param0, 0, 12);
+    itemData = Item_Load(itemID, 0, HEAP_ID_12);
 
-    if (Item_Get(v0, 14) != 1) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_PARTY_USE) != 1) {
+        Heap_FreeToHeap(itemData);
         return 28;
     }
 
-    if ((Item_Get(v0, 27) != 0) || (Item_Get(v0, 28) != 0) || (Item_Get(v0, 29) != 0) || (Item_Get(v0, 30) != 0) || (Item_Get(v0, 31) != 0) || (Item_Get(v0, 32) != 0) || (Item_Get(v0, 33) != 0)) {
-        Heap_FreeToHeap(v0);
+    if ((Item_Get(itemData, ITEM_PARAM_ATK_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_DEF_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_SPATK_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_SPDEF_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_SPEED_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_ACC_STAGES) != 0) || (Item_Get(itemData, ITEM_PARAM_CRIT_STAGES) != 0)) {
+        Heap_FreeToHeap(itemData);
         return 0;
     }
 
-    if (Item_Get(v0, 24) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_REVIVE_ALL) != 0) {
+        Heap_FreeToHeap(itemData);
         return 1;
     }
 
-    if (Item_Get(v0, 25) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_LEVEL_UP) != 0) {
+        Heap_FreeToHeap(itemData);
         return 2;
     }
 
-    v1 = Item_Get(v0, 15);
-    v1 += (Item_Get(v0, 16) << 1);
-    v1 += (Item_Get(v0, 17) << 2);
-    v1 += (Item_Get(v0, 18) << 3);
-    v1 += (Item_Get(v0, 19) << 4);
-    v1 += (Item_Get(v0, 20) << 5);
+    itemParam = Item_Get(itemData, ITEM_PARAM_HEAL_SLEEP);
+    itemParam += (Item_Get(itemData, ITEM_PARAM_HEAL_POISON) << 1);
+    itemParam += (Item_Get(itemData, ITEM_PARAM_HEAL_BURN) << 2);
+    itemParam += (Item_Get(itemData, ITEM_PARAM_HEAL_FREEZE) << 3);
+    itemParam += (Item_Get(itemData, ITEM_PARAM_HEAL_PARALYSIS) << 4);
+    itemParam += (Item_Get(itemData, ITEM_PARAM_HEAL_CONFUSION) << 5);
 
-    switch (v1) {
+    switch (itemParam) {
     case 0x1:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 3;
     case 0x2:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 4;
     case 0x4:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 5;
     case 0x8:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 6;
     case 0x10:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 7;
     case 0x20:
-        Heap_FreeToHeap(v0);
+        Heap_FreeToHeap(itemData);
         return 8;
     case 0x3f:
-        if (Item_Get(v0, 38) != 0) {
-            Heap_FreeToHeap(v0);
-            return 11;
+        if (Item_Get(itemData, ITEM_PARAM_HP_RESTORE) != 0) {
+            Heap_FreeToHeap(itemData);
+            return 11; // Full Restore
         } else {
-            Heap_FreeToHeap(v0);
-            return 9;
+            Heap_FreeToHeap(itemData);
+            return 9; // Full Heal
         }
     }
 
-    if (Item_Get(v0, 21) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_HEAL_ATTRACT) != 0) {
+        Heap_FreeToHeap(itemData);
         return 10;
     }
 
-    if (Item_Get(v0, 38) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_HP_RESTORE) != 0) {
+        Heap_FreeToHeap(itemData);
         return 11;
     }
 
-    v1 = Item_Get(v0, 48);
+    itemParam = Item_Get(itemData, ITEM_PARAM_HP_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 12;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 18;
     }
 
-    v1 = Item_Get(v0, 49);
+    itemParam = Item_Get(itemData, ITEM_PARAM_ATK_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 13;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 19;
     }
 
-    v1 = Item_Get(v0, 50);
+    itemParam = Item_Get(itemData, ITEM_PARAM_DEF_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 14;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 20;
     }
 
-    v1 = Item_Get(v0, 51);
+    itemParam = Item_Get(itemData, ITEM_PARAM_SPEED_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 15;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 21;
     }
 
-    v1 = Item_Get(v0, 52);
+    itemParam = Item_Get(itemData, ITEM_PARAM_SPATK_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 16;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 22;
     }
 
-    v1 = Item_Get(v0, 53);
+    itemParam = Item_Get(itemData, ITEM_PARAM_SPDEF_EVS);
 
-    if (v1 > 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam > 0) {
+        Heap_FreeToHeap(itemData);
         return 17;
     }
 
-    if (v1 < 0) {
-        Heap_FreeToHeap(v0);
+    if (itemParam < 0) {
+        Heap_FreeToHeap(itemData);
         return 23;
     }
 
-    if (Item_Get(v0, 26) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_EVOLVE) != 0) {
+        Heap_FreeToHeap(itemData);
         return 24;
     }
 
-    if (Item_Get(v0, 34) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_PP_UP) != 0) {
+        Heap_FreeToHeap(itemData);
         return 25;
     }
 
-    if (Item_Get(v0, 35) != 0) {
-        Heap_FreeToHeap(v0);
+    if (Item_Get(itemData, ITEM_PARAM_PP_MAX) != 0) {
+        Heap_FreeToHeap(itemData);
         return 26;
     }
 
-    if ((Item_Get(v0, 36) != 0) || (Item_Get(v0, 37) != 0)) {
-        Heap_FreeToHeap(v0);
+    if ((Item_Get(itemData, ITEM_PARAM_PP_RESTORE) != 0) || (Item_Get(itemData, ITEM_PARAM_PP_RESTORE_ALL) != 0)) {
+        Heap_FreeToHeap(itemData);
         return 27;
     }
 
-    Heap_FreeToHeap(v0);
+    Heap_FreeToHeap(itemData);
     return 28;
 }
 
-static void sub_02084E58(GameWindowLayout *param0, u16 param1, u32 param2)
+static void BufferUsedItemMessage(GameWindowLayout *windowLayout, u16 param1, u32 param2)
 {
-    Pokemon *v0;
-    Strbuf *v1;
+    Pokemon *mon;
+    Strbuf *strBuf;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-    StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
 
     switch (sub_02084B70(param1)) {
     case 4:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 65);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 65);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 3:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 91);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 91);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 5:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 67);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 67);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 6:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 68);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 68);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 7:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 66);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 66);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 8:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 73);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 73);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 10:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 74);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 74);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 9:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 71);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 71);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 12:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 0);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 0);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 13:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 1);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 1);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 14:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 2);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 2);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 15:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 3);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 3);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 16:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 4);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 4);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 17:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 5);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 75);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 5);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 18:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 0);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 0);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 19:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 1);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 1);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 20:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 2);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 2);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 21:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 3);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 3);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 22:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 4);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 4);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 23:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2);
-        StringTemplate_SetPokemonStatName(param0->unk_6A0, 1, 5);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 110 + param2);
+        StringTemplate_SetPokemonStatName(windowLayout->template, 1, 5);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 25:
     case 26:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 72);
-        StringTemplate_SetMoveName(param0->unk_6A0, 0, param2);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 72);
+        StringTemplate_SetMoveName(windowLayout->template, 0, param2);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
         break;
     case 27:
-        MessageLoader_GetStrbuf(param0->unk_69C, 69, param0->unk_6A4);
+        MessageLoader_GetStrbuf(windowLayout->messageLoader, 69, windowLayout->unk_6A4);
         break;
     default:
-        MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4);
+        MessageLoader_GetStrbuf(windowLayout->messageLoader, 105, windowLayout->unk_6A4);
     }
 }
 
-void sub_020852B8(GameWindowLayout *param0)
+void sub_020852B8(GameWindowLayout *windowLayout)
 {
-    switch (sub_02084B70(param0->unk_5A4->unk_24)) {
+    switch (sub_02084B70(windowLayout->partyManagementData->usedItemID)) {
     case 0:
     case 28:
         break;
     case 1:
         break;
     case 2:
-        param0->unk_B00 = sub_02085A70;
+        windowLayout->unk_B00 = sub_02085A70;
         break;
     case 3:
     case 4:
@@ -381,7 +384,7 @@ void sub_020852B8(GameWindowLayout *param0)
     case 25:
     case 26:
     case 27:
-        param0->unk_B00 = sub_02085384;
+        windowLayout->unk_B00 = sub_02085384;
         break;
     case 18:
     case 19:
@@ -389,24 +392,24 @@ void sub_020852B8(GameWindowLayout *param0)
     case 21:
     case 22:
     case 23:
-        param0->unk_B00 = sub_02085424;
+        windowLayout->unk_B00 = sub_02085424;
         break;
     case 11:
-        param0->unk_B00 = sub_020855C4;
+        windowLayout->unk_B00 = sub_020855C4;
         break;
     }
 }
 
 int sub_02085348(void *param0)
 {
-    GameWindowLayout *v0 = (GameWindowLayout *)param0;
+    GameWindowLayout *windowLayout = (GameWindowLayout *)param0;
 
-    if (Text_IsPrinterActive(v0->unk_B10) != 0) {
+    if (Text_IsPrinterActive(windowLayout->textPrinterID) != 0) {
         return 5;
     }
 
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-        v0->unk_5A4->unk_23 = 0;
+        windowLayout->partyManagementData->menuSelectionResult = 0;
         return 32;
     }
 
@@ -415,236 +418,236 @@ int sub_02085348(void *param0)
 
 static int sub_02085384(void *param0)
 {
-    GameWindowLayout *v0 = (GameWindowLayout *)param0;
+    GameWindowLayout *windowLayout = (GameWindowLayout *)param0;
 
-    Party_ApplyItemEffectsToMember(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
-    sub_0207EF14(v0, v0->unk_B11);
-    sub_020821F8(v0, v0->unk_B11);
-    sub_020822BC(v0, v0->unk_B11);
-    sub_02083014(v0, v0->unk_B11, v0->unk_704[v0->unk_B11].unk_0E_0);
-    sub_02084E58(v0, v0->unk_5A4->unk_24, 0);
-    sub_02082708(v0, 0xffffffff, 1);
+    Party_ApplyItemEffectsToMember(windowLayout->partyManagementData->party, windowLayout->partyManagementData->usedItemID, windowLayout->partySlot, 0, GetCurrentMapLabel(windowLayout), HEAP_ID_12);
+    sub_0207EF14(windowLayout, windowLayout->partySlot);
+    sub_020821F8(windowLayout, windowLayout->partySlot);
+    sub_020822BC(windowLayout, windowLayout->partySlot);
+    sub_02083014(windowLayout, windowLayout->partySlot, windowLayout->unk_704[windowLayout->partySlot].unk_0E_0);
+    BufferUsedItemMessage(windowLayout, windowLayout->partyManagementData->usedItemID, 0);
+    sub_02082708(windowLayout, 0xffffffff, 1);
     Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
 
-    v0->unk_B00 = sub_02085348;
+    windowLayout->unk_B00 = sub_02085348;
 
     return 5;
 }
 
-static int sub_02085424(void *param0)
+static int sub_02085424(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Pokemon *v1;
-    u8 v2[7];
+    GameWindowLayout *windowLayout;
+    Pokemon *mon;
+    u8 EVs[7];
 
-    v0 = (GameWindowLayout *)param0;
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+    windowLayout = (GameWindowLayout *)windowLayoutPtr;
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
 
-    v2[0] = Pokemon_GetValue(v1, MON_DATA_HP_EV, NULL);
-    v2[1] = Pokemon_GetValue(v1, MON_DATA_ATK_EV, NULL);
-    v2[2] = Pokemon_GetValue(v1, MON_DATA_DEF_EV, NULL);
-    v2[3] = Pokemon_GetValue(v1, MON_DATA_SPEED_EV, NULL);
-    v2[4] = Pokemon_GetValue(v1, MON_DATA_SPATK_EV, NULL);
-    v2[5] = Pokemon_GetValue(v1, MON_DATA_SPDEF_EV, NULL);
-    v2[6] = Pokemon_GetValue(v1, MON_DATA_FRIENDSHIP, NULL);
+    EVs[0] = Pokemon_GetValue(mon, MON_DATA_HP_EV, NULL);
+    EVs[1] = Pokemon_GetValue(mon, MON_DATA_ATK_EV, NULL);
+    EVs[2] = Pokemon_GetValue(mon, MON_DATA_DEF_EV, NULL);
+    EVs[3] = Pokemon_GetValue(mon, MON_DATA_SPEED_EV, NULL);
+    EVs[4] = Pokemon_GetValue(mon, MON_DATA_SPATK_EV, NULL);
+    EVs[5] = Pokemon_GetValue(mon, MON_DATA_SPDEF_EV, NULL);
+    EVs[6] = Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL);
 
-    Party_ApplyItemEffectsToMember(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
-    sub_0207EF14(v0, v0->unk_B11);
-    sub_020821F8(v0, v0->unk_B11);
-    sub_020822BC(v0, v0->unk_B11);
-    sub_02083014(v0, v0->unk_B11, v0->unk_704[v0->unk_B11].unk_0E_0);
+    Party_ApplyItemEffectsToMember(windowLayout->partyManagementData->party, windowLayout->partyManagementData->usedItemID, windowLayout->partySlot, 0, GetCurrentMapLabel(windowLayout), 12);
+    sub_0207EF14(windowLayout, windowLayout->partySlot);
+    sub_020821F8(windowLayout, windowLayout->partySlot);
+    sub_020822BC(windowLayout, windowLayout->partySlot);
+    sub_02083014(windowLayout, windowLayout->partySlot, windowLayout->unk_704[windowLayout->partySlot].unk_0E_0);
 
-    if ((v2[0] != Pokemon_GetValue(v1, MON_DATA_HP_EV, NULL)) || (v2[1] != Pokemon_GetValue(v1, MON_DATA_ATK_EV, NULL)) || (v2[2] != Pokemon_GetValue(v1, MON_DATA_DEF_EV, NULL)) || (v2[3] != Pokemon_GetValue(v1, MON_DATA_SPEED_EV, NULL)) || (v2[4] != Pokemon_GetValue(v1, MON_DATA_SPATK_EV, NULL)) || (v2[5] != Pokemon_GetValue(v1, MON_DATA_SPDEF_EV, NULL))) {
-        if (v2[6] != Pokemon_GetValue(v1, MON_DATA_FRIENDSHIP, NULL)) {
-            sub_02084E58(v0, v0->unk_5A4->unk_24, 0);
+    if ((EVs[0] != Pokemon_GetValue(mon, MON_DATA_HP_EV, NULL)) || (EVs[1] != Pokemon_GetValue(mon, MON_DATA_ATK_EV, NULL)) || (EVs[2] != Pokemon_GetValue(mon, MON_DATA_DEF_EV, NULL)) || (EVs[3] != Pokemon_GetValue(mon, MON_DATA_SPEED_EV, NULL)) || (EVs[4] != Pokemon_GetValue(mon, MON_DATA_SPATK_EV, NULL)) || (EVs[5] != Pokemon_GetValue(mon, MON_DATA_SPDEF_EV, NULL))) {
+        if (EVs[6] != Pokemon_GetValue(mon, MON_DATA_FRIENDSHIP, NULL)) {
+            BufferUsedItemMessage(windowLayout, windowLayout->partyManagementData->usedItemID, 0);
         } else {
-            sub_02084E58(v0, v0->unk_5A4->unk_24, 1);
+            BufferUsedItemMessage(windowLayout, windowLayout->partyManagementData->usedItemID, 1);
         }
     } else {
-        sub_02084E58(v0, v0->unk_5A4->unk_24, 2);
+        BufferUsedItemMessage(windowLayout, windowLayout->partyManagementData->usedItemID, 2);
     }
 
-    sub_02082708(v0, 0xffffffff, 1);
-    v0->unk_B00 = sub_02085348;
+    sub_02082708(windowLayout, 0xffffffff, 1);
+    windowLayout->unk_B00 = sub_02085348;
 
     return 5;
 }
 
-static int sub_020855C4(void *param0)
+static int sub_020855C4(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Pokemon *v1;
-    Strbuf *v2;
-    u32 v3;
-    u32 v4;
+    GameWindowLayout *windowLayout;
+    Pokemon *mon;
+    Strbuf *strBuf;
+    u32 curHP;
+    u32 summaryCondition;
 
-    v0 = (GameWindowLayout *)param0;
+    windowLayout = (GameWindowLayout *)windowLayoutPtr;
 
-    Party_ApplyItemEffectsToMember(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
+    Party_ApplyItemEffectsToMember(windowLayout->partyManagementData->party, windowLayout->partyManagementData->usedItemID, windowLayout->partySlot, 0, GetCurrentMapLabel(windowLayout), HEAP_ID_12);
 
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
-    v3 = Pokemon_GetValue(v1, MON_DATA_CURRENT_HP, NULL);
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    curHP = Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
 
-    if (v0->unk_704[v0->unk_B11].unk_06 == 0) {
-        v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 70);
-    } else if (v0->unk_704[v0->unk_B11].unk_06 == v3) {
-        v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 71);
+    if (windowLayout->unk_704[windowLayout->partySlot].curHP == 0) {
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 70);
+    } else if (windowLayout->unk_704[windowLayout->partySlot].curHP == curHP) {
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 71);
     } else {
-        v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 64);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 64);
     }
 
-    StringTemplate_SetNickname(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1));
-    StringTemplate_SetNumber(v0->unk_6A0, 1, v3 - v0->unk_704[v0->unk_B11].unk_06, 3, 0, 1);
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
-    Strbuf_Free(v2);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+    StringTemplate_SetNumber(windowLayout->template, 1, curHP - windowLayout->unk_704[windowLayout->partySlot].curHP, 3, 0, 1);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
 
-    v4 = PokemonSummaryScreen_StatusIconAnimIdx(v1);
-    sub_02083014(v0, v0->unk_B11, v4);
+    summaryCondition = PokemonSummaryScreen_StatusIconAnimIdx(mon);
+    sub_02083014(windowLayout, windowLayout->partySlot, summaryCondition);
 
-    if (v4 == 7) {
-        v0->unk_704[v0->unk_B11].unk_0E_0 = 7;
-        sub_02081FFC(v0, v0->unk_B11);
+    if (summaryCondition == SUMMARY_CONDITION_NONE) {
+        windowLayout->unk_704[windowLayout->partySlot].unk_0E_0 = SUMMARY_CONDITION_NONE;
+        sub_02081FFC(windowLayout, windowLayout->partySlot);
     }
 
-    sub_0207F8F8(v0, v0->unk_B11);
-    v0->unk_B00 = sub_02085704;
+    sub_0207F8F8(windowLayout, windowLayout->partySlot);
+    windowLayout->unk_B00 = (void *)PokemonSummaryScreen_UpdateHPBar;
     Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
 
     return 5;
 }
 
-static int sub_02085704(void *param0)
+static int PokemonSummaryScreen_UpdateHPBar(GameWindowLayout *param0)
 {
-    GameWindowLayout *v0 = (GameWindowLayout *)param0;
-    Pokemon *v1;
-    u32 v2;
+    GameWindowLayout *gameWindowLayout = (GameWindowLayout *)param0;
+    Pokemon *mon;
+    u32 curHP;
 
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
-    v2 = Pokemon_GetValue(v1, MON_DATA_CURRENT_HP, NULL);
+    mon = Party_GetPokemonBySlotIndex(gameWindowLayout->partyManagementData->party, gameWindowLayout->partySlot);
+    curHP = Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
 
-    if (v0->unk_704[v0->unk_B11].unk_06 != v2) {
-        v0->unk_704[v0->unk_B11].unk_06++;
+    if (gameWindowLayout->unk_704[gameWindowLayout->partySlot].curHP != curHP) {
+        gameWindowLayout->unk_704[gameWindowLayout->partySlot].curHP++;
     }
 
-    sub_02082098(v0, v0->unk_B11);
-    Window_FillTilemap(&v0->unk_04[3 + v0->unk_B11 * 5], 0);
-    sub_02082058(v0, v0->unk_B11);
-    sub_02082104(v0, v0->unk_B11);
+    sub_02082098(gameWindowLayout, gameWindowLayout->partySlot);
+    Window_FillTilemap(&gameWindowLayout->unk_04[3 + gameWindowLayout->partySlot * 5], 0);
+    sub_02082058(gameWindowLayout, gameWindowLayout->partySlot);
+    sub_02082104(gameWindowLayout, gameWindowLayout->partySlot);
 
-    if (v0->unk_704[v0->unk_B11].unk_06 == v2) {
-        sub_02082708(v0, 0xffffffff, 1);
-        v0->unk_B00 = sub_02085348;
+    if (gameWindowLayout->unk_704[gameWindowLayout->partySlot].curHP == curHP) {
+        sub_02082708(gameWindowLayout, 0xffffffff, 1);
+        gameWindowLayout->unk_B00 = sub_02085348;
     }
 
     return 5;
 }
 
-BOOL sub_020857A8(u16 param0)
+BOOL CheckItemSacredAsh(u16 itemID)
 {
-    if (Item_LoadParam(param0, 24, 12) != 0) {
-        return 1;
+    if (Item_LoadParam(itemID, ITEM_PARAM_REVIVE_ALL, HEAP_ID_12) != 0) {
+        return TRUE;
     }
 
-    return 0;
+    return FALSE;
 }
 
-static u8 sub_020857C0(GameWindowLayout *param0, u8 param1)
+static u8 GetFirstFaintedMon(GameWindowLayout *windowLayout, u8 startIndex)
 {
-    u8 v0;
+    u8 partySlot;
 
-    if (param1 >= 6) {
+    if (startIndex >= 6) {
         return 0xff;
     }
 
-    for (v0 = param1; v0 < 6; v0++) {
-        if ((param0->unk_704[v0].unk_29 != 0) && (param0->unk_704[v0].unk_06 == 0)) {
-            return v0;
+    for (partySlot = startIndex; partySlot < 6; partySlot++) {
+        if ((windowLayout->unk_704[partySlot].unk_29 != 0) && (windowLayout->unk_704[partySlot].curHP == 0)) {
+            return partySlot;
         }
     }
 
     return 0xff;
 }
 
-int sub_02085804(GameWindowLayout *param0)
+int sub_02085804(GameWindowLayout *windowLayout)
 {
-    Pokemon *v0;
-    Strbuf *v1;
-    u32 v2;
+    Pokemon *mon;
+    Strbuf *strBuf;
+    u32 curHP;
     u8 v3;
 
-    switch (param0->unk_B0E) {
+    switch (windowLayout->unk_B0E) {
     case 0:
-        param0->unk_B11 = sub_020857C0(param0, 0);
+        windowLayout->partySlot = GetFirstFaintedMon(windowLayout, 0);
 
-        if (param0->unk_B11 == 0xff) {
-            MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4);
-            sub_02082708(param0, 0xffffffff, 1);
-            param0->unk_B00 = sub_02085348;
-            sub_0208327C(param0, 0, 1);
-            param0->unk_B11 = 7;
+        if (windowLayout->partySlot == 0xff) {
+            MessageLoader_GetStrbuf(windowLayout->messageLoader, 105, windowLayout->unk_6A4);
+            sub_02082708(windowLayout, 0xffffffff, 1);
+            windowLayout->unk_B00 = sub_02085348;
+            sub_0208327C(windowLayout, 0, 1);
+            windowLayout->partySlot = 7;
 
             return 5;
         }
 
-        if (param0->unk_B11 != 0) {
-            sub_0207F8F8(param0, 0);
+        if (windowLayout->partySlot != 0) {
+            sub_0207F8F8(windowLayout, 0);
         }
     case 1:
 
-        v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-        Pokemon_ApplyItemEffects(v0, param0->unk_5A4->unk_24, 0, sub_02086930(param0), 12);
+        mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+        Pokemon_ApplyItemEffects(mon, windowLayout->partyManagementData->usedItemID, 0, GetCurrentMapLabel(windowLayout), HEAP_ID_12);
 
-        v2 = Pokemon_GetValue(v0, MON_DATA_CURRENT_HP, NULL);
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 70);
+        curHP = Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 70);
 
-        StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
+        StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
 
-        param0->unk_704[param0->unk_B11].unk_0E_0 = 7;
+        windowLayout->unk_704[windowLayout->partySlot].unk_0E_0 = 7;
 
-        sub_02083014(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0E_0);
-        sub_02081FFC(param0, param0->unk_B11);
-        sub_0207F8F8(param0, param0->unk_B11);
-        sub_0208327C(param0, param0->unk_B11, 1);
+        sub_02083014(windowLayout, windowLayout->partySlot, windowLayout->unk_704[windowLayout->partySlot].unk_0E_0);
+        sub_02081FFC(windowLayout, windowLayout->partySlot);
+        sub_0207F8F8(windowLayout, windowLayout->partySlot);
+        sub_0208327C(windowLayout, windowLayout->partySlot, 1);
         Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
 
-        param0->unk_B0E++;
+        windowLayout->unk_B0E++;
         break;
     case 2:
-        v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-        v2 = Pokemon_GetValue(v0, MON_DATA_CURRENT_HP, NULL);
+        mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+        curHP = Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
 
-        param0->unk_704[param0->unk_B11].unk_06++;
+        windowLayout->unk_704[windowLayout->partySlot].curHP++;
 
-        sub_02082098(param0, param0->unk_B11);
-        Window_FillTilemap(&param0->unk_04[3 + param0->unk_B11 * 5], 0);
-        sub_02082058(param0, param0->unk_B11);
-        sub_02082104(param0, param0->unk_B11);
+        sub_02082098(windowLayout, windowLayout->partySlot);
+        Window_FillTilemap(&windowLayout->unk_04[3 + windowLayout->partySlot * 5], 0);
+        sub_02082058(windowLayout, windowLayout->partySlot);
+        sub_02082104(windowLayout, windowLayout->partySlot);
 
-        if (param0->unk_704[param0->unk_B11].unk_06 == v2) {
-            sub_02082708(param0, 0xffffffff, 1);
-            param0->unk_B0E++;
+        if (windowLayout->unk_704[windowLayout->partySlot].curHP == curHP) {
+            sub_02082708(windowLayout, 0xffffffff, 1);
+            windowLayout->unk_B0E++;
         }
         break;
     case 3:
-        if (Text_IsPrinterActive(param0->unk_B10) != 0) {
+        if (Text_IsPrinterActive(windowLayout->textPrinterID) != 0) {
             break;
         }
 
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
-            v3 = param0->unk_B11;
-            param0->unk_B11 = sub_020857C0(param0, param0->unk_B11 + 1);
+            v3 = windowLayout->partySlot;
+            windowLayout->partySlot = GetFirstFaintedMon(windowLayout, windowLayout->partySlot + 1);
 
-            if (param0->unk_B11 != 0xff) {
-                Window_EraseMessageBox(&param0->unk_04[34], 0);
-                sub_0207F8F8(param0, v3);
-                param0->unk_B0E = 1;
+            if (windowLayout->partySlot != 0xff) {
+                Window_EraseMessageBox(&windowLayout->unk_04[34], 0);
+                sub_0207F8F8(windowLayout, v3);
+                windowLayout->unk_B0E = 1;
             } else {
-                Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, HEAP_ID_12);
-                param0->unk_5A4->unk_23 = 0;
-                param0->unk_B11 = 7;
+                Bag_TryRemoveItem(windowLayout->partyManagementData->bag, windowLayout->partyManagementData->usedItemID, 1, HEAP_ID_12);
+                windowLayout->partyManagementData->menuSelectionResult = 0;
+                windowLayout->partySlot = 7;
                 return 32;
             }
         }
@@ -654,165 +657,165 @@ int sub_02085804(GameWindowLayout *param0)
     return 7;
 }
 
-static int sub_02085A70(void *param0)
+static int sub_02085A70(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Pokemon *v1;
-    Strbuf *v2;
-    u32 v3;
-    u32 v4;
+    GameWindowLayout *windowLayout;
+    Pokemon *mon;
+    Strbuf *strBuf;
+    u32 unused;
+    u32 summaryCondition;
 
-    v0 = (GameWindowLayout *)param0;
-    v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+    windowLayout = (GameWindowLayout *)windowLayoutPtr;
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
 
-    v0->unk_B14[0] = (u16)Pokemon_GetValue(v1, MON_DATA_MAX_HP, NULL);
-    v0->unk_B14[1] = (u16)Pokemon_GetValue(v1, MON_DATA_ATK, NULL);
-    v0->unk_B14[2] = (u16)Pokemon_GetValue(v1, MON_DATA_DEF, NULL);
-    v0->unk_B14[3] = (u16)Pokemon_GetValue(v1, MON_DATA_SP_ATK, NULL);
-    v0->unk_B14[4] = (u16)Pokemon_GetValue(v1, MON_DATA_SP_DEF, NULL);
-    v0->unk_B14[5] = (u16)Pokemon_GetValue(v1, MON_DATA_SPEED, NULL);
+    windowLayout->monStats[0] = (u16)Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
+    windowLayout->monStats[1] = (u16)Pokemon_GetValue(mon, MON_DATA_ATK, NULL);
+    windowLayout->monStats[2] = (u16)Pokemon_GetValue(mon, MON_DATA_DEF, NULL);
+    windowLayout->monStats[3] = (u16)Pokemon_GetValue(mon, MON_DATA_SP_ATK, NULL);
+    windowLayout->monStats[4] = (u16)Pokemon_GetValue(mon, MON_DATA_SP_DEF, NULL);
+    windowLayout->monStats[5] = (u16)Pokemon_GetValue(mon, MON_DATA_SPEED, NULL);
 
-    Party_ApplyItemEffectsToMember(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
+    Party_ApplyItemEffectsToMember(windowLayout->partyManagementData->party, windowLayout->partyManagementData->usedItemID, windowLayout->partySlot, 0, GetCurrentMapLabel(windowLayout), HEAP_ID_12);
 
-    v0->unk_704[v0->unk_B11].unk_0A = Pokemon_GetValue(v1, MON_DATA_LEVEL, NULL);
-    v0->unk_704[v0->unk_B11].unk_06 = Pokemon_GetValue(v1, MON_DATA_CURRENT_HP, NULL);
-    v0->unk_704[v0->unk_B11].unk_08 = Pokemon_GetValue(v1, MON_DATA_MAX_HP, NULL);
+    windowLayout->unk_704[windowLayout->partySlot].level = Pokemon_GetValue(mon, MON_DATA_LEVEL, NULL);
+    windowLayout->unk_704[windowLayout->partySlot].curHP = Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL);
+    windowLayout->unk_704[windowLayout->partySlot].maxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
 
-    v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 193);
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 193);
 
-    StringTemplate_SetNickname(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1));
-    StringTemplate_SetNumber(v0->unk_6A0, 1, v0->unk_704[v0->unk_B11].unk_0A, 3, 0, 1);
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
-    Strbuf_Free(v2);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+    StringTemplate_SetNumber(windowLayout->template, 1, windowLayout->unk_704[windowLayout->partySlot].level, 3, 0, 1);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
 
-    v4 = PokemonSummaryScreen_StatusIconAnimIdx(v1);
-    sub_02083014(v0, v0->unk_B11, v4);
+    summaryCondition = PokemonSummaryScreen_StatusIconAnimIdx(mon);
+    sub_02083014(windowLayout, windowLayout->partySlot, summaryCondition);
 
-    if (v4 == 7) {
-        v0->unk_704[v0->unk_B11].unk_0E_0 = 7;
-        sub_02081FFC(v0, v0->unk_B11);
+    if (summaryCondition == SUMMARY_CONDITION_NONE) {
+        windowLayout->unk_704[windowLayout->partySlot].unk_0E_0 = SUMMARY_CONDITION_NONE;
+        sub_02081FFC(windowLayout, windowLayout->partySlot);
     }
 
-    sub_0207F8F8(v0, v0->unk_B11);
+    sub_0207F8F8(windowLayout, windowLayout->partySlot);
 
-    v0->unk_B00 = sub_02085704;
+    windowLayout->unk_B00 = (void *)PokemonSummaryScreen_UpdateHPBar;
 
-    sub_020821F8(v0, v0->unk_B11);
-    sub_020822BC(v0, v0->unk_B11);
-    sub_02082708(v0, 0xffffffff, 1);
+    sub_020821F8(windowLayout, windowLayout->partySlot);
+    sub_020822BC(windowLayout, windowLayout->partySlot);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    v0->unk_B00 = sub_02085C50;
-    v0->unk_B13 = 0;
+    windowLayout->unk_B00 = sub_02085C50;
+    windowLayout->unk_B13 = 0;
 
     return 5;
 }
 
-static int sub_02085C50(void *param0)
+static int sub_02085C50(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Pokemon *v1;
-    Strbuf *v2;
+    GameWindowLayout *windowLayout;
+    Pokemon *mon;
+    Strbuf *strBuf;
 
-    v0 = param0;
+    windowLayout = windowLayoutPtr;
 
-    switch (v0->unk_B13) {
+    switch (windowLayout->unk_B13) {
     case 0:
-        if (Text_IsPrinterActive(v0->unk_B10) == 0) {
+        if (Text_IsPrinterActive(windowLayout->textPrinterID) == 0) {
             if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
-                sub_020829DC(v0);
-                v0->unk_B13 = 1;
+                sub_020829DC(windowLayout);
+                windowLayout->unk_B13 = 1;
             }
         }
         break;
     case 1:
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
-            sub_02082B58(v0);
-            v0->unk_B13 = 2;
+            sub_02082B58(windowLayout);
+            windowLayout->unk_B13 = 2;
         }
         break;
     case 2:
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Sound_PlayEffect(SEQ_SE_CONFIRM);
-            sub_02082C10(v0);
-            v0->unk_B13 = 3;
-            v0->unk_5A4->unk_34 = 0;
+            sub_02082C10(windowLayout);
+            windowLayout->unk_B13 = 3;
+            windowLayout->partyManagementData->unk_34 = 0;
         }
         break;
     case 3:
-        v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
+        mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
 
-        switch (Pokemon_LevelUpMove(v1, &v0->unk_5A4->unk_34, &v0->unk_5A4->unk_26)) {
+        switch (Pokemon_LevelUpMove(mon, &windowLayout->partyManagementData->unk_34, &windowLayout->partyManagementData->learnedMove)) {
         case 0x0:
-            v0->unk_B13 = 6;
+            windowLayout->unk_B13 = 6;
             break;
         case 0xffff:
-            StringTemplate_SetNickname(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1));
-            StringTemplate_SetMoveName(v0->unk_6A0, 1, v0->unk_5A4->unk_26);
+            StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+            StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
 
-            v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52);
+            strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 52);
 
-            StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
-            Strbuf_Free(v2);
-            sub_02082708(v0, 0xffffffff, 0);
+            StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+            Strbuf_Free(strBuf);
+            sub_02082708(windowLayout, 0xffffffff, 0);
 
-            v0->unk_B04.unk_00 = sub_02085FB4;
-            v0->unk_B04.unk_04 = sub_02086008;
-            v0->unk_B0E = 26;
+            windowLayout->unk_B04.unk_00 = sub_02085FB4;
+            windowLayout->unk_B04.unk_04 = sub_02086008;
+            windowLayout->unk_B0E = 26;
 
             return 24;
         case 0xfffe:
             break;
         default:
-            StringTemplate_SetNickname(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1));
-            StringTemplate_SetMoveName(v0->unk_6A0, 1, v0->unk_5A4->unk_26);
+            StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+            StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
 
-            v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 194);
+            strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 194);
 
-            StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
-            Strbuf_Free(v2);
-            sub_02082708(v0, 0xffffffff, 0);
-            v0->unk_B13 = 4;
+            StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+            Strbuf_Free(strBuf);
+            sub_02082708(windowLayout, 0xffffffff, 0);
+            windowLayout->unk_B13 = 4;
             break;
         }
         break;
     case 4:
-        if (Text_IsPrinterActive(v0->unk_B10) == 0) {
+        if (Text_IsPrinterActive(windowLayout->textPrinterID) == 0) {
             if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
                 Sound_PlayEffect(SEQ_SE_CONFIRM);
-                v0->unk_B13 = 3;
+                windowLayout->unk_B13 = 3;
             }
         }
         break;
     case 5:
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-            v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
-            sub_02086590(v0, v1, v0->unk_5A4->unk_28);
-            v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 61);
+            mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+            TeachMove(windowLayout, mon, windowLayout->partyManagementData->selectedMoveSlot);
+            strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 61);
 
-            StringTemplate_SetMoveName(v0->unk_6A0, 1, v0->unk_5A4->unk_26);
-            StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v2);
-            Strbuf_Free(v2);
-            sub_02082708(v0, 0xffffffff, 0);
+            StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
+            StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+            Strbuf_Free(strBuf);
+            sub_02082708(windowLayout, 0xffffffff, 0);
 
-            v0->unk_B13 = 4;
+            windowLayout->unk_B13 = 4;
         }
         break;
     case 6: {
-        Pokemon *v3;
+        Pokemon *mon;
         FieldSystem *fieldSystem;
         int v5;
 
-        v3 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
-        fieldSystem = v0->unk_5A4->unk_1C;
+        mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+        fieldSystem = windowLayout->partyManagementData->fieldSystem;
         v5 = MapHeader_GetMapEvolutionMethod(fieldSystem->location->mapId);
-        v0->unk_5A4->unk_38 = Pokemon_GetEvolutionTargetSpecies(v0->unk_5A4->unk_00, v3, EVO_CLASS_BY_LEVEL, v5, &v0->unk_5A4->unk_3C);
+        windowLayout->partyManagementData->evoTargetSpecies = Pokemon_GetEvolutionTargetSpecies(windowLayout->partyManagementData->party, mon, EVO_CLASS_BY_LEVEL, v5, &windowLayout->partyManagementData->evoType);
 
-        if (v0->unk_5A4->unk_38 != 0) {
-            v0->unk_5A4->unk_23 = 9;
+        if (windowLayout->partyManagementData->evoTargetSpecies != 0) {
+            windowLayout->partyManagementData->menuSelectionResult = 9;
         } else {
-            v0->unk_5A4->unk_23 = 0;
+            windowLayout->partyManagementData->menuSelectionResult = 0;
         }
     }
         return 32;
@@ -821,233 +824,233 @@ static int sub_02085C50(void *param0)
     return 5;
 }
 
-int sub_02085EF4(GameWindowLayout *param0)
+int sub_02085EF4(GameWindowLayout *windowLayout)
 {
-    Pokemon *v0;
-    Strbuf *v1;
+    Pokemon *mon;
+    Strbuf *strBuf;
 
-    param0->unk_B00 = sub_02085C50;
-    param0->unk_B13 = 3;
+    windowLayout->unk_B00 = sub_02085C50;
+    windowLayout->unk_B13 = 3;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-    StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
 
-    if (param0->unk_5A4->unk_28 == 4) {
-        StringTemplate_SetMoveName(param0->unk_6A0, 1, param0->unk_5A4->unk_26);
-        return sub_02086008(param0);
+    if (windowLayout->partyManagementData->selectedMoveSlot == 4) {
+        StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
+        return sub_02086008(windowLayout);
     }
 
-    StringTemplate_SetMoveName(param0->unk_6A0, 1, Pokemon_GetValue(v0, 54 + param0->unk_5A4->unk_28, NULL));
-    v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60);
-    StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(param0, 0xffffffff, 1);
+    StringTemplate_SetMoveName(windowLayout->template, 1, Pokemon_GetValue(mon, 54 + windowLayout->partyManagementData->selectedMoveSlot, NULL));
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 60);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    param0->unk_B0E = 5;
-    param0->unk_B13 = 5;
+    windowLayout->unk_B0E = 5;
+    windowLayout->unk_B13 = 5;
 
     return 24;
 }
 
-static int sub_02085FB4(void *param0)
+static int sub_02085FB4(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 59);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_5A4->unk_23 = 5;
-    v0->unk_B0E = 25;
+    windowLayout->partyManagementData->menuSelectionResult = 5;
+    windowLayout->unk_B0E = 25;
 
     return 24;
 }
 
-static int sub_02086008(void *param0)
+static int sub_02086008(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 55);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 1);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    v0->unk_B04.unk_00 = sub_02086060;
-    v0->unk_B04.unk_04 = sub_020860AC;
-    v0->unk_B0E = 26;
+    windowLayout->unk_B04.unk_00 = sub_02086060;
+    windowLayout->unk_B04.unk_04 = sub_020860AC;
+    windowLayout->unk_B0E = 26;
 
     return 24;
 }
 
-static int sub_02086060(void *param0)
+static int sub_02086060(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 58);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_B0E = 5;
-    v0->unk_B13 = 4;
+    windowLayout->unk_B0E = 5;
+    windowLayout->unk_B13 = 4;
 
     return 24;
 }
 
-static int sub_020860AC(void *param0)
+static int sub_020860AC(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 52);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_B04.unk_00 = sub_02085FB4;
-    v0->unk_B04.unk_04 = sub_02086008;
-    v0->unk_B0E = 26;
+    windowLayout->unk_B04.unk_00 = sub_02085FB4;
+    windowLayout->unk_B04.unk_04 = sub_02086008;
+    windowLayout->unk_B0E = 26;
 
     return 24;
 }
 
-u8 sub_02086104(GameWindowLayout *param0, Pokemon *param1)
+u8 sub_02086104(GameWindowLayout *windowLayout, Pokemon *mon)
 {
-    u16 v0;
-    u8 v1;
+    u16 moveID;
+    u8 moveSlot;
 
-    for (v1 = 0; v1 < LEARNED_MOVES_MAX; v1++) {
-        v0 = (u16)Pokemon_GetValue(param1, MON_DATA_MOVE1 + v1, NULL);
+    for (moveSlot = 0; moveSlot < LEARNED_MOVES_MAX; moveSlot++) {
+        moveID = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + moveSlot, NULL);
 
-        if (v0 == param0->unk_5A4->unk_26) {
+        if (moveID == windowLayout->partyManagementData->learnedMove) {
             return 0xfd;
         }
 
-        if (v0 == 0) {
+        if (moveID == 0) {
             break;
         }
     }
 
-    if (Pokemon_CanLearnTM(param1, Item_TMHMNumber(param0->unk_5A4->unk_24)) == 0) {
+    if (Pokemon_CanLearnTM(mon, Item_TMHMNumber(windowLayout->partyManagementData->usedItemID)) == 0) {
         return 0xff;
     }
 
-    if (v1 == 4) {
+    if (moveSlot == 4) {
         return 0xfe;
     }
 
-    return v1;
+    return moveSlot;
 }
 
-int sub_0208615C(GameWindowLayout *param0)
+int sub_0208615C(GameWindowLayout *windowLayout)
 {
-    Pokemon *v0;
-    Strbuf *v1;
+    Pokemon *mon;
+    Strbuf *strBuf;
     u32 v2;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-    v2 = sub_02086104(param0, v0);
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    v2 = sub_02086104(windowLayout, mon);
 
-    StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
-    StringTemplate_SetMoveName(param0->unk_6A0, 1, param0->unk_5A4->unk_26);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
+    StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
 
     switch (v2) {
     case 0:
     case 1:
     case 2:
     case 3:
-        sub_02086590(param0, v0, v2);
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
-        sub_02082708(param0, 0xffffffff, 1);
-        param0->unk_5A4->unk_23 = 0;
-        param0->unk_B0E = 25;
+        TeachMove(windowLayout, mon, v2);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 61);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
+        sub_02082708(windowLayout, 0xffffffff, 1);
+        windowLayout->partyManagementData->menuSelectionResult = 0;
+        windowLayout->unk_B0E = 25;
         break;
     case 0xfd:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 63);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
-        sub_02082708(param0, 0xffffffff, 1);
-        param0->unk_5A4->unk_23 = 0;
-        param0->unk_B0E = 25;
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 63);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
+        sub_02082708(windowLayout, 0xffffffff, 1);
+        windowLayout->partyManagementData->menuSelectionResult = 0;
+        windowLayout->unk_B0E = 25;
         break;
     case 0xfe:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 52);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
-        sub_02082708(param0, 0xffffffff, 1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 52);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
+        sub_02082708(windowLayout, 0xffffffff, 1);
 
-        param0->unk_B04.unk_00 = sub_02086438;
-        param0->unk_B04.unk_04 = sub_0208648C;
-        param0->unk_B0E = 26;
+        windowLayout->unk_B04.unk_00 = sub_02086438;
+        windowLayout->unk_B04.unk_04 = sub_0208648C;
+        windowLayout->unk_B0E = 26;
         break;
     case 0xff:
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 62);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
-        sub_02082708(param0, 0xffffffff, 1);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 62);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
+        sub_02082708(windowLayout, 0xffffffff, 1);
 
-        param0->unk_5A4->unk_23 = 0;
-        param0->unk_B0E = 25;
+        windowLayout->partyManagementData->menuSelectionResult = 0;
+        windowLayout->unk_B0E = 25;
         break;
     }
 
     return 24;
 }
 
-int sub_020862F8(GameWindowLayout *param0)
+int sub_020862F8(GameWindowLayout *windowLayout)
 {
-    Pokemon *v0;
-    Strbuf *v1;
+    Pokemon *mon;
+    Strbuf *strBuf;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-    StringTemplate_SetNickname(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    StringTemplate_SetNickname(windowLayout->template, 0, Pokemon_GetBoxPokemon(mon));
 
-    if (param0->unk_5A4->unk_28 == 4) {
-        StringTemplate_SetMoveName(param0->unk_6A0, 1, param0->unk_5A4->unk_26);
-        return sub_0208648C(param0);
+    if (windowLayout->partyManagementData->selectedMoveSlot == 4) {
+        StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
+        return sub_0208648C(windowLayout);
     }
 
-    StringTemplate_SetMoveName(param0->unk_6A0, 1, Pokemon_GetValue(v0, 54 + param0->unk_5A4->unk_28, NULL));
-    v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60);
-    StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(param0, 0xffffffff, 1);
+    StringTemplate_SetMoveName(windowLayout->template, 1, Pokemon_GetValue(mon, 54 + windowLayout->partyManagementData->selectedMoveSlot, NULL));
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 60);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    param0->unk_B0E = 22;
+    windowLayout->unk_B0E = 22;
     return 24;
 }
 
-int sub_020863A0(GameWindowLayout *param0)
+int sub_020863A0(GameWindowLayout *windowLayout)
 {
-    Pokemon *v0;
-    Strbuf *v1;
+    Pokemon *mon;
+    Strbuf *strBuf;
 
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-        v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
+        mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
 
-        sub_02086590(param0, v0, param0->unk_5A4->unk_28);
-        v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61);
-        StringTemplate_SetMoveName(param0->unk_6A0, 1, param0->unk_5A4->unk_26);
-        StringTemplate_Format(param0->unk_6A0, param0->unk_6A4, v1);
-        Strbuf_Free(v1);
-        sub_02082708(param0, 0xffffffff, 0);
+        TeachMove(windowLayout, mon, windowLayout->partyManagementData->selectedMoveSlot);
+        strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 61);
+        StringTemplate_SetMoveName(windowLayout->template, 1, windowLayout->partyManagementData->learnedMove);
+        StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+        Strbuf_Free(strBuf);
+        sub_02082708(windowLayout, 0xffffffff, 0);
 
-        param0->unk_5A4->unk_23 = 0;
-        param0->unk_B0E = 25;
+        windowLayout->partyManagementData->menuSelectionResult = 0;
+        windowLayout->unk_B0E = 25;
 
         return 24;
     }
@@ -1055,192 +1058,192 @@ int sub_020863A0(GameWindowLayout *param0)
     return 22;
 }
 
-static int sub_02086438(void *param0)
+static int sub_02086438(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 59);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_5A4->unk_23 = 4;
-    v0->unk_B0E = 25;
+    windowLayout->partyManagementData->menuSelectionResult = 4;
+    windowLayout->unk_B0E = 25;
 
     return 24;
 }
 
-static int sub_0208648C(void *param0)
+static int sub_0208648C(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 55);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 1);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    v0->unk_B04.unk_00 = sub_020864E4;
-    v0->unk_B04.unk_04 = sub_02086538;
-    v0->unk_B0E = 26;
+    windowLayout->unk_B04.unk_00 = sub_020864E4;
+    windowLayout->unk_B04.unk_04 = sub_02086538;
+    windowLayout->unk_B0E = 26;
 
     return 24;
 }
 
-static int sub_020864E4(void *param0)
+static int sub_020864E4(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 58);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_5A4->unk_23 = 0;
-    v0->unk_B0E = 25;
+    windowLayout->partyManagementData->menuSelectionResult = 0;
+    windowLayout->unk_B0E = 25;
 
     return 24;
 }
 
-static int sub_02086538(void *param0)
+static int sub_02086538(void *windowLayoutPtr)
 {
-    GameWindowLayout *v0;
-    Strbuf *v1;
+    GameWindowLayout *windowLayout;
+    Strbuf *strBuf;
 
-    v0 = param0;
-    v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52);
+    windowLayout = windowLayoutPtr;
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 52);
 
-    StringTemplate_Format(v0->unk_6A0, v0->unk_6A4, v1);
-    Strbuf_Free(v1);
-    sub_02082708(v0, 0xffffffff, 0);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A4, strBuf);
+    Strbuf_Free(strBuf);
+    sub_02082708(windowLayout, 0xffffffff, 0);
 
-    v0->unk_B04.unk_00 = sub_02086438;
-    v0->unk_B04.unk_04 = sub_0208648C;
-    v0->unk_B0E = 26;
+    windowLayout->unk_B04.unk_00 = sub_02086438;
+    windowLayout->unk_B04.unk_04 = sub_0208648C;
+    windowLayout->unk_B0E = 26;
 
     return 24;
 }
 
-static void sub_02086590(GameWindowLayout *param0, Pokemon *param1, u32 param2)
+static void TeachMove(GameWindowLayout *windowLayout, Pokemon *mon, u32 moveSlot)
 {
-    u32 v0 = param0->unk_5A4->unk_26;
-    Pokemon_SetValue(param1, MON_DATA_MOVE1 + param2, &v0);
+    u32 tempVar = windowLayout->partyManagementData->learnedMove;
+    Pokemon_SetValue(mon, MON_DATA_MOVE1 + moveSlot, &tempVar);
 
-    v0 = 0;
-    Pokemon_SetValue(param1, MON_DATA_MOVE1_PP_UPS + param2, &v0);
+    tempVar = 0;
+    Pokemon_SetValue(mon, MON_DATA_MOVE1_PP_UPS + moveSlot, &tempVar);
 
-    v0 = MoveTable_CalcMaxPP(param0->unk_5A4->unk_26, 0);
-    Pokemon_SetValue(param1, MON_DATA_MOVE1_CUR_PP + param2, &v0);
+    tempVar = MoveTable_CalcMaxPP(windowLayout->partyManagementData->learnedMove, 0);
+    Pokemon_SetValue(mon, MON_DATA_MOVE1_CUR_PP + moveSlot, &tempVar);
 
-    if (param0->unk_5A4->unk_24 != 0) {
-        if (Item_IsHMMove(param0->unk_5A4->unk_26) == 0) {
-            Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, HEAP_ID_12);
+    if (windowLayout->partyManagementData->usedItemID != 0) {
+        if (Item_IsHMMove(windowLayout->partyManagementData->learnedMove) == FALSE) {
+            Bag_TryRemoveItem(windowLayout->partyManagementData->bag, windowLayout->partyManagementData->usedItemID, 1, HEAP_ID_12);
         }
 
-        Pokemon_UpdateFriendship(param1, 4, (u16)sub_02086930(param0));
+        Pokemon_UpdateFriendship(mon, 4, (u16)GetCurrentMapLabel(windowLayout));
     }
 }
 
-static u8 sub_02086614(GameWindowLayout *param0, u8 param1)
+static u8 BufferLearnedMoveInSlot(GameWindowLayout *windowLayout, u8 moveSlot)
 {
-    Pokemon *v0;
-    Strbuf *v1;
-    u16 v2;
+    Pokemon *mon;
+    Strbuf *strBuf;
+    u16 moveID;
 
-    v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-    v2 = (u16)Pokemon_GetValue(v0, MON_DATA_MOVE1 + param1, NULL);
-    v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 162 + param1);
+    mon = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+    moveID = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + moveSlot, NULL);
+    strBuf = MessageLoader_GetNewStrbuf(windowLayout->messageLoader, 162 + moveSlot);
 
-    StringTemplate_SetMoveName(param0->unk_6A0, 0, v2);
-    StringTemplate_Format(param0->unk_6A0, param0->unk_6A8, v1);
-    Strbuf_Free(v1);
+    StringTemplate_SetMoveName(windowLayout->template, 0, moveID);
+    StringTemplate_Format(windowLayout->template, windowLayout->unk_6A8, strBuf);
+    Strbuf_Free(strBuf);
 
-    if (v2 == 0) {
-        StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6A8, 0xfffffffd);
+    if (moveID == 0) {
+        StringList_AddFromStrbuf(windowLayout->unk_6FC, windowLayout->unk_6A8, 0xfffffffd);
         return 0;
     }
 
-    StringList_AddFromStrbuf(param0->unk_6FC, param0->unk_6A8, param1);
+    StringList_AddFromStrbuf(windowLayout->unk_6FC, windowLayout->unk_6A8, moveSlot);
     return 1;
 }
 
-void sub_020866A0(GameWindowLayout *param0, u8 param1)
+void sub_020866A0(GameWindowLayout *windowLayout, u8 param1)
 {
-    MenuTemplate v0;
-    u8 v1;
+    MenuTemplate menuTemplate;
+    u8 moveCount;
 
     if (param1 == 0) {
-        sub_020826F4(param0, 41, 1);
+        sub_020826F4(windowLayout, 41, 1);
     } else {
-        sub_020826F4(param0, 40, 1);
+        sub_020826F4(windowLayout, 40, 1);
     }
 
-    param0->unk_6FC = StringList_New(4, 12);
+    windowLayout->unk_6FC = StringList_New(4, 12);
 
-    v1 = sub_02086614(param0, 0);
-    v1 += sub_02086614(param0, 1);
-    v1 += sub_02086614(param0, 2);
-    v1 += sub_02086614(param0, 3);
+    moveCount = BufferLearnedMoveInSlot(windowLayout, 0);
+    moveCount += BufferLearnedMoveInSlot(windowLayout, 1);
+    moveCount += BufferLearnedMoveInSlot(windowLayout, 2);
+    moveCount += BufferLearnedMoveInSlot(windowLayout, 3);
 
-    v0.choices = param0->unk_6FC;
-    v0.window = &param0->unk_04[36];
-    v0.fontID = FONT_SYSTEM;
-    v0.xSize = 1;
-    v0.ySize = 4;
-    v0.lineSpacing = 0;
-    v0.suppressCursor = FALSE;
+    menuTemplate.choices = windowLayout->unk_6FC;
+    menuTemplate.window = &windowLayout->unk_04[36];
+    menuTemplate.fontID = FONT_SYSTEM;
+    menuTemplate.xSize = 1;
+    menuTemplate.ySize = 4;
+    menuTemplate.lineSpacing = 0;
+    menuTemplate.suppressCursor = FALSE;
 
-    if (v1 == 4) {
-        v0.loopAround = TRUE;
+    if (moveCount == 4) {
+        menuTemplate.loopAround = TRUE;
     } else {
-        v0.loopAround = FALSE;
+        menuTemplate.loopAround = FALSE;
     }
 
-    Window_DrawStandardFrame(&param0->unk_04[36], 1, 1, 14);
-    param0->unk_700 = Menu_NewAndCopyToVRAM(&v0, 8, 0, 0, 12, PAD_BUTTON_B);
+    Window_DrawStandardFrame(&windowLayout->unk_04[36], 1, 1, 14);
+    windowLayout->unk_700 = Menu_NewAndCopyToVRAM(&menuTemplate, 8, 0, 0, 12, PAD_BUTTON_B);
 }
 
-int sub_02086774(GameWindowLayout *param0)
+int sub_02086774(GameWindowLayout *windowLayout)
 {
-    u32 v0 = Menu_ProcessInput(param0->unk_700);
+    u32 menuAction = Menu_ProcessInput(windowLayout->unk_700);
 
-    switch (v0) {
-    case 0xffffffff:
+    switch (menuAction) {
+    case MENU_NOTHING_CHOSEN:
         break;
-    case 0xfffffffe:
-        Window_EraseMessageBox(&param0->unk_04[33], 1);
-        Window_EraseStandardFrame(&param0->unk_04[36], 1);
-        Menu_Free(param0->unk_700, NULL);
-        StringList_Free(param0->unk_6FC);
-        sub_020826E0(param0, 32, 1);
+    case MENU_CANCELED:
+        Window_EraseMessageBox(&windowLayout->unk_04[33], 1);
+        Window_EraseStandardFrame(&windowLayout->unk_04[36], 1);
+        Menu_Free(windowLayout->unk_700, NULL);
+        StringList_Free(windowLayout->unk_6FC);
+        sub_020826E0(windowLayout, 32, 1);
         return 4;
     default:
-        Window_EraseMessageBox(&param0->unk_04[33], 1);
-        Window_EraseStandardFrame(&param0->unk_04[36], 1);
-        Menu_Free(param0->unk_700, NULL);
-        StringList_Free(param0->unk_6FC);
+        Window_EraseMessageBox(&windowLayout->unk_04[33], 1);
+        Window_EraseStandardFrame(&windowLayout->unk_04[36], 1);
+        Menu_Free(windowLayout->unk_700, NULL);
+        StringList_Free(windowLayout->unk_6FC);
 
-        if (Party_ApplyItemEffectsToMember(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, (u8)v0, sub_02086930(param0), 12) == 1) {
-            Pokemon *v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-            sub_02084E58(param0, param0->unk_5A4->unk_24, Pokemon_GetValue(v1, MON_DATA_MOVE1 + v0, NULL));
-            Bag_TryRemoveItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, HEAP_ID_12);
+        if (Party_ApplyItemEffectsToMember(windowLayout->partyManagementData->party, windowLayout->partyManagementData->usedItemID, windowLayout->partySlot, (u8)menuAction, GetCurrentMapLabel(windowLayout), 12) == 1) {
+            Pokemon *v1 = Party_GetPokemonBySlotIndex(windowLayout->partyManagementData->party, windowLayout->partySlot);
+            BufferUsedItemMessage(windowLayout, windowLayout->partyManagementData->usedItemID, Pokemon_GetValue(v1, MON_DATA_MOVE1 + menuAction, NULL));
+            Bag_TryRemoveItem(windowLayout->partyManagementData->bag, windowLayout->partyManagementData->usedItemID, 1, HEAP_ID_12);
             Sound_PlayEffect(SEQ_SE_DP_KAIFUKU);
         } else {
-            MessageLoader_GetStrbuf(param0->unk_69C, 105, param0->unk_6A4);
+            MessageLoader_GetStrbuf(windowLayout->messageLoader, 105, windowLayout->unk_6A4);
         }
 
-        sub_02082708(param0, 0xffffffff, 1);
+        sub_02082708(windowLayout, 0xffffffff, 1);
 
-        param0->unk_5A4->unk_23 = 0;
-        param0->unk_B0E = 25;
+        windowLayout->partyManagementData->menuSelectionResult = 0;
+        windowLayout->unk_B0E = 25;
 
         return 24;
     }
@@ -1248,26 +1251,26 @@ int sub_02086774(GameWindowLayout *param0)
     return 6;
 }
 
-void sub_020868B0(GameWindowLayout *param0)
+void sub_020868B0(GameWindowLayout *windowLayout)
 {
-    Window_EraseMessageBox(&param0->unk_04[32], 1);
+    Window_EraseMessageBox(&windowLayout->unk_04[32], 1);
 
-    if (param0->unk_704[param0->unk_B11].unk_0C == 0) {
-        MessageLoader_GetStrbuf(param0->unk_69C, 127, param0->unk_6A4);
-        sub_02083080(param0, param0->unk_B11);
+    if (windowLayout->unk_704[windowLayout->partySlot].unk_0C == 0) {
+        MessageLoader_GetStrbuf(windowLayout->messageLoader, 127, windowLayout->unk_6A4);
+        sub_02083080(windowLayout, windowLayout->partySlot);
     } else {
-        MessageLoader_GetStrbuf(param0->unk_69C, 128, param0->unk_6A4);
-        param0->unk_B11 = 7;
+        MessageLoader_GetStrbuf(windowLayout->messageLoader, 128, windowLayout->unk_6A4);
+        windowLayout->partySlot = 7;
     }
 
-    sub_02082708(param0, 0xffffffff, 1);
+    sub_02082708(windowLayout, 0xffffffff, 1);
 
-    param0->unk_5A4->unk_23 = 0;
-    param0->unk_B0E = 25;
+    windowLayout->partyManagementData->menuSelectionResult = 0;
+    windowLayout->unk_B0E = 25;
 }
 
-static u16 sub_02086930(GameWindowLayout *param0)
+static u16 GetCurrentMapLabel(GameWindowLayout *windowLayout)
 {
-    FieldSystem *fieldSystem = param0->unk_5A4->unk_1C;
+    FieldSystem *fieldSystem = windowLayout->partyManagementData->fieldSystem;
     return (u16)MapHeader_GetMapLabelTextID(fieldSystem->location->mapId);
 }
diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c
index 6ebc74f491..f1e836eaa3 100644
--- a/src/unk_02097B18.c
+++ b/src/unk_02097B18.c
@@ -357,21 +357,21 @@ static BOOL sub_02097F38(FieldTask *param0)
         }
     } break;
     case 3: {
-        PartyManagementData *v6 = v0->unk_0C;
+        PartyManagementData *partyMan = v0->unk_0C;
 
-        v6->unk_00 = v1->unk_1C;
-        v6->unk_04 = SaveData_GetBag(v0->saveData);
-        v6->unk_08 = SaveData_GetMailBox(v0->saveData);
-        v6->selectedMonSlot = 0;
-        v6->unk_21 = 0;
-        v6->unk_20 = 15;
-        v6->unk_0C = v1->unk_24;
+        partyMan->party = v1->unk_1C;
+        partyMan->bag = SaveData_GetBag(v0->saveData);
+        partyMan->mailBox = SaveData_GetMailBox(v0->saveData);
+        partyMan->selectedMonSlot = 0;
+        partyMan->unk_21 = 0;
+        partyMan->unk_20 = 15;
+        partyMan->options = v1->unk_24;
 
-        FieldTask_RunApplication(param0, &Unk_020F1E88, v6);
+        FieldTask_RunApplication(param0, &Unk_020F1E88, partyMan);
         v0->unk_14 = 4;
     } break;
     case 4: {
-        PartyManagementData *v7 = v0->unk_0C;
+        PartyManagementData *partyMan = v0->unk_0C;
         Pokemon *v8;
         UnkStruct_0202CA28 *v9;
         UnkStruct_0202CA64 *v10;
@@ -381,8 +381,8 @@ static BOOL sub_02097F38(FieldTask *param0)
 
         v13 = sub_02097F18(v0->unk_08) + 1;
 
-        if (v7->selectedMonSlot != 7) {
-            v8 = sub_02097F00(v0->unk_08, v7->selectedMonSlot);
+        if (partyMan->selectedMonSlot != 7) {
+            v8 = sub_02097F00(v0->unk_08, partyMan->selectedMonSlot);
 
             Pokemon_SetValue(v8, MON_DATA_BALL_CAPSULE_ID, (u8 *)&v13);
             Pokemon_SetValue(v8, MON_DATA_171, sub_0202CA28(v1->unk_20, v13 - 1));
diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c
index 32c685f396..18ea892f64 100644
--- a/src/unk_020989DC.c
+++ b/src/unk_020989DC.c
@@ -271,7 +271,7 @@ static int sub_02098C2C(UnkStruct_02098BE4 *param0)
 
 static int sub_02098C44(UnkStruct_02098BE4 *param0)
 {
-    PartyManagementData *v0;
+    PartyManagementData *partyMan;
 
     if (!sub_02098AF8(&param0->unk_14)) {
         return 1;
@@ -283,16 +283,16 @@ static int sub_02098C44(UnkStruct_02098BE4 *param0)
 
     param0->unk_0C->unk_02 = 0;
 
-    v0 = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
-    MI_CpuClear8(v0, sizeof(PartyManagementData));
-    v0->unk_00 = param0->unk_0C->unk_10;
-    v0->unk_04 = param0->unk_0C->unk_14;
-    v0->unk_21 = 0;
-    v0->unk_20 = 20;
-    v0->unk_0C = param0->unk_0C->unk_18;
+    partyMan = Heap_AllocFromHeap(param0->heapID, sizeof(PartyManagementData));
+    MI_CpuClear8(partyMan, sizeof(PartyManagementData));
+    partyMan->party = param0->unk_0C->unk_10;
+    partyMan->bag = param0->unk_0C->unk_14;
+    partyMan->unk_21 = 0;
+    partyMan->unk_20 = 20;
+    partyMan->options = param0->unk_0C->unk_18;
 
-    param0->unk_14 = OverlayManager_New(&Unk_020F1E88, v0, param0->heapID);
-    param0->unk_10 = (void *)v0;
+    param0->unk_14 = OverlayManager_New(&Unk_020F1E88, partyMan, param0->heapID);
+    param0->unk_10 = (void *)partyMan;
 
     return 2;
 }
@@ -300,7 +300,7 @@ static int sub_02098C44(UnkStruct_02098BE4 *param0)
 static int sub_02098CB0(UnkStruct_02098BE4 *param0)
 {
     u8 v0;
-    PartyManagementData *v1;
+    PartyManagementData *partyMan;
     PokemonSummary *v2;
     static const u8 v3[] = {
         4, 7, 8
@@ -310,8 +310,8 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0)
         return 2;
     }
 
-    v1 = (PartyManagementData *)param0->unk_10;
-    v0 = v1->selectedMonSlot;
+    partyMan = (PartyManagementData *)param0->unk_10;
+    v0 = partyMan->selectedMonSlot;
     param0->unk_08 = v0;
     Heap_FreeToHeap(param0->unk_10);
 
@@ -334,7 +334,7 @@ static int sub_02098CB0(UnkStruct_02098BE4 *param0)
     PokemonSummaryScreen_FlagVisiblePages(v2, v3);
     PokemonSummaryScreen_SetPlayerProfile(v2, param0->unk_0C->unk_0C);
 
-    param0->unk_14 = OverlayManager_New(&gPokemonSummaryScreenApp, v1, param0->heapID);
+    param0->unk_14 = OverlayManager_New(&gPokemonSummaryScreenApp, partyMan, param0->heapID);
     param0->unk_10 = (void *)v2;
 
     return 3;
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index f6ee79baba..49918a5a8b 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -122,7 +122,7 @@ static BOOL sub_0209C2C0(UnkStruct_0209C1EC *param0)
 
         Heap_FreeToHeap(param0->unk_30);
 
-        if (param0->unk_30->unk_23 == 1) {
+        if (param0->unk_30->menuSelectionResult == 1) {
             param0->unk_34 = sub_0203D670(param0->fieldSystem, HEAP_ID_APPLICATION, SUMMARY_MODE_NORMAL);
             param0->unk_04 = v0;
             param0->unk_34->monIndex = v0;