From 67d92f62db83de364aa9c1fc163943b6a8a49c74 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Tue, 14 Nov 2023 20:20:21 -0500
Subject: [PATCH 01/12] improving readability

also seemingly located the party healing function
---
 include/constants/pokemon.h     |  6 +--
 include/unk_02096420.h          |  2 +-
 src/overlay104/ov104_0222FBE4.c |  2 +-
 src/overlay104/ov104_022395F0.c |  2 +-
 src/overlay104/ov104_0223A7F4.c |  4 +-
 src/overlay104/ov104_0223AF58.c |  2 +-
 src/overlay104/ov104_0223B6F4.c | 14 ++---
 src/overlay104/ov104_0223BCBC.c |  4 +-
 src/unk_0203F6C4.c              |  2 +-
 src/unk_02050A74.c              |  4 +-
 src/unk_02052C6C.c              |  2 +-
 src/unk_02096420.c              | 93 ++++++++++++++++++---------------
 12 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 65eb414818..6704ff4234 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -38,7 +38,7 @@ enum PokemonDataParam {
     MON_DATA_3,
     MON_DATA_4,
     MON_DATA_SPECIES,
-    MON_DATA_HELD_ITEM,
+    MON_DATA_HELD_ITEM, // 6
     MON_DATA_OT_ID,
     MON_DATA_EXP,
     MON_DATA_FRIENDSHIP,
@@ -195,7 +195,7 @@ enum PokemonDataParam {
     MON_DATA_STATUS_CONDITION,
     MON_DATA_LEVEL,
     MON_DATA_162,
-    MON_DATA_CURRENT_HP,
+    MON_DATA_CURRENT_HP, //163
     MON_DATA_MAX_HP,
     MON_DATA_ATK,
     MON_DATA_DEF,
@@ -204,7 +204,7 @@ enum PokemonDataParam {
     MON_DATA_SP_DEF,
     MON_DATA_170,
     MON_DATA_171,
-    MON_DATA_172,
+    MON_DATA_172, // data sanity?
     MON_DATA_173,
     MON_DATA_SPECIES_EGG,
     MON_DATA_COMBINED_IVS,
diff --git a/include/unk_02096420.h b/include/unk_02096420.h
index 509e9c43e1..ee47193596 100644
--- a/include/unk_02096420.h
+++ b/include/unk_02096420.h
@@ -8,6 +8,6 @@ u8 sub_02096420(Pokemon * param0, u16 param1, u16 param2, u32 param3);
 u8 sub_0209693C(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
 u8 sub_02096954(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4);
 u8 sub_02096F14(Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5);
-void sub_02097284(Party * param0);
+void HealParty(Party * party);
 
 #endif // POKEPLATINUM_UNK_02096420_H
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 3be665ec96..6093e45490 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -2005,7 +2005,7 @@ static BOOL ov104_02231050 (UnkStruct_ov104_0222E930 * param0)
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
 
-    sub_02097284(Party_GetFromSavedata(v0->unk_08));
+    HealParty(Party_GetFromSavedata(v0->unk_08));
     return 0;
 }
 
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index 75d132e76d..9901ea4ee4 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -354,7 +354,7 @@ BOOL ov104_02239B14 (UnkStruct_ov104_0222E930 * param0)
         sub_0204A4C8(v1, v2->unk_08);
     }
 
-    sub_02097284(Party_GetFromSavedata(v2->unk_08));
+    HealParty(Party_GetFromSavedata(v2->unk_08));
     sub_0209BA80(v1);
 
     v1->unk_8D4 = 0;
diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c
index 826f47ceed..0a4940d118 100644
--- a/src/overlay104/ov104_0223A7F4.c
+++ b/src/overlay104/ov104_0223A7F4.c
@@ -353,8 +353,8 @@ BattleParams * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov10
     v2 = ov104_0223AA50(param0->unk_04);
     v3 = ov104_0223AA74(param0->unk_04, 0);
 
-    sub_02097284(param0->unk_4D4);
-    sub_02097284(param0->unk_4D8);
+    HealParty(param0->unk_4D4);
+    HealParty(param0->unk_4D8);
 
     v4 = sub_02051D8C(11, ov104_0223AD74(param0->unk_04));
     sub_020521B8(v4, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index 6249716b88..bea2431a11 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -1586,7 +1586,7 @@ BattleParams * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov10
     v5 = ov104_0223B50C(param0->unk_04);
     v13 = Party_GetFromSavedata(param0->unk_6FC);
 
-    sub_02097284(v13);
+    HealParty(v13);
 
     v8 = sub_02051D8C(11, ov104_0223B4D4(param0->unk_04));
     sub_020521B8(v8, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index 680def205b..29ade4d96a 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -174,7 +174,7 @@ BattleParams * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov10
     v2 = ov104_0223B7A8(param0->unk_10, 0);
     v3 = ov104_0223B7DC(param0->unk_10, 0);
 
-    sub_02097284(param0->unk_2C);
+    HealParty(param0->unk_2C);
     v5 = sub_02051D8C(11, ov104_0223B9E4(param0->unk_10));
     sub_020521B8(v5, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
 
@@ -283,24 +283,24 @@ void ov104_0223BA24 (Party * param0)
 {
     int v0, v1, v2;
     u32 v3;
-    Pokemon * v4;
+    Pokemon * mon;
 
     v2 = Party_GetCurrentCount(param0);
 
     for (v0 = 0; v0 < v2; v0++) {
-        v4 = Party_GetPokemonBySlotIndex(param0, v0);
+        mon = Party_GetPokemonBySlotIndex(param0, v0);
 
-        if (Pokemon_GetValue(v4, MON_DATA_172, NULL) == 0) {
+        if (Pokemon_GetValue(mon, MON_DATA_172, NULL) == 0) {
             continue;
         }
 
-        if (Pokemon_GetValue(v4, MON_DATA_CURRENT_HP, NULL) == 0) {
+        if (Pokemon_GetValue(mon, MON_DATA_CURRENT_HP, NULL) == 0) {
             v3 = 1;
-            Pokemon_SetValue(v4, 163, &v3);
+            Pokemon_SetValue(mon, 163, &v3);
         }
 
         v3 = 0;
-        Pokemon_SetValue(v4, 160, &v3);
+        Pokemon_SetValue(mon, 160, &v3);
     }
 
     return;
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index ac500dd51e..ed99606854 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -254,8 +254,8 @@ BattleParams * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov10
         break;
     }
 
-    sub_02097284(param0->unk_70);
-    sub_02097284(param0->unk_74);
+    HealParty(param0->unk_70);
+    HealParty(param0->unk_74);
 
     return v5;
 }
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index e963bd8616..54c6084c71 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -5681,7 +5681,7 @@ static BOOL sub_02043C3C (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = sub_02050A60(param0->unk_28);
 
-    sub_02097284(Party_GetFromSavedata(v0->unk_0C));
+    HealParty(Party_GetFromSavedata(v0->unk_0C));
     return 0;
 }
 
diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c
index 7e2ca5f1ee..e93c39f50f 100644
--- a/src/unk_02050A74.c
+++ b/src/unk_02050A74.c
@@ -187,7 +187,7 @@ static BOOL sub_02050B30 (UnkStruct_020508D4 * param0)
         }
 
         if (sub_0206A984(sub_020507E4(v0->unk_0C))) {
-            sub_02097284(Party_GetFromSavedata(v0->unk_0C));
+            HealParty(Party_GetFromSavedata(v0->unk_0C));
         }
 
         sub_020518B0(v0, v1->unk_10);
@@ -405,7 +405,7 @@ static BOOL sub_02050EE0 (UnkStruct_020508D4 * param0)
         }
 
         if (sub_0206A984(sub_020507E4(v0->unk_0C))) {
-            sub_02097284(Party_GetFromSavedata(v0->unk_0C));
+            HealParty(Party_GetFromSavedata(v0->unk_0C));
         }
 
         sub_020518B0(v0, v1->unk_10);
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 32d14b292d..761a842831 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -132,7 +132,7 @@ static BOOL sub_02052CBC (UnkStruct_020508D4 * param0)
     {
         int v6;
 
-        sub_02097284(Party_GetFromSavedata(v2->unk_0C));
+        HealParty(Party_GetFromSavedata(v2->unk_0C));
         sub_02024804();
         v6 = sub_020246E0(v2->unk_0C);
         sub_02052C6C(v2, v3->unk_00);
diff --git a/src/unk_02096420.c b/src/unk_02096420.c
index ee5673d008..c55a0165fc 100644
--- a/src/unk_02096420.c
+++ b/src/unk_02096420.c
@@ -12,7 +12,7 @@
 #include "unk_02096420.h"
 
 static u8 sub_02096F34(Pokemon * param0, u32 param1);
-static u8 sub_02096F84(Pokemon * param0, u32 param1, u32 param2);
+static u8 SetMonPP(Pokemon * param0, u32 param1, u32 param2);
 static u8 sub_02097004(Pokemon * param0, u32 param1, u32 param2);
 static void sub_020970AC(Pokemon * param0, u32 param1, u32 param2, u32 param3);
 static s32 sub_020970EC(s32 param0, s32 param1, s32 param2);
@@ -371,14 +371,14 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
     }
 
     if (Item_Get(v0, 36) != 0) {
-        if (sub_02096F84(param0, param2, Item_Get(v0, 55)) == 1) {
+        if (SetMonPP(param0, param2, Item_Get(v0, 55)) == 1) {
             v2 = 1;
         }
 
         v3 = 1;
     } else if (Item_Get(v0, 37) != 0) {
         for (v1[0] = 0; v1[0] < 4; v1[0]++) {
-            if (sub_02096F84(param0, v1[0], Item_Get(v0, 55)) == 1) {
+            if (SetMonPP(param0, v1[0], Item_Get(v0, 55)) == 1) {
                 v2 = 1;
             }
         }
@@ -532,55 +532,55 @@ u8 sub_02096F14 (Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u
     return sub_02096954(v0, param1, param3, param4, param5);
 }
 
-static u8 sub_02096F34 (Pokemon * param0, u32 param1)
+static u8 sub_02096F34 (Pokemon * mon, u32 moveIDX) // param0,1
 {
-    u16 v0;
-    u8 v1;
-    u8 v2;
+    u16 move; // v0
+    u8 ppCurr; // v1
+    u8 ppUps; // v2
 
-    v0 = (u16)Pokemon_GetValue(param0, MON_DATA_MOVE1 + param1, NULL);
+    move = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + moveIDX, NULL);
 
-    if (v0 == 0) {
+    if (move == 0) {
         return 0;
     }
 
-    v1 = (u8)Pokemon_GetValue(param0, MON_DATA_MOVE1_CUR_PP + param1, NULL);
-    v2 = (u8)Pokemon_GetValue(param0, MON_DATA_MOVE1_PP_UPS + param1, NULL);
+    ppCurr = (u8)Pokemon_GetValue(mon, MON_DATA_MOVE1_CUR_PP + moveIDX, NULL);
+    ppUps = (u8)Pokemon_GetValue(mon, MON_DATA_MOVE1_PP_UPS + moveIDX, NULL);
 
-    if (v1 < MoveTable_CalcMaxPP(v0, v2)) {
+    if (ppCurr < MoveTable_CalcMaxPP(move, ppUps)) {
         return 1;
     }
 
     return 0;
 }
 
-static u8 sub_02096F84 (Pokemon * param0, u32 param1, u32 param2)
+static u8 SetMonPP (Pokemon * mon, u32 moveIDX, u32 pp)
 {
-    u16 v0;
-    u8 v1;
-    u8 v2;
+    u16 move;
+    u8 ppCurr;
+    u8 ppMax;
 
-    v0 = (u16)Pokemon_GetValue(param0, MON_DATA_MOVE1 + param1, NULL);
+    move = (u16)Pokemon_GetValue(mon, MON_DATA_MOVE1 + moveIDX, NULL);
 
-    if (v0 == 0) {
+    if (move == 0) {
         return 0;
     }
 
-    v1 = (u8)Pokemon_GetValue(param0, MON_DATA_MOVE1_CUR_PP + param1, NULL);
-    v2 = (u8)MoveTable_CalcMaxPP(v0, Pokemon_GetValue(param0, MON_DATA_MOVE1_PP_UPS + param1, NULL));
+    ppCurr = (u8)Pokemon_GetValue(mon, MON_DATA_MOVE1_CUR_PP + moveIDX, NULL);
+    ppMax = (u8)MoveTable_CalcMaxPP(move, Pokemon_GetValue(mon, MON_DATA_MOVE1_PP_UPS + moveIDX, NULL));
 
-    if (v1 < v2) {
-        if (param2 == 127) {
-            v1 = v2;
+    if (ppCurr < ppMax) {
+        if (pp == 127) { // case from healing function
+            ppCurr = ppMax; // ppCurr = max pp
         } else {
-            v1 += param2;
+            ppCurr += pp;
 
-            if (v1 > v2) {
-                v1 = v2;
+            if (ppCurr > ppMax) {
+                ppCurr = ppMax;
             }
         }
 
-        Pokemon_SetValue(param0, 58 + param1, &v1);
+        Pokemon_SetValue(mon, 58 + moveIDX, &ppCurr); // set the pp of the move
         return 1;
     }
 
@@ -751,30 +751,39 @@ static u8 sub_020971D0 (Pokemon * param0, s32 param1, s32 param2, u16 param3, u3
     return 1;
 }
 
-void sub_02097284 (Party * param0)
+void HealParty (Party * party) 
 {
-    int v0, v1, v2;
-    u32 v3;
-    Pokemon * v4;
+    int i, j, monCount;
+    u32 tmp;
+    Pokemon * mon;
 
-    v2 = Party_GetCurrentCount(param0);
+    monCount = Party_GetCurrentCount(party);
 
-    for (v0 = 0; v0 < v2; v0++) {
-        v4 = Party_GetPokemonBySlotIndex(param0, v0);
+    // loop through party
+    for (i = 0; i < monCount; i++) {
+        // set mon pointer to current pokemon
+        mon = Party_GetPokemonBySlotIndex(party, i);
 
-        if (Pokemon_GetValue(v4, MON_DATA_172, NULL) == 0) {
+        // data sanity?
+        if (Pokemon_GetValue(mon, MON_DATA_172, NULL) == 0) {
             continue;
         }
 
-        v3 = Pokemon_GetValue(v4, MON_DATA_MAX_HP, NULL);
-        Pokemon_SetValue(v4, 163, &v3);
+        // set tmp variable to max hp value
+        tmp = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
+        // set mon's current hp to max hp
+        Pokemon_SetValue(mon, MON_DATA_CURRENT_HP, &tmp);
 
-        v3 = 0;
-        Pokemon_SetValue(v4, 160, &v3);
+        // set tmp variable to 0
+        tmp = 0;
+        // clear mon's status condition
+        Pokemon_SetValue(mon, MON_DATA_STATUS_CONDITION, &tmp);
 
-        for (v1 = 0; v1 < 4; v1++) {
-            if (sub_02096F34(v4, v1) == 1) {
-                sub_02096F84(v4, v1, 127);
+        // loop through mon's moves
+        for (j = 0; j < 4; j++) {
+            // check if move is at max pp
+            if (sub_02096F34(mon, j) == 1) {
+                SetMonPP(mon, j, 127); // set
             }
         }
     }

From 22d65fdf733baf6e70776552dc61455592bfe2c5 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Wed, 15 Nov 2023 12:49:09 -0500
Subject: [PATCH 02/12] readability

---
 include/constants/pokemon.h |  2 +-
 include/pokemon.h           | 18 ++++-----
 src/pokemon.c               | 78 ++++++++++++++++++-------------------
 src/unk_0207E0B8.c          |  2 +-
 4 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 6704ff4234..90c256e25a 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -192,7 +192,7 @@ enum PokemonDataParam {
     MON_DATA_OT_GENDER,
     MON_DATA_158,
     MON_DATA_159,
-    MON_DATA_STATUS_CONDITION,
+    MON_DATA_STATUS_CONDITION, // 160
     MON_DATA_LEVEL,
     MON_DATA_162,
     MON_DATA_CURRENT_HP, //163
diff --git a/include/pokemon.h b/include/pokemon.h
index 253c51d47a..9fb2bb70de 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -180,16 +180,16 @@ typedef struct BoxPokemon {
  * @brief Party Pokemon data structure
  */
 typedef struct PartyPokemon {
-    u32 unk_00;
+    u32 status; // status
     u8 level;  //!< The pokemons level
-    u8 unk_05;
-    u16 unk_06;
-    u16 unk_08;
-    u16 unk_0A;
-    u16 unk_0C;
-    u16 unk_0E;
-    u16 unk_10;
-    u16 unk_12;
+    u8 mail; // mail
+    u16 hp; // hp?
+    u16 maxHP; // max hp?
+    u16 attack; // attack? 0a
+    u16 defense; // defense? 0c
+    u16 speed; // speed? 0e
+    u16 spAtk; // sp. attack? 10
+    u16 spDef; // sp. defense? 12
     UnkStruct_0202818C unk_14;
     UnkStruct_0202CA28 unk_4C;
 } PartyPokemon;
diff --git a/src/pokemon.c b/src/pokemon.c
index d1c54ad6f7..37f0670198 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -540,34 +540,34 @@ static u32 Pokemon_GetDataInternal(Pokemon *mon, enum PokemonDataParam param, vo
 
     switch (param) {
     case MON_DATA_STATUS_CONDITION:
-        result = mon->party.unk_00;
+        result = mon->party.status;
         break;
     case MON_DATA_LEVEL:
         result = mon->party.level;
         break;
     case MON_DATA_162:
-        result = mon->party.unk_05;
+        result = mon->party.mail;
         break;
     case MON_DATA_CURRENT_HP:
-        result = mon->party.unk_06;
+        result = mon->party.hp;
         break;
     case MON_DATA_MAX_HP:
-        result = mon->party.unk_08;
+        result = mon->party.maxHP;
         break;
     case MON_DATA_ATK:
-        result = mon->party.unk_0A;
+        result = mon->party.attack;
         break;
     case MON_DATA_DEF:
-        result = mon->party.unk_0C;
+        result = mon->party.defense;
         break;
     case MON_DATA_SPEED:
-        result = mon->party.unk_0E;
+        result = mon->party.speed;
         break;
     case MON_DATA_SP_ATK:
-        result = mon->party.unk_10;
+        result = mon->party.spAtk;
         break;
     case MON_DATA_SP_DEF:
-        result = mon->party.unk_12;
+        result = mon->party.spDef;
         break;
     case MON_DATA_170:
         sub_020281A0(&mon->party.unk_14, dest);
@@ -1048,34 +1048,34 @@ static void Pokemon_SetDataInternal(Pokemon *mon, enum PokemonDataParam param, c
 
     switch (param) {
     case MON_DATA_STATUS_CONDITION:
-        mon->party.unk_00 = u32Value[0];
+        mon->party.status = u32Value[0];
         break;
     case MON_DATA_LEVEL:
         mon->party.level = u8Value[0];
         break;
     case MON_DATA_162:
-        mon->party.unk_05 = u8Value[0];
+        mon->party.mail = u8Value[0];
         break;
     case MON_DATA_CURRENT_HP:
-        mon->party.unk_06 = u16Value[0];
+        mon->party.hp = u16Value[0];
         break;
     case MON_DATA_MAX_HP:
-        mon->party.unk_08 = u16Value[0];
+        mon->party.maxHP = u16Value[0];
         break;
     case MON_DATA_ATK:
-        mon->party.unk_0A = u16Value[0];
+        mon->party.attack = u16Value[0];
         break;
     case MON_DATA_DEF:
-        mon->party.unk_0C = u16Value[0];
+        mon->party.defense = u16Value[0];
         break;
     case MON_DATA_SPEED:
-        mon->party.unk_0E = u16Value[0];
+        mon->party.speed = u16Value[0];
         break;
     case MON_DATA_SP_ATK:
-        mon->party.unk_10 = u16Value[0];
+        mon->party.spAtk = u16Value[0];
         break;
     case MON_DATA_SP_DEF:
-        mon->party.unk_12 = u16Value[0];
+        mon->party.spDef = u16Value[0];
         break;
     case MON_DATA_170:
         sub_020281A0(value, &mon->party.unk_14);
@@ -1523,10 +1523,10 @@ static void Pokemon_IncreaseDataInternal(Pokemon *mon, enum PokemonDataParam par
 {
     switch (param) {
     case MON_DATA_CURRENT_HP:
-        if (mon->party.unk_06 + value > mon->party.unk_08) {
-            mon->party.unk_06 = mon->party.unk_08;
+        if (mon->party.hp + value > mon->party.maxHP) {
+            mon->party.hp = mon->party.maxHP;
         } else {
-            mon->party.unk_06 += value;
+            mon->party.hp += value;
         }
         break;
     case MON_DATA_STATUS_CONDITION:
@@ -4852,16 +4852,16 @@ void sub_02078B40(Pokemon *mon, UnkStruct_02078B40 *param1)
 
     param1->pokeball = monDataBlockD->pokeball;
 
-    param1->unk_5C = mon->party.unk_00;
+    param1->unk_5C = mon->party.status;
     param1->level = mon->party.level;
-    param1->unk_61 = mon->party.unk_05;
-    param1->unk_62 = mon->party.unk_06;
-    param1->unk_64 = mon->party.unk_08;
-    param1->unk_66 = mon->party.unk_0A;
-    param1->unk_68 = mon->party.unk_0C;
-    param1->unk_6A = mon->party.unk_0E;
-    param1->unk_6C = mon->party.unk_10;
-    param1->unk_6E = mon->party.unk_12;
+    param1->unk_61 = mon->party.mail;
+    param1->unk_62 = mon->party.hp;
+    param1->unk_64 = mon->party.maxHP;
+    param1->unk_66 = mon->party.attack;
+    param1->unk_68 = mon->party.defense;
+    param1->unk_6A = mon->party.speed;
+    param1->unk_6C = mon->party.spAtk;
+    param1->unk_6E = mon->party.spDef;
 
     if (mon->box.partyDecrypted == FALSE) {
         Pokemon_EncryptData(&mon->party, sizeof(PartyPokemon), mon->box.personality);
@@ -4928,16 +4928,16 @@ void sub_02078E0C(UnkStruct_02078B40 *param0, Pokemon *mon)
 
     monDataBlockD->pokeball = param0->pokeball;
 
-    mon->party.unk_00 = param0->unk_5C;
+    mon->party.status = param0->unk_5C;
     mon->party.level = param0->level;
-    mon->party.unk_05 = param0->unk_61;
-    mon->party.unk_06 = param0->unk_62;
-    mon->party.unk_08 = param0->unk_64;
-    mon->party.unk_0A = param0->unk_66;
-    mon->party.unk_0C = param0->unk_68;
-    mon->party.unk_0E = param0->unk_6A;
-    mon->party.unk_10 = param0->unk_6C;
-    mon->party.unk_12 = param0->unk_6E;
+    mon->party.mail = param0->unk_61;
+    mon->party.hp = param0->unk_62;
+    mon->party.maxHP = param0->unk_64;
+    mon->party.attack = param0->unk_66;
+    mon->party.defense = param0->unk_68;
+    mon->party.speed = param0->unk_6A;
+    mon->party.spAtk = param0->unk_6C;
+    mon->party.spDef = param0->unk_6E;
 
     Pokemon_EncryptData(&mon->party, sizeof(PartyPokemon), mon->box.personality);
     mon->box.checksum = Pokemon_GetDataChecksum(&mon->box.dataBlocks, sizeof(PokemonDataBlock) * 4);
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index f1332890ae..28cc137f7a 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -2527,7 +2527,7 @@ static BOOL sub_02080F3C (UnkStruct_0207F248 * param0, u8 param1, s8 param2)
 
         v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
         v1 = param0->unk_704[param1].unk_06;
-        Pokemon_SetValue(v0, 163, &v1);
+        Pokemon_SetValue(v0, 163, &v1); //hm
         return 1;
     }
 

From 024df03e6dd9552e0c381ec9430470bcfb85b001 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Wed, 15 Nov 2023 13:20:52 -0500
Subject: [PATCH 03/12] clean it up

---
 include/pokemon.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 9fb2bb70de..2ba47fca5b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -178,18 +178,20 @@ typedef struct BoxPokemon {
 
 /**
  * @brief Party Pokemon data structure
+ *  This is used to store stats for a pokemon while it is in the players party.
+ *  Rather than recalculating stats after each battle, they're stored here.
  */
 typedef struct PartyPokemon {
     u32 status; // status
-    u8 level;  //!< The pokemons level
-    u8 mail; // mail
-    u16 hp; // hp?
-    u16 maxHP; // max hp?
-    u16 attack; // attack? 0a
-    u16 defense; // defense? 0c
-    u16 speed; // speed? 0e
-    u16 spAtk; // sp. attack? 10
-    u16 spDef; // sp. defense? 12
+    u8 level;  // level
+    u8 mail; // mail 04
+    u16 hp; // hp 06
+    u16 maxHP; // max hp 08
+    u16 attack; // attack 0a
+    u16 defense; // defense 0c
+    u16 speed; // speed 0e
+    u16 spAtk; // sp. attack 10
+    u16 spDef; // sp. defense
     UnkStruct_0202818C unk_14;
     UnkStruct_0202CA28 unk_4C;
 } PartyPokemon;
@@ -198,8 +200,8 @@ typedef struct PartyPokemon {
  * @brief The main Pokemon data structure
  */
 typedef struct Pokemon {
-    BoxPokemon box; //!< Contains the pokemons boxed data
-    PartyPokemon party; //!< Contains the pokemons extra data while it is in the players party
+    BoxPokemon box; // Contains the pokemons boxed data
+    PartyPokemon party; // Contains the pokemons extra data while it is in the players party
 } Pokemon;
 
 /**

From 1c24449c3a3681e8ce26412710489c74d0ac1ff4 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Wed, 15 Nov 2023 13:23:25 -0500
Subject: [PATCH 04/12] Update pokemon.h

---
 include/pokemon.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 2ba47fca5b..5ebbcd2271 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -182,16 +182,16 @@ typedef struct BoxPokemon {
  *  Rather than recalculating stats after each battle, they're stored here.
  */
 typedef struct PartyPokemon {
-    u32 status; // status
-    u8 level;  // level
-    u8 mail; // mail 04
-    u16 hp; // hp 06
-    u16 maxHP; // max hp 08
-    u16 attack; // attack 0a
-    u16 defense; // defense 0c
-    u16 speed; // speed 0e
-    u16 spAtk; // sp. attack 10
-    u16 spDef; // sp. defense
+    u32 status;
+    u8 level;
+    u8 mail;
+    u16 hp;
+    u16 maxHP;
+    u16 attack;
+    u16 defense;
+    u16 speed;
+    u16 spAtk;
+    u16 spDef;
     UnkStruct_0202818C unk_14;
     UnkStruct_0202CA28 unk_4C;
 } PartyPokemon;

From 03bdd93aa88b84d66c9b29ad8b5a7ac65ed37892 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 12:17:32 -0500
Subject: [PATCH 05/12] add function names

Adds names to many unnamed functions for readability. Also adds names to a couple structs.
---
 include/pokemon.h                          |  14 +-
 include/struct_defs/struct_02090800.h      |  12 +-
 include/struct_defs/struct_02090800_sub1.h |   2 +-
 include/unk_02006224.h                     |  14 +-
 include/unk_0202CC64.h                     |  16 +-
 include/unk_02092494.h                     |   6 +-
 src/main.c                                 |   2 +-
 src/overlay005/ov5_021E622C.c              |   6 +-
 src/overlay006/ov6_02240C9C.c              |   2 +-
 src/overlay006/ov6_02243258.c              |   2 +-
 src/overlay019/ov19_021D0D80.c             |   4 +-
 src/overlay088/ov88_0223B140.c             |   8 +-
 src/overlay094/ov94_02242AD0.c             |   4 +-
 src/overlay104/ov104_0222DCE0.c            |   2 +-
 src/overlay104/ov104_0223B6F4.c            |   2 +-
 src/overlay104/ov104_0223BCBC.c            |   2 +-
 src/overlay118/ov118_021D0D80.c            |   2 +-
 src/pokemon.c                              |  50 ++--
 src/unk_02003B60.c                         |   2 +-
 src/unk_02005474.c                         |   4 +-
 src/unk_02006224.c                         |  54 ++---
 src/unk_0202CC64.c                         |  16 +-
 src/unk_02046C7C.c                         |   2 +-
 src/unk_020482D4.c                         |   8 +-
 src/unk_02051D8C.c                         |  10 +-
 src/unk_020559DC.c                         |   2 +-
 src/unk_0207A6DC.c                         |   2 +-
 src/unk_0208C324.c                         |   4 +-
 src/unk_0208FCF8.c                         |   2 +-
 src/unk_02092494.c                         | 266 ++++++++++-----------
 src/unk_020933F8.c                         |   4 +-
 31 files changed, 263 insertions(+), 263 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 5ebbcd2271..7072cfb5ed 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -801,10 +801,10 @@ int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMov
 
 void Pokemon_ApplyPokerus(Party *party);
 u8 Pokemon_HasPokerus(Party *party, u8 param1);
-void sub_020777B4(Party *party, s32 param1);
+void UpdatePokerusStatusInParty(Party *party, s32 param1);
 void Pokemon_ValidatePokerus(Party *party);
-BOOL sub_020778D8(Pokemon *mon);
-BOOL sub_020778F8(Pokemon *mon);
+BOOL IsPokemonInfectedWithPokerus(Pokemon *mon);
+BOOL CanPokemonSpreadPokerus(Pokemon *mon);
 
 /**
  * @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus
@@ -953,12 +953,12 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie
  * @param delay                 Number of frames until playback will begin.
  */
 void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
-BOOL sub_02077E3C(Pokemon *mon);
+BOOL IsPokemonEligibleForAction(Pokemon *mon);
 void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void sub_02077EE4(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void sub_02077F0C(Pokemon *mon, u32 param1, int param2);
+void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
+void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2);
 BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);
-BOOL Pokemon_CanFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
+BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
 
 /**
  * @brief Sets the ability of a Pokemon based on its species, form and peronsality value
diff --git a/include/struct_defs/struct_02090800.h b/include/struct_defs/struct_02090800.h
index e3317b8381..67d43abc98 100644
--- a/include/struct_defs/struct_02090800.h
+++ b/include/struct_defs/struct_02090800.h
@@ -12,11 +12,11 @@ typedef struct {
     UnkStruct_0200B358 * unk_08;
     Pokemon * unk_0C;
     BOOL unk_10;
-    UnkStruct_02090800_sub1 unk_14;
-    UnkStruct_02090800_sub1 unk_1C;
-    UnkStruct_02090800_sub1 unk_24;
-    UnkStruct_02090800_sub1 unk_2C;
-    UnkStruct_02090800_sub1 unk_34;
-} UnkStruct_02090800;
+    PokemonInfoDisplayStruct_sub1 unk_14;
+    PokemonInfoDisplayStruct_sub1 unk_1C;
+    PokemonInfoDisplayStruct_sub1 unk_24;
+    PokemonInfoDisplayStruct_sub1 unk_2C;
+    PokemonInfoDisplayStruct_sub1 unk_34;
+} PokemonInfoDisplayStruct;
 
 #endif // POKEPLATINUM_STRUCT_02090800_H
diff --git a/include/struct_defs/struct_02090800_sub1.h b/include/struct_defs/struct_02090800_sub1.h
index 74baf68cdc..a0b7ddc81e 100644
--- a/include/struct_defs/struct_02090800_sub1.h
+++ b/include/struct_defs/struct_02090800_sub1.h
@@ -6,6 +6,6 @@
 typedef struct {
     int unk_00;
     Strbuf* unk_04;
-} UnkStruct_02090800_sub1;
+} PokemonInfoDisplayStruct_sub1;
 
 #endif // POKEPLATINUM_STRUCT_02090800_SUB1_H
diff --git a/include/unk_02006224.h b/include/unk_02006224.h
index 41548f85f3..0d71317125 100644
--- a/include/unk_02006224.h
+++ b/include/unk_02006224.h
@@ -5,13 +5,13 @@
 
 #include <nitro/spi.h>
 
-BOOL sub_02006224(void);
-BOOL sub_02006260(const ChatotCry * param0);
-BOOL sub_0200629C(const ChatotCry * param0, u32 param1, int param2, int param3);
-void sub_02006350(void);
-MICResult sub_0200637C(void);
-MICResult sub_020063B8(void);
-void sub_020063C0(ChatotCry * param0);
+BOOL CheckMicRecordingStatus(void);
+BOOL IsChatotCryStructReadyForProcessing(const ChatotCry * param0);
+BOOL ProcessAudioInput(const ChatotCry * param0, u32 param1, int param2, int param3);
+void ResetMicStatusFlags(void);
+MICResult StartMicSampling(void);
+MICResult StopMicSampling(void);
+void StoreMicDataInChatotCryStruct(ChatotCry * param0);
 void Sound_FlagDefaultChatotCry(u8 param0);
 BOOL Sound_PlayChatotCry(ChatotCry * param0, u32 param1, int param2, int param3);
 BOOL Sound_PlayDelayedChatotCry(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4);
diff --git a/include/unk_0202CC64.h b/include/unk_0202CC64.h
index b28120292e..876c753443 100644
--- a/include/unk_0202CC64.h
+++ b/include/unk_0202CC64.h
@@ -6,13 +6,13 @@
 
 int ChatotCry_SaveSize(void);
 void ChatotCry_Init(ChatotCry * param0);
-ChatotCry * sub_0202CC84(int param0);
-ChatotCry * sub_0202CC98(SaveData * param0);
-BOOL sub_0202CCA4(const ChatotCry * param0);
-void sub_0202CCA8(ChatotCry * param0);
-const void * sub_0202CCB0(const ChatotCry * param0);
-void sub_0202CCB4(s8 * param0, const s8 * param1);
-void sub_0202CCEC(ChatotCry * param0, const s8 * param1);
-void sub_0202CD3C(ChatotCry * param0, const ChatotCry * param1);
+ChatotCry * AllocateAndInitializeChatotCryData(int param0);
+ChatotCry * GetChatotCryDataFromSave(SaveData * param0);
+BOOL IsChatotCryDataValid(const ChatotCry * param0);
+void ResetChatotCryDataStatus(ChatotCry * param0);
+const void * GetChatotCryAudioBuffer(const ChatotCry * param0);
+void ProcessChatotCryAudioData(s8 * param0, const s8 * param1);
+void StoreProcessedAudioInChatotCryData(ChatotCry * param0, const s8 * param1);
+void CopyChatotCryData(ChatotCry * param0, const ChatotCry * param1);
 
 #endif // POKEPLATINUM_UNK_0202CC64_H
diff --git a/include/unk_02092494.h b/include/unk_02092494.h
index 5c031db7d0..b6a288d67b 100644
--- a/include/unk_02092494.h
+++ b/include/unk_02092494.h
@@ -5,9 +5,9 @@
 #include "pokemon.h"
 #include "struct_defs/struct_02090800.h"
 
-UnkStruct_02090800 * sub_02092494(Pokemon * param0, BOOL param1, int param2);
-void sub_0209282C(UnkStruct_02090800 * param0);
+PokemonInfoDisplayStruct * sub_02092494(Pokemon * param0, BOOL param1, int param2);
+void sub_0209282C(PokemonInfoDisplayStruct * param0);
 void sub_0209304C(Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
-void sub_0209305C(BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
+void ProcessBoxPokemonWithTrainerInfo(BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
 
 #endif // POKEPLATINUM_UNK_02092494_H
diff --git a/src/main.c b/src/main.c
index a0c10ba558..2060ec0fe7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ void NitroMain (void)
     Unk_02101D28.unk_10.unk_00 = -1;
     Unk_02101D28.unk_10.unk_08 = sub_020244AC();
 
-    sub_02003B60(sub_0202CC98(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
+    sub_02003B60(GetChatotCryDataFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
     sub_02022844();
 
     if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c
index 4b0eee2ab7..5906779fd7 100644
--- a/src/overlay005/ov5_021E622C.c
+++ b/src/overlay005/ov5_021E622C.c
@@ -2041,8 +2041,8 @@ static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param
     Party_RemovePokemonBySlotIndex(param0, param1);
 
     if (Party_HasSpecies(param0, 441) == 0) {
-        ChatotCry * v7 = sub_0202CC98(param3);
-        sub_0202CCA8(v7);
+        ChatotCry * v7 = GetChatotCryDataFromSave(param3);
+        ResetChatotCryDataStatus(v7);
     }
 }
 
@@ -2441,7 +2441,7 @@ static void ov5_021E6948 (Pokemon * param0, BoxPokemon * param1, BoxPokemon * pa
         if (v7->unk_00[v0] != 0) {
             for (v1 = 0; v1 < 100; v1++) {
                 if (v7->unk_00[v0] == Item_MoveForTMHM(328 + v1)) {
-                    if (Pokemon_CanFormLearnTM(v3, v6, v1)) {
+                    if (CanPokemonFormLearnTM(v3, v6, v1)) {
                         if (Pokemon_AddMove(param0, v7->unk_00[v0]) == 0xffff) {
                             Pokemon_ReplaceMove(param0, v7->unk_00[v0]);
                         }
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 1cd0cace76..5bba0a6bb0 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -1686,7 +1686,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param
         }
     }
 
-    sub_02077F0C(param2, param3->battleType, v0);
+    AssignHeldItemToPokemon(param2, param3->battleType, v0);
 
     {
         u8 v1;
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 17cd1c2379..9a10d644bf 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -1233,7 +1233,7 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
         param0->unk_00++;
 
         {
-            sub_02077E3C(param0->unk_5C);
+            IsPokemonEligibleForAction(param0->unk_5C);
         }
     }
 
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 61d76c54b0..1442bda6bb 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -330,9 +330,9 @@ int ov19_021D0E58 (UnkStruct_020067E8 * param0, int * param1)
     UnkStruct_ov19_021D5DF8 * v0 = sub_0200682C(param0);
 
     if (Party_HasSpecies(v0->unk_124, 441) == 0) {
-        ChatotCry * v1 = sub_0202CC98(v0->unk_11C);
+        ChatotCry * v1 = GetChatotCryDataFromSave(v0->unk_11C);
 
-        sub_0202CCA8(v1);
+        ResetChatotCryDataStatus(v1);
     }
 
     ov19_021D64A0(v0->unk_114);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 93de3cbe9a..fae9363c2e 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -700,7 +700,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
         }
         break;
     case 14:
-        ov88_0223D140(sub_0202CC98(param0->unk_04));
+        ov88_0223D140(GetChatotCryDataFromSave(param0->unk_04));
         param0->unk_4C++;
         break;
     case 15:
@@ -1538,7 +1538,7 @@ static void ov88_0223CE74 (UnkStruct_02095E80 * param0)
         v1 = param0->unk_6F4[param0->unk_88[0]].unk_06;
 
         if (v0 == 441) {
-            Sound_PlayChatotCry(sub_0202CC98(param0->unk_04), 0, 100, 0);
+            Sound_PlayChatotCry(GetChatotCryDataFromSave(param0->unk_04), 0, 100, 0);
         } else {
             sub_02005844(v0, v1);
         }
@@ -2528,8 +2528,8 @@ static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param
     param4->unk_2C = param2;
 
     if (Party_HasSpecies(param0, 441) == 0) {
-        ChatotCry * v4 = sub_0202CC98(param4->unk_10);
-        sub_0202CCA8(v4);
+        ChatotCry * v4 = GetChatotCryDataFromSave(param4->unk_10);
+        ResetChatotCryDataStatus(v4);
     }
 
     sub_0202F180(param4->unk_10, v1);
diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c
index 1ee3747d12..4fee91d51b 100644
--- a/src/overlay094/ov94_02242AD0.c
+++ b/src/overlay094/ov94_02242AD0.c
@@ -1264,8 +1264,8 @@ static void ov94_02243B08 (UnkStruct_ov94_0223FD4C * param0, int param1)
         Party_RemovePokemonBySlotIndex(param0->unk_00->unk_08, param0->unk_112);
 
         if (Party_HasSpecies(param0->unk_00->unk_08, 441) == 0) {
-            ChatotCry * v2 = sub_0202CC98(param0->unk_00->unk_20);
-            sub_0202CCA8(v2);
+            ChatotCry * v2 = GetChatotCryDataFromSave(param0->unk_00->unk_20);
+            ResetChatotCryDataStatus(v2);
         }
     }
 
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index c5c4559f82..281bc73977 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -361,7 +361,7 @@ void ov104_0222E134 (SaveData * param0, Pokemon * param1)
     TrainerInfo * v5 = sub_02025E38(param0);
 
     v0 = Pokemon_GetValue(param1, MON_DATA_OT_ID, NULL);
-    sub_02077EE4(param1, sub_02025E38(param0), 4, 0, 0, 11);
+    PostCapturePokemonProcessing(param1, sub_02025E38(param0), 4, 0, 0, 11);
 
     v3 = sub_0203A138(562);
     sub_0209304C(param1, v5, v4, v3, 11);
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index 29ade4d96a..9be9bd123b 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -308,7 +308,7 @@ void ov104_0223BA24 (Party * param0)
 
 void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, Pokemon * param1)
 {
-    sub_02077EE4(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index ed99606854..3cd45f61c5 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -294,7 +294,7 @@ BOOL ov104_0223C000 (u8 param0)
 
 void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, Pokemon * param1)
 {
-    sub_02077EE4(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index 1abe9739fa..ea62b16381 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -132,7 +132,7 @@ int ov118_021D0DBC (UnkStruct_0207F248 * param0)
         v0->unk_00++;
         break;
     case 7:
-        sub_02077E3C(v1);
+        IsPokemonEligibleForAction(v1);
         v0->unk_00++;
         break;
     case 8:
diff --git a/src/pokemon.c b/src/pokemon.c
index 37f0670198..7551bdfd80 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -125,11 +125,11 @@ static void BoxPokemon_ReplaceMove(BoxPokemon *boxMon, u16 moveID);
 static void BoxPokemon_SetMoveSlot(BoxPokemon *boxMon, u16 moveID, u8 moveSlot);
 static BOOL Pokemon_HasMove(Pokemon *mon, u16 moveID);
 static s8 BoxPokemon_GetFlavorAffinity(BoxPokemon *boxMon, int flavor);
-static BOOL sub_020778E0(BoxPokemon *boxMon);
-static BOOL sub_02077900(BoxPokemon *boxMon);
-static void sub_02077EA4(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-static void sub_02077EF8(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-static BOOL BoxPokemon_CanLearnTM(BoxPokemon *boxMon, u8 tmID);
+static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon);
+static BOOL CanBoxPokemonSpreadPokerus(BoxPokemon *boxMon);
+static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
+static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
+static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID);
 static void BoxPokemon_CalcAbility(BoxPokemon *boxMon);
 static void PokemonPersonalData_LoadSpecies(int monSpecies, PokemonPersonalData *monPersonalData);
 static void PokemonPersonalData_LoadForm(int monSpecies, int monForm, PokemonPersonalData *monPersonalData);
@@ -3784,7 +3784,7 @@ u8 Pokemon_HasPokerus(Party *party, u8 param1)
     return result;
 }
 
-void sub_020777B4(Party *party, s32 param1)
+void UpdatePokerusStatusInParty(Party *party, s32 param1)
 {
     int currentPartyCount = Party_GetCurrentCount(party);
 
@@ -3845,22 +3845,22 @@ void Pokemon_ValidatePokerus(Party *party)
     }
 }
 
-BOOL sub_020778D8(Pokemon *mon)
+BOOL IsPokemonInfectedWithPokerus(Pokemon *mon)
 {
-    return sub_020778E0(&mon->box);
+    return IsBoxPokemonInfectedWithPokerus(&mon->box);
 }
 
-static BOOL sub_020778E0(BoxPokemon *boxMon)
+static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon)
 {
     return (BoxPokemon_GetValue(boxMon, MON_DATA_POKERUS, NULL) & 0xf) != 0;
 }
 
-BOOL sub_020778F8(Pokemon *mon)
+BOOL CanPokemonSpreadPokerus(Pokemon *mon)
 {
-    return sub_02077900(&mon->box);
+    return CanBoxPokemonSpreadPokerus(&mon->box);
 }
 
-static BOOL sub_02077900(BoxPokemon *boxMon)
+static BOOL CanBoxPokemonSpreadPokerus(BoxPokemon *boxMon)
 {
     u8 monPokerus = BoxPokemon_GetValue(boxMon, MON_DATA_POKERUS, NULL);
 
@@ -4214,7 +4214,7 @@ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16
     Sound_PlayDelayedPokemonCry(crymod, species, pan, volume, heapID, delay, form);
 }
 
-BOOL sub_02077E3C(Pokemon *mon)
+BOOL IsPokemonEligibleForAction(Pokemon *mon)
 {
     int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
     int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
@@ -4224,7 +4224,7 @@ BOOL sub_02077E3C(Pokemon *mon)
 
 void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
-    sub_02077EA4(&mon->box, param1, monPokeball, param3, param4, param5);
+    InitializeBoxPokemonAfterCapture(&mon->box, param1, monPokeball, param3, param4, param5);
 
     if (monPokeball == ITEM_HEAL_BALL) {
         int monMaxHP = Pokemon_GetValue(mon, MON_DATA_MAX_HP, NULL);
@@ -4235,22 +4235,22 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, in
     }
 }
 
-static void sub_02077EA4(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
+static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
-    sub_0209305C(boxMon, param1, 0, param3, param5);
+    ProcessBoxPokemonWithTrainerInfo(boxMon, param1, 0, param3, param5);
     BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &Unk_020E4C40);
     BoxPokemon_SetValue(boxMon, MON_DATA_POKEBALL, &monPokeball);
     BoxPokemon_SetValue(boxMon, MON_DATA_158, &param4);
 }
 
-void sub_02077EE4(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
+void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
-    sub_02077EF8(&mon->box, param1, monPokeball, param3, param4, param5);
+    PostCaptureBoxPokemonProcessing(&mon->box, param1, monPokeball, param3, param4, param5);
 }
 
-static void sub_02077EF8(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
+static void PostCaptureBoxPokemonProcessing(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
-    sub_02077EA4(boxMon, param1, monPokeball, param3, param4, param5);
+    InitializeBoxPokemonAfterCapture(boxMon, param1, monPokeball, param3, param4, param5);
 }
 
 static const u16 sHeldItemChance[][2] = {
@@ -4258,7 +4258,7 @@ static const u16 sHeldItemChance[][2] = {
     {20, 80}
 };
 
-void sub_02077F0C(Pokemon *mon, u32 param1, int param2)
+void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2)
 {
     if (param1 & (0x1 | 0x80)) {
         return;
@@ -4286,18 +4286,18 @@ void sub_02077F0C(Pokemon *mon, u32 param1, int param2)
 
 BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID)
 {
-    return BoxPokemon_CanLearnTM(&mon->box, tmID);
+    return CanBoxPokemonLearnTM(&mon->box, tmID);
 }
 
-static BOOL BoxPokemon_CanLearnTM(BoxPokemon *boxMon, u8 tmID)
+static BOOL CanBoxPokemonLearnTM(BoxPokemon *boxMon, u8 tmID)
 {
     u16 monSpeciesEgg = BoxPokemon_GetValue(boxMon, MON_DATA_SPECIES_EGG, NULL);
     int monForm = BoxPokemon_GetValue(boxMon, MON_DATA_FORM, NULL);
 
-    return Pokemon_CanFormLearnTM(monSpeciesEgg, monForm, tmID);
+    return CanPokemonFormLearnTM(monSpeciesEgg, monForm, tmID);
 }
 
-BOOL Pokemon_CanFormLearnTM(u16 monSpecies, int monForm, u8 tmID)
+BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID)
 {
     if (monSpecies == SPECIES_EGG) {
         return FALSE;
diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c
index 98ba3e4b55..6441feebd7 100644
--- a/src/unk_02003B60.c
+++ b/src/unk_02003B60.c
@@ -125,7 +125,7 @@ void sub_02003BD8 (void)
         sub_02003C64();
     }
 
-    sub_02006224();
+    CheckMicRecordingStatus();
 
     for (v0 = 0; v0 < 2; v0++) {
         if (v1->unk_BCDD0[v0] != 0) {
diff --git a/src/unk_02005474.c b/src/unk_02005474.c
index 798b7592c9..bbfe614b9e 100644
--- a/src/unk_02005474.c
+++ b/src/unk_02005474.c
@@ -425,7 +425,7 @@ BOOL sub_02005844 (u16 param0, u8 param1)
     }
 
     if (v0 == 441) {
-        if (sub_0200629C(*v3, 0, 127, 0) == 1) {
+        if (ProcessAudioInput(*v3, 0, 127, 0) == 1) {
             Sound_FlagDefaultChatotCry(0);
             return 1;
         }
@@ -477,7 +477,7 @@ void sub_0200592C (int param0)
         sub_02004C4C(15);
     }
 
-    sub_02006350();
+    ResetMicStatusFlags();
     sub_0200605C();
 
     return;
diff --git a/src/unk_02006224.c b/src/unk_02006224.c
index 66e1da6579..5d5ce66689 100644
--- a/src/unk_02006224.c
+++ b/src/unk_02006224.c
@@ -11,20 +11,20 @@
 #include "unk_0201D15C.h"
 #include "unk_0202CC64.h"
 
-BOOL sub_02006224(void);
-BOOL sub_02006260(const ChatotCry * param0);
-BOOL sub_0200629C(const ChatotCry * param0, u32 param1, int param2, int param3);
-void sub_02006350(void);
-MICResult sub_0200637C(void);
-MICResult sub_020063B8(void);
-void sub_020063C0(ChatotCry * param0);
+BOOL CheckMicRecordingStatus(void);
+BOOL IsChatotCryStructReadyForProcessing(const ChatotCry * param0);
+BOOL ProcessAudioInput(const ChatotCry * param0, u32 param1, int param2, int param3);
+void ResetMicStatusFlags(void);
+MICResult StartMicSampling(void);
+MICResult StopMicSampling(void);
+void StoreMicDataInChatotCryStruct(ChatotCry * param0);
 void Sound_FlagDefaultChatotCry(u8 param0);
 BOOL Sound_PlayChatotCry(ChatotCry * param0, u32 param1, int param2, int param3);
 BOOL Sound_PlayDelayedChatotCry(ChatotCry * param0, u32 param1, int param2, int param3, u8 param4);
 int Sound_Chatter(ChatotCry * param0);
 BOOL Sound_CanPlayChatotCry(int param0);
 
-BOOL sub_02006224 (void)
+BOOL CheckMicRecordingStatus (void)
 {
     u8 * v0 = sub_02003D5C(16);
     u8 * v1 = sub_02003D5C(30);
@@ -32,11 +32,11 @@ BOOL sub_02006224 (void)
     if (*v1 == 1) {
         if (*v0 == 1) {
             if (sub_02004D04(14) == 0) {
-                sub_02006350();
+                ResetMicStatusFlags();
                 return 1;
             }
         } else {
-            sub_02006350();
+            ResetMicStatusFlags();
             return 1;
         }
     }
@@ -44,12 +44,12 @@ BOOL sub_02006224 (void)
     return 0;
 }
 
-BOOL sub_02006260 (const ChatotCry * param0)
+BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry)
 {
     u8 * v0 = sub_02003D5C(31);
     u8 * v1 = sub_02003D5C(54);
 
-    if (sub_0202CCA4(param0) == 0) {
+    if (IsChatotCryDataValid(cry) == 0) {
         return 0;
     }
 
@@ -64,14 +64,14 @@ BOOL sub_02006260 (const ChatotCry * param0)
     return 1;
 }
 
-BOOL sub_0200629C (const ChatotCry * param0, u32 param1, int param2, int param3)
+BOOL ProcessAudioInput (const ChatotCry * param0, u32 param1, int param2, int param3)
 {
     u16 v0;
     int v1, v2;
     s8 * v3 = sub_02005014();
     u8 * v4 = sub_02003D5C(30);
 
-    if (sub_02006260(param0) == 0) {
+    if (IsChatotCryStructReadyForProcessing(param0) == 0) {
         return 0;
     }
 
@@ -82,11 +82,11 @@ BOOL sub_0200629C (const ChatotCry * param0, u32 param1, int param2, int param3)
     }
 
     sub_0200592C(0);
-    sub_02006350();
+    ResetMicStatusFlags();
     sub_02004BCC(14);
 
     v0 = (LCRNG_Next() % 8192);
-    sub_0202CCB4(v3, sub_0202CCB0(param0));
+    ProcessChatotCryAudioData(v3, GetChatotCryAudioBuffer(param0));
 
     {
         UnkStruct_02004CB4 v5;
@@ -112,7 +112,7 @@ BOOL sub_0200629C (const ChatotCry * param0, u32 param1, int param2, int param3)
     return v1;
 }
 
-void sub_02006350 (void)
+void ResetMicStatusFlags (void)
 {
     u8 * v0 = sub_02003D5C(16);
     u8 * v1 = sub_02003D5C(30);
@@ -126,7 +126,7 @@ void sub_02006350 (void)
     return;
 }
 
-MICResult sub_0200637C (void)
+MICResult StartMicSampling (void)
 {
     MICAutoParam v0;
 
@@ -146,14 +146,14 @@ MICResult sub_0200637C (void)
     return sub_02004B5C(&v0);
 }
 
-MICResult sub_020063B8 (void)
+MICResult StopMicSampling (void)
 {
     return sub_02004B64();
 }
 
-void sub_020063C0 (ChatotCry * param0)
+void StoreMicDataInChatotCryStruct (ChatotCry * param0)
 {
-    sub_0202CCEC(param0, (const s8 *)sub_02005014());
+    StoreProcessedAudioInChatotCryData(param0, (const s8 *)sub_02005014());
     return;
 }
 
@@ -171,9 +171,9 @@ BOOL Sound_PlayChatotCry (ChatotCry * param0, u32 param1, int param2, int param3
     ChatotCry ** v1 = sub_02003D5C(36);
 
     if (param0 == NULL) {
-        v0 = sub_0200629C(*v1, param1, param2, param3);
+        v0 = ProcessAudioInput(*v1, param1, param2, param3);
     } else {
-        v0 = sub_0200629C(param0, param1, param2, param3);
+        v0 = ProcessAudioInput(param0, param1, param2, param3);
     }
 
     if (v0 == 0) {
@@ -190,9 +190,9 @@ BOOL Sound_PlayDelayedChatotCry (ChatotCry * param0, u32 param1, int param2, int
     ChatotCry ** v1 = sub_02003D5C(36);
 
     if (param0 == NULL) {
-        v0 = sub_0200629C(*v1, param1, param2, param3);
+        v0 = ProcessAudioInput(*v1, param1, param2, param3);
     } else {
-        v0 = sub_0200629C(param0, param1, param2, param3);
+        v0 = ProcessAudioInput(param0, param1, param2, param3);
     }
 
     if (v0 == 0) {
@@ -209,11 +209,11 @@ int Sound_Chatter (ChatotCry * param0)
     const s8 * v0;
     s8 v1;
 
-    if (sub_0202CCA4(param0) == 0) {
+    if (IsChatotCryDataValid(param0) == 0) {
         return 0;
     }
 
-    v0 = sub_0202CCB0(param0);
+    v0 = GetChatotCryAudioBuffer(param0);
     v1 = v0[15];
 
     if ((-128 <= v1) && (v1 < -30)) {
diff --git a/src/unk_0202CC64.c b/src/unk_0202CC64.c
index 16521409d2..d14217ffba 100644
--- a/src/unk_0202CC64.c
+++ b/src/unk_0202CC64.c
@@ -19,7 +19,7 @@ void ChatotCry_Init (ChatotCry * param0)
     param0->exists = FALSE;
 }
 
-ChatotCry * sub_0202CC84 (int param0)
+ChatotCry * AllocateAndInitializeChatotCryData (int param0)
 {
     ChatotCry * v0 = Heap_AllocFromHeap(param0, sizeof(ChatotCry));
 
@@ -27,27 +27,27 @@ ChatotCry * sub_0202CC84 (int param0)
     return v0;
 }
 
-ChatotCry * sub_0202CC98 (SaveData * param0)
+ChatotCry * GetChatotCryDataFromSave (SaveData * param0)
 {
     return (ChatotCry *)SaveData_Get(param0, 22);
 }
 
-BOOL sub_0202CCA4 (const ChatotCry * param0)
+BOOL IsChatotCryDataValid (const ChatotCry * param0)
 {
     return param0->exists;
 }
 
-void sub_0202CCA8 (ChatotCry * param0)
+void ResetChatotCryDataStatus (ChatotCry * param0)
 {
     param0->exists = FALSE;
 }
 
-const void * sub_0202CCB0 (const ChatotCry * param0)
+const void * GetChatotCryAudioBuffer (const ChatotCry * param0)
 {
     return param0->data;
 }
 
-void sub_0202CCB4 (s8 * param0, const s8 * param1)
+void ProcessChatotCryAudioData (s8 * param0, const s8 * param1)
 {
     int v0, v1 = 0;
     s8 v2;
@@ -68,7 +68,7 @@ void sub_0202CCB4 (s8 * param0, const s8 * param1)
     }
 }
 
-void sub_0202CCEC (ChatotCry * param0, const s8 * param1)
+void StoreProcessedAudioInChatotCryData (ChatotCry * param0, const s8 * param1)
 {
     int v0, v1;
     s8 v2;
@@ -92,7 +92,7 @@ void sub_0202CCEC (ChatotCry * param0, const s8 * param1)
     }
 }
 
-void sub_0202CD3C (ChatotCry * param0, const ChatotCry * param1)
+void CopyChatotCryData (ChatotCry * param0, const ChatotCry * param1)
 {
     MI_CpuCopyFast(param1, param0, sizeof(ChatotCry));
 }
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index 5183e5c5fd..d8a271781a 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -121,7 +121,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0)
     v8.unk_14 = sub_0202A750(param0->unk_34->unk_0C);
     v8.unk_18 = sub_02025E44(param0->unk_34->unk_0C);
     v8.unk_1C = param0->unk_34->unk_0C;
-    v8.unk_20 = sub_0202CC98(param0->unk_34->unk_0C);
+    v8.unk_20 = GetChatotCryDataFromSave(param0->unk_34->unk_0C);
 
     *v2 = sub_02093800(&v8);
 
diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c
index 31ea8d7d8f..f072e57dde 100644
--- a/src/unk_020482D4.c
+++ b/src/unk_020482D4.c
@@ -223,7 +223,7 @@ BOOL sub_020484F8 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (sub_02006260(sub_0202CC98(param0->unk_34->unk_0C)) == 1) {
+    if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->unk_34->unk_0C)) == 1) {
         *v0 = 1;
         return 0;
     }
@@ -236,7 +236,7 @@ BOOL sub_02048530 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (sub_0200637C() == MIC_RESULT_SUCCESS) {
+    if (StartMicSampling() == MIC_RESULT_SUCCESS) {
         *v0 = 1;
         return 0;
     }
@@ -247,13 +247,13 @@ BOOL sub_02048530 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204855C (UnkStruct_0203E724 * param0)
 {
-    sub_020063B8();
+    StopMicSampling();
     return 1;
 }
 
 BOOL sub_02048568 (UnkStruct_0203E724 * param0)
 {
-    sub_020063C0(sub_0202CC98(param0->unk_34->unk_0C));
+    StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->unk_34->unk_0C));
     return 1;
 }
 
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index 686d937e13..a032cc2445 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -100,7 +100,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        v1->unk_F0[v0] = sub_0202CC84(param0);
+        v1->unk_F0[v0] = AllocateAndInitializeChatotCryData(param0);
     }
 
     v1->unk_E0 = sub_0207D3C0(param0);
@@ -247,7 +247,7 @@ void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2
 
 void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2)
 {
-    sub_0202CD3C(param0->unk_F0[param2], param1);
+    CopyChatotCryData(param0->unk_F0[param2], param1);
 }
 
 void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
@@ -256,7 +256,7 @@ void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, Sav
     Party * v1 = Party_GetFromSavedata(param2);
     UnkStruct_0207D3C0 * v2 = sub_0207D990(param2);
     UnkStruct_02026324 * v3 = sub_02027560(param2);
-    ChatotCry * v4 = sub_0202CC98(param2);
+    ChatotCry * v4 = GetChatotCryDataFromSave(param2);
     UnkStruct_020279FC * v5 = sub_02025E44(param2);
     UnkStruct_0203A790 * v6 = sub_0203A790(param2);
 
@@ -311,7 +311,7 @@ void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int
     Party * v3 = Party_GetFromSavedata(param1->unk_0C);
     UnkStruct_0207D3C0 * v4 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v5 = sub_02027560(param1->unk_0C);
-    ChatotCry * v6 = sub_0202CC98(param1->unk_0C);
+    ChatotCry * v6 = GetChatotCryDataFromSave(param1->unk_0C);
     UnkStruct_020279FC * v7 = sub_02025E44(param1->unk_0C);
     Pokemon * v8;
 
@@ -361,7 +361,7 @@ void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, con
     TrainerInfo * v0 = sub_02025E38(param1->unk_0C);
     UnkStruct_0207D3C0 * v1 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v2 = sub_02027560(param1->unk_0C);
-    ChatotCry * v3 = sub_0202CC98(param1->unk_0C);
+    ChatotCry * v3 = GetChatotCryDataFromSave(param1->unk_0C);
     UnkStruct_020279FC * v4 = sub_02025E44(param1->unk_0C);
     const UnkStruct_0202610C * v5 = param1->unk_B0;
     int v6, v7, v8;
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index c787cdbac2..c36df1b541 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -101,7 +101,7 @@ static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
         Party * v0;
 
         v0 = Party_GetFromSavedata(param0->unk_0C);
-        sub_020777B4(v0, param1);
+        UpdatePokerusStatusInParty(v0, param1);
     }
 
     {
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 7fac2abe71..6d122f613b 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -421,7 +421,7 @@ BOOL sub_0207AAA0 (UnkStruct_0207A778 * param0)
     }
 
     v0 = (ChatotCry *)&param0->unk_20[0];
-    sub_0202CD3C(v0, param0->unk_00->unk_F0[0]);
+    CopyChatotCryData(v0, param0->unk_00->unk_F0[0]);
 
     return 1;
 }
diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c
index eb817dac90..cc799b86ab 100644
--- a/src/unk_0208C324.c
+++ b/src/unk_0208C324.c
@@ -1102,9 +1102,9 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStru
     param2->unk_4E = Pokemon_GetValue(param1, MON_DATA_FORM, NULL);
     param2->unk_50_0 = sub_0208E9F0(param1);
 
-    if (sub_020778F8(param1) == 1) {
+    if (CanPokemonSpreadPokerus(param1) == 1) {
         param2->unk_50_30 = 2;
-    } else if (sub_020778D8(param1) == 1) {
+    } else if (IsPokemonInfectedWithPokerus(param1) == 1) {
         param2->unk_50_30 = 1;
 
         if (param2->unk_50_0 == 7) {
diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c
index 13a6988ee2..25f19a52f3 100644
--- a/src/unk_0208FCF8.c
+++ b/src/unk_0208FCF8.c
@@ -535,7 +535,7 @@ static void sub_02090578 (UnkStruct_0208D7BC * param0)
 
 static void sub_02090800 (Window * param0, Pokemon * param1, BOOL param2)
 {
-    UnkStruct_02090800 * v0 = sub_02092494(param1, param2, 19);
+    PokemonInfoDisplayStruct * v0 = sub_02092494(param1, param2, 19);
 
     if (v0->unk_14.unk_04 != NULL) {
         sub_0201D78C(param0, 0, v0->unk_14.unk_04, 0, 0 + (v0->unk_14.unk_00 - 1) * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL);
diff --git a/src/unk_02092494.c b/src/unk_02092494.c
index ff00950354..615ef63bf7 100644
--- a/src/unk_02092494.c
+++ b/src/unk_02092494.c
@@ -13,25 +13,25 @@
 #include "pokemon.h"
 #include "unk_02092494.h"
 
-static int sub_02092E8C(Pokemon * param0, BOOL param1, int param2);
-static void sub_02092878(UnkStruct_02090800 * param0);
-static void sub_020928A0(UnkStruct_02090800 * param0, int param1);
-static void sub_020929C0(UnkStruct_02090800 * param0, int param1);
-static void sub_02092B1C(UnkStruct_02090800 * param0, int param1, int param2);
-static void sub_02092C24(UnkStruct_02090800 * param0);
-static void sub_02092E10(UnkStruct_02090800 * param0);
-static void sub_02092E4C(UnkStruct_02090800 * param0);
-static void sub_020932A4(BoxPokemon * param0, TrainerInfo * param1, int param2);
-static void sub_020932F0(BoxPokemon * param0, int param1, int param2);
-static void sub_02093368(BoxPokemon * param0, int param1);
-static void sub_020933C8(BoxPokemon * param0);
-static void sub_020933E8(BoxPokemon * param0);
-
-UnkStruct_02090800 * sub_02092494 (Pokemon * param0, BOOL param1, int param2)
+static int DeterminePokemonStatus(Pokemon * param0, BOOL param1, int param2);
+static void InitializeNatureRelatedStrBuf(PokemonInfoDisplayStruct * param0);
+static void InitializePokemonMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1);
+static void InitializeAlternateMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1);
+static void InitializeSpecialMetInfoStrBuf(PokemonInfoDisplayStruct * param0, int param1, int param2);
+static void InitializeIVsStrBuf(PokemonInfoDisplayStruct * param0);
+static void InitializeFlavorAffinityStrBuf(PokemonInfoDisplayStruct * param0);
+static void InitializeFriendshipLevelStrBuf(PokemonInfoDisplayStruct * param0);
+static void AssignTrainerInfoToBoxPokemon(BoxPokemon * param0, TrainerInfo * param1, int param2);
+static void SetMetLocationForBoxPokemon(BoxPokemon * param0, int param1, int param2);
+static void ResetBoxPokemonEggStatus(BoxPokemon * param0, int param1);
+static void FinalizeBoxPokemonData(BoxPokemon * param0);
+static void UpdateBoxPokemonAfterCheck(BoxPokemon * param0);
+
+PokemonInfoDisplayStruct * sub_02092494 (Pokemon * param0, BOOL param1, int param2)
 {
-    UnkStruct_02090800 * v0;
+    PokemonInfoDisplayStruct * v0;
 
-    v0 = Heap_AllocFromHeap(param2, sizeof(UnkStruct_02090800));
+    v0 = Heap_AllocFromHeap(param2, sizeof(PokemonInfoDisplayStruct));
     v0->unk_00 = param2;
     v0->unk_04 = MessageLoader_Init(1, 26, 455, v0->unk_00);
     v0->unk_08 = sub_0200B368(9, 32, v0->unk_00);
@@ -55,238 +55,238 @@ UnkStruct_02090800 * sub_02092494 (Pokemon * param0, BOOL param1, int param2)
         v0->unk_34.unk_04 = NULL;
     }
 
-    switch (sub_02092E8C(v0->unk_0C, v0->unk_10, v0->unk_00)) {
+    switch (DeterminePokemonStatus(v0->unk_0C, v0->unk_10, v0->unk_00)) {
     case 0:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 49);
+        InitializePokemonMetInfoStrBuf(v0, 49);
 
         v0->unk_24.unk_00 = 6;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 7;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 1:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 50);
+        InitializePokemonMetInfoStrBuf(v0, 50);
 
         v0->unk_24.unk_00 = 6;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 7;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 2:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 51);
+        InitializePokemonMetInfoStrBuf(v0, 51);
 
         v0->unk_24.unk_00 = 6;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 7;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 3:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 52);
+        InitializePokemonMetInfoStrBuf(v0, 52);
 
         v0->unk_24.unk_00 = 8;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 9;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 4:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 53);
+        InitializePokemonMetInfoStrBuf(v0, 53);
 
         v0->unk_24.unk_00 = 8;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 9;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 5:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 54);
+        InitializePokemonMetInfoStrBuf(v0, 54);
 
         v0->unk_24.unk_00 = 8;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 9;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 6:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 55);
+        InitializePokemonMetInfoStrBuf(v0, 55);
 
         v0->unk_24.unk_00 = 8;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 9;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 7:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 56);
+        InitializePokemonMetInfoStrBuf(v0, 56);
 
         v0->unk_24.unk_00 = 7;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 8;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 8:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 57);
+        InitializePokemonMetInfoStrBuf(v0, 57);
 
         v0->unk_24.unk_00 = 7;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 8;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 9:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 58);
+        InitializePokemonMetInfoStrBuf(v0, 58);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 10:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 59);
+        InitializePokemonMetInfoStrBuf(v0, 59);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 11:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 60);
+        InitializePokemonMetInfoStrBuf(v0, 60);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 12:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 61);
+        InitializePokemonMetInfoStrBuf(v0, 61);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 13:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 62);
+        InitializePokemonMetInfoStrBuf(v0, 62);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 14:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020928A0(v0, 63);
+        InitializePokemonMetInfoStrBuf(v0, 63);
 
         v0->unk_24.unk_00 = 9;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
         break;
     case 15:
         v0->unk_14.unk_00 = 1;
-        sub_02092878(v0);
+        InitializeNatureRelatedStrBuf(v0);
 
         v0->unk_1C.unk_00 = 2;
-        sub_020929C0(v0, 64);
+        InitializeAlternateMetInfoStrBuf(v0, 64);
 
         v0->unk_24.unk_00 = 6;
-        sub_02092C24(v0);
+        InitializeIVsStrBuf(v0);
 
         v0->unk_2C.unk_00 = 7;
-        sub_02092E10(v0);
+        InitializeFlavorAffinityStrBuf(v0);
         break;
     case 16:
         v0->unk_1C.unk_00 = 1;
-        sub_02092B1C(v0, 101, 0);
+        InitializeSpecialMetInfoStrBuf(v0, 101, 0);
 
         v0->unk_34.unk_00 = 6;
-        sub_02092E4C(v0);
+        InitializeFriendshipLevelStrBuf(v0);
         break;
     case 17:
         v0->unk_1C.unk_00 = 1;
-        sub_02092B1C(v0, 102, 1);
+        InitializeSpecialMetInfoStrBuf(v0, 102, 1);
 
         v0->unk_34.unk_00 = 6;
-        sub_02092E4C(v0);
+        InitializeFriendshipLevelStrBuf(v0);
         break;
     case 18:
         v0->unk_1C.unk_00 = 1;
-        sub_02092B1C(v0, 103, 0);
+        InitializeSpecialMetInfoStrBuf(v0, 103, 0);
 
         v0->unk_34.unk_00 = 6;
-        sub_02092E4C(v0);
+        InitializeFriendshipLevelStrBuf(v0);
         break;
     case 19:
         v0->unk_1C.unk_00 = 1;
-        sub_02092B1C(v0, 103, 1);
+        InitializeSpecialMetInfoStrBuf(v0, 103, 1);
 
         v0->unk_34.unk_00 = 6;
-        sub_02092E4C(v0);
+        InitializeFriendshipLevelStrBuf(v0);
         break;
     case 20:
         v0->unk_1C.unk_00 = 1;
-        sub_02092B1C(v0, 104, 0);
+        InitializeSpecialMetInfoStrBuf(v0, 104, 0);
 
         v0->unk_34.unk_00 = 6;
-        sub_02092E4C(v0);
+        InitializeFriendshipLevelStrBuf(v0);
         break;
     }
 
     return v0;
 }
 
-void sub_0209282C (UnkStruct_02090800 * param0)
+void sub_0209282C (PokemonInfoDisplayStruct * param0)
 {
     if (param0->unk_14.unk_04 != NULL) {
         Heap_FreeToHeap(param0->unk_14.unk_04);
@@ -313,7 +313,7 @@ void sub_0209282C (UnkStruct_02090800 * param0)
     Heap_FreeToHeap(param0);
 }
 
-static void sub_02092878 (UnkStruct_02090800 * param0)
+static void InitializeNatureRelatedStrBuf (PokemonInfoDisplayStruct * param0)
 {
     int v0 = Pokemon_GetNature(param0->unk_0C);
 
@@ -325,7 +325,7 @@ static void sub_02092878 (UnkStruct_02090800 * param0)
     MessageLoader_GetStrbuf(param0->unk_04, (24 + v0), param0->unk_14.unk_04);
 }
 
-static void sub_020928A0 (UnkStruct_02090800 * param0, int param1)
+static void InitializePokemonMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1)
 {
     Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 8), param0->unk_00);
 
@@ -345,7 +345,7 @@ static void sub_020928A0 (UnkStruct_02090800 * param0, int param1)
     Strbuf_Free(v0);
 }
 
-static void sub_020929C0 (UnkStruct_02090800 * param0, int param1)
+static void InitializeAlternateMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1)
 {
     Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 4), param0->unk_00);
 
@@ -388,7 +388,7 @@ static void sub_020929C0 (UnkStruct_02090800 * param0, int param1)
     Strbuf_Free(v0);
 }
 
-static void sub_02092B1C (UnkStruct_02090800 * param0, int param1, int param2)
+static void InitializeSpecialMetInfoStrBuf (PokemonInfoDisplayStruct * param0, int param1, int param2)
 {
     Strbuf* v0 = Strbuf_Init((((2 * 18) * 2) * 5), param0->unk_00);
 
@@ -421,7 +421,7 @@ static const u16 Unk_020F5578[6][5] = {
     {0x60, 0x61, 0x62, 0x63, 0x64}
 };
 
-static void sub_02092C24 (UnkStruct_02090800 * param0)
+static void InitializeIVsStrBuf (PokemonInfoDisplayStruct * param0)
 {
     int v0[6], v1, v2;
     int v3, v4;
@@ -596,7 +596,7 @@ static const u16 Unk_020F556C[6] = {
     0x45
 };
 
-static void sub_02092E10 (UnkStruct_02090800 * param0)
+static void InitializeFlavorAffinityStrBuf (PokemonInfoDisplayStruct * param0)
 {
     int v0, v1, v2;
 
@@ -613,7 +613,7 @@ static void sub_02092E10 (UnkStruct_02090800 * param0)
     MessageLoader_GetStrbuf(param0->unk_04, v2, param0->unk_2C.unk_04);
 }
 
-static void sub_02092E4C (UnkStruct_02090800 * param0)
+static void InitializeFriendshipLevelStrBuf (PokemonInfoDisplayStruct * param0)
 {
     int v0 = Pokemon_GetValue(param0->unk_0C, MON_DATA_FRIENDSHIP, NULL);
     int v1;
@@ -633,7 +633,7 @@ static void sub_02092E4C (UnkStruct_02090800 * param0)
     MessageLoader_GetStrbuf(param0->unk_04, v1, param0->unk_34.unk_04);
 }
 
-static int sub_02092E8C (Pokemon * param0, BOOL param1, int param2)
+static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2)
 {
     int v0 = 0;
 
@@ -718,10 +718,10 @@ static int sub_02092E8C (Pokemon * param0, BOOL param1, int param2)
 
 void sub_0209304C (Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4)
 {
-    sub_0209305C(&param0->box, param1, param2, param3, param4);
+    ProcessBoxPokemonWithTrainerInfo(&param0->box, param1, param2, param3, param4);
 }
 
-void sub_0209305C (BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4)
+void ProcessBoxPokemonWithTrainerInfo (BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4)
 {
     switch (param2) {
     case 0:
@@ -730,64 +730,64 @@ void sub_0209305C (BoxPokemon * param0, TrainerInfo * param1, int param2, int pa
         }
 
         if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-            sub_02093368(param0, 0);
-            sub_020932F0(param0, param3, 1);
-            sub_020933C8(param0);
+            ResetBoxPokemonEggStatus(param0, 0);
+            SetMetLocationForBoxPokemon(param0, param3, 1);
+            FinalizeBoxPokemonData(param0);
         } else {
-            sub_020932F0(param0, param3, 0);
-            sub_02093368(param0, 1);
+            SetMetLocationForBoxPokemon(param0, param3, 0);
+            ResetBoxPokemonEggStatus(param0, 1);
         }
 
-        sub_020932A4(param0, param1, param4);
+        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
         break;
     case 1:
         if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-            sub_02093368(param0, 0);
-            sub_020932F0(param0, (sub_02017070(1, 1)), 1);
-            sub_020933C8(param0);
+            ResetBoxPokemonEggStatus(param0, 0);
+            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 1)), 1);
+            FinalizeBoxPokemonData(param0);
         } else {
-            sub_02093368(param0, 0);
-            sub_020932F0(param0, (sub_02017070(1, 1)), 1);
+            ResetBoxPokemonEggStatus(param0, 0);
+            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 1)), 1);
         }
         break;
     case 2:
-        sub_02093368(param0, 0);
-        sub_020932F0(param0, (sub_02017070(0, 55)), 1);
-        sub_020933C8(param0);
+        ResetBoxPokemonEggStatus(param0, 0);
+        SetMetLocationForBoxPokemon(param0, (sub_02017070(0, 55)), 1);
+        FinalizeBoxPokemonData(param0);
         break;
     case 3:
-        sub_020932F0(param0, param3, 0);
-        sub_02093368(param0, 1);
-        sub_020932A4(param0, param1, param4);
+        SetMetLocationForBoxPokemon(param0, param3, 0);
+        ResetBoxPokemonEggStatus(param0, 1);
+        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
         break;
     case 4:
         if (sub_0207884C(param0, param1, param4) == 1) {
             if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-                sub_02093368(param0, 0);
-                sub_020932F0(param0, param3, 1);
-                sub_020933C8(param0);
+                ResetBoxPokemonEggStatus(param0, 0);
+                SetMetLocationForBoxPokemon(param0, param3, 1);
+                FinalizeBoxPokemonData(param0);
             } else {
-                sub_020932F0(param0, param3, 0);
-                sub_02093368(param0, 1);
+                SetMetLocationForBoxPokemon(param0, param3, 0);
+                ResetBoxPokemonEggStatus(param0, 1);
             }
         } else {
             if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-                sub_02093368(param0, 0);
-                sub_020932F0(param0, param3, 1);
-                sub_020933C8(param0);
+                ResetBoxPokemonEggStatus(param0, 0);
+                SetMetLocationForBoxPokemon(param0, param3, 1);
+                FinalizeBoxPokemonData(param0);
             } else {
-                sub_02093368(param0, 0);
-                sub_020932F0(param0, param3, 1);
+                ResetBoxPokemonEggStatus(param0, 0);
+                SetMetLocationForBoxPokemon(param0, param3, 1);
             }
         }
 
-        sub_020933E8(param0);
+        UpdateBoxPokemonAfterCheck(param0);
         break;
     case 5:
         if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
             (void)0;
         } else {
-            sub_020932F0(param0, (sub_02017070(1, 2)), 1);
+            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 2)), 1);
         }
         break;
     case 6:
@@ -813,13 +813,13 @@ void sub_0209305C (BoxPokemon * param0, TrainerInfo * param1, int param2, int pa
             }
         }
 
-        sub_020932F0(param0, param3, 1);
-        sub_020932A4(param0, param1, param4);
+        SetMetLocationForBoxPokemon(param0, param3, 1);
+        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
         break;
     }
 }
 
-static void sub_020932A4 (BoxPokemon * param0, TrainerInfo * param1, int param2)
+static void AssignTrainerInfoToBoxPokemon (BoxPokemon * param0, TrainerInfo * param1, int param2)
 {
     int v0 = TrainerInfo_ID(param1);
     int v1 = TrainerInfo_Gender(param1);
@@ -831,7 +831,7 @@ static void sub_020932A4 (BoxPokemon * param0, TrainerInfo * param1, int param2)
     Strbuf_Free(v2);
 }
 
-static void sub_020932F0 (BoxPokemon * param0, int param1, int param2)
+static void SetMetLocationForBoxPokemon (BoxPokemon * param0, int param1, int param2)
 {
     RTCDate v0;
 
@@ -850,7 +850,7 @@ static void sub_020932F0 (BoxPokemon * param0, int param1, int param2)
     }
 }
 
-static void sub_02093368 (BoxPokemon * param0, int param1)
+static void ResetBoxPokemonEggStatus (BoxPokemon * param0, int param1)
 {
     int v0 = 0;
 
@@ -867,13 +867,13 @@ static void sub_02093368 (BoxPokemon * param0, int param1)
     }
 }
 
-static void sub_020933C8 (BoxPokemon * param0)
+static void FinalizeBoxPokemonData (BoxPokemon * param0)
 {
     int v0 = BoxPokemon_GetValue(param0, MON_DATA_LEVEL, NULL);
     BoxPokemon_SetValue(param0, 156, &v0);
 }
 
-static void sub_020933E8 (BoxPokemon * param0)
+static void UpdateBoxPokemonAfterCheck (BoxPokemon * param0)
 {
     int v0 = 1;
     BoxPokemon_SetValue(param0, 110, &v0);
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index 69b1f8623a..052f74bd24 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -445,10 +445,10 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0)
     }
 
     for (v2 = 0; v2 < 4; v2++) {
-        v0->unk_14C[v2] = sub_0202CC84(20);
+        v0->unk_14C[v2] = AllocateAndInitializeChatotCryData(20);
     }
 
-    sub_0202CD3C(v0->unk_14C[0], param0->unk_20);
+    CopyChatotCryData(v0->unk_14C[0], param0->unk_20);
 
     {
         Pokemon_Copy(param0->unk_08, v0->unk_00.unk_00[0]);

From 51b665dadeb4b7bc0e6fb6a6150e060c13e63cc0 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 12:30:47 -0500
Subject: [PATCH 06/12] add function names

---
 include/unk_02096420.h          |  8 +--
 src/overlay104/ov104_0222FBE4.c |  2 +-
 src/overlay104/ov104_022395F0.c |  2 +-
 src/overlay104/ov104_0223A7F4.c |  4 +-
 src/overlay104/ov104_0223AF58.c |  2 +-
 src/overlay104/ov104_0223B6F4.c |  2 +-
 src/overlay104/ov104_0223BCBC.c |  4 +-
 src/overlay107/ov107_02241AE0.c |  2 +-
 src/unk_0203F6C4.c              |  2 +-
 src/unk_02050A74.c              |  4 +-
 src/unk_02052C6C.c              |  2 +-
 src/unk_0207E0B8.c              |  2 +-
 src/unk_02084B70.c              |  2 +-
 src/unk_02096420.c              | 96 ++++++++++++++++-----------------
 14 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/include/unk_02096420.h b/include/unk_02096420.h
index ee47193596..1941437afa 100644
--- a/include/unk_02096420.h
+++ b/include/unk_02096420.h
@@ -4,10 +4,10 @@
 #include "pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
-u8 sub_02096420(Pokemon * param0, u16 param1, u16 param2, u32 param3);
-u8 sub_0209693C(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
-u8 sub_02096954(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4);
+u8 CheckItemEffectsOnPokemon(Pokemon * param0, u16 param1, u16 param2, u32 param3);
+u8 CheckItemEffectsOnPartyMember(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
+u8 ApplyItemEffectsToPokemon(Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4);
 u8 sub_02096F14(Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5);
-void HealParty(Party * party);
+void HealAllPokemonInParty(Party * party);
 
 #endif // POKEPLATINUM_UNK_02096420_H
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 6093e45490..43f37c1d35 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -2005,7 +2005,7 @@ static BOOL ov104_02231050 (UnkStruct_ov104_0222E930 * param0)
 
     v0 = sub_0209B970(param0->unk_00->unk_00);
 
-    HealParty(Party_GetFromSavedata(v0->unk_08));
+    HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_08));
     return 0;
 }
 
diff --git a/src/overlay104/ov104_022395F0.c b/src/overlay104/ov104_022395F0.c
index 9901ea4ee4..9bcd6006d5 100644
--- a/src/overlay104/ov104_022395F0.c
+++ b/src/overlay104/ov104_022395F0.c
@@ -354,7 +354,7 @@ BOOL ov104_02239B14 (UnkStruct_ov104_0222E930 * param0)
         sub_0204A4C8(v1, v2->unk_08);
     }
 
-    HealParty(Party_GetFromSavedata(v2->unk_08));
+    HealAllPokemonInParty(Party_GetFromSavedata(v2->unk_08));
     sub_0209BA80(v1);
 
     v1->unk_8D4 = 0;
diff --git a/src/overlay104/ov104_0223A7F4.c b/src/overlay104/ov104_0223A7F4.c
index 0a4940d118..feed13937e 100644
--- a/src/overlay104/ov104_0223A7F4.c
+++ b/src/overlay104/ov104_0223A7F4.c
@@ -353,8 +353,8 @@ BattleParams * ov104_0223ABA0 (UnkStruct_ov104_0223ADA0 * param0, UnkStruct_ov10
     v2 = ov104_0223AA50(param0->unk_04);
     v3 = ov104_0223AA74(param0->unk_04, 0);
 
-    HealParty(param0->unk_4D4);
-    HealParty(param0->unk_4D8);
+    HealAllPokemonInParty(param0->unk_4D4);
+    HealAllPokemonInParty(param0->unk_4D8);
 
     v4 = sub_02051D8C(11, ov104_0223AD74(param0->unk_04));
     sub_020521B8(v4, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index bea2431a11..3400dd2c9f 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -1586,7 +1586,7 @@ BattleParams * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkStruct_ov10
     v5 = ov104_0223B50C(param0->unk_04);
     v13 = Party_GetFromSavedata(param0->unk_6FC);
 
-    HealParty(v13);
+    HealAllPokemonInParty(v13);
 
     v8 = sub_02051D8C(11, ov104_0223B4D4(param0->unk_04));
     sub_020521B8(v8, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index 9be9bd123b..ad57c097fb 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -174,7 +174,7 @@ BattleParams * ov104_0223B810 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov10
     v2 = ov104_0223B7A8(param0->unk_10, 0);
     v3 = ov104_0223B7DC(param0->unk_10, 0);
 
-    HealParty(param0->unk_2C);
+    HealAllPokemonInParty(param0->unk_2C);
     v5 = sub_02051D8C(11, ov104_0223B9E4(param0->unk_10));
     sub_020521B8(v5, NULL, param1->unk_08, param1->unk_1C, param1->unk_0C, param1->unk_10, param1->unk_20);
 
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 3cd45f61c5..49002359bc 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -254,8 +254,8 @@ BattleParams * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov10
         break;
     }
 
-    HealParty(param0->unk_70);
-    HealParty(param0->unk_74);
+    HealAllPokemonInParty(param0->unk_70);
+    HealAllPokemonInParty(param0->unk_74);
 
     return v5;
 }
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index f3bae312f2..a51faa1a2d 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -3564,7 +3564,7 @@ void ov107_02245438 (int param0, int param1, void * param2, void * param3)
 
 static void ov107_02245454 (Pokemon * param0, u16 param1)
 {
-    sub_02096954(param0, param1, 0, 0, 100);
+    ApplyItemEffectsToPokemon(param0, param1, 0, 0, 100);
     return;
 }
 
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 54c6084c71..0116cdee8a 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -5681,7 +5681,7 @@ static BOOL sub_02043C3C (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = sub_02050A60(param0->unk_28);
 
-    HealParty(Party_GetFromSavedata(v0->unk_0C));
+    HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_0C));
     return 0;
 }
 
diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c
index e93c39f50f..b07b5fe40e 100644
--- a/src/unk_02050A74.c
+++ b/src/unk_02050A74.c
@@ -187,7 +187,7 @@ static BOOL sub_02050B30 (UnkStruct_020508D4 * param0)
         }
 
         if (sub_0206A984(sub_020507E4(v0->unk_0C))) {
-            HealParty(Party_GetFromSavedata(v0->unk_0C));
+            HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_0C));
         }
 
         sub_020518B0(v0, v1->unk_10);
@@ -405,7 +405,7 @@ static BOOL sub_02050EE0 (UnkStruct_020508D4 * param0)
         }
 
         if (sub_0206A984(sub_020507E4(v0->unk_0C))) {
-            HealParty(Party_GetFromSavedata(v0->unk_0C));
+            HealAllPokemonInParty(Party_GetFromSavedata(v0->unk_0C));
         }
 
         sub_020518B0(v0, v1->unk_10);
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 761a842831..10313f1e46 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -132,7 +132,7 @@ static BOOL sub_02052CBC (UnkStruct_020508D4 * param0)
     {
         int v6;
 
-        HealParty(Party_GetFromSavedata(v2->unk_0C));
+        HealAllPokemonInParty(Party_GetFromSavedata(v2->unk_0C));
         sub_02024804();
         v6 = sub_020246E0(v2->unk_0C);
         sub_02052C6C(v2, v3->unk_00);
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 28cc137f7a..e956ba388c 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -2603,7 +2603,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0)
         return 6;
     }
 
-    if (sub_0209693C(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, 0, 12) == 1) {
+    if (CheckItemEffectsOnPartyMember(param0->unk_5A4->unk_00, param0->unk_5A4->unk_24, param0->unk_B11, 0, 12) == 1) {
         Bag_SubtractItem(param0->unk_5A4->unk_04, param0->unk_5A4->unk_24, 1, 12);
 
         if (Item_Get(v0, 26) != 0) {
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index 30477838db..a469d58cae 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -594,7 +594,7 @@ int sub_02085804 (UnkStruct_0207F248 * param0)
     case 1:
 
         v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
-        sub_02096954(v0, param0->unk_5A4->unk_24, 0, sub_02086930(param0), 12);
+        ApplyItemEffectsToPokemon(v0, param0->unk_5A4->unk_24, 0, sub_02086930(param0), 12);
 
         v2 = Pokemon_GetValue(v0, MON_DATA_CURRENT_HP, NULL);
         v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 70);
diff --git a/src/unk_02096420.c b/src/unk_02096420.c
index c55a0165fc..3373616a07 100644
--- a/src/unk_02096420.c
+++ b/src/unk_02096420.c
@@ -11,15 +11,15 @@
 #include "item.h"
 #include "unk_02096420.h"
 
-static u8 sub_02096F34(Pokemon * param0, u32 param1);
-static u8 SetMonPP(Pokemon * param0, u32 param1, u32 param2);
-static u8 sub_02097004(Pokemon * param0, u32 param1, u32 param2);
-static void sub_020970AC(Pokemon * param0, u32 param1, u32 param2, u32 param3);
-static s32 sub_020970EC(s32 param0, s32 param1, s32 param2);
-static u8 sub_020971D0(Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4);
-static u8 sub_02097144(Pokemon * param0, ItemData * param1);
-
-u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
+static u8 CheckMovePPAvailability(Pokemon * param0, u32 param1);
+static u8 UpdatePokemonMovePP(Pokemon * param0, u32 param1, u32 param2);
+static u8 IncreaseMovePPUps(Pokemon * param0, u32 param1, u32 param2);
+static void RestorePokemonHP(Pokemon * param0, u32 param1, u32 param2, u32 param3);
+static s32 CalculateEVUpdate(s32 param0, s32 param1, s32 param2);
+static u8 UpdatePokemonFriendship(Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4);
+static u8 CheckFriendshipItemEffect(Pokemon * param0, ItemData * param1);
+
+u8 CheckItemEffectsOnPokemon (Pokemon * param0, u16 param1, u16 param2, u32 param3)
 {
     ItemData * v0;
     s32 v1[8];
@@ -104,7 +104,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
     }
 
     if (Item_Get(v0, 36) != 0) {
-        if (sub_02096F34(param0, param2) == 1) {
+        if (CheckMovePPAvailability(param0, param2) == 1) {
             Heap_FreeToHeap(v0);
             return 1;
         }
@@ -112,7 +112,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
 
     if (Item_Get(v0, 37) != 0) {
         for (v1[0] = 0; v1[0] < 4; v1[0]++) {
-            if (sub_02096F34(param0, v1[0]) == 1) {
+            if (CheckMovePPAvailability(param0, v1[0]) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -141,7 +141,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                     return 1;
                 }
 
-                if (sub_02097144(param0, v0) == 1) {
+                if (CheckFriendshipItemEffect(param0, v0) == 1) {
                     Heap_FreeToHeap(v0);
                     return 1;
                 }
@@ -163,7 +163,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                 return 1;
             }
 
-            if (sub_02097144(param0, v0) == 1) {
+            if (CheckFriendshipItemEffect(param0, v0) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -184,7 +184,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                 return 1;
             }
 
-            if (sub_02097144(param0, v0) == 1) {
+            if (CheckFriendshipItemEffect(param0, v0) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -205,7 +205,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                 return 1;
             }
 
-            if (sub_02097144(param0, v0) == 1) {
+            if (CheckFriendshipItemEffect(param0, v0) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -226,7 +226,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                 return 1;
             }
 
-            if (sub_02097144(param0, v0) == 1) {
+            if (CheckFriendshipItemEffect(param0, v0) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -247,7 +247,7 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
                 return 1;
             }
 
-            if (sub_02097144(param0, v0) == 1) {
+            if (CheckFriendshipItemEffect(param0, v0) == 1) {
                 Heap_FreeToHeap(v0);
                 return 1;
             }
@@ -259,13 +259,13 @@ u8 sub_02096420 (Pokemon * param0, u16 param1, u16 param2, u32 param3)
     return 0;
 }
 
-u8 sub_0209693C (Party * param0, u16 param1, u8 param2, u8 param3, u32 param4)
+u8 CheckItemEffectsOnPartyMember (Party * param0, u16 param1, u8 param2, u8 param3, u32 param4)
 {
     Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2);
-    return sub_02096420(v0, param1, param3, param4);
+    return CheckItemEffectsOnPokemon(v0, param1, param3, param4);
 }
 
-u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4)
+u8 ApplyItemEffectsToPokemon (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param4)
 {
     ItemData * v0;
     s32 v1[8];
@@ -320,14 +320,14 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (((Item_Get(v0, 23) != 0) || (Item_Get(v0, 24) != 0)) && (Item_Get(v0, 25) != 0)) {
         if (v1[0] == 0) {
-            sub_020970AC(param0, v1[0], v1[1], Item_Get(v0, 54));
+            RestorePokemonHP(param0, v1[0], v1[1], Item_Get(v0, 54));
             v2 = 1;
         }
 
         v3 = 1;
     } else if (Item_Get(v0, 38) != 0) {
         if (v1[0] < v1[1]) {
-            sub_020970AC(param0, v1[0], v1[1], Item_Get(v0, 54));
+            RestorePokemonHP(param0, v1[0], v1[1], Item_Get(v0, 54));
             v2 = 1;
         }
 
@@ -343,7 +343,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
             if (v1[0] == 0) {
                 v1[3] = Pokemon_GetValue(param0, MON_DATA_MAX_HP, NULL);
-                sub_020970AC(param0, v1[0], v1[3], v1[3] - v1[1]);
+                RestorePokemonHP(param0, v1[0], v1[3], v1[3] - v1[1]);
             }
 
             v2 = 1;
@@ -357,13 +357,13 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
     }
 
     if (Item_Get(v0, 34) != 0) {
-        if (sub_02097004(param0, param2, 1) == 1) {
+        if (IncreaseMovePPUps(param0, param2, 1) == 1) {
             v2 = 1;
         }
 
         v3 = 1;
     } else if (Item_Get(v0, 35) != 0) {
-        if (sub_02097004(param0, param2, 3) == 1) {
+        if (IncreaseMovePPUps(param0, param2, 3) == 1) {
             v2 = 1;
         }
 
@@ -371,14 +371,14 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
     }
 
     if (Item_Get(v0, 36) != 0) {
-        if (SetMonPP(param0, param2, Item_Get(v0, 55)) == 1) {
+        if (UpdatePokemonMovePP(param0, param2, Item_Get(v0, 55)) == 1) {
             v2 = 1;
         }
 
         v3 = 1;
     } else if (Item_Get(v0, 37) != 0) {
         for (v1[0] = 0; v1[0] < 4; v1[0]++) {
-            if (SetMonPP(param0, v1[0], Item_Get(v0, 55)) == 1) {
+            if (UpdatePokemonMovePP(param0, v1[0], Item_Get(v0, 55)) == 1) {
                 v2 = 1;
             }
         }
@@ -396,7 +396,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
     if (Pokemon_GetValue(param0, MON_DATA_SPECIES, NULL) != 292) {
         if (Item_Get(v0, 39) != 0) {
             v1[7] = Item_Get(v0, 48);
-            v1[6] = sub_020970EC(v1[0], (v1[1] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
+            v1[6] = CalculateEVUpdate(v1[0], (v1[1] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
 
             if (v1[6] != -1) {
                 v1[0] = v1[6];
@@ -413,7 +413,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (Item_Get(v0, 40) != 0) {
         v1[7] = Item_Get(v0, 49);
-        v1[6] = sub_020970EC(v1[1], (v1[0] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
+        v1[6] = CalculateEVUpdate(v1[1], (v1[0] + v1[2] + v1[3] + v1[4] + v1[5]), v1[7]);
 
         if (v1[6] != -1) {
             v1[1] = v1[6];
@@ -429,7 +429,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (Item_Get(v0, 41) != 0) {
         v1[7] = Item_Get(v0, 50);
-        v1[6] = sub_020970EC(v1[2], (v1[0] + v1[1] + v1[3] + v1[4] + v1[5]), v1[7]);
+        v1[6] = CalculateEVUpdate(v1[2], (v1[0] + v1[1] + v1[3] + v1[4] + v1[5]), v1[7]);
 
         if (v1[6] != -1) {
             v1[2] = v1[6];
@@ -445,7 +445,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (Item_Get(v0, 42) != 0) {
         v1[7] = Item_Get(v0, 51);
-        v1[6] = sub_020970EC(v1[3], (v1[0] + v1[1] + v1[2] + v1[4] + v1[5]), v1[7]);
+        v1[6] = CalculateEVUpdate(v1[3], (v1[0] + v1[1] + v1[2] + v1[4] + v1[5]), v1[7]);
 
         if (v1[6] != -1) {
             v1[3] = v1[6];
@@ -461,7 +461,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (Item_Get(v0, 43) != 0) {
         v1[7] = Item_Get(v0, 52);
-        v1[6] = sub_020970EC(v1[4], (v1[0] + v1[1] + v1[2] + v1[3] + v1[5]), v1[7]);
+        v1[6] = CalculateEVUpdate(v1[4], (v1[0] + v1[1] + v1[2] + v1[3] + v1[5]), v1[7]);
 
         if (v1[6] != -1) {
             v1[4] = v1[6];
@@ -477,7 +477,7 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (Item_Get(v0, 44) != 0) {
         v1[7] = Item_Get(v0, 53);
-        v1[6] = sub_020970EC(v1[5], (v1[0] + v1[1] + v1[2] + v1[3] + v1[4]), v1[7]);
+        v1[6] = CalculateEVUpdate(v1[5], (v1[0] + v1[1] + v1[2] + v1[3] + v1[4]), v1[7]);
 
         if (v1[6] != -1) {
             v1[5] = v1[6];
@@ -500,21 +500,21 @@ u8 sub_02096954 (Pokemon * param0, u16 param1, u16 param2, u16 param3, u32 param
 
     if (v1[0] < 100) {
         if (Item_Get(v0, 45) != 0) {
-            if (sub_020971D0(param0, v1[0], Item_Get(v0, 56), param3, param4) == 0) {
+            if (UpdatePokemonFriendship(param0, v1[0], Item_Get(v0, 56), param3, param4) == 0) {
                 Heap_FreeToHeap(v0);
                 return v2;
             }
         }
     } else if ((v1[0] >= 100) && (v1[0] < 200)) {
         if (Item_Get(v0, 46) != 0) {
-            if (sub_020971D0(param0, v1[0], Item_Get(v0, 57), param3, param4) == 0) {
+            if (UpdatePokemonFriendship(param0, v1[0], Item_Get(v0, 57), param3, param4) == 0) {
                 Heap_FreeToHeap(v0);
                 return v2;
             }
         }
     } else if ((v1[0] >= 200) && (v1[0] <= 255)) {
         if (Item_Get(v0, 47) != 0) {
-            if (sub_020971D0(param0, v1[0], Item_Get(v0, 58), param3, param4) == 0) {
+            if (UpdatePokemonFriendship(param0, v1[0], Item_Get(v0, 58), param3, param4) == 0) {
                 Heap_FreeToHeap(v0);
                 return v2;
             }
@@ -529,10 +529,10 @@ u8 sub_02096F14 (Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u
 {
     Pokemon * v0 = Party_GetPokemonBySlotIndex(param0, param2);
 
-    return sub_02096954(v0, param1, param3, param4, param5);
+    return ApplyItemEffectsToPokemon(v0, param1, param3, param4, param5);
 }
 
-static u8 sub_02096F34 (Pokemon * mon, u32 moveIDX) // param0,1
+static u8 CheckMovePPAvailability (Pokemon * mon, u32 moveIDX) // param0,1
 {
     u16 move; // v0
     u8 ppCurr; // v1
@@ -554,7 +554,7 @@ static u8 sub_02096F34 (Pokemon * mon, u32 moveIDX) // param0,1
     return 0;
 }
 
-static u8 SetMonPP (Pokemon * mon, u32 moveIDX, u32 pp)
+static u8 UpdatePokemonMovePP (Pokemon * mon, u32 moveIDX, u32 pp)
 {
     u16 move;
     u8 ppCurr;
@@ -587,7 +587,7 @@ static u8 SetMonPP (Pokemon * mon, u32 moveIDX, u32 pp)
     return 0;
 }
 
-static u8 sub_02097004 (Pokemon * param0, u32 param1, u32 param2)
+static u8 IncreaseMovePPUps (Pokemon * param0, u32 param1, u32 param2)
 {
     u16 v0;
     u8 v1;
@@ -623,7 +623,7 @@ static u8 sub_02097004 (Pokemon * param0, u32 param1, u32 param2)
     return 1;
 }
 
-static void sub_020970AC (Pokemon * param0, u32 param1, u32 param2, u32 param3)
+static void RestorePokemonHP (Pokemon * mon, u32 param1, u32 param2, u32 param3)
 {
     if (param2 == 1) {
         param3 = 1;
@@ -641,10 +641,10 @@ static void sub_020970AC (Pokemon * param0, u32 param1, u32 param2, u32 param3)
         param1 += param3;
     }
 
-    Pokemon_SetValue(param0, 163, &param1);
+    Pokemon_SetValue(mon, 163, &param1);
 }
 
-static s32 sub_020970EC (s32 param0, s32 param1, s32 param2)
+static s32 CalculateEVUpdate (s32 param0, s32 param1, s32 param2)
 {
     if ((param0 == 0) && (param2 < 0)) {
         return -1;
@@ -673,7 +673,7 @@ static s32 sub_020970EC (s32 param0, s32 param1, s32 param2)
     return param0;
 }
 
-static u8 sub_02097144 (Pokemon * param0, ItemData * param1)
+static u8 CheckFriendshipItemEffect (Pokemon * param0, ItemData * param1)
 {
     s32 v0;
     s32 v1;
@@ -713,7 +713,7 @@ static u8 sub_02097144 (Pokemon * param0, ItemData * param1)
     return 0;
 }
 
-static u8 sub_020971D0 (Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4)
+static u8 UpdatePokemonFriendship (Pokemon * param0, s32 param1, s32 param2, u16 param3, u32 param4)
 {
     if ((param1 == 255) && (param2 > 0)) {
         return 0;
@@ -751,7 +751,7 @@ static u8 sub_020971D0 (Pokemon * param0, s32 param1, s32 param2, u16 param3, u3
     return 1;
 }
 
-void HealParty (Party * party) 
+void HealAllPokemonInParty (Party * party) 
 {
     int i, j, monCount;
     u32 tmp;
@@ -782,8 +782,8 @@ void HealParty (Party * party)
         // loop through mon's moves
         for (j = 0; j < 4; j++) {
             // check if move is at max pp
-            if (sub_02096F34(mon, j) == 1) {
-                SetMonPP(mon, j, 127); // set
+            if (CheckMovePPAvailability(mon, j) == 1) {
+                UpdatePokemonMovePP(mon, j, 127); // set
             }
         }
     }

From 6cabe0085657b695cc06171f6bb23367c127db86 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 15:23:18 -0500
Subject: [PATCH 07/12] add struct names

---
 build.sh                                      |   1 +
 include/functypes/funcptr_0207E634.h          |   2 +-
 include/functypes/funcptr_0207F248.h          |   2 +-
 include/functypes/struct_0207F248_1.h         |   2 +-
 include/overlay005/ov5_021D2F14.h             |   2 +-
 include/overlay005/ov5_021DDBE8.h             |   4 +-
 include/overlay005/struct_ov5_021D30A8.h      |   2 +-
 include/overlay005/struct_ov5_021DE47C.h      |   2 +-
 include/overlay006/battle_params.h            |   2 +-
 include/overlay006/struct_ov6_02246254.h      |   2 +-
 include/overlay007/struct_ov7_0224D008.h      |  10 +-
 include/overlay012/funcptr_ov12_02239E64_1.h  |   2 +-
 include/overlay012/funcptr_ov12_02239E68.h    |   2 +-
 include/overlay012/ov12_0221FC20.h            |   6 +-
 include/overlay012/ov12_022269C0.h            |   2 +-
 include/overlay012/ov12_02226B84.h            |  10 +-
 include/overlay012/ov12_0222AC70.h            |   6 +-
 include/overlay012/ov12_0222D6B0.h            |  10 +-
 include/overlay012/ov12_0222E91C.h            |   2 +-
 include/overlay012/ov12_0222F700.h            |  28 +-
 include/overlay012/ov12_022346A4.h            |   8 +-
 .../overlay012/struct_ov12_02223764_sub1.h    |   4 +-
 include/overlay012/struct_ov12_0223595C.h     |   6 +-
 include/overlay012/struct_ov12_02237728.h     |   2 +-
 include/overlay013/ov13_02228A38.h            |   2 +-
 include/overlay013/struct_ov13_022213F0.h     |   2 +-
 include/overlay013/struct_ov13_02227244.h     |   2 +-
 include/overlay016/ov16_0223DF00.h            |   6 +-
 include/overlay016/ov16_02266F1C.h            |   4 +-
 include/overlay016/ov16_0226D094.h            |   6 +-
 include/overlay016/ov16_0226DB7C.h            |   6 +-
 include/overlay016/ov16_0226DE44.h            |   6 +-
 include/overlay016/struct_ov16_02264408.h     |   2 +-
 include/overlay017/ov17_0223F118.h            |  12 +-
 include/overlay017/ov17_02241270.h            |  12 +-
 include/overlay017/ov17_022413D8.h            |  16 +-
 include/overlay017/ov17_022476F8.h            |   4 +-
 include/overlay017/ov17_0224A0FC.h            |  48 +--
 include/overlay017/ov17_0224F080.h            |  10 +-
 include/overlay017/ov17_02252AB0.h            |   6 +-
 include/overlay017/struct_ov17_0223F88C.h     |   4 +-
 include/overlay017/struct_ov17_02246F24.h     |   2 +-
 include/overlay017/struct_ov17_022476F8.h     |   4 +-
 include/overlay017/struct_ov17_02247A48.h     |   2 +-
 include/overlay017/struct_ov17_0224A1EC.h     |   4 +-
 include/overlay017/struct_ov17_0224DF54.h     |   2 +-
 include/overlay017/struct_ov17_0224FCA0.h     |   2 +-
 include/overlay017/struct_ov17_022507C4.h     |   4 +-
 include/overlay019/ov19_021D61B0.h            |   4 +-
 include/overlay019/ov19_021D79F8.h            |   2 +-
 include/overlay019/ov19_021D8B54.h            |   2 +-
 include/overlay019/ov19_021DA270.h            |   2 +-
 include/overlay019/ov19_021DA814.h            |   2 +-
 include/overlay019/ov19_021DA92C.h            |   2 +-
 include/overlay019/ov19_021DB2FC.h            |   2 +-
 include/overlay019/ov19_021DB8E4.h            |   2 +-
 include/overlay019/ov19_021DC5F0.h            |   2 +-
 include/overlay019/ov19_021DCF88.h            |   2 +-
 include/overlay019/ov19_021DE3E8.h            |   2 +-
 include/overlay019/ov19_021DEC04.h            |   2 +-
 include/overlay019/struct_ov19_021D8E00.h     |  10 +-
 include/overlay019/struct_ov19_021DA384.h     |   2 +-
 include/overlay019/struct_ov19_021DA8D8.h     |   6 +-
 include/overlay019/struct_ov19_021DA9E0.h     |   6 +-
 include/overlay019/struct_ov19_021DBA9C.h     |   6 +-
 include/overlay019/struct_ov19_021DC680.h     |   2 +-
 include/overlay019/struct_ov19_021DCD18.h     |   2 +-
 include/overlay020/ov20_021D2098.h            |   4 +-
 include/overlay021/ov21_021D0D80.h            |   6 +-
 include/overlay021/ov21_021D1FA4.h            |   6 +-
 include/overlay021/ov21_021D57B4.h            |   4 +-
 include/overlay021/struct_ov21_021D13FC.h     |   2 +-
 include/overlay021/struct_ov21_021D1FA4.h     |   2 +-
 include/overlay021/struct_ov21_021D22F8.h     |   4 +-
 include/overlay021/struct_ov21_021D2584.h     |   2 +-
 include/overlay021/struct_ov21_021D4CB8.h     |   2 +-
 include/overlay022/ov22_02255094.h            |   2 +-
 include/overlay022/struct_ov22_02256BAC.h     |   4 +-
 include/overlay022/struct_ov22_02259C58.h     |   2 +-
 include/overlay022/struct_ov22_0225A0E4.h     |   2 +-
 include/overlay022/struct_ov22_0225A428.h     |   2 +-
 include/overlay022/struct_ov22_0225A914.h     |   2 +-
 include/overlay022/struct_ov22_0225AB54.h     |   2 +-
 include/overlay022/struct_ov22_0225AE9C.h     |   2 +-
 include/overlay023/struct_ov23_02248D20.h     |   2 +-
 include/overlay023/struct_ov23_02250CD4.h     |  10 +-
 include/overlay062/ov62_02246B00.h            |   2 +-
 include/overlay062/struct_ov62_0223118C.h     |   6 +-
 include/overlay062/struct_ov62_02246B00.h     |   2 +-
 .../overlay062/struct_ov62_02246BF4_sub2.h    |   4 +-
 include/overlay063/ov63_0222AE60.h            |   4 +-
 include/overlay063/ov63_0222CCE4.h            |   4 +-
 include/overlay065/struct_ov65_0222EBE0_t.h   |   8 +-
 include/overlay065/struct_ov65_02234E50.h     |   2 +-
 include/overlay065/struct_ov65_022358CC.h     |   2 +-
 .../overlay065/struct_ov65_022358CC_sub1.h    |   4 +-
 include/overlay070/ov70_0225D9A4.h            |   2 +-
 include/overlay071/struct_ov71_0223D238.h     |   4 +-
 include/overlay072/struct_ov72_0223DB98_t.h   |  10 +-
 include/overlay076/ov76_0223B870.h            |   4 +-
 include/overlay076/struct_ov76_0223C398.h     |  10 +-
 include/overlay077/ov77_021D6670.h            |   2 +-
 include/overlay079/struct_ov79_021D0E1C.h     |  16 +-
 include/overlay080/ov80_021D2AF4.h            |   2 +-
 include/overlay080/struct_ov80_021D2A08.h     |   4 +-
 include/overlay080/struct_ov80_021D2C5C.h     |   2 +-
 include/overlay082/struct_ov82_0223B164.h     |   2 +-
 include/overlay083/ov83_0223D6A8.h            |   2 +-
 include/overlay083/struct_ov83_0223D784.h     |   2 +-
 include/overlay083/struct_ov83_0223D9A8.h     |   2 +-
 include/overlay083/struct_ov83_0223DB30.h     |   4 +-
 include/overlay083/struct_ov83_0223E244.h     |   2 +-
 include/overlay083/struct_ov83_0223E5C0.h     |   2 +-
 include/overlay083/struct_ov83_0223F054.h     |   2 +-
 include/overlay083/struct_ov83_0223F410.h     |   2 +-
 include/overlay083/struct_ov83_0223F670.h     |   2 +-
 include/overlay084/struct_ov84_0223B5A0.h     |  12 +-
 include/overlay084/struct_ov84_02240FA8.h     |   2 +-
 include/overlay088/ov88_0223E9C4.h            |   6 +-
 include/overlay088/struct_ov88_0223C370.h     |   2 +-
 include/overlay094/ov94_0223BCB0.h            |   4 +-
 include/overlay094/ov94_022414B8.h            |  10 +-
 include/overlay094/struct_ov94_0223FD4C.h     |  24 +-
 include/overlay095/ov95_02246C20.h            |   2 +-
 include/overlay096/ov96_0223B6A0.h            |   2 +-
 include/overlay096/struct_ov96_0223BF40_t.h   |   6 +-
 include/overlay097/ov97_02237694.h            |   2 +-
 include/overlay097/struct_ov97_0222D04C.h     |   8 +-
 include/overlay097/struct_ov97_02237AEC.h     |   2 +-
 include/overlay098/struct_ov98_02246E88.h     |   2 +-
 include/overlay099/struct_ov99_021D2CB0.h     |   6 +-
 include/overlay100/struct_ov100_021D46C8.h    |   6 +-
 include/overlay101/ov101_021D7E48.h           |   4 +-
 include/overlay101/struct_ov101_021D8544.h    |   2 +-
 include/overlay104/ov104_0222DCE0.h           |   4 +-
 include/overlay104/ov104_0223D768.h           |   6 +-
 include/overlay104/struct_ov104_02230BE4.h    |   2 +-
 include/overlay104/struct_ov104_022320B4_t.h  |   2 +-
 include/overlay104/struct_ov104_0223C4CC.h    |   6 +-
 include/overlay105/ov105_02245AAC.h           |   2 +-
 include/overlay105/struct_ov105_02245AAC.h    |   2 +-
 include/overlay106/ov106_02243310.h           |   2 +-
 include/overlay106/struct_ov106_02243310.h    |   2 +-
 include/overlay107/ov107_02249604.h           |   2 +-
 include/overlay107/struct_ov107_02249954.h    |   2 +-
 include/overlay108/ov108_02243030.h           |   2 +-
 include/overlay108/struct_ov108_02243030.h    |   2 +-
 include/overlay109/struct_ov109_021D5140.h    |   8 +-
 include/overlay111/ov111_021D2F80.h           |   2 +-
 include/overlay111/struct_ov111_021D2F80.h    |   2 +-
 include/overlay114/ov114_0225C700.h           |   2 +-
 include/overlay115/struct_ov115_02261520.h    |   2 +-
 include/overlay116/struct_ov116_022649E4.h    |   6 +-
 include/overlay117/ov117_02263AF0.h           |   2 +-
 include/overlay117/struct_ov117_02261280.h    |   6 +-
 include/overlay118/ov118_021D0D80.h           |   4 +-
 .../overlay118/struct_ov118_021D0FDC_decl.h   |   2 +-
 include/overlay119/ov119_021D0D80.h           |   2 +-
 include/overlay119/struct_ov119_021D17B8.h    |  10 +-
 include/pokemon.h                             |   2 +-
 include/struct_decls/struct_02001AF4_decl.h   |   2 +-
 include/struct_decls/struct_0200C6E4_decl.h   |   2 +-
 include/struct_decls/struct_0200C704_decl.h   |   2 +-
 include/struct_decls/struct_02013A04_decl.h   |   2 +-
 include/struct_decls/struct_020218BC_decl.h   |   2 +-
 include/struct_decls/struct_02022550_decl.h   |   2 +-
 include/struct_defs/battle_system.h           |   8 +-
 include/struct_defs/funcptr_0207F248_sub1.h   |   6 +-
 include/struct_defs/struct_0200D0F4.h         |   2 +-
 include/struct_defs/struct_020127E8.h         |   4 +-
 include/struct_defs/struct_02013A04_t.h       |   2 +-
 include/struct_defs/struct_020279FC.h         |   2 +-
 include/struct_defs/struct_0202F298.h         |   2 +-
 include/struct_defs/struct_0203D9B8.h         |   2 +-
 include/struct_defs/struct_0203DA00.h         |   2 +-
 include/struct_defs/struct_0203DDFC.h         |   2 +-
 include/struct_defs/struct_0203DE34.h         |   2 +-
 include/struct_defs/struct_0203E0FC.h         |   2 +-
 include/struct_defs/struct_0203E2FC.h         |   2 +-
 include/struct_defs/struct_020425E0.h         |   2 +-
 include/struct_defs/struct_0206BC70.h         |   2 +-
 include/struct_defs/struct_020708E0.h         |   4 +-
 include/struct_defs/struct_0207AE68_t.h       |   4 +-
 include/struct_defs/struct_0207C690.h         |   2 +-
 include/struct_defs/struct_0207F248.h         |  28 +-
 include/struct_defs/struct_02081CF4.h         |   2 +-
 include/struct_defs/struct_020831B4.h         |   4 +-
 include/struct_defs/struct_02083D1C.h         |   2 +-
 include/struct_defs/struct_0208737C.h         |   2 +-
 include/struct_defs/struct_02089438.h         |   2 +-
 include/struct_defs/struct_02089688_sub1.h    |   4 +-
 include/struct_defs/struct_0208B878_sub1.h    |   4 +-
 include/struct_defs/struct_0208D7BC.h         |   6 +-
 include/struct_defs/struct_02093800.h         |   2 +-
 include/struct_defs/struct_02093BBC.h         |   2 +-
 include/struct_defs/struct_02095C48.h         |   2 +-
 include/struct_defs/struct_02095E80_t.h       |  22 +-
 include/struct_defs/struct_02095EAC_t.h       |   8 +-
 include/struct_defs/struct_020961E8_t.h       |   8 +-
 include/struct_defs/struct_020978D8.h         |   2 +-
 include/struct_defs/struct_02097F18.h         |   2 +-
 include/struct_defs/struct_020985E4.h         |   2 +-
 include/struct_defs/struct_02098C44.h         |   4 +-
 include/struct_defs/struct_02098D38.h         |   2 +-
 include/struct_defs/struct_0209903C.h         |   2 +-
 include/struct_defs/struct_020997B8.h         |   2 +-
 include/struct_defs/struct_0209BBA4.h         |   2 +-
 include/struct_defs/struct_0209C194_1.h       |   2 +-
 include/struct_defs/struct_020F1DB8.h         |   2 +-
 include/unk_0200112C.h                        |   2 +-
 include/unk_02001AF4.h                        |  28 +-
 include/unk_02003B60.h                        |   2 +-
 include/unk_020093B4.h                        |   2 +-
 include/unk_0200C6E4.h                        | 138 ++++----
 include/unk_02012744.h                        |   2 +-
 include/unk_02013A04.h                        |  12 +-
 include/unk_0201E010.h                        |   6 +-
 include/unk_020218BC.h                        | 104 +++---
 include/unk_02024220.h                        |   4 +-
 include/unk_02025E08.h                        |   2 +-
 include/unk_020279FC.h                        |  32 +-
 include/unk_0203D1B8.h                        |   2 +-
 include/unk_0205D8CC.h                        |   4 +-
 include/unk_0207AE68.h                        |   2 +-
 include/unk_0207C63C.h                        |   2 +-
 include/unk_0207C908.h                        |  20 +-
 include/unk_0207E0B8.h                        |  22 +-
 include/unk_020819DC.h                        |  58 ++--
 include/unk_02082C2C.h                        |  32 +-
 include/unk_02083370.h                        |  22 +-
 include/unk_02084B70.h                        |  20 +-
 include/unk_0208694C.h                        |   2 +-
 include/unk_020890F4.h                        |   6 +-
 include/unk_0208B284.h                        |   2 +-
 src/overlay005/ov5_021D2F14.c                 |   4 +-
 src/overlay005/ov5_021D5EB8.c                 |  10 +-
 src/overlay005/ov5_021DC018.c                 |   6 +-
 src/overlay005/ov5_021DDBE8.c                 |  10 +-
 src/overlay005/ov5_021E2338.c                 |  26 +-
 src/overlay005/ov5_021EA874.c                 |   4 +-
 src/overlay005/ov5_021F6454.c                 |   2 +-
 src/overlay005/ov5_021F77A8.c                 |   2 +-
 src/overlay006/ov6_022426AC.c                 |   4 +-
 src/overlay006/ov6_02243258.c                 | 102 +++---
 src/overlay007/ov7_02249960.c                 |   4 +-
 src/overlay007/ov7_0224B4E8.c                 |   4 +-
 src/overlay007/ov7_0224BE9C.c                 |  14 +-
 src/overlay009/ov9_02249960.c                 |  10 +-
 src/overlay010/ov10_0221F800.c                |   8 +-
 src/overlay012/ov12_0221FC20.c                |  14 +-
 src/overlay012/ov12_022269C0.c                |   8 +-
 src/overlay012/ov12_02226B84.c                |  20 +-
 src/overlay012/ov12_0222AC70.c                |  24 +-
 src/overlay012/ov12_0222D6B0.c                |  26 +-
 src/overlay012/ov12_0222E91C.c                |   2 +-
 src/overlay012/ov12_0222F700.c                |  98 +++---
 src/overlay012/ov12_022346A4.c                |  18 +-
 src/overlay012/ov12_02235E94.c                |   2 +-
 src/overlay013/ov13_02224500.c                |  40 +--
 src/overlay013/ov13_02227BDC.c                |  22 +-
 src/overlay013/ov13_02228A38.c                |   6 +-
 src/overlay016/battle_script.c                |   6 +-
 src/overlay016/ov16_0223B140.c                |  10 +-
 src/overlay016/ov16_0223DF00.c                |  12 +-
 src/overlay016/ov16_0225BFFC.c                |   6 +-
 src/overlay016/ov16_0225CBB8.c                |  10 +-
 src/overlay016/ov16_02266F1C.c                |  22 +-
 src/overlay016/ov16_02268520.c                |  10 +-
 src/overlay016/ov16_0226871C.c                |  48 +--
 src/overlay016/ov16_0226D094.c                |  14 +-
 src/overlay016/ov16_0226DB7C.c                |  12 +-
 src/overlay016/ov16_0226DE44.c                |  12 +-
 src/overlay017/ov17_0223F118.c                |  14 +-
 src/overlay017/ov17_0223F7E4.c                |  14 +-
 src/overlay017/ov17_02241270.c                |  12 +-
 src/overlay017/ov17_022413D8.c                |  32 +-
 src/overlay017/ov17_022476F8.c                |   4 +-
 src/overlay017/ov17_022492DC.c                |   8 +-
 src/overlay017/ov17_0224A0FC.c                |  50 +--
 src/overlay017/ov17_0224F080.c                |  10 +-
 src/overlay017/ov17_02252AB0.c                |  12 +-
 src/overlay019/ov19_021D0D80.c                |   2 +-
 src/overlay019/ov19_021D61B0.c                |   8 +-
 src/overlay019/ov19_021D79F8.c                |   2 +-
 src/overlay019/ov19_021D8B54.c                |  14 +-
 src/overlay019/ov19_021DA270.c                |   2 +-
 src/overlay019/ov19_021DA814.c                |   2 +-
 src/overlay019/ov19_021DA92C.c                |   2 +-
 src/overlay019/ov19_021DB2FC.c                |   2 +-
 src/overlay019/ov19_021DB8E4.c                |   2 +-
 src/overlay019/ov19_021DC5F0.c                |   2 +-
 src/overlay019/ov19_021DCF88.c                |  22 +-
 src/overlay019/ov19_021DE3E8.c                |   8 +-
 src/overlay019/ov19_021DEC04.c                |  14 +-
 src/overlay020/ov20_021D2098.c                |   8 +-
 src/overlay020/ov20_021D2EA4.c                |   6 +-
 src/overlay020/ov20_021D3864.c                |   2 +-
 src/overlay020/ov20_021D3A54.c                |   2 +-
 src/overlay020/ov20_021D40E8.c                |   6 +-
 src/overlay020/ov20_021D4728.c                |  12 +-
 src/overlay021/ov21_021D0D80.c                |  10 +-
 src/overlay021/ov21_021D1FA4.c                |   6 +-
 src/overlay021/ov21_021D4C0C.c                |   2 +-
 src/overlay021/ov21_021D57B4.c                |   4 +-
 src/overlay021/ov21_021D5AEC.c                |  12 +-
 src/overlay021/ov21_021D76B0.c                |  12 +-
 src/overlay021/ov21_021D85B0.c                |   4 +-
 src/overlay021/ov21_021D94BC.c                |   6 +-
 src/overlay021/ov21_021DC9BC.c                |   4 +-
 src/overlay021/ov21_021DDD2C.c                |   2 +-
 src/overlay021/ov21_021DE668.c                |   4 +-
 src/overlay021/ov21_021DF734.c                |   4 +-
 src/overlay021/ov21_021E0C68.c                |   2 +-
 src/overlay021/ov21_021E1924.c                |  16 +-
 src/overlay021/ov21_021E29DC.c                |   2 +-
 src/overlay021/ov21_021E3FFC.c                |   8 +-
 src/overlay021/ov21_021E4CA4.c                |  20 +-
 src/overlay021/ov21_021E6014.c                |  10 +-
 src/overlay021/ov21_021E68F4.c                |  12 +-
 src/overlay021/ov21_021E737C.c                |  30 +-
 src/overlay021/ov21_021E8484.c                |  12 +-
 src/overlay021/ov21_021E8D48.c                |  20 +-
 src/overlay022/ov22_02255094.c                |   2 +-
 src/overlay022/ov22_02255D44.c                |  10 +-
 src/overlay022/ov22_0225A428.c                |  12 +-
 src/overlay022/ov22_0225B660.c                |   2 +-
 src/overlay023/ov23_0223E140.c                |   6 +-
 src/overlay023/ov23_0224340C.c                |   6 +-
 src/overlay023/ov23_02248C08.c                |   4 +-
 src/overlay023/ov23_02248F1C.c                |  14 +-
 src/overlay023/ov23_0224B05C.c                |   8 +-
 src/overlay023/ov23_0224DC40.c                |   8 +-
 src/overlay023/ov23_0224F294.c                |  12 +-
 src/overlay023/ov23_0225128C.c                |   2 +-
 src/overlay023/ov23_02253598.c                |   2 +-
 src/overlay023/ov23_022542CC.c                |   4 +-
 src/overlay056/ov56_022561C0.c                |   8 +-
 src/overlay058/ov58_021D0D80.c                |  12 +-
 src/overlay061/ov61_0222BF44.c                |   8 +-
 src/overlay062/ov62_022300D8.c                |  40 +--
 src/overlay062/ov62_02231690.c                |  28 +-
 src/overlay062/ov62_02236CBC.c                |  16 +-
 src/overlay062/ov62_02239D60.c                |   4 +-
 src/overlay062/ov62_02246B00.c                |  14 +-
 src/overlay063/ov63_0222AE60.c                |  10 +-
 src/overlay063/ov63_0222CCE4.c                |   4 +-
 src/overlay064/ov64_0222DCE0.c                |  12 +-
 src/overlay065/ov65_0223648C.c                |   4 +-
 src/overlay067/ov67_0225C700.c                |   4 +-
 src/overlay068/ov68_0225C700.c                |  14 +-
 src/overlay069/ov69_0225C700.c                |  20 +-
 src/overlay070/ov70_0225D9A4.c                |  26 +-
 src/overlay072/ov72_0223D7A0.c                |  10 +-
 src/overlay073/ov73_021D0D80.c                |   4 +-
 src/overlay074/ov74_021D0D80.c                |  12 +-
 src/overlay075/ov75_021D0D80.c                |   6 +-
 src/overlay076/ov76_0223B140.c                |   8 +-
 src/overlay076/ov76_0223B870.c                |  28 +-
 src/overlay077/ov77_021D0D80.c                |   2 +-
 src/overlay077/ov77_021D25B0.c                |   2 +-
 src/overlay077/ov77_021D54B0.c                |   8 +-
 src/overlay077/ov77_021D6670.c                |   6 +-
 src/overlay078/ov78_021D0D80.c                |   6 +-
 src/overlay079/ov79_021D2268.c                |   4 +-
 src/overlay080/ov80_021D1458.c                |   8 +-
 src/overlay080/ov80_021D2AF4.c                |   2 +-
 src/overlay083/ov83_0223D6A8.c                |   4 +-
 src/overlay086/ov86_0223B140.c                |  14 +-
 src/overlay087/ov87_021D106C.c                |   4 +-
 src/overlay088/ov88_0223B140.c                |  20 +-
 src/overlay088/ov88_0223E9C4.c                |   6 +-
 src/overlay090/ov90_021D0D80.c                |   8 +-
 src/overlay091/ov91_021D0D80.c                |  18 +-
 src/overlay092/ov92_021D0D80.c                |   6 +-
 src/overlay094/ov94_0223BCB0.c                |   4 +-
 src/overlay094/ov94_0223FB48.c                |  14 +-
 src/overlay094/ov94_022414B8.c                |  14 +-
 src/overlay094/ov94_02243EF8.c                |   4 +-
 src/overlay095/ov95_02246C20.c                |   6 +-
 src/overlay095/ov95_02247B6C.c                |   2 +-
 src/overlay095/ov95_02248590.c                |   2 +-
 src/overlay095/ov95_02249740.c                |   2 +-
 src/overlay095/ov95_0224A390.c                |   2 +-
 src/overlay095/ov95_0224B3D8.c                |   2 +-
 src/overlay096/ov96_0223B6A0.c                |   2 +-
 src/overlay097/ov97_0222AE60.c                |   2 +-
 src/overlay097/ov97_0222C174.c                |   4 +-
 src/overlay097/ov97_0222D30C.c                |   6 +-
 src/overlay097/ov97_02230410.c                |  10 +-
 src/overlay097/ov97_02233B18.c                |  28 +-
 src/overlay097/ov97_02237694.c                |   6 +-
 src/overlay098/ov98_022471C8.c                |  10 +-
 src/overlay099/ov99_021D0D80.c                |  10 +-
 src/overlay100/ov100_021D13E4.c               |   8 +-
 src/overlay100/ov100_021D1C44.c               |   8 +-
 src/overlay100/ov100_021D2F0C.c               |   8 +-
 src/overlay101/ov101_021D59AC.c               |   2 +-
 src/overlay101/ov101_021D7E48.c               |   8 +-
 src/overlay104/ov104_0222DCE0.c               |   8 +-
 src/overlay104/ov104_0222FBE4.c               |   2 +-
 src/overlay104/ov104_02231F74.c               |  10 +-
 src/overlay104/ov104_02237378.c               |  14 +-
 src/overlay104/ov104_02239C58.c               |   4 +-
 src/overlay104/ov104_0223C2D4.c               |  10 +-
 src/overlay104/ov104_0223D768.c               |   6 +-
 src/overlay104/ov104_0223DC7C.c               |  10 +-
 src/overlay105/ov105_02241AE0.c               |   8 +-
 src/overlay105/ov105_02245AAC.c               |   6 +-
 src/overlay105/ov105_02245DC4.c               |   2 +-
 src/overlay105/ov105_02245E54.c               |   2 +-
 src/overlay105/ov105_02245FB8.c               |   2 +-
 src/overlay106/ov106_02241AE0.c               |   6 +-
 src/overlay106/ov106_02243310.c               |   6 +-
 src/overlay106/ov106_022435FC.c               |   2 +-
 src/overlay107/ov107_02241AE0.c               |   8 +-
 src/overlay107/ov107_02245EB0.c               |   8 +-
 src/overlay107/ov107_02249604.c               |   6 +-
 src/overlay107/ov107_02249B1C.c               |   2 +-
 src/overlay108/ov108_02241AE0.c               |   6 +-
 src/overlay108/ov108_02243030.c               |   6 +-
 src/overlay108/ov108_0224351C.c               |   2 +-
 src/overlay109/ov109_021D0D80.c               |   8 +-
 src/overlay110/ov110_021D0D80.c               |   2 +-
 src/overlay111/ov111_021D0D80.c               |   2 +-
 src/overlay111/ov111_021D2F80.c               |   6 +-
 src/overlay111/ov111_021D33F4.c               |   2 +-
 src/overlay112/ov112_0225C700.c               |   2 +-
 src/overlay113/ov113_0225C700.c               |  18 +-
 src/overlay114/ov114_0225C700.c               |  24 +-
 src/overlay115/ov115_02260CEC.c               |  16 +-
 src/overlay116/ov116_02261870.c               |  32 +-
 src/overlay117/ov117_02260668.c               |  10 +-
 src/overlay117/ov117_02263AF0.c               |   2 +-
 src/overlay118/ov118_021D0D80.c               |  40 +--
 src/overlay119/ov119_021D0D80.c               |  10 +-
 src/overlay121/ov121_021D0D80.c               |  12 +-
 src/pokemon.c                                 |   2 +-
 src/unk_0200112C.c                            |   2 +-
 src/unk_02001AF4.c                            |  66 ++--
 src/unk_02003B60.c                            |   4 +-
 src/unk_020093B4.c                            |   2 +-
 src/unk_0200C6E4.c                            | 168 ++++-----
 src/unk_02012744.c                            |  12 +-
 src/unk_02013A04.c                            |  22 +-
 src/unk_0201C970.c                            |   2 +-
 src/unk_0201E010.c                            |   6 +-
 src/unk_020218BC.c                            | 314 ++++++++---------
 src/unk_02024220.c                            |   6 +-
 src/unk_02025E08.c                            |   4 +-
 src/unk_020279FC.c                            |  42 +--
 src/unk_0203A9C8.c                            |  42 +--
 src/unk_0203D1B8.c                            |  40 +--
 src/unk_0203E880.c                            |   2 +-
 src/unk_0203F6C4.c                            |  14 +-
 src/unk_02049D08.c                            |   2 +-
 src/unk_0204F13C.c                            |   6 +-
 src/unk_0204FAB4.c                            |   6 +-
 src/unk_0205003C.c                            |   6 +-
 src/unk_02051D8C.c                            |   8 +-
 src/unk_02052C6C.c                            |   2 +-
 src/unk_020530C8.c                            |   2 +-
 src/unk_0205A0D8.c                            |   6 +-
 src/unk_0205CA94.c                            |  14 +-
 src/unk_0205D8CC.c                            |   4 +-
 src/unk_020683F4.c                            |  22 +-
 src/unk_0206B9D8.c                            |   6 +-
 src/unk_0206F314.c                            |   4 +-
 src/unk_020722AC.c                            |  16 +-
 src/unk_0207AE68.c                            |   4 +-
 src/unk_0207C63C.c                            |   6 +-
 src/unk_0207C908.c                            |  20 +-
 src/unk_0207E0B8.c                            | 326 +++++++++---------
 src/unk_020819DC.c                            |  80 ++---
 src/unk_02082C2C.c                            |  48 +--
 src/unk_02083370.c                            | 188 +++++-----
 src/unk_02084B70.c                            |  70 ++--
 src/unk_0208694C.c                            |  30 +-
 src/unk_020890F4.c                            |   6 +-
 src/unk_0208A3F4.c                            |  12 +-
 src/unk_0208B284.c                            |  16 +-
 src/unk_0208EA44.c                            |   6 +-
 src/unk_02097B18.c                            |  10 +-
 src/unk_020989DC.c                            |  10 +-
 src/unk_02099DFC.c                            |   2 +-
 src/unk_0209A2C4.c                            |   2 +-
 src/unk_0209C194.c                            |   2 +-
 486 files changed, 2617 insertions(+), 2616 deletions(-)

diff --git a/build.sh b/build.sh
index 7906ccd9bc..d8b399b8d0 100755
--- a/build.sh
+++ b/build.sh
@@ -9,4 +9,5 @@ fi
 # Set up env variable to show % of completion during ninja build
 export NINJA_STATUS="[%p %f/%t] "
 
+# Build the project
 ninja -C build "$target" "$@"
diff --git a/include/functypes/funcptr_0207E634.h b/include/functypes/funcptr_0207E634.h
index bc865c4c1b..50976fccf6 100644
--- a/include/functypes/funcptr_0207E634.h
+++ b/include/functypes/funcptr_0207E634.h
@@ -3,6 +3,6 @@
 
 #include "struct_defs/struct_0207F248.h"
 
-typedef void (* UnkFuncPtr_0207E634)(UnkStruct_0207F248 *, int *);
+typedef void (* UnkFuncPtr_0207E634)(GameWindowLayout *, int *);
 
 #endif // POKEPLATINUM_FUNCPTR_0207E634_H
diff --git a/include/functypes/funcptr_0207F248.h b/include/functypes/funcptr_0207F248.h
index 0639fbea97..b314df85ec 100644
--- a/include/functypes/funcptr_0207F248.h
+++ b/include/functypes/funcptr_0207F248.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_FUNCPTR_0207F248_H
 #define POKEPLATINUM_FUNCPTR_0207F248_H
 
-typedef int (* UnkFuncPtr_0207F248)(void *);
+typedef int (* GenericFunctionPtr)(void *);
 
 #endif // POKEPLATINUM_FUNCPTR_0207F248_H
diff --git a/include/functypes/struct_0207F248_1.h b/include/functypes/struct_0207F248_1.h
index 82ee5381e1..32015e768c 100644
--- a/include/functypes/struct_0207F248_1.h
+++ b/include/functypes/struct_0207F248_1.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0207F248_1_H
 #define POKEPLATINUM_STRUCT_0207F248_1_H
 
-typedef int (* UnkStruct_0207F248_1)(void *);
+typedef int (* GameWindowLayout_1)(void *);
 
 #endif // POKEPLATINUM_STRUCT_0207F248_1_H
diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h
index 77d06bfefa..02ac50abaf 100644
--- a/include/overlay005/ov5_021D2F14.h
+++ b/include/overlay005/ov5_021D2F14.h
@@ -12,7 +12,7 @@
 
 void ov5_021D2F14(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F2EC * param1, u32 param2, u32 param3);
 void ov5_021D30A8(UnkStruct_ov5_021D30A8 * param0);
-UnkStruct_02022550 * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
+GraphicElementData * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
 void ov5_021D3190(UnkStruct_ov5_021D30A8 * param0, UnkStruct_ov104_02241308 * param1, u32 param2, u32 param3);
 void ov5_021D3270(UnkStruct_ov5_021D30A8 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
 void ov5_021D32E8(UnkStruct_ov5_021D30A8 * param0, NARC * param1, int param2, int param3, int param4, int param5, int param6);
diff --git a/include/overlay005/ov5_021DDBE8.h b/include/overlay005/ov5_021DDBE8.h
index e90f602b85..7f880769b0 100644
--- a/include/overlay005/ov5_021DDBE8.h
+++ b/include/overlay005/ov5_021DDBE8.h
@@ -51,8 +51,8 @@ void ov5_021DE47C(UnkStruct_ov5_021DE47C * param0, int param1, int param2);
 void ov5_021DE4AC(UnkStruct_ov5_021DE47C * param0);
 void ov5_021DE4CC(NARC * param0, UnkStruct_ov5_021DE47C * param1, UnkStruct_ov5_021DE5A4 * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov5_021DE5A4(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1);
-void ov5_021DE5D0(UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param3, u16 param4);
-UnkStruct_02022550 * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
+void ov5_021DE5D0(GraphicElementData * param0, u32 param1, u32 param2, u8 param3, u16 param4);
+GraphicElementData * ov5_021DE62C(UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5);
 VecFx32 ov5_021DE660(fx32 param0, fx32 param1, fx32 param2);
 UnkStruct_ov5_021DE6BC * ov5_021DE6A4(u32 param0);
 void ov5_021DE6BC(UnkStruct_ov5_021DE6BC * param0);
diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h
index 6219959f5a..e71f7fc94f 100644
--- a/include/overlay005/struct_ov5_021D30A8.h
+++ b/include/overlay005/struct_ov5_021D30A8.h
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009508 * unk_190;
     UnkStruct_02009714 * unk_194[6];
diff --git a/include/overlay005/struct_ov5_021DE47C.h b/include/overlay005/struct_ov5_021DE47C.h
index c6cb864176..7832ecf8d9 100644
--- a/include/overlay005/struct_ov5_021DE47C.h
+++ b/include/overlay005/struct_ov5_021DE47C.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
 } UnkStruct_ov5_021DE47C;
diff --git a/include/overlay006/battle_params.h b/include/overlay006/battle_params.h
index 311ccd1ba9..bd104f67d2 100644
--- a/include/overlay006/battle_params.h
+++ b/include/overlay006/battle_params.h
@@ -34,7 +34,7 @@ typedef struct {
     ChatotCry * unk_F0[4];
     UnkStruct_02056B24 * unk_100;
     UnkStruct_0202C878 * unk_104;
-    UnkStruct_020279FC * unk_108;
+    AnimationControlFlags * unk_108;
     UnkStruct_0206D140 * unk_10C;
     BattleParams_sub1 unk_110;
     UnkStruct_0202CD88 * unk_11C;
diff --git a/include/overlay006/struct_ov6_02246254.h b/include/overlay006/struct_ov6_02246254.h
index f38541bd25..82df7abc34 100644
--- a/include/overlay006/struct_ov6_02246254.h
+++ b/include/overlay006/struct_ov6_02246254.h
@@ -11,7 +11,7 @@ typedef struct {
     const TrainerInfo * unk_08;
     int unk_0C;
     int unk_10;
-    const UnkStruct_020279FC * unk_14;
+    const AnimationControlFlags * unk_14;
 } UnkStruct_ov6_02246254;
 
 #endif // POKEPLATINUM_STRUCT_OV6_02246254_H
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
index 781a6b4245..2c1cd68f22 100644
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -26,18 +26,18 @@ typedef struct {
     Window unk_08[6];
     Window unk_68;
     UnkStruct_0200112C * unk_78;
-    UnkStruct_02013A04 * unk_7C;
-    UnkStruct_02001AF4 * unk_80;
-    UnkStruct_02013A04 * unk_84;
+    ResourceMetadata * unk_7C;
+    UIControlData * unk_80;
+    ResourceMetadata * unk_84;
     MessageLoader * unk_88;
     UnkStruct_0200B358 * unk_8C;
     UnkStruct_020203AC * unk_90;
     UnkStruct_ov5_021D30A8 unk_94;
-    UnkStruct_02022550 * unk_25C[4];
+    GraphicElementData * unk_25C[4];
     u16 unk_26C[2];
     TrainerInfo * unk_270;
     void * unk_274;
-    UnkStruct_020279FC * unk_278;
+    AnimationControlFlags * unk_278;
     UnkStruct_0202B628 * unk_27C;
     UnkStruct_0202CD88 * unk_280;
     SaveData * unk_284;
diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h
index b88ea4c345..525b0ed23e 100644
--- a/include/overlay012/funcptr_ov12_02239E64_1.h
+++ b/include/overlay012/funcptr_ov12_02239E64_1.h
@@ -6,6 +6,6 @@
 #include "struct_decls/struct_02022550_decl.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, UnkStruct_02022550 *);
+typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, GraphicElementData *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H
diff --git a/include/overlay012/funcptr_ov12_02239E68.h b/include/overlay012/funcptr_ov12_02239E68.h
index 92fa1701db..bf33bc2168 100644
--- a/include/overlay012/funcptr_ov12_02239E68.h
+++ b/include/overlay012/funcptr_ov12_02239E68.h
@@ -6,6 +6,6 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, UnkStruct_0200C6E4 *, UnkStruct_0200C704 *, CellActorData *);
+typedef void (* UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, CellTransferStateData *, AnimationResourceCollection *, CellActorData *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H
diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h
index cac8104161..ce43c14753 100644
--- a/include/overlay012/ov12_0221FC20.h
+++ b/include/overlay012/ov12_0221FC20.h
@@ -46,9 +46,9 @@ BGL * ov12_02220278(UnkStruct_ov12_0221FCDC * param0);
 s32 ov12_02220280(UnkStruct_ov12_0221FCDC * param0, int param1);
 CellActorData * ov12_02220298(UnkStruct_ov12_0221FCDC * param0, int param1);
 CellActorData * ov12_022202C0(UnkStruct_ov12_0221FCDC * param0, int param1);
-UnkStruct_0200C704 * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
-UnkStruct_0200C704 * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
-UnkStruct_0200C6E4 * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
+AnimationResourceCollection * ov12_022202EC(UnkStruct_ov12_0221FCDC * param0);
+AnimationResourceCollection * ov12_02220300(UnkStruct_ov12_0221FCDC * param0);
+CellTransferStateData * ov12_02220308(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02220474(void);
 int ov12_02220540(UnkStruct_ov12_0221FCDC * param0, int param1);
 void ov12_02220590(UnkStruct_ov12_0221FCDC * param0, UnkStruct_ov12_022380DC * param1, int param2);
diff --git a/include/overlay012/ov12_022269C0.h b/include/overlay012/ov12_022269C0.h
index 1a4841f3a8..fb7189517f 100644
--- a/include/overlay012/ov12_022269C0.h
+++ b/include/overlay012/ov12_022269C0.h
@@ -10,6 +10,6 @@ void ov12_022269C0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022269EC(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02226A3C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02226A88(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02226B1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_022269C0_H
diff --git a/include/overlay012/ov12_02226B84.h b/include/overlay012/ov12_02226B84.h
index aaa1bc0577..221cd2493b 100644
--- a/include/overlay012/ov12_02226B84.h
+++ b/include/overlay012/ov12_02226B84.h
@@ -11,7 +11,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022271D8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227408(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227534(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222777C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02227828(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222797C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02227CBC(UnkStruct_ov12_0221FCDC * param0);
@@ -38,10 +38,10 @@ void ov12_02229B28(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02229C5C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02229E54(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222A00C(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222A1AC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A34C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A410(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222A5C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222A604(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222A8F4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222AB50(UnkStruct_ov12_0221FCDC * param0);
diff --git a/include/overlay012/ov12_0222AC70.h b/include/overlay012/ov12_0222AC70.h
index 4f9760180a..7c86437cc9 100644
--- a/include/overlay012/ov12_0222AC70.h
+++ b/include/overlay012/ov12_0222AC70.h
@@ -6,7 +6,7 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222AE68(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222B194(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222B45C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222B68C(UnkStruct_ov12_0221FCDC * param0);
@@ -22,8 +22,8 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222C8F8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222CA2C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222CB90(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222CC54(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222CFA0(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222D56C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_0222AC70_H
diff --git a/include/overlay012/ov12_0222D6B0.h b/include/overlay012/ov12_0222D6B0.h
index 3f7e3e6678..2231692a24 100644
--- a/include/overlay012/ov12_0222D6B0.h
+++ b/include/overlay012/ov12_0222D6B0.h
@@ -6,12 +6,12 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222D7C0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222DB60(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222DEFC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222E1A8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222E248(CellActorData * param0);
-void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222E2F8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_0222E61C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_0222D6B0_H
diff --git a/include/overlay012/ov12_0222E91C.h b/include/overlay012/ov12_0222E91C.h
index 5037719548..1685044da3 100644
--- a/include/overlay012/ov12_0222E91C.h
+++ b/include/overlay012/ov12_0222E91C.h
@@ -7,7 +7,7 @@
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
 void ov12_0222EAA0(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222EC90(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0222EFB0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F2F8(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F5EC(UnkStruct_ov12_0221FCDC * param0);
diff --git a/include/overlay012/ov12_0222F700.h b/include/overlay012/ov12_0222F700.h
index b56a3410ea..951453e421 100644
--- a/include/overlay012/ov12_0222F700.h
+++ b/include/overlay012/ov12_0222F700.h
@@ -8,33 +8,33 @@
 
 void ov12_0222F770(UnkStruct_ov12_0221FCDC * param0);
 void ov12_0222F9E4(UnkStruct_ov12_0221FCDC * param0);
-void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_0222FE30(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_022300C4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022303D0(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230754(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230804(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02230A8C(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02230CEC(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231010(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022312A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02231444(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02231650(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231950(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02231C1C(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02231E7C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02232024(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02232378(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_0223249C(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022326AC(UnkStruct_ov12_0221FCDC * param0);
-void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_022329E0(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02232CA8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02233178(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02233454(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02233734(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022339C4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02233CD4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_02233F30(UnkStruct_ov12_0221FCDC * param0);
-void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_02234008(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 void ov12_02234214(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022342C4(UnkStruct_ov12_0221FCDC * param0);
 void ov12_022344D0(UnkStruct_ov12_0221FCDC * param0);
diff --git a/include/overlay012/ov12_022346A4.h b/include/overlay012/ov12_022346A4.h
index c9df5e17e7..00b28ec309 100644
--- a/include/overlay012/ov12_022346A4.h
+++ b/include/overlay012/ov12_022346A4.h
@@ -6,9 +6,9 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
-void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3);
+void ov12_022346A4(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_022348C8(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02234A10(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
+void ov12_02234D98(UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3);
 
 #endif // POKEPLATINUM_OV12_022346A4_H
diff --git a/include/overlay012/struct_ov12_02223764_sub1.h b/include/overlay012/struct_ov12_02223764_sub1.h
index c940d40b4b..a6191fae12 100644
--- a/include/overlay012/struct_ov12_02223764_sub1.h
+++ b/include/overlay012/struct_ov12_02223764_sub1.h
@@ -6,8 +6,8 @@
 #include "struct_decls/struct_0200C704_decl.h"
 
 typedef struct {
-    UnkStruct_0200C6E4 * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    CellTransferStateData * unk_00;
+    AnimationResourceCollection * unk_04;
     PaletteSys * unk_08;
 } UnkStruct_ov12_02223764_sub1;
 
diff --git a/include/overlay012/struct_ov12_0223595C.h b/include/overlay012/struct_ov12_0223595C.h
index 33247ecd28..ea4d3177ed 100644
--- a/include/overlay012/struct_ov12_0223595C.h
+++ b/include/overlay012/struct_ov12_0223595C.h
@@ -13,9 +13,9 @@ typedef struct {
     u8 unk_02;
     u8 unk_03;
     UnkStruct_ov12_0221FCDC * unk_04;
-    UnkStruct_0200C6E4 * unk_08;
-    UnkStruct_0200C704 * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    CellTransferStateData * unk_08;
+    AnimationResourceCollection * unk_0C;
+    AnimationResourceCollection * unk_10;
     BGL * unk_14;
     PaletteSys * unk_18;
 } UnkStruct_ov12_0223595C;
diff --git a/include/overlay012/struct_ov12_02237728.h b/include/overlay012/struct_ov12_02237728.h
index 571dbfca7e..4b15e3d383 100644
--- a/include/overlay012/struct_ov12_02237728.h
+++ b/include/overlay012/struct_ov12_02237728.h
@@ -13,7 +13,7 @@ typedef struct BallThrow {
     int ballID;
     int bgPrio;
     int surface;
-    UnkStruct_0200C6E4 *cellActorSys;
+    CellTransferStateData *cellActorSys;
     PaletteSys *paletteSys;
     BattleSystem *battleSys;
 } BallThrow;
diff --git a/include/overlay013/ov13_02228A38.h b/include/overlay013/ov13_02228A38.h
index e4a635aefa..3c11013b13 100644
--- a/include/overlay013/ov13_02228A38.h
+++ b/include/overlay013/ov13_02228A38.h
@@ -13,7 +13,7 @@ void ov13_02228A60(UnkStruct_ov13_02228A50 * param0, u8 param1);
 void ov13_02228A64(UnkStruct_ov13_02228A50 * param0, UnkStruct_ov16_0226DC24 * param1);
 void ov13_02228A68(UnkStruct_ov13_02228A50 * param0, u8 param1);
 void ov13_02228A90(UnkStruct_ov13_02228A50 * param0);
-void ov13_02228A9C(UnkStruct_ov13_02228A50 * param0, const UnkStruct_020F1DB8 * param1);
+void ov13_02228A9C(UnkStruct_ov13_02228A50 * param0, const ByteFlagSet * param1);
 void ov13_02228AC8(UnkStruct_ov13_02228A50 * param0, u32 param1);
 u32 ov13_02228B64(UnkStruct_ov13_02228A50 * param0);
 
diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h
index ab18bb4ace..c043bda4ec 100644
--- a/include/overlay013/struct_ov13_022213F0.h
+++ b/include/overlay013/struct_ov13_022213F0.h
@@ -41,7 +41,7 @@ typedef struct {
     MessageLoader * unk_1FA4;
     UnkStruct_0200B358 * unk_1FA8;
     Strbuf* unk_1FAC;
-    UnkStruct_0200C704 * unk_1FB0;
+    AnimationResourceCollection * unk_1FB0;
     CellActorData * unk_1FB4[38];
     Window unk_204C[2];
     Window * unk_206C;
diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h
index 2e9f3b4c87..319716ebb2 100644
--- a/include/overlay013/struct_ov13_02227244.h
+++ b/include/overlay013/struct_ov13_02227244.h
@@ -31,7 +31,7 @@ typedef struct {
     UnkStruct_ov13_02228A50 * unk_34;
     UnkStruct_ov16_0226DEEC * unk_38;
     BagItem unk_3C[5][36];
-    UnkStruct_0200C704 * unk_30C;
+    AnimationResourceCollection * unk_30C;
     CellActorData * unk_310[6];
     u16 unk_328[3][144];
     u16 unk_688[4][130];
diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h
index 1d08b6b625..313b51b9ef 100644
--- a/include/overlay016/ov16_0223DF00.h
+++ b/include/overlay016/ov16_0223DF00.h
@@ -80,8 +80,8 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler);
 Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot);
 UnkStruct_02007768 * ov16_0223E000(BattleSystem * param0);
 UnkStruct_ov12_0221FCDC * ov16_0223E008(BattleSystem * param0);
-UnkStruct_0200C6E4 * ov16_0223E010(BattleSystem * param0);
-UnkStruct_0200C704 * ov16_0223E018(BattleSystem * param0);
+CellTransferStateData * ov16_0223E010(BattleSystem * param0);
+AnimationResourceCollection * ov16_0223E018(BattleSystem * param0);
 UnkStruct_ov16_02268520 * ov16_0223E020(BattleSystem * param0, int param1);
 UnkStruct_ov16_02268A14 * ov16_0223E02C(BattleSystem * param0);
 UnkStruct_ov16_0226D160 * ov16_0223E034(BattleSystem * param0, UnkEnum_ov16_0226D194 param1);
@@ -191,7 +191,7 @@ u8 ov16_0223ED60(BattleSystem * param0);
 u8 ov16_0223ED6C(BattleSystem * param0);
 int BattleSystem_NumSafariBalls(BattleSystem * param0);
 void BattleSystem_SetSafariBalls(BattleSystem * param0, int param1);
-UnkStruct_020279FC * ov16_0223EDA4(BattleSystem * param0);
+AnimationControlFlags * ov16_0223EDA4(BattleSystem * param0);
 
 /**
  * @brief Check if battle animations are turned on.
diff --git a/include/overlay016/ov16_02266F1C.h b/include/overlay016/ov16_02266F1C.h
index f88eca5cd5..1dc4a7e05a 100644
--- a/include/overlay016/ov16_02266F1C.h
+++ b/include/overlay016/ov16_02266F1C.h
@@ -8,8 +8,8 @@
 #include "struct_decls/cell_actor_data.h"
 #include "overlay016/struct_ov16_022674C4.h"
 
-void ov16_02266F1C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, int param4);
-CellActorData * ov16_02267060(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2);
+void ov16_02266F1C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, int param4);
+CellActorData * ov16_02267060(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
 void ov16_02267084(UnkStruct_ov16_022674C4 * param0, u32 param1, u32 param2);
 void ov16_02267220(UnkStruct_ov16_022674C4 * param0);
 void ov16_02267258(UnkStruct_ov16_022674C4 * param0);
diff --git a/include/overlay016/ov16_0226D094.h b/include/overlay016/ov16_0226D094.h
index f374ea5b45..9630cfbef2 100644
--- a/include/overlay016/ov16_0226D094.h
+++ b/include/overlay016/ov16_0226D094.h
@@ -8,9 +8,9 @@
 
 #include "enums.h"
 
-void ov16_0226D094(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2);
-void ov16_0226D12C(UnkStruct_0200C704 * param0);
-UnkStruct_ov16_0226D160 * ov16_0226D194(u8 param0[], UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_1 param2, UnkEnum_ov16_0226D194_3 param3, UnkStruct_0200C6E4 * param4, UnkStruct_0200C704 * param5);
+void ov16_0226D094(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2);
+void ov16_0226D12C(AnimationResourceCollection * param0);
+UnkStruct_ov16_0226D160 * ov16_0226D194(u8 param0[], UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_1 param2, UnkEnum_ov16_0226D194_3 param3, CellTransferStateData * param4, AnimationResourceCollection * param5);
 BOOL ov16_0226D1FC(UnkStruct_ov16_0226D160 * param0);
 void ov16_0226D220(UnkStruct_ov16_0226D160 * param0, UnkEnum_ov16_0226D220 param1, UnkEnum_ov16_0226D194_2 param2);
 BOOL ov16_0226D258(UnkStruct_ov16_0226D160 * param0);
diff --git a/include/overlay016/ov16_0226DB7C.h b/include/overlay016/ov16_0226DB7C.h
index 6119a99fe1..fe8e56c0cb 100644
--- a/include/overlay016/ov16_0226DB7C.h
+++ b/include/overlay016/ov16_0226DB7C.h
@@ -6,9 +6,9 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "overlay016/struct_ov16_0226DC24_decl.h"
 
-void ov16_0226DB7C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
-void ov16_0226DBFC(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov16_0226DC24 * ov16_0226DC24(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov16_0226DB7C(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
+void ov16_0226DBFC(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov16_0226DC24 * ov16_0226DC24(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov16_0226DCA8(UnkStruct_ov16_0226DC24 * param0);
 void ov16_0226DCCC(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
 void ov16_0226DD54(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8);
diff --git a/include/overlay016/ov16_0226DE44.h b/include/overlay016/ov16_0226DE44.h
index 017651011a..484c2f2c1a 100644
--- a/include/overlay016/ov16_0226DE44.h
+++ b/include/overlay016/ov16_0226DE44.h
@@ -6,9 +6,9 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "overlay016/struct_ov16_0226DEEC_decl.h"
 
-void ov16_0226DE44(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7);
-void ov16_0226DEC4(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov16_0226DEEC * ov16_0226DEEC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov16_0226DE44(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7);
+void ov16_0226DEC4(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov16_0226DEEC * ov16_0226DEEC(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov16_0226DF68(UnkStruct_ov16_0226DEEC * param0);
 void ov16_0226DF80(UnkStruct_ov16_0226DEEC * param0, int param1, int param2, fx32 param3);
 void ov16_0226DFB0(UnkStruct_ov16_0226DEEC * param0, int param1, int param2);
diff --git a/include/overlay016/struct_ov16_02264408.h b/include/overlay016/struct_ov16_02264408.h
index 3d02198be3..c5b73f57b0 100644
--- a/include/overlay016/struct_ov16_02264408.h
+++ b/include/overlay016/struct_ov16_02264408.h
@@ -10,7 +10,7 @@
 #include "overlay016/struct_ov16_02264408_sub1.h"
 
 typedef struct {
-    UnkStruct_0200C6E4 * unk_00;
+    CellTransferStateData * unk_00;
     BGL * unk_04;
     PaletteSys * unk_08;
     UnkStruct_ov16_0223E0C8 * unk_0C[4];
diff --git a/include/overlay017/ov17_0223F118.h b/include/overlay017/ov17_0223F118.h
index b4b9300aa4..7ff7c2a73b 100644
--- a/include/overlay017/ov17_0223F118.h
+++ b/include/overlay017/ov17_0223F118.h
@@ -13,17 +13,17 @@
 #include "overlay017/struct_ov17_0223F6E8.h"
 #include "overlay017/struct_ov17_0223F744.h"
 
-UnkStruct_0207C690 * ov17_0223F140(int param0);
-void ov17_0223F1E0(UnkStruct_0207C690 * param0);
-void ov17_0223F1E8(int param0, BGL * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
+GenericPointerData * ov17_0223F140(int param0);
+void ov17_0223F1E0(GenericPointerData * param0);
+void ov17_0223F1E8(int param0, BGL * param1, AnimationResourceCollection * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
 void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 * param0);
 void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 * param0, int param1, int param2, int param3);
 Strbuf* ov17_0223F310(u32 param0, u32 param1);
 void ov17_0223F334(UnkStruct_02095C48 * param0, int param1);
 void ov17_0223F374(UnkStruct_02095C48 * param0);
-void ov17_0223F560(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, int param4, int param5, int param6);
-void ov17_0223F5E8(UnkStruct_0200C704 * param0, int param1, int param2, int param3, int param4);
-void ov17_0223F630(UnkStruct_ov17_0223F6E8 * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10);
+void ov17_0223F560(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6);
+void ov17_0223F5E8(AnimationResourceCollection * param0, int param1, int param2, int param3, int param4);
+void ov17_0223F630(UnkStruct_ov17_0223F6E8 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10);
 void ov17_0223F6C4(UnkStruct_ov17_0223F6E8 * param0);
 UnkStruct_ov17_0223F744 * ov17_0223F70C(int param0, PaletteSys * param1, const u16 * param2, int param3, int param4, u32 param5);
 void ov17_0223F744(UnkStruct_ov17_0223F744 * param0);
diff --git a/include/overlay017/ov17_02241270.h b/include/overlay017/ov17_02241270.h
index cb7b700f48..41115deb30 100644
--- a/include/overlay017/ov17_02241270.h
+++ b/include/overlay017/ov17_02241270.h
@@ -6,13 +6,13 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/cell_actor_data.h"
 
-void ov17_02241270(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-CellActorData * ov17_022412C0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2);
-void ov17_022412F0(UnkStruct_0200C704 * param0);
+void ov17_02241270(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+CellActorData * ov17_022412C0(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
+void ov17_022412F0(AnimationResourceCollection * param0);
 void ov17_02241314(CellActorData * param0);
-void ov17_0224131C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-CellActorData * ov17_0224136C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4);
+void ov17_0224131C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+CellActorData * ov17_0224136C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4);
 void ov17_022413AC(CellActorData * param0);
-void ov17_022413B4(UnkStruct_0200C704 * param0);
+void ov17_022413B4(AnimationResourceCollection * param0);
 
 #endif // POKEPLATINUM_OV17_02241270_H
diff --git a/include/overlay017/ov17_022413D8.h b/include/overlay017/ov17_022413D8.h
index 41b5c853a3..831d088fb7 100644
--- a/include/overlay017/ov17_022413D8.h
+++ b/include/overlay017/ov17_022413D8.h
@@ -26,8 +26,8 @@ void ov17_022415E4(UnkStruct_ov17_0223F88C * param0);
 void ov17_022416E4(UnkStruct_ov17_0223F88C * param0);
 void ov17_02241928(UnkStruct_ov17_0223F88C * param0, UnkStruct_02095C48 * param1, NARC * param2);
 void ov17_0224197C(UnkStruct_ov17_0223F88C * param0);
-void ov17_022419AC(PaletteSys * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, NARC * param3);
-void ov17_02241A00(UnkStruct_0200C704 * param0);
+void ov17_022419AC(PaletteSys * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, NARC * param3);
+void ov17_02241A00(AnimationResourceCollection * param0);
 void ov17_02241A24(UnkStruct_ov17_0223F88C * param0);
 void ov17_02241A64(UnkStruct_ov17_0223F88C * param0);
 void ov17_02241A8C(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
@@ -35,12 +35,12 @@ void ov17_02241B1C(UnkStruct_ov17_0223F88C * param0);
 void ov17_02241B3C(UnkStruct_ov17_02246F24 * param0, int param1, int param2, u8 * param3);
 void ov17_02241D94(UnkStruct_ov17_0223F88C * param0, int param1, NARC * param2);
 void ov17_02241E24(UnkStruct_ov17_0223F88C * param0);
-void ov17_02241E58(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_02241EA4(UnkStruct_0200C704 * param0);
+void ov17_02241E58(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_02241EA4(AnimationResourceCollection * param0);
 void ov17_02241EF0(UnkStruct_ov17_0223F88C * param0);
 void ov17_02241F34(UnkStruct_ov17_0223F88C * param0, int param1, int param2, int param3);
-void ov17_02242154(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_022421E0(UnkStruct_0200C704 * param0);
+void ov17_02242154(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_022421E0(AnimationResourceCollection * param0);
 void ov17_02242248(UnkStruct_ov17_0223F88C * param0);
 BOOL ov17_022424A8(UnkStruct_ov17_0223F88C * param0, int param1);
 void ov17_022424D4(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
@@ -53,8 +53,8 @@ void ov17_02242EE4(UnkStruct_ov17_02246F24 * param0, int param1);
 void ov17_02242FA4(UnkStruct_ov17_02246F24 * param0);
 void ov17_02242FC0(UnkStruct_ov17_02246F24 * param0);
 void ov17_02242FE8(UnkStruct_ov17_02246F24 * param0);
-void ov17_02243040(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224308C(UnkStruct_0200C704 * param0);
+void ov17_02243040(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224308C(AnimationResourceCollection * param0);
 void ov17_022430AC(UnkStruct_ov17_0223F88C * param0, int param1, int param2);
 void ov17_022430F8(UnkStruct_ov17_0223F88C * param0);
 void ov17_02243120(UnkStruct_ov17_02246F24 * param0, UnkStruct_ov17_022449B8 * param1, int param2);
diff --git a/include/overlay017/ov17_022476F8.h b/include/overlay017/ov17_022476F8.h
index 354a5ef6d5..5b288d1c31 100644
--- a/include/overlay017/ov17_022476F8.h
+++ b/include/overlay017/ov17_022476F8.h
@@ -10,8 +10,8 @@
 
 void ov17_022476F8(UnkStruct_ov17_022476F8 * param0, int param1);
 void ov17_02247734(UnkStruct_ov17_022476F8 * param0);
-void ov17_0224774C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_02247798(UnkStruct_0200C704 * param0);
+void ov17_0224774C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_02247798(AnimationResourceCollection * param0);
 void ov17_022477B8(UnkStruct_ov17_02247A48 * param0, int param1, int param2, fx32 param3, int param4);
 void ov17_022478D0(UnkStruct_ov17_02247A48 * param0, int param1);
 void ov17_02247918(UnkStruct_ov17_02247A48 * param0);
diff --git a/include/overlay017/ov17_0224A0FC.h b/include/overlay017/ov17_0224A0FC.h
index ee2a782d82..4e6f2846be 100644
--- a/include/overlay017/ov17_0224A0FC.h
+++ b/include/overlay017/ov17_0224A0FC.h
@@ -22,42 +22,42 @@ s16 ov17_0224A10C(int param0);
 s16 ov17_0224A120(int param0);
 void ov17_0224A134(UnkStruct_ov17_0224DF54 * param0);
 void ov17_0224A1EC(UnkStruct_ov17_0224A1EC * param0);
-void ov17_0224A20C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1);
-void ov17_0224A210(UnkStruct_0200C704 * param0);
+void ov17_0224A20C(CellTransferStateData * param0, AnimationResourceCollection * param1);
+void ov17_0224A210(AnimationResourceCollection * param0);
 void ov17_0224A214(UnkStruct_ov17_0224A1EC * param0, int param1, int param2);
 void ov17_0224A368(UnkStruct_ov17_0224A1EC * param0, int param1, int param2, int param3);
-void ov17_0224A390(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224A428(UnkStruct_0200C704 * param0);
+void ov17_0224A390(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224A428(AnimationResourceCollection * param0);
 void ov17_0224A580(UnkStruct_ov17_0224A1EC * param0);
-void ov17_0224A5A8(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224A5F8(UnkStruct_0200C704 * param0);
-void ov17_0224A61C(UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2);
+void ov17_0224A5A8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224A5F8(AnimationResourceCollection * param0);
+void ov17_0224A61C(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
 void ov17_0224A650(UnkStruct_ov17_0224A1EC * param0);
 void ov17_0224A674(UnkStruct_ov17_0224A1EC * param0);
 void ov17_0224A7B8(UnkStruct_ov17_0224A1EC * param0);
-void ov17_0224A7E0(UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, int param3, int param4, u8 param5);
+void ov17_0224A7E0(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, u8 param5);
 void ov17_0224A95C(UnkStruct_ov17_0224A1EC * param0);
-void ov17_0224A984(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224A9D4(UnkStruct_0200C704 * param0);
-void ov17_0224A9F8(UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2);
+void ov17_0224A984(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224A9D4(AnimationResourceCollection * param0);
+void ov17_0224A9F8(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
 void ov17_0224AA1C(UnkStruct_ov17_0224A1EC * param0);
 void ov17_0224AA38(UnkStruct_ov17_0224DF54 * param0);
 void ov17_0224AA58(UnkStruct_ov17_0224DF54 * param0);
-void ov17_0224AA94(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224AAE4(UnkStruct_0200C704 * param0);
-void ov17_0224AB08(UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2);
+void ov17_0224AA94(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224AAE4(AnimationResourceCollection * param0);
+void ov17_0224AB08(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
 void ov17_0224ABB0(UnkStruct_ov17_0224A1EC * param0);
 void ov17_0224ABDC(UnkStruct_ov17_0224A1EC * param0, int param1);
 void ov17_0224AC78(UnkStruct_ov17_0224ABFC * param0, int param1, int param2);
-void ov17_0224AC80(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224ACD0(UnkStruct_0200C704 * param0);
-void ov17_0224ACF4(UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2);
+void ov17_0224AC80(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224ACD0(AnimationResourceCollection * param0);
+void ov17_0224ACF4(UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
 void ov17_0224ACF8(UnkStruct_ov17_0224A1EC * param0);
-void ov17_0224ACFC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224AD4C(UnkStruct_0200C704 * param0);
+void ov17_0224ACFC(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224AD4C(AnimationResourceCollection * param0);
 BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 * param0, int param1, int param2);
-void ov17_0224AFA8(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224AFF8(UnkStruct_0200C704 * param0);
+void ov17_0224AFA8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224AFF8(AnimationResourceCollection * param0);
 BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 * param0);
 void ov17_0224B058(UnkStruct_ov17_0224DF54 * param0);
 void ov17_0224B068(UnkStruct_ov17_0224A1EC * param0, int param1);
@@ -75,9 +75,9 @@ int ov17_0224BDF0(UnkStruct_ov17_0224DF54 * param0, int param1);
 int ov17_0224BE24(UnkStruct_ov17_0224DF54 * param0, int param1);
 void ov17_0224C2CC(UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruct_ov17_0224C0C0 * param2);
 int ov17_0224C300(UnkStruct_ov17_0224DF54 * param0);
-void ov17_0224C310(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2);
-void ov17_0224C360(UnkStruct_0200C704 * param0);
-void ov17_0224C384(UnkStruct_ov17_0224DF54 * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2);
+void ov17_0224C310(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2);
+void ov17_0224C360(AnimationResourceCollection * param0);
+void ov17_0224C384(UnkStruct_ov17_0224DF54 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2);
 void ov17_0224C3E4(UnkStruct_ov17_0224DF54 * param0);
 void ov17_0224C434(UnkStruct_ov17_0224B058 * param0, u32 param1, u32 param2, int param3);
 void ov17_0224C47C(UnkStruct_ov17_0224B058 * param0, int param1);
diff --git a/include/overlay017/ov17_0224F080.h b/include/overlay017/ov17_0224F080.h
index 7ed7fc6e6b..14ad9973b0 100644
--- a/include/overlay017/ov17_0224F080.h
+++ b/include/overlay017/ov17_0224F080.h
@@ -13,11 +13,11 @@ u32 ov17_0224F098(void);
 u32 ov17_0224F09C(void);
 u8 ov17_0224F0A0(int param0);
 u32 ov17_0224F0B8(void);
-void ov17_0224F0BC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
-void ov17_0224F0F0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, u32 param3);
-void ov17_0224F138(UnkStruct_0200C704 * param0, u32 param1);
-void ov17_0224F140(UnkStruct_0200C704 * param0, u32 param1, u32 param2);
-CellActorData * ov17_0224F154(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
+void ov17_0224F0BC(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
+void ov17_0224F0F0(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3);
+void ov17_0224F138(AnimationResourceCollection * param0, u32 param1);
+void ov17_0224F140(AnimationResourceCollection * param0, u32 param1, u32 param2);
+CellActorData * ov17_0224F154(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
 void ov17_0224F184(CellActorData * param0);
 
 #endif // POKEPLATINUM_OV17_0224F080_H
diff --git a/include/overlay017/ov17_02252AB0.h b/include/overlay017/ov17_02252AB0.h
index 57ba1c0b42..c4ca9c35ec 100644
--- a/include/overlay017/ov17_02252AB0.h
+++ b/include/overlay017/ov17_02252AB0.h
@@ -6,9 +6,9 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "overlay017/struct_ov17_02252B48_decl.h"
 
-void ov17_02252AB0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6);
-void ov17_02252B20(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov17_02252B48 * ov17_02252B48(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov17_02252AB0(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6);
+void ov17_02252B20(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov17_02252B48 * ov17_02252B48(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov17_02252BCC(UnkStruct_ov17_02252B48 * param0);
 void ov17_02252BF0(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, fx32 param9);
 void ov17_02252C78(UnkStruct_ov17_02252B48 * param0, int param1, int param2, int param3, int param4, fx32 param5);
diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h
index 913aa7b2e1..7e1573df71 100644
--- a/include/overlay017/struct_ov17_0223F88C.h
+++ b/include/overlay017/struct_ov17_0223F88C.h
@@ -22,8 +22,8 @@ typedef struct {
     UnkStruct_02095C48_sub1 * unk_00;
     UnkStruct_02007768 * unk_04;
     Sprite * unk_08[4];
-    UnkStruct_0200C6E4 * unk_18;
-    UnkStruct_0200C704 * unk_1C;
+    CellTransferStateData * unk_18;
+    AnimationResourceCollection * unk_1C;
     UnkStruct_ov12_0221FCDC * unk_20;
     BGL * unk_24;
     Window unk_28[1];
diff --git a/include/overlay017/struct_ov17_02246F24.h b/include/overlay017/struct_ov17_02246F24.h
index bbb65abd99..cd05fc333c 100644
--- a/include/overlay017/struct_ov17_02246F24.h
+++ b/include/overlay017/struct_ov17_02246F24.h
@@ -14,7 +14,7 @@
 typedef struct {
     UnkStruct_02095C48 * unk_00;
     SysTask * unk_04;
-    UnkStruct_0207C690 * unk_08;
+    GenericPointerData * unk_08;
     UnkStruct_ov17_0223F88C unk_0C;
     UnkStruct_ov17_022472F8 unk_220;
     UnkStruct_ov17_02246F24_sub1 unk_304;
diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h
index 38e74c2e46..cf66fa8aa4 100644
--- a/include/overlay017/struct_ov17_022476F8.h
+++ b/include/overlay017/struct_ov17_022476F8.h
@@ -21,8 +21,8 @@ typedef struct {
     UnkStruct_02007768 * unk_04;
     Sprite * unk_08[4];
     Sprite * unk_18;
-    UnkStruct_0200C6E4 * unk_1C;
-    UnkStruct_0200C704 * unk_20;
+    CellTransferStateData * unk_1C;
+    AnimationResourceCollection * unk_20;
     BGL * unk_24;
     Window unk_28[1];
     MessageLoader * unk_38;
diff --git a/include/overlay017/struct_ov17_02247A48.h b/include/overlay017/struct_ov17_02247A48.h
index 019026e129..ee457c0c51 100644
--- a/include/overlay017/struct_ov17_02247A48.h
+++ b/include/overlay017/struct_ov17_02247A48.h
@@ -15,7 +15,7 @@
 typedef struct {
     UnkStruct_02095C48 * unk_00;
     SysTask * unk_04;
-    UnkStruct_0207C690 * unk_08;
+    GenericPointerData * unk_08;
     UnkStruct_ov17_022476F8 unk_0C;
     UnkStruct_ov17_02247A48_sub1 unk_D2;
     UnkStruct_ov17_02249260 unk_E0;
diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h
index 926b71e34d..4b0fa4d2fd 100644
--- a/include/overlay017/struct_ov17_0224A1EC.h
+++ b/include/overlay017/struct_ov17_0224A1EC.h
@@ -32,8 +32,8 @@ typedef struct {
     UnkStruct_ov17_0224B09C unk_04[4];
     UnkStruct_02007768 * unk_44;
     Sprite * unk_48[4];
-    UnkStruct_0200C6E4 * unk_58;
-    UnkStruct_0200C704 * unk_5C;
+    CellTransferStateData * unk_58;
+    AnimationResourceCollection * unk_5C;
     BGL * unk_60;
     Window unk_64[2];
     MessageLoader * unk_84;
diff --git a/include/overlay017/struct_ov17_0224DF54.h b/include/overlay017/struct_ov17_0224DF54.h
index 36293eba3b..37dba5614b 100644
--- a/include/overlay017/struct_ov17_0224DF54.h
+++ b/include/overlay017/struct_ov17_0224DF54.h
@@ -22,7 +22,7 @@ typedef struct UnkStruct_ov17_0224DF54_t {
     SysTask * unk_04;
     SysTask * unk_08;
     UnkStruct_02014014 * unk_0C;
-    UnkStruct_0207C690 * unk_10;
+    GenericPointerData * unk_10;
     UnkStruct_ov17_0224A1EC unk_14;
     UnkStruct_ov17_0224DF54_sub1 unk_A3C;
     UnkStruct_ov17_0224DF54_sub2 unk_A6C;
diff --git a/include/overlay017/struct_ov17_0224FCA0.h b/include/overlay017/struct_ov17_0224FCA0.h
index d33f4ddb39..491ed4ad34 100644
--- a/include/overlay017/struct_ov17_0224FCA0.h
+++ b/include/overlay017/struct_ov17_0224FCA0.h
@@ -15,7 +15,7 @@ typedef struct {
     UnkStruct_02095C48 * unk_00;
     SysTask * unk_04;
     SysTask * unk_08;
-    UnkStruct_0207C690 * unk_0C;
+    GenericPointerData * unk_0C;
     UnkStruct_ov17_022507C4 unk_10;
     UnkStruct_ov17_0224FCA0_sub1 unk_39A;
     UnkStruct_ov17_0224FCA0_sub2 unk_434;
diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h
index 2c3f3b6eb0..2560add0ab 100644
--- a/include/overlay017/struct_ov17_022507C4.h
+++ b/include/overlay017/struct_ov17_022507C4.h
@@ -22,8 +22,8 @@ typedef struct {
     UnkStruct_02095C48_sub1 * unk_00;
     UnkStruct_02007768 * unk_04;
     Sprite * unk_08[4];
-    UnkStruct_0200C6E4 * unk_18;
-    UnkStruct_0200C704 * unk_1C;
+    CellTransferStateData * unk_18;
+    AnimationResourceCollection * unk_1C;
     BGL * unk_20;
     Window unk_24[9];
     MessageLoader * unk_B4;
diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index 4e2576a449..c2bc2a7857 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -36,8 +36,8 @@ UnkStruct_ov19_021DBA9C * ov19_021D780C(UnkStruct_ov19_021D61B0 * param0);
 UnkStruct_02007768 * ov19_021D7818(UnkStruct_ov19_021D61B0 * param0);
 int ov19_021D7820(UnkStruct_ov19_021D61B0 * param0);
 void ov19_021D783C(UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5);
-UnkStruct_02022550 * ov19_021D785C(UnkStruct_020218BC * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
-void ov19_021D78AC(UnkStruct_02022550 * param0, u32 param1);
+GraphicElementData * ov19_021D785C(GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov19_021D78AC(GraphicElementData * param0, u32 param1);
 void ov19_021D78C8(const u16 * param0, u16 * param1, u32 param2, u16 param3, u32 param4);
 const UnkStruct_ov19_021D5DF8 * ov19_021D7964(UnkStruct_ov19_021D61B0 * param0);
 void ov19_021D79B8(void * param0, UnkFuncPtr_ov19_021D79B8 param1, void * param2);
diff --git a/include/overlay019/ov19_021D79F8.h b/include/overlay019/ov19_021D79F8.h
index 0d7fe484d6..4879a9251b 100644
--- a/include/overlay019/ov19_021D79F8.h
+++ b/include/overlay019/ov19_021D79F8.h
@@ -9,7 +9,7 @@
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
-BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4);
+BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4);
 void ov19_021D7A74(UnkStruct_ov19_021D8318 * param0);
 void ov19_021D7A9C(UnkStruct_ov19_021D8318 * param0);
 void ov19_021D7B4C(UnkStruct_ov19_021D8318 * param0, const UnkStruct_ov19_021D4F5C * param1, int param2, BOOL param3);
diff --git a/include/overlay019/ov19_021D8B54.h b/include/overlay019/ov19_021D8B54.h
index 19e3c89644..969770cde1 100644
--- a/include/overlay019/ov19_021D8B54.h
+++ b/include/overlay019/ov19_021D8B54.h
@@ -9,7 +9,7 @@
 
 #include <nitro/fx/fx.h>
 
-BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4);
+BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4);
 void ov19_021D8C1C(UnkStruct_ov19_021D8E00 * param0, NARC * param1);
 void ov19_021D8E84(UnkStruct_ov19_021D8E00 * param0);
 void ov19_021D8F60(UnkStruct_ov19_021D8E00 * param0);
diff --git a/include/overlay019/ov19_021DA270.h b/include/overlay019/ov19_021DA270.h
index e07a358916..a302100490 100644
--- a/include/overlay019/ov19_021DA270.h
+++ b/include/overlay019/ov19_021DA270.h
@@ -11,7 +11,7 @@
 
 #include <nnsys.h>
 
-BOOL ov19_021DA270(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4);
+BOOL ov19_021DA270(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4);
 void ov19_021DA384(UnkStruct_ov19_021DA384 * param0);
 void ov19_021DA3CC(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2);
 void ov19_021DA3F0(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2);
diff --git a/include/overlay019/ov19_021DA814.h b/include/overlay019/ov19_021DA814.h
index 50aba087b1..9f69724964 100644
--- a/include/overlay019/ov19_021DA814.h
+++ b/include/overlay019/ov19_021DA814.h
@@ -7,7 +7,7 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 
-BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4);
+BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4);
 void ov19_021DA864(UnkStruct_ov19_021DA8D8 * param0, NARC * param1);
 void ov19_021DA8D8(UnkStruct_ov19_021DA8D8 * param0);
 void ov19_021DA8FC(UnkStruct_ov19_021DA8D8 * param0, int param1);
diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h
index 53794ee798..ae7381a24a 100644
--- a/include/overlay019/ov19_021DA92C.h
+++ b/include/overlay019/ov19_021DA92C.h
@@ -9,7 +9,7 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
 
-BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, const MessageLoader * param5, NARC * param6);
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6);
 void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 * param0);
 void ov19_021DAA80(UnkStruct_ov19_021DA9E0 * param0);
 void ov19_021DAA90(UnkStruct_ov19_021DA9E0 * param0);
diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h
index 2b35f7a517..e062aa48e4 100644
--- a/include/overlay019/ov19_021DB2FC.h
+++ b/include/overlay019/ov19_021DB2FC.h
@@ -11,7 +11,7 @@
 #include "overlay019/struct_ov19_021DB6F0.h"
 #include "overlay019/struct_ov19_021DF964.h"
 
-BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8);
+BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8);
 void ov19_021DB370(UnkStruct_ov19_021DB6F0 * param0);
 void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 * param0);
 void ov19_021DB448(UnkStruct_ov19_021DB6F0 * param0, u32 param1);
diff --git a/include/overlay019/ov19_021DB8E4.h b/include/overlay019/ov19_021DB8E4.h
index 33d775a0d9..54084319ae 100644
--- a/include/overlay019/ov19_021DB8E4.h
+++ b/include/overlay019/ov19_021DB8E4.h
@@ -10,7 +10,7 @@
 
 #include <nnsys.h>
 
-BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, NARC * param5);
+BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5);
 void ov19_021DBA9C(UnkStruct_ov19_021DBA9C * param0);
 void ov19_021DBAD0(UnkStruct_ov19_021DBA9C * param0);
 void ov19_021DBB48(UnkStruct_ov19_021DBA9C * param0);
diff --git a/include/overlay019/ov19_021DC5F0.h b/include/overlay019/ov19_021DC5F0.h
index f125e9b53b..53037e930e 100644
--- a/include/overlay019/ov19_021DC5F0.h
+++ b/include/overlay019/ov19_021DC5F0.h
@@ -9,7 +9,7 @@
 #include "overlay019/struct_ov19_021DC680.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
-BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, NARC * param5);
+BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5);
 void ov19_021DC680(UnkStruct_ov19_021DC680 * param0);
 void ov19_021DC6A0(UnkStruct_ov19_021DC680 * param0);
 void ov19_021DC6C8(UnkStruct_ov19_021DC680 * param0);
diff --git a/include/overlay019/ov19_021DCF88.h b/include/overlay019/ov19_021DCF88.h
index 3e92154e7a..a006d23371 100644
--- a/include/overlay019/ov19_021DCF88.h
+++ b/include/overlay019/ov19_021DCF88.h
@@ -8,7 +8,7 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
 
-BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4);
+BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4);
 void ov19_021DD078(UnkStruct_ov19_021DCF88 * param0);
 void ov19_021DD114(UnkStruct_ov19_021DCF88 * param0, NARC * param1);
 void ov19_021DD378(UnkStruct_ov19_021DCF88 * param0);
diff --git a/include/overlay019/ov19_021DE3E8.h b/include/overlay019/ov19_021DE3E8.h
index 2aaead36d4..6f0a377760 100644
--- a/include/overlay019/ov19_021DE3E8.h
+++ b/include/overlay019/ov19_021DE3E8.h
@@ -9,7 +9,7 @@
 
 #include <nitro/fx/fx.h>
 
-BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4);
+BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4);
 void ov19_021DE440(UnkStruct_ov19_021DE3E8 * param0);
 void ov19_021DE584(UnkStruct_ov19_021DE3E8 * param0);
 void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 * param0);
diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h
index 8d079b0b21..ff0bbe1b79 100644
--- a/include/overlay019/ov19_021DEC04.h
+++ b/include/overlay019/ov19_021DEC04.h
@@ -9,7 +9,7 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DEC04_decl.h"
 
-BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, MessageLoader * param5, NARC * param6);
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, NARC * param6);
 void ov19_021DECAC(UnkStruct_ov19_021DEC04 * param0);
 void ov19_021DECE8(UnkStruct_ov19_021DEC04 * param0, NARC * param1);
 void ov19_021DEDDC(UnkStruct_ov19_021DEC04 * param0, BOOL param1);
diff --git a/include/overlay019/struct_ov19_021D8E00.h b/include/overlay019/struct_ov19_021D8E00.h
index 7963073f6b..ccf269cf33 100644
--- a/include/overlay019/struct_ov19_021D8E00.h
+++ b/include/overlay019/struct_ov19_021D8E00.h
@@ -14,11 +14,11 @@
 #include <nnsys.h>
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
-    UnkStruct_02022550 * unk_04;
-    UnkStruct_02022550 * unk_08;
-    UnkStruct_02022550 * unk_0C;
-    UnkStruct_02022550 * unk_10;
+    GraphicElementManager * unk_00;
+    GraphicElementData * unk_04;
+    GraphicElementData * unk_08;
+    GraphicElementData * unk_0C;
+    GraphicElementData * unk_10;
     void * unk_14;
     void * unk_18;
     NNSG2dCellDataBank * unk_1C;
diff --git a/include/overlay019/struct_ov19_021DA384.h b/include/overlay019/struct_ov19_021DA384.h
index 320fdb6aa3..eecdeb7b3f 100644
--- a/include/overlay019/struct_ov19_021DA384.h
+++ b/include/overlay019/struct_ov19_021DA384.h
@@ -18,7 +18,7 @@ typedef struct {
     void * unk_18;
     NNSG2dCellDataBank * unk_1C;
     NNSG2dAnimBankData * unk_20;
-    UnkStruct_020218BC * unk_24;
+    GraphicElementManager * unk_24;
     u8 padding_28[24];
     const UnkStruct_ov19_021D4DF0 * unk_40;
     UnkStruct_ov19_021D61B0 * unk_44;
diff --git a/include/overlay019/struct_ov19_021DA8D8.h b/include/overlay019/struct_ov19_021DA8D8.h
index d6f26069c3..3b331e9f1d 100644
--- a/include/overlay019/struct_ov19_021DA8D8.h
+++ b/include/overlay019/struct_ov19_021DA8D8.h
@@ -9,14 +9,14 @@
 #include <nnsys.h>
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementManager * unk_00;
+    GraphicElementData * unk_04;
     void * unk_08;
     void * unk_0C;
     NNSG2dCellDataBank * unk_10;
     NNSG2dAnimBankData * unk_14;
     NNSG2dImageProxy unk_18;
-    UnkStruct_020218BC * unk_3C;
+    GraphicElementManager * unk_3C;
     const UnkStruct_ov19_021D4DF0 * unk_40;
     UnkStruct_ov19_021D61B0 * unk_44;
 } UnkStruct_ov19_021DA8D8;
diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h
index c434e67aa8..c25f38eaab 100644
--- a/include/overlay019/struct_ov19_021DA9E0.h
+++ b/include/overlay019/struct_ov19_021DA9E0.h
@@ -19,7 +19,7 @@ typedef struct {
     BOOL unk_00;
     Window * unk_04;
     BGL * unk_08;
-    UnkStruct_020218BC * unk_0C;
+    GraphicElementManager * unk_0C;
     const UnkStruct_ov19_021D4DF0 * unk_10;
     UnkStruct_ov19_021D61B0 * unk_14;
     UnkStruct_0200C440 * unk_18;
@@ -28,10 +28,10 @@ typedef struct {
     Sprite * unk_24;
     void * unk_28;
     NNSG2dCellDataBank * unk_2C;
-    UnkStruct_02022550 * unk_30;
+    GraphicElementData * unk_30;
     void * unk_34;
     NNSG2dCellDataBank * unk_38;
-    UnkStruct_02022550 * unk_3C[2];
+    GraphicElementData * unk_3C[2];
     Strbuf* unk_44;
     Strbuf* unk_48;
     SysTask * unk_4C;
diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h
index ead77cfe0e..959b7fffc7 100644
--- a/include/overlay019/struct_ov19_021DBA9C.h
+++ b/include/overlay019/struct_ov19_021DBA9C.h
@@ -18,7 +18,7 @@
 typedef struct {
     UnkStruct_ov19_021D61B0 * unk_00;
     BGL * unk_04;
-    UnkStruct_020218BC * unk_08;
+    GraphicElementManager * unk_08;
     const UnkStruct_ov19_021D4DF0 * unk_0C;
     Window * unk_10;
     void * unk_14;
@@ -32,8 +32,8 @@ typedef struct {
     NNSG2dScreenData * unk_38;
     UnkStruct_0201AE08 unk_3C;
     UnkStruct_0200C440 * unk_44;
-    UnkStruct_02022550 * unk_48[18];
-    UnkStruct_02022550 * unk_90;
+    GraphicElementData * unk_48[18];
+    GraphicElementData * unk_90;
     u32 unk_94[18];
     SysTask * unk_DC;
     s32 unk_E0;
diff --git a/include/overlay019/struct_ov19_021DC680.h b/include/overlay019/struct_ov19_021DC680.h
index 3ffd989521..8ef8940911 100644
--- a/include/overlay019/struct_ov19_021DC680.h
+++ b/include/overlay019/struct_ov19_021DC680.h
@@ -14,7 +14,7 @@
 typedef struct {
     UnkStruct_ov19_021D61B0 * unk_00;
     BGL * unk_04;
-    UnkStruct_020218BC * unk_08;
+    GraphicElementManager * unk_08;
     const UnkStruct_ov19_021D4DF0 * unk_0C;
     UnkStruct_ov19_021D8318 * unk_10;
     void * unk_14;
diff --git a/include/overlay019/struct_ov19_021DCD18.h b/include/overlay019/struct_ov19_021DCD18.h
index ce754ecfbf..e028b20df2 100644
--- a/include/overlay019/struct_ov19_021DCD18.h
+++ b/include/overlay019/struct_ov19_021DCD18.h
@@ -6,7 +6,7 @@
 #include <nnsys.h>
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     NNSG2dImageProxy unk_04;
     u32 unk_28;
     u16 unk_2C;
diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h
index 995dcce5bf..0671ce6f83 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -19,8 +19,8 @@ BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 * param0);
 BOOL ov20_021D2210(UnkStruct_ov20_021D2128 * param0, int param1);
 u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 * param0);
 BGL * ov20_021D2E04(UnkStruct_ov20_021D2128 * param0);
-UnkStruct_020218BC * ov20_021D2E08(UnkStruct_ov20_021D2128 * param0);
+GraphicElementManager * ov20_021D2E08(UnkStruct_ov20_021D2128 * param0);
 void ov20_021D2E0C(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3);
-UnkStruct_02022550 * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+GraphicElementData * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
 
 #endif // POKEPLATINUM_OV20_021D2098_H
diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h
index a260e62b6c..e34c04b271 100644
--- a/include/overlay021/ov21_021D0D80.h
+++ b/include/overlay021/ov21_021D0D80.h
@@ -46,9 +46,9 @@ UnkStruct_ov21_021D3320 * ov21_021D13EC(UnkStruct_ov21_021D0F60 * param0);
 UnkStruct_ov21_021D13FC * ov21_021D13FC(UnkStruct_ov21_021D0F60 * param0);
 UnkStruct_ov21_021E68F4 * ov21_021D1410(UnkStruct_ov21_021D0F60 * param0, int param1);
 UnkStruct_ov21_021E68F4 * ov21_021D1430(UnkStruct_ov21_021D0F60 * param0, int param1);
-void ov21_021D144C(UnkStruct_02022550 * param0, int param1);
-void ov21_021D1498(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2);
-void ov21_021D1524(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+void ov21_021D144C(GraphicElementData * param0, int param1);
+void ov21_021D1498(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2);
+void ov21_021D1524(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 void ov21_021D154C(UnkUnion_020225E0 * param0, int param1, int param2, int param3, int param4);
 void ov21_021D1558(UnkStruct_ov21_021D157C * param0, BGL * param1, int param2, NNSG2dScreenData * param3, int param4, int param5, int param6, int param7, int param8);
 BOOL ov21_021D157C(UnkStruct_ov21_021D157C * param0);
diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h
index 1fbaeb14a4..b6839ce363 100644
--- a/include/overlay021/ov21_021D1FA4.h
+++ b/include/overlay021/ov21_021D1FA4.h
@@ -31,8 +31,8 @@ void ov21_021D222C(UnkStruct_ov21_021D13FC * param0, int param1, int param2, int
 void ov21_021D2250(UnkStruct_ov21_021D13FC * param0, int * param1, int * param2, int param3);
 Sprite * ov21_021D2274(const UnkStruct_ov21_021D13FC * param0, int param1);
 void ov21_021D2280(const UnkStruct_ov21_021D13FC * param0, BOOL param1, int param2);
-UnkStruct_02022550 * ov21_021D22A8(const UnkStruct_ov21_021D13FC * param0);
-UnkStruct_02022550 * ov21_021D22C4(const UnkStruct_ov21_021D13FC * param0);
+GraphicElementData * ov21_021D22A8(const UnkStruct_ov21_021D13FC * param0);
+GraphicElementData * ov21_021D22C4(const UnkStruct_ov21_021D13FC * param0);
 void ov21_021D22E0(UnkStruct_ov21_021D13FC * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4);
 void ov21_021D22F8(UnkStruct_ov21_021D22F8 * param0, UnkStruct_ov21_021D4CB8 * param1, int param2, int param3, u32 param4);
 UnkStruct_02009DC8 * ov21_021D2344(const UnkStruct_ov21_021D13FC * param0, int param1);
@@ -64,7 +64,7 @@ void * ov21_021D27E0(UnkStruct_ov21_021D13FC * param0, u32 param1, NNSG2dPalette
 void * ov21_021D2808(UnkStruct_ov21_021D13FC * param0, u32 param1, BOOL param2, NNSG2dCharacterData ** param3, u32 param4);
 void ov21_021D2B88(UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1, int param2, NARC * param3);
 void ov21_021D2C58(UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** param1);
-void ov21_021D2D88(UnkStruct_ov21_021D22F8 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, int param4);
+void ov21_021D2D88(UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4);
 void ov21_021D2E1C(UnkStruct_ov21_021D22F8 * param0);
 void ov21_021D2E44(UnkStruct_ov21_021D22F8 * param0, BOOL param1);
 
diff --git a/include/overlay021/ov21_021D57B4.h b/include/overlay021/ov21_021D57B4.h
index 04fa614c86..e85d6f25e2 100644
--- a/include/overlay021/ov21_021D57B4.h
+++ b/include/overlay021/ov21_021D57B4.h
@@ -12,7 +12,7 @@ UnkStruct_ov21_021D5868 * ov21_021D5868(int param0, int * param1);
 UnkStruct_ov21_021D5890 * ov21_021D5890(int param0, int * param1);
 void ov21_021D58C0(u8 * param0, u8 param1, u8 param2, const UnkStruct_ov21_021D5890 * param3);
 u32 ov21_021D5948(u8 * param0, int param1, int param2, const UnkStruct_ov21_021D5890 * param3, const UnkStruct_ov21_021D5844 * param4, const u8 * param5, u32 param6);
-void ov21_021D59D8(UnkStruct_02022550 * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7);
-int ov21_021D5A20(UnkStruct_02022550 ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13);
+void ov21_021D59D8(GraphicElementData * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7);
+int ov21_021D5A20(GraphicElementData ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13);
 
 #endif // POKEPLATINUM_OV21_021D57B4_H
diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h
index d1e26b8ea7..ad38d0058a 100644
--- a/include/overlay021/struct_ov21_021D13FC.h
+++ b/include/overlay021/struct_ov21_021D13FC.h
@@ -21,7 +21,7 @@ typedef struct {
     BGL * unk_00;
     Window unk_04;
     UnkStruct_0200C738 unk_14;
-    UnkStruct_020218BC * unk_138;
+    GraphicElementManager * unk_138;
     UnkStruct_02009714 * unk_13C[4];
     UnkStruct_ov21_021D4C0C * unk_14C;
     UnkStruct_02007768 * unk_150;
diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h
index aec67c6da8..7c74ac02e3 100644
--- a/include/overlay021/struct_ov21_021D1FA4.h
+++ b/include/overlay021/struct_ov21_021D1FA4.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     BGL * unk_04;
     int unk_08;
     int unk_0C;
diff --git a/include/overlay021/struct_ov21_021D22F8.h b/include/overlay021/struct_ov21_021D22F8.h
index 6d06e243a6..3559048968 100644
--- a/include/overlay021/struct_ov21_021D22F8.h
+++ b/include/overlay021/struct_ov21_021D22F8.h
@@ -8,8 +8,8 @@
 #include <nitro/fx/fx.h>
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_00;
+    GraphicElementData * unk_04;
     UnkStruct_ov21_021D4CA0 * unk_08;
     UnkStruct_02009DC8 * unk_0C[4];
     VecFx32 unk_1C;
diff --git a/include/overlay021/struct_ov21_021D2584.h b/include/overlay021/struct_ov21_021D2584.h
index 16ebd5d2cf..4bcc71dc3c 100644
--- a/include/overlay021/struct_ov21_021D2584.h
+++ b/include/overlay021/struct_ov21_021D2584.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02022550_decl.h"
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[4];
+    GraphicElementData * unk_00[4];
     UnkStruct_02009DC8 * unk_10[4];
     int unk_20;
     int unk_24;
diff --git a/include/overlay021/struct_ov21_021D4CB8.h b/include/overlay021/struct_ov21_021D4CB8.h
index 5db562eafc..7e28f70125 100644
--- a/include/overlay021/struct_ov21_021D4CB8.h
+++ b/include/overlay021/struct_ov21_021D4CB8.h
@@ -11,7 +11,7 @@ typedef struct {
     UnkStruct_ov21_021D4C0C * unk_00;
     const Window * unk_04;
     const NNSG2dImagePaletteProxy * unk_08;
-    const UnkStruct_02022550 * unk_0C;
+    const GraphicElementData * unk_0C;
     int unk_10;
     int unk_14;
     int unk_18;
diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h
index c78dda5e54..479bffd416 100644
--- a/include/overlay022/ov22_02255094.h
+++ b/include/overlay022/ov22_02255094.h
@@ -18,7 +18,7 @@ void ov22_02255134(UnkStruct_ov22_0225A0E4 * param0);
 void ov22_02255180(UnkStruct_ov22_0225A0E4 * param0);
 void ov22_022551B4(UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1);
 void ov22_022551D0(UnkStruct_ov22_0225A0E4 * param0);
-UnkStruct_02022550 * ov22_022551E4(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5);
+GraphicElementData * ov22_022551E4(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5);
 void ov22_02255248(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5);
 void ov22_02255268(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5, int param6);
 void ov22_0225528C(UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4);
diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h
index 883d4f9239..a6fef661bc 100644
--- a/include/overlay022/struct_ov22_02256BAC.h
+++ b/include/overlay022/struct_ov22_02256BAC.h
@@ -10,9 +10,9 @@
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     UnkStruct_02009714 ** unk_08;
-    const UnkStruct_020279FC * unk_0C;
+    const AnimationControlFlags * unk_0C;
     int unk_10;
     int unk_14;
     int unk_18;
diff --git a/include/overlay022/struct_ov22_02259C58.h b/include/overlay022/struct_ov22_02259C58.h
index f967865b54..dbb2e12bfc 100644
--- a/include/overlay022/struct_ov22_02259C58.h
+++ b/include/overlay022/struct_ov22_02259C58.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02022550_decl.h"
 
 typedef struct UnkStruct_ov22_02259C58_tag {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     void * unk_08;
     void (* unk_0C)(struct UnkStruct_ov22_02259C58_tag * param0, void * param1);
diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h
index 640b212e30..6326b6f8c2 100644
--- a/include/overlay022/struct_ov22_0225A0E4.h
+++ b/include/overlay022/struct_ov22_0225A0E4.h
@@ -32,7 +32,7 @@ typedef struct {
     NNSG2dCharacterData ** unk_38;
     int unk_3C;
     BGL * unk_40;
-    UnkStruct_020218BC * unk_44;
+    GraphicElementManager * unk_44;
     UnkStruct_02009714 * unk_48[4];
     UnkStruct_0200C738 unk_58;
     NARC * unk_5C;
diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h
index e7794107b9..c8c1680898 100644
--- a/include/overlay022/struct_ov22_0225A428.h
+++ b/include/overlay022/struct_ov22_0225A428.h
@@ -12,7 +12,7 @@
 typedef struct {
     UnkStruct_ov22_022597BC unk_00;
     Window * unk_2C;
-    UnkStruct_020218BC * unk_30;
+    GraphicElementManager * unk_30;
     UnkStruct_02009714 ** unk_34;
     UnkStruct_ov22_0225A914 unk_38;
     UnkStruct_ov22_0225AB54 unk_A0;
diff --git a/include/overlay022/struct_ov22_0225A914.h b/include/overlay022/struct_ov22_0225A914.h
index 3ff098d5f9..e8ae739c3e 100644
--- a/include/overlay022/struct_ov22_0225A914.h
+++ b/include/overlay022/struct_ov22_0225A914.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_02022550 * unk_10[20];
+    GraphicElementData * unk_10[20];
     int unk_60;
     int unk_64;
 } UnkStruct_ov22_0225A914;
diff --git a/include/overlay022/struct_ov22_0225AB54.h b/include/overlay022/struct_ov22_0225AB54.h
index 332e1683fc..cda6b1d519 100644
--- a/include/overlay022/struct_ov22_0225AB54.h
+++ b/include/overlay022/struct_ov22_0225AB54.h
@@ -10,7 +10,7 @@
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_02022550 * unk_10[2];
+    GraphicElementData * unk_10[2];
     Window * unk_18;
     int unk_1C;
     int unk_20;
diff --git a/include/overlay022/struct_ov22_0225AE9C.h b/include/overlay022/struct_ov22_0225AE9C.h
index 1cedc71968..0b1e0de398 100644
--- a/include/overlay022/struct_ov22_0225AE9C.h
+++ b/include/overlay022/struct_ov22_0225AE9C.h
@@ -8,7 +8,7 @@
 
 typedef struct {
     BOOL unk_00;
-    UnkStruct_02022550 * unk_04[2];
+    GraphicElementData * unk_04[2];
     VecFx32 unk_0C[2];
     UnkStruct_ov22_0225AD68 unk_24;
     UnkStruct_ov22_0225AD68 unk_38;
diff --git a/include/overlay023/struct_ov23_02248D20.h b/include/overlay023/struct_ov23_02248D20.h
index 92deefd43e..38752a354a 100644
--- a/include/overlay023/struct_ov23_02248D20.h
+++ b/include/overlay023/struct_ov23_02248D20.h
@@ -10,7 +10,7 @@
 typedef struct {
     UnkFuncPtr_ov23_02248D20 unk_00;
     UnkStruct_020298B0 * unk_04;
-    UnkStruct_02013A04 * unk_08;
+    ResourceMetadata * unk_08;
     UnkStruct_0200112C * unk_0C;
     UnkStruct_020149F0 * unk_10;
     u16 unk_14;
diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h
index 5eb7a3e648..396968cf9c 100644
--- a/include/overlay023/struct_ov23_02250CD4.h
+++ b/include/overlay023/struct_ov23_02250CD4.h
@@ -27,14 +27,14 @@ typedef struct {
     Window unk_10;
     Window unk_20;
     Window unk_30;
-    UnkStruct_02013A04 * unk_40;
-    UnkStruct_02013A04 * unk_44;
+    ResourceMetadata * unk_40;
+    ResourceMetadata * unk_44;
     UnkStruct_0200112C * unk_48;
     UnkStruct_ov23_02248D20 * unk_4C;
     UnkStruct_0200112C * unk_50;
-    UnkStruct_02001AF4 * unk_54;
-    UnkStruct_02013A04 * unk_58;
-    UnkStruct_02001AF4 * unk_5C;
+    UIControlData * unk_54;
+    ResourceMetadata * unk_58;
+    UIControlData * unk_5C;
     UnkFuncPtr_ov23_022515D8 unk_60;
     UnkFuncPtr_ov23_022515D8 unk_64;
     Strbuf* unk_68;
diff --git a/include/overlay062/ov62_02246B00.h b/include/overlay062/ov62_02246B00.h
index 24c4a73b27..8e572b1780 100644
--- a/include/overlay062/ov62_02246B00.h
+++ b/include/overlay062/ov62_02246B00.h
@@ -5,7 +5,7 @@
 #include "overlay062/struct_ov62_02246B00.h"
 #include "overlay062/struct_ov62_02246BF4.h"
 
-UnkStruct_ov62_02246B00 * ov62_02246B00(int param0, int param1, int param2[], UnkStruct_020279FC * param3);
+UnkStruct_ov62_02246B00 * ov62_02246B00(int param0, int param1, int param2[], AnimationControlFlags * param3);
 void ov62_02246B4C(UnkStruct_ov62_02246B00 * param0);
 void ov62_02246B70(UnkStruct_ov62_02246BF4 * param0, int param1);
 void ov62_02246BF4(UnkStruct_ov62_02246BF4 * param0);
diff --git a/include/overlay062/struct_ov62_0223118C.h b/include/overlay062/struct_ov62_0223118C.h
index bdcc01bd4e..0ce21bc595 100644
--- a/include/overlay062/struct_ov62_0223118C.h
+++ b/include/overlay062/struct_ov62_0223118C.h
@@ -19,8 +19,8 @@
 
 typedef struct {
     NARC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     u8 padding_0C[4];
     BGL * unk_10;
     PaletteSys * unk_14;
@@ -34,7 +34,7 @@ typedef struct {
     int unk_44;
     u8 unk_48;
     u8 padding_49[3];
-    UnkStruct_0207C690 * unk_4C;
+    GenericPointerData * unk_4C;
     UnkStruct_02007768 * unk_50;
     UnkStruct_ov62_022349A8 unk_54;
     UnkStruct_ov62_0223359C unk_46C;
diff --git a/include/overlay062/struct_ov62_02246B00.h b/include/overlay062/struct_ov62_02246B00.h
index deb008758d..583c633b28 100644
--- a/include/overlay062/struct_ov62_02246B00.h
+++ b/include/overlay062/struct_ov62_02246B00.h
@@ -9,7 +9,7 @@ typedef struct {
     int unk_04[4];
     u8 padding_14[4];
     Strbuf* unk_18;
-    UnkStruct_020279FC * unk_1C;
+    AnimationControlFlags * unk_1C;
 } UnkStruct_ov62_02246B00;
 
 #endif // POKEPLATINUM_STRUCT_OV62_02246B00_H
diff --git a/include/overlay062/struct_ov62_02246BF4_sub2.h b/include/overlay062/struct_ov62_02246BF4_sub2.h
index 78596775f2..b5fed27f48 100644
--- a/include/overlay062/struct_ov62_02246BF4_sub2.h
+++ b/include/overlay062/struct_ov62_02246BF4_sub2.h
@@ -11,8 +11,8 @@
 
 typedef struct {
     NARC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     BGL * unk_0C;
     PaletteSys * unk_10;
     UnkStruct_02023FCC * unk_14;
diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h
index e47b43c46f..c5e0ed1a63 100644
--- a/include/overlay063/ov63_0222AE60.h
+++ b/include/overlay063/ov63_0222AE60.h
@@ -8,7 +8,7 @@
 #include "overlay063/struct_ov63_0222BB38_decl.h"
 #include "overlay064/struct_ov64_022302EC.h"
 
-UnkStruct_ov63_0222AE60 * ov63_0222AE60(UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3);
+UnkStruct_ov63_0222AE60 * ov63_0222AE60(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3);
 void ov63_0222AF14(UnkStruct_ov63_0222AE60 * param0);
 void ov63_0222AF94(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, int param3, u32 param4);
 void ov63_0222AFD0(UnkStruct_ov63_0222AE60 * param0, u32 param1);
@@ -20,7 +20,7 @@ void ov63_0222B0A0(UnkStruct_ov63_0222AE60 * param0, u32 param1, u32 param2, u32
 void ov63_0222B0B8(UnkStruct_ov63_0222AE60 * param0);
 UnkStruct_ov63_0222BB38 * ov63_0222B0C0(UnkStruct_ov63_0222AE60 * param0, const UnkStruct_ov64_022302EC * param1, u32 param2, u32 param3);
 void ov63_0222B210(UnkStruct_ov63_0222BB38 * param0);
-const UnkStruct_02022550 * ov63_0222B234(const UnkStruct_ov63_0222BB38 * param0);
+const GraphicElementData * ov63_0222B234(const UnkStruct_ov63_0222BB38 * param0);
 void ov63_0222B238(UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2);
 void ov63_0222B278(UnkStruct_ov63_0222BB38 * param0, u16 param1);
 u16 ov63_0222B284(const UnkStruct_ov63_0222BB38 * param0);
diff --git a/include/overlay063/ov63_0222CCE4.h b/include/overlay063/ov63_0222CCE4.h
index 5935f05a23..3a5cdc703c 100644
--- a/include/overlay063/ov63_0222CCE4.h
+++ b/include/overlay063/ov63_0222CCE4.h
@@ -8,8 +8,8 @@
 #include "overlay063/struct_ov63_0222CD2C.h"
 #include "overlay063/struct_ov63_0222CE44.h"
 
-UnkStruct_ov63_0222CD2C * ov63_0222CCE4(UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov63_0222CD2C * ov63_0222CD2C(UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
+UnkStruct_ov63_0222CD2C * ov63_0222CCE4(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov63_0222CD2C * ov63_0222CD2C(GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
 void ov63_0222CD9C(UnkStruct_ov63_0222CD2C * param0);
 void ov63_0222CDE8(UnkStruct_ov63_0222CD2C * param0, u32 param1, int param2, u32 param3);
 void ov63_0222CE0C(UnkStruct_ov63_0222CD2C * param0, u32 param1);
diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h
index bc3f4a45dc..640397c4f7 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -32,9 +32,9 @@ struct UnkStruct_ov65_0222EBE0_t {
     u8 unk_2C[32];
     int unk_4C[32];
     int unk_CC[32];
-    UnkStruct_02013A04 * unk_14C;
+    ResourceMetadata * unk_14C;
     UnkStruct_0200112C * unk_150;
-    UnkStruct_02013A04 * unk_154;
+    ResourceMetadata * unk_154;
     UnkStruct_0200112C * unk_158;
     BGL * unk_15C;
     SaveData * unk_160;
@@ -46,9 +46,9 @@ struct UnkStruct_ov65_0222EBE0_t {
     Strbuf* unk_178;
     Strbuf* unk_17C;
     int unk_180;
-    UnkStruct_02001AF4 * unk_184;
+    UIControlData * unk_184;
     void * unk_188;
-    UnkStruct_020218BC * unk_18C;
+    GraphicElementManager * unk_18C;
     UnkStruct_0200C738 unk_190;
     UnkStruct_02009714 * unk_31C[4];
     UnkStruct_02012744 * unk_32C;
diff --git a/include/overlay065/struct_ov65_02234E50.h b/include/overlay065/struct_ov65_02234E50.h
index 1a8bab13cf..e8c2a82272 100644
--- a/include/overlay065/struct_ov65_02234E50.h
+++ b/include/overlay065/struct_ov65_02234E50.h
@@ -34,7 +34,7 @@ typedef struct {
     Window unk_FC[8][2];
     Window unk_1FC;
     UnkStruct_02009DC8 * unk_20C[4];
-    UnkStruct_02022550 * unk_21C[3];
+    GraphicElementData * unk_21C[3];
     SpriteManagerAllocation unk_228;
     FontOAM * unk_234;
     u32 unk_238;
diff --git a/include/overlay065/struct_ov65_022358CC.h b/include/overlay065/struct_ov65_022358CC.h
index 1d07588741..72691051e3 100644
--- a/include/overlay065/struct_ov65_022358CC.h
+++ b/include/overlay065/struct_ov65_022358CC.h
@@ -7,7 +7,7 @@
 #include "overlay065/struct_ov65_022358CC_sub1.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_ov65_022358CC_sub1 unk_1A0;
diff --git a/include/overlay065/struct_ov65_022358CC_sub1.h b/include/overlay065/struct_ov65_022358CC_sub1.h
index da161b110c..cf0e7d9ebc 100644
--- a/include/overlay065/struct_ov65_022358CC_sub1.h
+++ b/include/overlay065/struct_ov65_022358CC_sub1.h
@@ -8,8 +8,8 @@
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     UnkStruct_ov19_021DA864 unk_10;
-    UnkStruct_02022550 * unk_34;
-    UnkStruct_02022550 * unk_38;
+    GraphicElementData * unk_34;
+    GraphicElementData * unk_38;
 } UnkStruct_ov65_022358CC_sub1;
 
 #endif // POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H
diff --git a/include/overlay070/ov70_0225D9A4.h b/include/overlay070/ov70_0225D9A4.h
index 6f41e5c25d..6778d829c4 100644
--- a/include/overlay070/ov70_0225D9A4.h
+++ b/include/overlay070/ov70_0225D9A4.h
@@ -50,7 +50,7 @@ void ov70_0225E00C(UnkStruct_ov70_0225DEE8 * param0, u32 param1);
 void ov70_0225E020(UnkStruct_ov70_0225DEE8 * param0, u32 param1, u32 param2);
 void ov70_0225E034(UnkStruct_ov70_0225DEE8 * param0);
 void ov70_0225E044(UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32 param2);
-const UnkStruct_02013A04 * ov70_0225E054(const UnkStruct_ov70_0225DEE8 * param0);
+const ResourceMetadata * ov70_0225E054(const UnkStruct_ov70_0225DEE8 * param0);
 BOOL ov70_0225E064(const UnkStruct_ov70_0225DEE8 * param0, u32 param1);
 void ov70_0225E074(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3);
 void ov70_0225E0A4(UnkStruct_ov70_0225DEE8 * param0, const UnkStruct_ov84_02240FA8 * param1, u16 param2, u16 param3, u8 param4, u8 param5, u8 param6);
diff --git a/include/overlay071/struct_ov71_0223D238.h b/include/overlay071/struct_ov71_0223D238.h
index 6970af0462..d4f5dd4692 100644
--- a/include/overlay071/struct_ov71_0223D238.h
+++ b/include/overlay071/struct_ov71_0223D238.h
@@ -10,11 +10,11 @@
 #include <nnsys.h>
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[2][4];
-    UnkStruct_02022550 * unk_1C0[25];
+    GraphicElementData * unk_1C0[25];
     void * unk_224[8];
     NNSG2dPaletteData * unk_244[8];
 } UnkStruct_ov71_0223D238;
diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h
index a22a819de1..37e3f857e9 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -23,7 +23,7 @@ struct UnkStruct_ov72_0223DB98_t {
     BGL * unk_00;
     BOOL unk_04;
     UnkStruct_0202CD88 * unk_08;
-    UnkStruct_020279FC * unk_0C;
+    AnimationControlFlags * unk_0C;
     UnkStruct_0200B358 * unk_10;
     MessageLoader * unk_14;
     Strbuf* unk_18[5];
@@ -31,15 +31,15 @@ struct UnkStruct_ov72_0223DB98_t {
     Strbuf* unk_30;
     Strbuf* unk_34;
     int unk_38;
-    UnkStruct_020218BC * unk_3C;
+    GraphicElementManager * unk_3C;
     UnkStruct_0200C738 unk_40;
     UnkStruct_02009714 * unk_1CC[4];
     UnkStruct_02009DC8 * unk_1DC[2][4];
     UnkStruct_ov19_021DA864 unk_1FC;
     UnkStruct_ov19_021DA864 unk_220;
-    UnkStruct_02022550 * unk_244[14];
-    UnkStruct_02022550 * unk_27C[14];
-    UnkStruct_02022550 * unk_2B4[9];
+    GraphicElementData * unk_244[14];
+    GraphicElementData * unk_27C[14];
+    GraphicElementData * unk_2B4[9];
     Window unk_2D8[5];
     Window unk_328;
     Window unk_338;
diff --git a/include/overlay076/ov76_0223B870.h b/include/overlay076/ov76_0223B870.h
index e46d85bd45..92f209feb7 100644
--- a/include/overlay076/ov76_0223B870.h
+++ b/include/overlay076/ov76_0223B870.h
@@ -22,7 +22,7 @@ void ov76_0223BB04(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223BBAC(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223BC70(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223BD30(UnkStruct_ov76_0223DE00 * param0, s8 param1, int param2);
-UnkStruct_0207C690 * ov76_0223BE6C(void);
+GenericPointerData * ov76_0223BE6C(void);
 void ov76_0223BE8C(void);
 void ov76_0223BF10(void);
 void ov76_0223BF50(void);
@@ -41,7 +41,7 @@ void ov76_0223C4AC(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C544(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C568(UnkStruct_ov76_0223DE00 * param0, int param1);
 void ov76_0223C588(UnkStruct_ov76_0223DE00 * param0);
-void ov76_0223C5A4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
+void ov76_0223C5A4(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
 void ov76_0223C61C(UnkStruct_ov76_0223DE00 * param0, NARC * param1);
 void ov76_0223C7E0(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C80C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2);
diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h
index 9ce5b2bc30..f23a5b7eeb 100644
--- a/include/overlay076/struct_ov76_0223C398.h
+++ b/include/overlay076/struct_ov76_0223C398.h
@@ -25,13 +25,13 @@
 typedef struct {
     int unk_00;
     BOOL unk_04;
-    UnkStruct_0200C6E4 * unk_08;
-    UnkStruct_0200C704 * unk_0C;
+    CellTransferStateData * unk_08;
+    AnimationResourceCollection * unk_0C;
     BGL * unk_10;
     PaletteSys * unk_14;
     Window unk_18[11];
-    UnkStruct_02013A04 * unk_C8;
-    UnkStruct_02001AF4 * unk_CC;
+    ResourceMetadata * unk_C8;
+    UIControlData * unk_CC;
     UnkStruct_02007768 * unk_D0;
     Sprite * unk_D4;
     int unk_D8;
@@ -41,7 +41,7 @@ typedef struct {
     UnkStruct_02015920 * unk_150;
     UnkStruct_ov12_02235FE0 * unk_154;
     BallRotation * unk_158;
-    UnkStruct_0207C690 * unk_15C;
+    GenericPointerData * unk_15C;
     UnkStruct_02012744 * unk_160;
     FontOAM * unk_164[2];
     SpriteManagerAllocation unk_16C[2];
diff --git a/include/overlay077/ov77_021D6670.h b/include/overlay077/ov77_021D6670.h
index 66c2df894a..e6b633ca0d 100644
--- a/include/overlay077/ov77_021D6670.h
+++ b/include/overlay077/ov77_021D6670.h
@@ -8,7 +8,7 @@
 UnkStruct_ov77_021D670C * ov77_021D670C(void);
 UnkStruct_ov77_021D6734 * ov77_021D6734(const int param0);
 void ov77_021D6760(UnkStruct_ov77_021D6734 * param0);
-UnkStruct_02022550 ** ov77_021D6794(UnkStruct_ov77_021D6734 * param0, const int param1);
+GraphicElementData ** ov77_021D6794(UnkStruct_ov77_021D6734 * param0, const int param1);
 void ov77_021D67B0(UnkStruct_ov77_021D670C * param0);
 void ov77_021D69C0(UnkStruct_ov77_021D670C * param0, const int param1);
 void ov77_021D6BA0(UnkStruct_ov77_021D6734 * param0, int param1);
diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h
index 8ffc29aaa0..3897affd73 100644
--- a/include/overlay079/struct_ov79_021D0E1C.h
+++ b/include/overlay079/struct_ov79_021D0E1C.h
@@ -45,19 +45,19 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
     UnkStruct_ov84_02240FA8 unk_A4;
     UnkStruct_0200112C * unk_C4;
     UnkStruct_0200112C * unk_C8;
-    UnkStruct_02013A04 * unk_CC;
-    UnkStruct_02013A04 * unk_D0;
-    UnkStruct_02001AF4 * unk_D4;
+    ResourceMetadata * unk_CC;
+    ResourceMetadata * unk_D0;
+    UIControlData * unk_D4;
     void * unk_D8;
     void * unk_DC;
     NNSG2dScreenData * unk_E0;
     NNSG2dScreenData * unk_E4;
     Window unk_E8[13];
-    UnkStruct_0200C6E4 * unk_1B8;
-    UnkStruct_0200C704 * unk_1BC;
-    UnkStruct_02022550 * unk_1C0[3];
-    UnkStruct_02022550 * unk_1CC[5];
-    UnkStruct_02022550 * unk_1E0[6];
+    CellTransferStateData * unk_1B8;
+    AnimationResourceCollection * unk_1BC;
+    GraphicElementData * unk_1C0[3];
+    GraphicElementData * unk_1CC[5];
+    GraphicElementData * unk_1E0[6];
     UnkStruct_0209903C * unk_1F8;
     UnkStruct_0209916C * unk_1FC;
 } UnkStruct_ov79_021D0E1C;
diff --git a/include/overlay080/ov80_021D2AF4.h b/include/overlay080/ov80_021D2AF4.h
index 3e963ccf60..b148ed1eae 100644
--- a/include/overlay080/ov80_021D2AF4.h
+++ b/include/overlay080/ov80_021D2AF4.h
@@ -8,7 +8,7 @@
 #include "overlay080/struct_ov80_021D2C5C.h"
 #include "overlay080/struct_ov80_021D2E10.h"
 
-UnkStruct_ov80_021D2C1C * ov80_021D2AF4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u8 * param2, short param3, int param4);
+UnkStruct_ov80_021D2C1C * ov80_021D2AF4(CellTransferStateData * param0, AnimationResourceCollection * param1, u8 * param2, short param3, int param4);
 void ov80_021D2C1C(UnkStruct_ov80_021D2C1C * param0);
 UnkStruct_ov80_021D2C5C * ov80_021D2C5C(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3);
 int ov80_021D2CC0(UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int param3);
diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h
index 5f1e0c57fb..ff11f58e77 100644
--- a/include/overlay080/struct_ov80_021D2A08.h
+++ b/include/overlay080/struct_ov80_021D2A08.h
@@ -59,8 +59,8 @@ typedef struct UnkStruct_ov80_021D2A08_t {
     NNSG2dScreenData * unk_CC;
     NNSG2dScreenData * unk_D0;
     NNSG2dScreenData * unk_D4;
-    UnkStruct_0200C6E4 * unk_D8;
-    UnkStruct_0200C704 * unk_DC;
+    CellTransferStateData * unk_D8;
+    AnimationResourceCollection * unk_DC;
     CellActorData * unk_E0;
 } UnkStruct_ov80_021D2A08;
 
diff --git a/include/overlay080/struct_ov80_021D2C5C.h b/include/overlay080/struct_ov80_021D2C5C.h
index 9cf456b51e..84ed4d5ea6 100644
--- a/include/overlay080/struct_ov80_021D2C5C.h
+++ b/include/overlay080/struct_ov80_021D2C5C.h
@@ -7,7 +7,7 @@
 typedef struct {
     UnkStruct_ov80_021D2C5C_sub1 unk_00;
     int unk_14;
-    UnkStruct_02022550 * unk_18;
+    GraphicElementData * unk_18;
 } UnkStruct_ov80_021D2C5C;
 
 #endif // POKEPLATINUM_STRUCT_OV80_021D2C5C_H
diff --git a/include/overlay082/struct_ov82_0223B164.h b/include/overlay082/struct_ov82_0223B164.h
index 82d7c4c434..7b63744375 100644
--- a/include/overlay082/struct_ov82_0223B164.h
+++ b/include/overlay082/struct_ov82_0223B164.h
@@ -15,7 +15,7 @@ typedef struct {
     SaveData * unk_0C;
     TrainerInfo * unk_10;
     UnkStruct_0207D3C0 * unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     UnkStruct_0202B628 * unk_1C;
     BOOL unk_20;
     BOOL unk_24;
diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h
index 6b9a588409..969f247f5e 100644
--- a/include/overlay083/ov83_0223D6A8.h
+++ b/include/overlay083/ov83_0223D6A8.h
@@ -33,7 +33,7 @@ void ov83_0223D784(UnkStruct_ov83_0223D784 * param0);
 void ov83_0223D7A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
 void ov83_0223D894(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, NARC * param2, UnkStruct_02009DC8 * param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov83_0223D95C(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1);
-UnkStruct_02022550 * ov83_0223D9A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6);
+GraphicElementData * ov83_0223D9A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6);
 void ov83_0223D9DC(UnkStruct_ov83_0223D9EC * param0, fx32 param1, fx32 param2, int param3);
 BOOL ov83_0223D9EC(UnkStruct_ov83_0223D9EC * param0);
 void ov83_0223DA34(UnkStruct_ov83_0223DA94 * param0, fx32 param1, fx32 param2, fx32 param3, int param4);
diff --git a/include/overlay083/struct_ov83_0223D784.h b/include/overlay083/struct_ov83_0223D784.h
index d8e28ad7c3..c77ae774ec 100644
--- a/include/overlay083/struct_ov83_0223D784.h
+++ b/include/overlay083/struct_ov83_0223D784.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
 } UnkStruct_ov83_0223D784;
diff --git a/include/overlay083/struct_ov83_0223D9A8.h b/include/overlay083/struct_ov83_0223D9A8.h
index 88f853db96..6c109eaaa5 100644
--- a/include/overlay083/struct_ov83_0223D9A8.h
+++ b/include/overlay083/struct_ov83_0223D9A8.h
@@ -7,7 +7,7 @@
 #include <nitro/fx/fx.h>
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     const UnkStruct_ov19_021DA864 * unk_04;
     VecFx32 unk_08;
     u32 unk_14;
diff --git a/include/overlay083/struct_ov83_0223DB30.h b/include/overlay083/struct_ov83_0223DB30.h
index 9e792d652c..354de6073c 100644
--- a/include/overlay083/struct_ov83_0223DB30.h
+++ b/include/overlay083/struct_ov83_0223DB30.h
@@ -8,8 +8,8 @@
 typedef struct {
     BOOL unk_00;
     BOOL unk_04;
-    UnkStruct_02022550 * unk_08[4];
-    UnkStruct_02022550 * unk_18[4];
+    GraphicElementData * unk_08[4];
+    GraphicElementData * unk_18[4];
     UnkStruct_ov83_0223D95C unk_28[4];
     int unk_108;
     UnkStruct_ov83_0223DA94 unk_10C[4];
diff --git a/include/overlay083/struct_ov83_0223E244.h b/include/overlay083/struct_ov83_0223E244.h
index e5825dd2da..00ec229faa 100644
--- a/include/overlay083/struct_ov83_0223E244.h
+++ b/include/overlay083/struct_ov83_0223E244.h
@@ -6,7 +6,7 @@
 typedef struct {
     BOOL unk_00;
     BOOL unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
 } UnkStruct_ov83_0223E244;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223E244_H
diff --git a/include/overlay083/struct_ov83_0223E5C0.h b/include/overlay083/struct_ov83_0223E5C0.h
index c8343236fd..96822f7270 100644
--- a/include/overlay083/struct_ov83_0223E5C0.h
+++ b/include/overlay083/struct_ov83_0223E5C0.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     BOOL unk_00;
-    UnkStruct_02022550 * unk_04[4];
+    GraphicElementData * unk_04[4];
     const UnkStruct_ov83_0223FE50 * unk_14;
     u32 unk_18;
     UnkStruct_ov83_0223D4CC * unk_1C;
diff --git a/include/overlay083/struct_ov83_0223F054.h b/include/overlay083/struct_ov83_0223F054.h
index 3cbc019bbd..082422efb6 100644
--- a/include/overlay083/struct_ov83_0223F054.h
+++ b/include/overlay083/struct_ov83_0223F054.h
@@ -18,7 +18,7 @@ typedef struct {
     UnkStruct_ov83_0223DA94 unk_30;
     UnkStruct_ov83_0223DA94 unk_48;
     UnkStruct_ov83_0223DA94 unk_60;
-    UnkStruct_02022550 * unk_78;
+    GraphicElementData * unk_78;
     int unk_7C;
 } UnkStruct_ov83_0223F054;
 
diff --git a/include/overlay083/struct_ov83_0223F410.h b/include/overlay083/struct_ov83_0223F410.h
index 2622216a1b..3f23e28a19 100644
--- a/include/overlay083/struct_ov83_0223F410.h
+++ b/include/overlay083/struct_ov83_0223F410.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02022550_decl.h"
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     int unk_08;
     BOOL unk_0C;
diff --git a/include/overlay083/struct_ov83_0223F670.h b/include/overlay083/struct_ov83_0223F670.h
index ae04a98f18..0914a44b03 100644
--- a/include/overlay083/struct_ov83_0223F670.h
+++ b/include/overlay083/struct_ov83_0223F670.h
@@ -12,7 +12,7 @@ typedef struct {
     VecFx32 unk_08;
     UnkStruct_ov83_0223DA94 unk_14;
     UnkStruct_ov83_0223DA94 unk_2C;
-    UnkStruct_02022550 * unk_44;
+    GraphicElementData * unk_44;
 } UnkStruct_ov83_0223F670;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223F670_H
diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h
index 0142b08f1d..56733ff40c 100644
--- a/include/overlay084/struct_ov84_0223B5A0.h
+++ b/include/overlay084/struct_ov84_0223B5A0.h
@@ -28,10 +28,10 @@ typedef struct {
     UnkStruct_0207CB08 * unk_C4;
     UnkStruct_0207D3C0 * unk_C8;
     TrainerInfo * unk_CC;
-    UnkStruct_020279FC * unk_D0;
+    AnimationControlFlags * unk_D0;
     NARC * unk_D4;
-    UnkStruct_0200C6E4 * unk_D8;
-    UnkStruct_0200C704 * unk_DC;
+    CellTransferStateData * unk_D8;
+    AnimationResourceCollection * unk_DC;
     CellActorData * unk_E0[12];
     UnkStruct_0200C440 * unk_110;
     MessageLoader * unk_114;
@@ -39,10 +39,10 @@ typedef struct {
     MessageLoader * unk_11C;
     MessageLoader * unk_120;
     Strbuf* unk_124[12];
-    UnkStruct_02013A04 * unk_154;
-    UnkStruct_02001AF4 * unk_158;
+    ResourceMetadata * unk_154;
+    UIControlData * unk_158;
     UnkStruct_0200112C * unk_15C;
-    UnkStruct_02013A04 * unk_160;
+    ResourceMetadata * unk_160;
     Strbuf* unk_164[165];
     Strbuf* unk_3F8;
     Strbuf* unk_3FC;
diff --git a/include/overlay084/struct_ov84_02240FA8.h b/include/overlay084/struct_ov84_02240FA8.h
index 4d1a10e625..77b7ee8605 100644
--- a/include/overlay084/struct_ov84_02240FA8.h
+++ b/include/overlay084/struct_ov84_02240FA8.h
@@ -6,7 +6,7 @@
 #include "struct_defs/struct_0205AA50.h"
 
 typedef struct {
-    const UnkStruct_02013A04 * unk_00;
+    const ResourceMetadata * unk_00;
     void (* unk_04)(UnkStruct_0200112C *, u32, u8);
     void (* unk_08)(UnkStruct_0200112C *, u32, u8);
     Window * unk_0C;
diff --git a/include/overlay088/ov88_0223E9C4.h b/include/overlay088/ov88_0223E9C4.h
index 95d1ab11c5..137f2b3aad 100644
--- a/include/overlay088/ov88_0223E9C4.h
+++ b/include/overlay088/ov88_0223E9C4.h
@@ -11,12 +11,12 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0205AA50.h"
 
-void ov88_0223E9C4(BGL * param0, Window * param1, UnkStruct_020279FC * param2);
+void ov88_0223E9C4(BGL * param0, Window * param1, AnimationControlFlags * param2);
 void ov88_0223EC04(Window * param0);
 void ov88_0223EC78(Window * param0, Strbuf *param1, int param2, u32 param3, int param4, int param5);
 int ov88_0223ECBC(Window * param0, int param1, int param2, MessageLoader * param3, UnkStruct_0200B358 * param4);
-u32  ov88_0223ED2C(BGL * param0, UnkStruct_02001AF4 ** param1, int * param2);
+u32  ov88_0223ED2C(BGL * param0, UIControlData ** param1, int * param2);
 void ov88_0223ED80(Window * param0);
-UnkStruct_0200112C * ov88_0223ED94(UnkStruct_02013A04 * param0, int param1, Window * param2, BGL * param3);
+UnkStruct_0200112C * ov88_0223ED94(ResourceMetadata * param0, int param1, Window * param2, BGL * param3);
 
 #endif // POKEPLATINUM_OV88_0223E9C4_H
diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h
index 4186dafb67..647a58dc31 100644
--- a/include/overlay088/struct_ov88_0223C370.h
+++ b/include/overlay088/struct_ov88_0223C370.h
@@ -20,7 +20,7 @@ typedef struct {
     UnkStruct_02027F8C * unk_0C;
     SaveData * unk_10;
     UnkStruct_0202C878 * unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     UnkStruct_0202B628 * unk_1C;
     UnkStruct_0202CD88 * unk_20;
     UnkStruct_02026324 * unk_24;
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index e0292a942e..df29a9118c 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -13,9 +13,9 @@ int ov94_0223BCB0(UnkStruct_020067E8 * param0, int * param1);
 int ov94_0223BE2C(UnkStruct_020067E8 * param0, int * param1);
 int ov94_0223BF54(UnkStruct_020067E8 * param0, int * param1);
 void ov94_0223C300(UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3);
-UnkStruct_02001AF4 * ov94_0223C3C0(BGL * param0, int param1, int param2);
+UIControlData * ov94_0223C3C0(BGL * param0, int param1, int param2);
 void ov94_0223C3F4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2);
-void ov94_0223C3FC(UnkStruct_02022550 * param0, int param1, int param2);
+void ov94_0223C3FC(GraphicElementData * param0, int param1, int param2);
 int ov94_0223C4B4(void);
 void ov94_0223C4C0(UnkStruct_ov94_0223FD4C * param0, int param1, int param2);
 void ov94_0223C4C8(UnkStruct_ov94_0223FD4C * param0);
diff --git a/include/overlay094/ov94_022414B8.h b/include/overlay094/ov94_022414B8.h
index 2f9be06c65..113bb97b24 100644
--- a/include/overlay094/ov94_022414B8.h
+++ b/include/overlay094/ov94_022414B8.h
@@ -27,13 +27,13 @@ void ov94_02242368(MessageLoader * param0, MessageLoader * param1, UnkStruct_020
 u16 * ov94_02242524(int param0, int param1, int * param2);
 u8 * ov94_02242548(int param0);
 void ov94_022425A8(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1);
-UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, Window * param2, MessageLoader * param3);
-UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6);
-UnkStruct_0200112C * ov94_02242840(UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2);
-UnkStruct_0200112C * ov94_022428B0(UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2, int param3);
+UnkStruct_0200112C * ov94_022426A8(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3);
+UnkStruct_0200112C * ov94_022427C0(UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6);
+UnkStruct_0200112C * ov94_02242840(ResourceMetadata ** param0, Window * param1, MessageLoader * param2);
+UnkStruct_0200112C * ov94_022428B0(ResourceMetadata ** param0, Window * param1, MessageLoader * param2, int param3);
 void ov94_02242934(UnkStruct_ov94_0223BA88_sub3 * param0, int param1, int param2);
 int ov94_02242970(int param0, int param1, int param2);
-UnkStruct_0200112C * ov94_022429B4(UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3);
+UnkStruct_0200112C * ov94_022429B4(ResourceMetadata ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3);
 void ov94_02242A44(UnkStruct_ov94_0223FD4C * param0, int param1);
 u32 ov94_02242A6C(UnkStruct_0200112C * param0, u16 * param1);
 void ov94_02242AAC(UnkStruct_ov94_02242AAC * param0);
diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index 983df8efe5..e9bac0f55c 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -100,21 +100,21 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
     Strbuf* unk_BB4[10];
     Strbuf* unk_BDC;
     int unk_BE0;
-    UnkStruct_020218BC * unk_BE4;
+    GraphicElementManager * unk_BE4;
     UnkStruct_0200C738 unk_BE8;
     UnkStruct_02009714 * unk_D74[4];
     UnkStruct_02009DC8 * unk_D84[3][4];
     UnkStruct_ov19_021DA864 unk_DB4;
     UnkStruct_ov19_021DA864 unk_DD8;
     UnkStruct_ov19_021DA864 unk_DFC;
-    UnkStruct_02022550 * unk_E20;
-    UnkStruct_02022550 * unk_E24;
-    UnkStruct_02022550 * unk_E28[30];
-    UnkStruct_02022550 * unk_EA0[30];
-    UnkStruct_02022550 * unk_F18[6];
-    UnkStruct_02022550 * unk_F30;
-    UnkStruct_02022550 * unk_F34[8];
-    UnkStruct_02022550 * unk_F54[2];
+    GraphicElementData * unk_E20;
+    GraphicElementData * unk_E24;
+    GraphicElementData * unk_E28[30];
+    GraphicElementData * unk_EA0[30];
+    GraphicElementData * unk_F18[6];
+    GraphicElementData * unk_F30;
+    GraphicElementData * unk_F34[8];
+    GraphicElementData * unk_F54[2];
     Window unk_F5C;
     Window unk_F6C;
     Window unk_F7C;
@@ -123,9 +123,9 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
     Window unk_FCC[13];
     Window unk_109C;
     Window unk_10AC[2];
-    UnkStruct_02013A04 * unk_10CC;
-    UnkStruct_02001AF4 * unk_10D0;
-    UnkStruct_02001AF4 * unk_10D4;
+    ResourceMetadata * unk_10CC;
+    UIControlData * unk_10D0;
+    UIControlData * unk_10D4;
     UnkStruct_0200112C * unk_10D8;
     void * unk_10DC;
     int unk_10E0;
diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h
index 9f6cc7c4b2..955073e289 100644
--- a/include/overlay095/ov95_02246C20.h
+++ b/include/overlay095/ov95_02246C20.h
@@ -27,7 +27,7 @@ void ov95_022474D4(UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32
 void ov95_02247568(UnkStruct_ov95_02247568 * param0, u32 param1, u32 param2, u32 param3);
 void ov95_022475A0(UnkStruct_ov95_02247568 * param0);
 void ov95_022475C4(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4);
-UnkStruct_02022550 * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+GraphicElementData * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
 BGL * ov95_02247628(UnkStruct_ov95_02247628 * param0);
 UnkStruct_0200B358 * ov95_0224762C(UnkStruct_ov95_02247628 * param0);
 MessageLoader * ov95_02247630(UnkStruct_ov95_02247628 * param0);
diff --git a/include/overlay096/ov96_0223B6A0.h b/include/overlay096/ov96_0223B6A0.h
index b5eae0f0af..3ad5725bad 100644
--- a/include/overlay096/ov96_0223B6A0.h
+++ b/include/overlay096/ov96_0223B6A0.h
@@ -12,7 +12,7 @@ int ov96_0223B6A0(UnkStruct_020067E8 * param0, int * param1);
 int ov96_0223B7F8(UnkStruct_020067E8 * param0, int * param1);
 int ov96_0223B8CC(UnkStruct_020067E8 * param0, int * param1);
 void ov96_0223BAE0(UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3);
-UnkStruct_02001AF4 * ov96_0223BBC8(BGL * param0, int param1, int param2);
+UIControlData * ov96_0223BBC8(BGL * param0, int param1, int param2);
 void ov96_0223BBFC(UnkStruct_ov96_0223BF40 * param0, int param1, int param2);
 int ov96_0223BC50(void);
 void ov96_0223BC5C(UnkStruct_ov96_0223BF40 * param0, int param1, int param2);
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index d26e509a15..76144ba11b 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -60,14 +60,14 @@ struct UnkStruct_ov96_0223BF40_t {
     Strbuf* unk_BE8;
     Strbuf* unk_BEC;
     int unk_BF0;
-    UnkStruct_020218BC * unk_BF4;
+    GraphicElementManager * unk_BF4;
     UnkStruct_0200C738 unk_BF8;
     UnkStruct_02009714 * unk_D84[4];
     UnkStruct_02009DC8 * unk_D94[3][4];
     UnkStruct_ov19_021DA864 unk_DC4;
     UnkStruct_ov19_021DA864 unk_DE8;
     UnkStruct_ov19_021DA864 unk_E0C;
-    UnkStruct_02022550 * unk_E30[2];
+    GraphicElementData * unk_E30[2];
     Window unk_E38;
     Window unk_E48;
     Window unk_E58;
@@ -75,7 +75,7 @@ struct UnkStruct_ov96_0223BF40_t {
     Window unk_E78;
     Window unk_E88[3];
     Window unk_EB8[11];
-    UnkStruct_02001AF4 * unk_F68;
+    UIControlData * unk_F68;
     void * unk_F6C;
     int unk_F70;
     int unk_F74;
diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h
index dca82ab1c8..88475fa008 100644
--- a/include/overlay097/ov97_02237694.h
+++ b/include/overlay097/ov97_02237694.h
@@ -33,7 +33,7 @@ void ov97_02237B0C(int param0, int param1, int param2, int param3, int param4, i
 void ov97_02237C80(fx32 param0, fx32 param1);
 void ov97_02237CA0(void);
 void ov97_02237CAC(int param0);
-UnkStruct_02022550 * ov97_02237D14(int param0, UnkStruct_02022550 * param1, int param2, int param3, int param4);
+GraphicElementData * ov97_02237D14(int param0, GraphicElementData * param1, int param2, int param3, int param4);
 void ov97_02237DA0(void);
 u32 ov97_02237E4C(int param0);
 void ov97_02238194(BGL * param0, UnkStruct_0202DF40 * param1);
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index 95b6af94a7..f6bceb543c 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -24,7 +24,7 @@
 typedef struct {
     BGL * unk_00;
     SaveData * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     UnkStruct_0200B358 * unk_0C;
     MessageLoader * unk_10;
     Strbuf* unk_14;
@@ -36,7 +36,7 @@ typedef struct {
     int unk_70;
     int unk_74;
     UnkStruct_0200112C * unk_78;
-    UnkStruct_02013A04 * unk_7C;
+    ResourceMetadata * unk_7C;
     int unk_80;
     int unk_84;
     int unk_88;
@@ -45,12 +45,12 @@ typedef struct {
     int unk_438;
     int unk_43C;
     int unk_440;
-    UnkStruct_020218BC * unk_444;
+    GraphicElementManager * unk_444;
     UnkStruct_0200C738 unk_448;
     UnkStruct_02009714 * unk_5D4[6];
     UnkStruct_02009DC8 * unk_5EC[6];
     UnkStruct_ov19_021DA864 unk_604;
-    UnkStruct_02022550 * unk_628;
+    GraphicElementData * unk_628;
     int unk_62C;
     int unk_630;
     int unk_634;
diff --git a/include/overlay097/struct_ov97_02237AEC.h b/include/overlay097/struct_ov97_02237AEC.h
index de70f69eae..fe58459429 100644
--- a/include/overlay097/struct_ov97_02237AEC.h
+++ b/include/overlay097/struct_ov97_02237AEC.h
@@ -8,7 +8,7 @@
 #include "overlay019/struct_ov19_021DA864.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[6];
     UnkStruct_02009DC8 * unk_1A8[2][6];
diff --git a/include/overlay098/struct_ov98_02246E88.h b/include/overlay098/struct_ov98_02246E88.h
index a14f4a55bf..890a892afd 100644
--- a/include/overlay098/struct_ov98_02246E88.h
+++ b/include/overlay098/struct_ov98_02246E88.h
@@ -14,7 +14,7 @@
 typedef struct {
     UnkStruct_020067E8 * unk_00;
     SaveData * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     void * unk_0C;
     NNSFndHeapHandle unk_10;
     DWCInetControl unk_14;
diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h
index 34912044a4..0aabdf7cb7 100644
--- a/include/overlay099/struct_ov99_021D2CB0.h
+++ b/include/overlay099/struct_ov99_021D2CB0.h
@@ -25,10 +25,10 @@ typedef struct {
     BOOL unk_04;
     BGL * unk_08;
     PaletteSys * unk_0C;
-    UnkStruct_0207C690 * unk_10;
+    GenericPointerData * unk_10;
     SysTask * unk_14;
-    UnkStruct_0200C6E4 * unk_18;
-    UnkStruct_0200C704 * unk_1C;
+    CellTransferStateData * unk_18;
+    AnimationResourceCollection * unk_1C;
     MessageLoader * unk_20;
     Window * unk_24;
     UnkStruct_020203AC * unk_28;
diff --git a/include/overlay100/struct_ov100_021D46C8.h b/include/overlay100/struct_ov100_021D46C8.h
index 6c84128fe1..a63c36d079 100644
--- a/include/overlay100/struct_ov100_021D46C8.h
+++ b/include/overlay100/struct_ov100_021D46C8.h
@@ -20,11 +20,11 @@
 
 typedef struct {
     NARC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     BGL * unk_0C;
     PaletteSys * unk_10;
-    UnkStruct_0207C690 * unk_14;
+    GenericPointerData * unk_14;
     UnkStruct_020203AC * unk_18;
     NNSFndAllocator unk_1C;
     MessageLoader * unk_2C;
diff --git a/include/overlay101/ov101_021D7E48.h b/include/overlay101/ov101_021D7E48.h
index 92da416124..3a95211363 100644
--- a/include/overlay101/ov101_021D7E48.h
+++ b/include/overlay101/ov101_021D7E48.h
@@ -22,7 +22,7 @@ void ov101_021D82F0(UnkStruct_ov101_021D7E48 * param0, NARC * param1, u32 param2
 void ov101_021D8358(UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
 void ov101_021D84A4(UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544 * param1, const VecFx32 * param2, u32 param3, int param4, u32 param5, u32 param6, u32 param7, u32 param8, int param9, int param10);
 void ov101_021D8544(UnkStruct_ov101_021D8544 * param0);
-void ov101_021D8560(UnkStruct_02022550 * param0, VecFx32 * param1);
-void ov101_021D8574(UnkStruct_02022550 * param0, VecFx32 * param1);
+void ov101_021D8560(GraphicElementData * param0, VecFx32 * param1);
+void ov101_021D8574(GraphicElementData * param0, VecFx32 * param1);
 
 #endif // POKEPLATINUM_OV101_021D7E48_H
diff --git a/include/overlay101/struct_ov101_021D8544.h b/include/overlay101/struct_ov101_021D8544.h
index ae63989da8..e65b043b0f 100644
--- a/include/overlay101/struct_ov101_021D8544.h
+++ b/include/overlay101/struct_ov101_021D8544.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     int unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     const NNSG2dImageProxy * unk_08;
 } UnkStruct_ov101_021D8544;
 
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index 586ad0bf09..ead5ebcb12 100644
--- a/include/overlay104/ov104_0222DCE0.h
+++ b/include/overlay104/ov104_0222DCE0.h
@@ -22,8 +22,8 @@ void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 * param0, Pokemon * para
 u16 ov104_0222E10C(u8 param0);
 void ov104_0222E134(SaveData * param0, Pokemon * param1);
 void ov104_0222E1C0(SaveData * param0, Party * param1, Pokemon * param2);
-void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1);
-void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(GraphicElementData * param0, u8 param1);
+void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3);
 u8 ov104_0222E240(u16 param0, u16 param1);
 void ov104_0222E278(UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, int param3);
 void ov104_0222E284(BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4);
diff --git a/include/overlay104/ov104_0223D768.h b/include/overlay104/ov104_0223D768.h
index 8c28090f01..82c725798c 100644
--- a/include/overlay104/ov104_0223D768.h
+++ b/include/overlay104/ov104_0223D768.h
@@ -7,9 +7,9 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/cell_actor_data.h"
 
-void ov104_0223D768(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, u16 param4);
-void ov104_0223D7EC(UnkStruct_0200C704 * param0, u16 param1);
-CellActorData * ov104_0223D828(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u16 param2);
+void ov104_0223D768(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, u16 param4);
+void ov104_0223D7EC(AnimationResourceCollection * param0, u16 param1);
+CellActorData * ov104_0223D828(CellTransferStateData * param0, AnimationResourceCollection * param1, u16 param2);
 void ov104_0223D858(CellActorData * param0);
 
 #endif // POKEPLATINUM_OV104_0223D768_H
diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h
index a43b79c604..3af3deaa29 100644
--- a/include/overlay104/struct_ov104_02230BE4.h
+++ b/include/overlay104/struct_ov104_02230BE4.h
@@ -10,7 +10,7 @@
 
 typedef struct {
     void * unk_00;
-    const UnkStruct_020279FC * unk_04;
+    const AnimationControlFlags * unk_04;
     SaveData * unk_08;
     UnkStruct_0202B628 * unk_0C;
     UnkStruct_0207D99C * unk_10;
diff --git a/include/overlay104/struct_ov104_022320B4_t.h b/include/overlay104/struct_ov104_022320B4_t.h
index 2c086d0c12..64a1ef1594 100644
--- a/include/overlay104/struct_ov104_022320B4_t.h
+++ b/include/overlay104/struct_ov104_022320B4_t.h
@@ -32,7 +32,7 @@ struct UnkStruct_ov104_022320B4_t {
     BOOL unk_5C;
     UnkStruct_ov104_02232B5C * unk_60;
     Window unk_64;
-    UnkStruct_02001AF4 * unk_74;
+    UIControlData * unk_74;
     u16 * unk_78;
     void * unk_7C;
     void * unk_80;
diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h
index e9064bb09c..3ff103ff8b 100644
--- a/include/overlay104/struct_ov104_0223C4CC.h
+++ b/include/overlay104/struct_ov104_0223C4CC.h
@@ -25,7 +25,7 @@ typedef struct UnkStruct_ov104_0223C4CC_t {
     BGL * unk_00;
     PaletteSys * unk_04;
     UnkStruct_0209B75C * unk_08;
-    UnkStruct_0207C690 * unk_0C;
+    GenericPointerData * unk_0C;
     UnkStruct_ov104_0223D5F0 * unk_10;
     UnkStruct_ov63_0222BE18 * unk_14;
     UnkStruct_ov63_0222BCE8 * unk_18;
@@ -36,8 +36,8 @@ typedef struct UnkStruct_ov104_0223C4CC_t {
     UnkStruct_ov63_0222D848 * unk_2C;
     UnkStruct_ov63_0222D77C * unk_30;
     struct {
-        UnkStruct_0200C6E4 * unk_00;
-        UnkStruct_0200C704 * unk_04;
+        CellTransferStateData * unk_00;
+        AnimationResourceCollection * unk_04;
     } unk_34;
     UnkStruct_ov104_0223D3B0_1 unk_3C;
     CellActorData * unk_80[4];
diff --git a/include/overlay105/ov105_02245AAC.h b/include/overlay105/ov105_02245AAC.h
index a288ad5c3c..4feb596677 100644
--- a/include/overlay105/ov105_02245AAC.h
+++ b/include/overlay105/ov105_02245AAC.h
@@ -5,7 +5,7 @@
 #include "overlay105/struct_ov105_02245AAC.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0);
-UnkStruct_02022550 * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
 void ov105_02245C50(UnkStruct_ov105_02245AAC * param0);
 
 #endif // POKEPLATINUM_OV105_02245AAC_H
diff --git a/include/overlay105/struct_ov105_02245AAC.h b/include/overlay105/struct_ov105_02245AAC.h
index 814cecff54..edc6310d77 100644
--- a/include/overlay105/struct_ov105_02245AAC.h
+++ b/include/overlay105/struct_ov105_02245AAC.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[1][4];
diff --git a/include/overlay106/ov106_02243310.h b/include/overlay106/ov106_02243310.h
index ca4ed60edf..481601b434 100644
--- a/include/overlay106/ov106_02243310.h
+++ b/include/overlay106/ov106_02243310.h
@@ -6,7 +6,7 @@
 #include "overlay106/struct_ov106_02243310.h"
 
 void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1);
-UnkStruct_02022550 * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
+GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
 void ov106_02243570(UnkStruct_ov106_02243310 * param0);
 
 #endif // POKEPLATINUM_OV106_02243310_H
diff --git a/include/overlay106/struct_ov106_02243310.h b/include/overlay106/struct_ov106_02243310.h
index d830ce6085..f90f0f6260 100644
--- a/include/overlay106/struct_ov106_02243310.h
+++ b/include/overlay106/struct_ov106_02243310.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[2][4];
diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h
index 6254a80d3b..0691a06a81 100644
--- a/include/overlay107/ov107_02249604.h
+++ b/include/overlay107/ov107_02249604.h
@@ -6,7 +6,7 @@
 #include "overlay107/struct_ov107_02249954.h"
 
 void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2);
-UnkStruct_02022550 * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov107_02249954(UnkStruct_ov107_02249954 * param0);
 void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1);
 void ov107_022499FC(UnkStruct_ov107_02249954 * param0, u16 param1);
diff --git a/include/overlay107/struct_ov107_02249954.h b/include/overlay107/struct_ov107_02249954.h
index 3f3923209b..2d9b7ccf70 100644
--- a/include/overlay107/struct_ov107_02249954.h
+++ b/include/overlay107/struct_ov107_02249954.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[7][4];
diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h
index a039fd1a1b..39569bb153 100644
--- a/include/overlay108/ov108_02243030.h
+++ b/include/overlay108/ov108_02243030.h
@@ -6,7 +6,7 @@
 #include "overlay108/struct_ov108_02243030.h"
 
 void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3);
-UnkStruct_02022550 * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov108_02243194(UnkStruct_ov108_02243030 * param0);
 
 #endif // POKEPLATINUM_OV108_02243030_H
diff --git a/include/overlay108/struct_ov108_02243030.h b/include/overlay108/struct_ov108_02243030.h
index dd871ee03f..66f67c1444 100644
--- a/include/overlay108/struct_ov108_02243030.h
+++ b/include/overlay108/struct_ov108_02243030.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[11][4];
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index 251e6dd5aa..1b93d0db78 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -40,21 +40,21 @@ typedef struct UnkStruct_ov109_021D5140_t {
     Strbuf* unk_54;
     Strbuf* unk_58;
     int unk_5C;
-    UnkStruct_020218BC * unk_60;
+    GraphicElementManager * unk_60;
     UnkStruct_0200C738 unk_64;
     UnkStruct_02009714 * unk_1F0[4];
     UnkStruct_02009DC8 * unk_200[3][4];
     UnkStruct_ov19_021DA864 unk_230;
     UnkStruct_ov19_021DA864 unk_254;
     UnkStruct_ov19_021DA864 unk_278;
-    UnkStruct_02022550 * unk_29C[14];
-    UnkStruct_02022550 * unk_2D4[14];
+    GraphicElementData * unk_29C[14];
+    GraphicElementData * unk_2D4[14];
     Window unk_30C[5];
     Window unk_35C;
     Window unk_36C;
     Window unk_37C;
     Window * unk_38C[2];
-    UnkStruct_02001AF4 * unk_394;
+    UIControlData * unk_394;
     void * unk_398[2];
     NNSG2dCharacterData * unk_3A0[2];
     void * unk_3A8[2];
diff --git a/include/overlay111/ov111_021D2F80.h b/include/overlay111/ov111_021D2F80.h
index 6ba2ed7bd2..51b3dfcda5 100644
--- a/include/overlay111/ov111_021D2F80.h
+++ b/include/overlay111/ov111_021D2F80.h
@@ -5,7 +5,7 @@
 #include "overlay111/struct_ov111_021D2F80.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0);
-UnkStruct_02022550 * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
 void ov111_021D3320(UnkStruct_ov111_021D2F80 * param0);
 void ov111_021D33B0(UnkStruct_ov111_021D2F80 * param0, int param1);
 
diff --git a/include/overlay111/struct_ov111_021D2F80.h b/include/overlay111/struct_ov111_021D2F80.h
index c1d8251bbf..9f62e8ee55 100644
--- a/include/overlay111/struct_ov111_021D2F80.h
+++ b/include/overlay111/struct_ov111_021D2F80.h
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020218BC_decl.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[5][4];
diff --git a/include/overlay114/ov114_0225C700.h b/include/overlay114/ov114_0225C700.h
index 951802fa39..719f931622 100644
--- a/include/overlay114/ov114_0225C700.h
+++ b/include/overlay114/ov114_0225C700.h
@@ -34,7 +34,7 @@ void ov114_0225CA2C(UnkStruct_ov114_0225E854 * param0, u32 param1, BOOL param2);
 void ov114_0225CA44(UnkStruct_ov114_0225E854 * param0, BOOL param1);
 BOOL ov114_0225CA54(UnkStruct_ov114_0225C76C * param0);
 BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C * param0);
-UnkStruct_ov114_0225CAD4 * ov114_0225CAD4(UnkStruct_020218BC * param0, u32 param1);
+UnkStruct_ov114_0225CAD4 * ov114_0225CAD4(GraphicElementManager * param0, u32 param1);
 void ov114_0225CB38(UnkStruct_ov114_0225CAD4 * param0);
 int ov114_0225CB74(UnkStruct_ov114_0225CAD4 * param0);
 void ov114_0225CB8C(UnkStruct_ov114_0225CAD4 * param0);
diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h
index 81cf58120e..acc469df2b 100644
--- a/include/overlay115/struct_ov115_02261520.h
+++ b/include/overlay115/struct_ov115_02261520.h
@@ -7,7 +7,7 @@
 #include <nitro/fx/fx.h>
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     const UnkStruct_ov19_021DA864 * unk_04;
     VecFx32 unk_08;
     VecFx32 unk_14;
diff --git a/include/overlay116/struct_ov116_022649E4.h b/include/overlay116/struct_ov116_022649E4.h
index e14e76ede4..2b2ddac0bb 100644
--- a/include/overlay116/struct_ov116_022649E4.h
+++ b/include/overlay116/struct_ov116_022649E4.h
@@ -15,11 +15,11 @@
 typedef struct {
     NARC * unk_00;
     NARC * unk_04;
-    UnkStruct_0200C6E4 * unk_08;
-    UnkStruct_0200C704 * unk_0C;
+    CellTransferStateData * unk_08;
+    AnimationResourceCollection * unk_0C;
     BGL * unk_10;
     PaletteSys * unk_14;
-    UnkStruct_0207C690 * unk_18;
+    GenericPointerData * unk_18;
     UnkStruct_020203AC * unk_1C;
     u8 padding_20[4];
     NNSFndAllocator unk_24;
diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h
index 1b90138192..9e2503e8b2 100644
--- a/include/overlay117/ov117_02263AF0.h
+++ b/include/overlay117/ov117_02263AF0.h
@@ -46,7 +46,7 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C
 void ov117_02265B3C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1);
 void ov117_02265B58(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1, int param2, int param3, int param4);
 void ov117_02265C1C(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265C3C * param1);
-void ov117_02265DB8(BGL * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
+void ov117_02265DB8(BGL * param0, AnimationResourceCollection * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
 void ov117_02265EB0(UnkStruct_ov117_02265EB0 * param0);
 void ov117_02265EC8(UnkStruct_ov117_02265EC8 * param0);
 void ov117_02265F34(UnkStruct_ov117_02261280 * param0, UnkStruct_ov117_02265EC8 * param1);
diff --git a/include/overlay117/struct_ov117_02261280.h b/include/overlay117/struct_ov117_02261280.h
index 996a7e850c..cb4c2d236a 100644
--- a/include/overlay117/struct_ov117_02261280.h
+++ b/include/overlay117/struct_ov117_02261280.h
@@ -42,8 +42,8 @@ typedef struct UnkStruct_ov117_02261280_t {
     u32 unk_0C[4];
     UnkStruct_ov114_0225CAD4 * unk_1C;
     int unk_20;
-    UnkStruct_0200C6E4 * unk_24;
-    UnkStruct_0200C704 * unk_28;
+    CellTransferStateData * unk_24;
+    AnimationResourceCollection * unk_28;
     BGL * unk_2C;
     Window unk_30[5];
     MessageLoader * unk_80;
@@ -52,7 +52,7 @@ typedef struct UnkStruct_ov117_02261280_t {
     PaletteSys * unk_8C;
     UnkStruct_02012744 * unk_90;
     SysTask * unk_94;
-    UnkStruct_0207C690 * unk_98;
+    GenericPointerData * unk_98;
     UnkStruct_020203AC * unk_9C;
     UnkStruct_020203AC * unk_A0;
     UnkStruct_02014014 * unk_A4;
diff --git a/include/overlay118/ov118_021D0D80.h b/include/overlay118/ov118_021D0D80.h
index 40cad4fefa..20e21274e0 100644
--- a/include/overlay118/ov118_021D0D80.h
+++ b/include/overlay118/ov118_021D0D80.h
@@ -3,7 +3,7 @@
 
 #include "struct_defs/struct_0207F248.h"
 
-void ov118_021D0D80(UnkStruct_0207F248 * param0);
-int ov118_021D0DBC(UnkStruct_0207F248 * param0);
+void ov118_021D0D80(GameWindowLayout * param0);
+int ov118_021D0DBC(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_OV118_021D0D80_H
diff --git a/include/overlay118/struct_ov118_021D0FDC_decl.h b/include/overlay118/struct_ov118_021D0FDC_decl.h
index 601c4eda18..f592a903f2 100644
--- a/include/overlay118/struct_ov118_021D0FDC_decl.h
+++ b/include/overlay118/struct_ov118_021D0FDC_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_OV118_021D0FDC_DECL_H
 #define POKEPLATINUM_STRUCT_OV118_021D0FDC_DECL_H
 
-typedef struct UnkStruct_ov118_021D0FDC_t UnkStruct_ov118_021D0FDC;
+typedef struct OverlayMetadata_t OverlayMetadata;
 
 #endif // POKEPLATINUM_STRUCT_OV118_021D0FDC_DECL_H
diff --git a/include/overlay119/ov119_021D0D80.h b/include/overlay119/ov119_021D0D80.h
index c1d57c8c96..4ffd9fd58f 100644
--- a/include/overlay119/ov119_021D0D80.h
+++ b/include/overlay119/ov119_021D0D80.h
@@ -14,7 +14,7 @@
 
 void ov119_021D0D80(void);
 void ov119_021D0DA8(void);
-UnkStruct_0207C690 * ov119_021D0DD4(void);
+GenericPointerData * ov119_021D0DD4(void);
 void ov119_021D0DF4(void);
 void ov119_021D0E78(void);
 void ov119_021D0EB8(BGL * param0);
diff --git a/include/overlay119/struct_ov119_021D17B8.h b/include/overlay119/struct_ov119_021D17B8.h
index 11e2dfc515..ec69503e66 100644
--- a/include/overlay119/struct_ov119_021D17B8.h
+++ b/include/overlay119/struct_ov119_021D17B8.h
@@ -21,14 +21,14 @@ typedef struct {
     int unk_0C;
     int unk_10;
     Window unk_14[2];
-    UnkStruct_0207C690 * unk_34;
+    GenericPointerData * unk_34;
     UnkStruct_02007768 * unk_38;
     NARC * unk_3C;
     UnkStruct_ov119_021D14DC * unk_40;
-    UnkStruct_02013A04 * unk_44;
-    UnkStruct_02001AF4 * unk_48;
-    UnkStruct_0200C704 * unk_4C;
-    UnkStruct_0200C6E4 * unk_50;
+    ResourceMetadata * unk_44;
+    UIControlData * unk_48;
+    AnimationResourceCollection * unk_4C;
+    CellTransferStateData * unk_50;
     PokemonAnimationSys * unk_54;
 } UnkStruct_ov119_021D17B8;
 
diff --git a/include/pokemon.h b/include/pokemon.h
index 7072cfb5ed..1d273a554c 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -646,7 +646,7 @@ u8 BoxPokemon_SpriteYOffset(BoxPokemon *boxMon, u8 face, BOOL preferDP);
  */
 u8 LoadPokemonSpriteYOffset(u16 species, u8 gender, u8 face, u8 form, u32 personality);
 void sub_0207697C(ArchivedSprite *param0, u16 param1);
-CellActorData *sub_02076994(UnkStruct_0200C6E4 *param0, UnkStruct_0200C704 *param1, PaletteSys *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
+CellActorData *sub_02076994(CellTransferStateData *param0, AnimationResourceCollection *param1, PaletteSys *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
 void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 *param2);
 
 /**
diff --git a/include/struct_decls/struct_02001AF4_decl.h b/include/struct_decls/struct_02001AF4_decl.h
index ba9cb73606..aed2194813 100644
--- a/include/struct_decls/struct_02001AF4_decl.h
+++ b/include/struct_decls/struct_02001AF4_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_02001AF4_DECL_H
 #define POKEPLATINUM_STRUCT_02001AF4_DECL_H
 
-typedef struct UnkStruct_02001AF4_t UnkStruct_02001AF4;
+typedef struct UIControlData_t UIControlData;
 
 #endif // POKEPLATINUM_STRUCT_02001AF4_DECL_H
diff --git a/include/struct_decls/struct_0200C6E4_decl.h b/include/struct_decls/struct_0200C6E4_decl.h
index 1816e45d50..ab90f306fc 100644
--- a/include/struct_decls/struct_0200C6E4_decl.h
+++ b/include/struct_decls/struct_0200C6E4_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0200C6E4_DECL_H
 #define POKEPLATINUM_STRUCT_0200C6E4_DECL_H
 
-typedef struct UnkStruct_0200C6E4_t UnkStruct_0200C6E4;
+typedef struct CellTransferStateData_t CellTransferStateData;
 
 #endif // POKEPLATINUM_STRUCT_0200C6E4_DECL_H
diff --git a/include/struct_decls/struct_0200C704_decl.h b/include/struct_decls/struct_0200C704_decl.h
index dfb3b7c231..540f026d6d 100644
--- a/include/struct_decls/struct_0200C704_decl.h
+++ b/include/struct_decls/struct_0200C704_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0200C704_DECL_H
 #define POKEPLATINUM_STRUCT_0200C704_DECL_H
 
-typedef struct UnkStruct_0200C704_t UnkStruct_0200C704;
+typedef struct AnimationResourceCollection_t AnimationResourceCollection;
 
 #endif // POKEPLATINUM_STRUCT_0200C704_DECL_H
diff --git a/include/struct_decls/struct_02013A04_decl.h b/include/struct_decls/struct_02013A04_decl.h
index 1629fba7ca..90fa4c17f0 100644
--- a/include/struct_decls/struct_02013A04_decl.h
+++ b/include/struct_decls/struct_02013A04_decl.h
@@ -2,6 +2,6 @@
 #define POKEPLATINUM_STRUCT_02013A04_DECL_H
 #include "struct_defs/struct_02013A04_t.h"
 
-typedef struct UnkStruct_02013A04_t UnkStruct_02013A04;
+typedef struct ResourceMetadata_t ResourceMetadata;
 
 #endif // POKEPLATINUM_STRUCT_02013A04_DECL_H
diff --git a/include/struct_decls/struct_020218BC_decl.h b/include/struct_decls/struct_020218BC_decl.h
index 71a2ded4c2..4e8e5c9d3b 100644
--- a/include/struct_decls/struct_020218BC_decl.h
+++ b/include/struct_decls/struct_020218BC_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_020218BC_DECL_H
 #define POKEPLATINUM_STRUCT_020218BC_DECL_H
 
-typedef struct UnkStruct_020218BC_t UnkStruct_020218BC;
+typedef struct GraphicElementManager_t GraphicElementManager;
 
 #endif // POKEPLATINUM_STRUCT_020218BC_DECL_H
diff --git a/include/struct_decls/struct_02022550_decl.h b/include/struct_decls/struct_02022550_decl.h
index 6065636cf7..b097e21fe6 100644
--- a/include/struct_decls/struct_02022550_decl.h
+++ b/include/struct_decls/struct_02022550_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_02022550_DECL_H
 #define POKEPLATINUM_STRUCT_02022550_DECL_H
 
-typedef struct UnkStruct_02022550_t UnkStruct_02022550;
+typedef struct GraphicElementData_t GraphicElementData;
 
 #endif // POKEPLATINUM_STRUCT_02022550_DECL_H
diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h
index 3c59cba8a6..76f1dfbdc6 100644
--- a/include/struct_defs/battle_system.h
+++ b/include/struct_defs/battle_system.h
@@ -44,7 +44,7 @@
 #include <nnsys.h>
 
 struct BattleSystem {
-    UnkStruct_0207C690 * unk_00;
+    GenericPointerData * unk_00;
     BGL * unk_04;
     Window * unk_08;
     MessageLoader * unk_0C;
@@ -68,8 +68,8 @@ struct BattleSystem {
     ChatotCry * unk_78[4];
     UnkStruct_02007768 * unk_88;
     UnkStruct_ov12_0221FCDC * unk_8C;
-    UnkStruct_0200C6E4 * unk_90;
-    UnkStruct_0200C704 * unk_94;
+    CellTransferStateData * unk_90;
+    AnimationResourceCollection * unk_94;
     UnkStruct_02056B24 * unk_98;
     UnkStruct_0206D140 * unk_9C;
     u16 trainerIDs[4];
@@ -81,7 +81,7 @@ struct BattleSystem {
     UnkStruct_0200C440 * unk_1A4;
     UnkStruct_0200C440 * unk_1A8;
     void * unk_1AC;
-    UnkStruct_020279FC * unk_1B0;
+    AnimationControlFlags * unk_1B0;
     UnkStruct_02027F8C * unk_1B4;
     void * unk_1B8;
     UnkStruct_0209C370 * unk_1BC;
diff --git a/include/struct_defs/funcptr_0207F248_sub1.h b/include/struct_defs/funcptr_0207F248_sub1.h
index 2f14c23ecd..18ba70c41b 100644
--- a/include/struct_defs/funcptr_0207F248_sub1.h
+++ b/include/struct_defs/funcptr_0207F248_sub1.h
@@ -4,8 +4,8 @@
 #include "functypes/struct_0207F248_1.h"
 
 typedef struct {
-    UnkStruct_0207F248_1 unk_00;
-    UnkStruct_0207F248_1 unk_04;
-} UnkFuncPtr_0207F248_sub1;
+    GameWindowLayout_1 unk_00;
+    GameWindowLayout_1 unk_04;
+} FunctionPtrPair;
 
 #endif // POKEPLATINUM_FUNCPTR_0207F248_SUB1_H
diff --git a/include/struct_defs/struct_0200D0F4.h b/include/struct_defs/struct_0200D0F4.h
index 298cb4e8cd..070d8aead3 100644
--- a/include/struct_defs/struct_0200D0F4.h
+++ b/include/struct_defs/struct_0200D0F4.h
@@ -6,7 +6,7 @@
 #include "overlay019/struct_ov19_021DA864.h"
 
 typedef struct CellActorData {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_ov19_021DA864 * unk_04;
     UnkStruct_02009508 * unk_08;
     int unk_0C;
diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h
index 2a58d93c87..6ec5ea096a 100644
--- a/include/struct_defs/struct_020127E8.h
+++ b/include/struct_defs/struct_020127E8.h
@@ -11,9 +11,9 @@
 typedef struct {
     const UnkStruct_02012744 * unk_00;
     const Window * unk_04;
-    UnkStruct_020218BC * unk_08;
+    GraphicElementManager * unk_08;
     const NNSG2dImagePaletteProxy * unk_0C;
-    const UnkStruct_02022550 * unk_10;
+    const GraphicElementData * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
diff --git a/include/struct_defs/struct_02013A04_t.h b/include/struct_defs/struct_02013A04_t.h
index b48458eca6..a84c49eb8b 100644
--- a/include/struct_defs/struct_02013A04_t.h
+++ b/include/struct_defs/struct_02013A04_t.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02013A04_T_H
 #define POKEPLATINUM_STRUCT_02013A04_T_H
 
-struct UnkStruct_02013A04_t {
+struct ResourceMetadata_t {
     const void * unk_00;
     u32 unk_04;
 };
diff --git a/include/struct_defs/struct_020279FC.h b/include/struct_defs/struct_020279FC.h
index eaa07db8b1..04da98e9b9 100644
--- a/include/struct_defs/struct_020279FC.h
+++ b/include/struct_defs/struct_020279FC.h
@@ -9,6 +9,6 @@ typedef struct {
     u16 unk_02_0 : 2;
     u16 unk_02_2 : 5;
     u16 : 1;
-} UnkStruct_020279FC;
+} AnimationControlFlags;
 
 #endif // POKEPLATINUM_STRUCT_020279FC_H
diff --git a/include/struct_defs/struct_0202F298.h b/include/struct_defs/struct_0202F298.h
index 49145b584e..a3d65ae26d 100644
--- a/include/struct_defs/struct_0202F298.h
+++ b/include/struct_defs/struct_0202F298.h
@@ -14,7 +14,7 @@ typedef struct UnkStruct_0202F298_t {
     UnkStruct_0202FAA8_sub1 unk_150;
     UnkStruct_0202FD30 unk_1150[4];
     TrainerInfo unk_1B68[4];
-    UnkStruct_020279FC unk_1BE8;
+    AnimationControlFlags unk_1BE8;
     u16 unk_1BEA;
     UnkStruct_0202F298_sub1 unk_1BEC;
 } UnkStruct_0202F298;
diff --git a/include/struct_defs/struct_0203D9B8.h b/include/struct_defs/struct_0203D9B8.h
index 3219d9e39c..b047956947 100644
--- a/include/struct_defs/struct_0203D9B8.h
+++ b/include/struct_defs/struct_0203D9B8.h
@@ -19,7 +19,7 @@ typedef struct {
     TrainerInfo * unk_0C;
     Party * unk_10;
     UnkStruct_0207D3C0 * unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     UnkStruct_020989DC unk_1C[100];
 } UnkStruct_0203D9B8;
 
diff --git a/include/struct_defs/struct_0203DA00.h b/include/struct_defs/struct_0203DA00.h
index d93d775429..6b6c88f6e6 100644
--- a/include/struct_defs/struct_0203DA00.h
+++ b/include/struct_defs/struct_0203DA00.h
@@ -12,7 +12,7 @@ typedef struct {
     Pokemon * unk_00;
     UnkStruct_02029C68 * unk_04;
     const UnkStruct_02029D04 * unk_08;
-    const UnkStruct_020279FC * unk_0C;
+    const AnimationControlFlags * unk_0C;
     UnkStruct_0202CD88 * unk_10;
     const TrainerInfo * unk_14;
     BOOL * unk_18;
diff --git a/include/struct_defs/struct_0203DDFC.h b/include/struct_defs/struct_0203DDFC.h
index 841cb44d78..ffeb960d3a 100644
--- a/include/struct_defs/struct_0203DDFC.h
+++ b/include/struct_defs/struct_0203DDFC.h
@@ -8,7 +8,7 @@
 typedef struct {
     UnkStruct_0205C22C * unk_00;
     UnkStruct_0202B628 * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
 } UnkStruct_0203DDFC;
 
 #endif // POKEPLATINUM_STRUCT_0203DDFC_H
diff --git a/include/struct_defs/struct_0203DE34.h b/include/struct_defs/struct_0203DE34.h
index eca39929fc..ceecc6ddcc 100644
--- a/include/struct_defs/struct_0203DE34.h
+++ b/include/struct_defs/struct_0203DE34.h
@@ -10,7 +10,7 @@
 typedef struct {
     SaveData * unk_00;
     UnkStruct_0205C22C * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     UnkStruct_0202CD88 * unk_0C;
     UnkStruct_0202B628 * unk_10;
 } UnkStruct_0203DE34;
diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h
index fdb392356e..c72076bec0 100644
--- a/include/struct_defs/struct_0203E0FC.h
+++ b/include/struct_defs/struct_0203E0FC.h
@@ -25,7 +25,7 @@ typedef struct {
     UnkStruct_0202C878 * unk_18;
     TrainerInfo * unk_1C;
     SaveData * unk_20;
-    UnkStruct_020279FC * unk_24;
+    AnimationControlFlags * unk_24;
     UnkStruct_0202CD88 * unk_28;
     UnkStruct_0202B628 * unk_2C;
     UnkStruct_0207D3C0 * unk_30;
diff --git a/include/struct_defs/struct_0203E2FC.h b/include/struct_defs/struct_0203E2FC.h
index 6b10c62ce2..12465889fd 100644
--- a/include/struct_defs/struct_0203E2FC.h
+++ b/include/struct_defs/struct_0203E2FC.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     Pokemon * unk_00;
-    UnkStruct_020279FC * unk_04;
+    AnimationControlFlags * unk_04;
     TrainerInfo * unk_08;
     u16 unk_0C;
 } UnkStruct_0203E2FC;
diff --git a/include/struct_defs/struct_020425E0.h b/include/struct_defs/struct_020425E0.h
index d298a3966e..f66bc7462a 100644
--- a/include/struct_defs/struct_020425E0.h
+++ b/include/struct_defs/struct_020425E0.h
@@ -5,7 +5,7 @@
 
 typedef struct {
     int unk_00;
-    const UnkStruct_020279FC * unk_04;
+    const AnimationControlFlags * unk_04;
 } UnkStruct_020425E0;
 
 #endif // POKEPLATINUM_STRUCT_020425E0_H
diff --git a/include/struct_defs/struct_0206BC70.h b/include/struct_defs/struct_0206BC70.h
index b425bae48a..cad022789d 100644
--- a/include/struct_defs/struct_0206BC70.h
+++ b/include/struct_defs/struct_0206BC70.h
@@ -14,7 +14,7 @@ typedef struct {
     UnkStruct_0202D764 * unk_04;
     UnkStruct_02025CCC * unk_08;
     SaveData * unk_0C;
-    UnkStruct_020279FC * unk_10;
+    AnimationControlFlags * unk_10;
     DWCUserData * unk_14;
     int unk_18;
     int unk_1C;
diff --git a/include/struct_defs/struct_020708E0.h b/include/struct_defs/struct_020708E0.h
index c2dac964c9..57bfe1f845 100644
--- a/include/struct_defs/struct_020708E0.h
+++ b/include/struct_defs/struct_020708E0.h
@@ -13,8 +13,8 @@
 typedef struct {
     Window unk_00;
     Window unk_10;
-    UnkStruct_02001AF4 * unk_20;
-    UnkStruct_02013A04 * unk_24;
+    UIControlData * unk_20;
+    ResourceMetadata * unk_24;
     u16 unk_28;
     u16 unk_2A;
     u32 unk_2C;
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index 3b07fa3fe9..9cd0d3a24d 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -34,9 +34,9 @@ struct UnkStruct_0207AE68_t {
     Sprite * unk_1C[2];
     Party * unk_24;
     Pokemon * unk_28;
-    UnkStruct_020279FC * unk_2C;
+    AnimationControlFlags * unk_2C;
     UnkStruct_0207C8C4 * unk_30;
-    UnkStruct_0207C690 * unk_34;
+    GenericPointerData * unk_34;
     UnkStruct_020067E8 * unk_38;
     UnkStruct_02098D38 * unk_3C;
     void * unk_40;
diff --git a/include/struct_defs/struct_0207C690.h b/include/struct_defs/struct_0207C690.h
index 2d0b3822dc..952966c2e7 100644
--- a/include/struct_defs/struct_0207C690.h
+++ b/include/struct_defs/struct_0207C690.h
@@ -5,6 +5,6 @@ typedef struct {
     int unk_00;
     void * unk_04;
     void * unk_08;
-} UnkStruct_0207C690;
+} GenericPointerData;
 
 #endif // POKEPLATINUM_STRUCT_0207C690_H
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index bf355c262f..50f2c996c2 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -31,10 +31,10 @@ typedef struct {
     u16 unk_324[96];
     u16 unk_3E4[96];
     u16 unk_4A4[128];
-    UnkStruct_02098C44 * unk_5A4;
-    UnkStruct_0200C6E4 * unk_5A8;
-    UnkStruct_0200C704 * unk_5AC;
-    UnkStruct_02022550 * unk_5B0[29];
+    PartyManagementData * unk_5A4;
+    CellTransferStateData * unk_5A8;
+    AnimationResourceCollection * unk_5AC;
+    GraphicElementData * unk_5B0[29];
     CellActorData * unk_624[29];
     UnkStruct_0200C440 * unk_698;
     MessageLoader * unk_69C;
@@ -42,13 +42,13 @@ typedef struct {
     Strbuf* unk_6A4;
     Strbuf* unk_6A8;
     Strbuf* unk_6AC[20];
-    UnkStruct_02013A04 * unk_6FC;
-    UnkStruct_02001AF4 * unk_700;
-    UnkStruct_020831B4 unk_704[6];
-    const UnkStruct_020F1DB8 * unk_7F4;
-    UnkStruct_02083D1C unk_7F8;
-    UnkFuncPtr_0207F248 unk_B00;
-    UnkFuncPtr_0207F248_sub1 unk_B04;
+    ResourceMetadata * unk_6FC;
+    UIControlData * unk_700;
+    StrBufWrapper unk_704[6];
+    const ByteFlagSet * unk_7F4;
+    DualArrayShortData unk_7F8;
+    GenericFunctionPtr unk_B00;
+    FunctionPtrPair unk_B04;
     u8 unk_B0C;
     u8 unk_B0D;
     u8 unk_B0E;
@@ -61,8 +61,8 @@ typedef struct {
     u8 unk_B13;
     u16 unk_B14[6];
     HeightWeightData * unk_B20;
-    UnkStruct_ov118_021D0FDC * unk_B24;
-    UnkStruct_0207C690 * unk_B28;
-} UnkStruct_0207F248;
+    OverlayMetadata * unk_B24;
+    GenericPointerData * unk_B28;
+} GameWindowLayout;
 
 #endif // POKEPLATINUM_STRUCT_0207F248_H
diff --git a/include/struct_defs/struct_02081CF4.h b/include/struct_defs/struct_02081CF4.h
index 6d789c39ff..74a54dbc45 100644
--- a/include/struct_defs/struct_02081CF4.h
+++ b/include/struct_defs/struct_02081CF4.h
@@ -5,7 +5,7 @@
 #include "struct_defs/struct_0205AA50.h"
 
 typedef struct {
-    const UnkStruct_02013A04 * unk_00;
+    const ResourceMetadata * unk_00;
     Window * unk_04;
     u8 unk_08;
     u8 unk_09;
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index 6e23ead896..ceeecfcf48 100644
--- a/include/struct_defs/struct_020831B4.h
+++ b/include/struct_defs/struct_020831B4.h
@@ -26,9 +26,9 @@ typedef struct {
     s16 unk_1C;
     s16 unk_1E;
     s16 unk_20;
-    UnkStruct_02022550 * unk_24;
+    GraphicElementData * unk_24;
     u8 unk_28;
     u8 unk_29;
-} UnkStruct_020831B4;
+} StrBufWrapper;
 
 #endif // POKEPLATINUM_STRUCT_020831B4_H
diff --git a/include/struct_defs/struct_02083D1C.h b/include/struct_defs/struct_02083D1C.h
index f58daf44b3..3e9eb48d6c 100644
--- a/include/struct_defs/struct_02083D1C.h
+++ b/include/struct_defs/struct_02083D1C.h
@@ -9,6 +9,6 @@ typedef struct {
     u8 unk_304;
     u8 unk_305;
     u8 unk_306;
-} UnkStruct_02083D1C;
+} DualArrayShortData;
 
 #endif // POKEPLATINUM_STRUCT_02083D1C_H
diff --git a/include/struct_defs/struct_0208737C.h b/include/struct_defs/struct_0208737C.h
index c7ce458848..4cec1ce7ae 100644
--- a/include/struct_defs/struct_0208737C.h
+++ b/include/struct_defs/struct_0208737C.h
@@ -16,7 +16,7 @@ typedef struct {
     u16 unk_1C[20];
     int unk_44;
     PCBoxes * unk_48;
-    UnkStruct_020279FC * unk_4C;
+    AnimationControlFlags * unk_4C;
 } UnkStruct_0208737C;
 
 #endif // POKEPLATINUM_STRUCT_0208737C_H
diff --git a/include/struct_defs/struct_02089438.h b/include/struct_defs/struct_02089438.h
index f5f5518315..da99f57bcb 100644
--- a/include/struct_defs/struct_02089438.h
+++ b/include/struct_defs/struct_02089438.h
@@ -9,7 +9,7 @@ typedef struct {
     int unk_04[5];
     int unk_18;
     Strbuf* unk_1C;
-    UnkStruct_020279FC * unk_20;
+    AnimationControlFlags * unk_20;
     int unk_24;
     u32 unk_28;
     u32 unk_2C;
diff --git a/include/struct_defs/struct_02089688_sub1.h b/include/struct_defs/struct_02089688_sub1.h
index 8f23359d6f..84eace5b2e 100644
--- a/include/struct_defs/struct_02089688_sub1.h
+++ b/include/struct_defs/struct_02089688_sub1.h
@@ -15,8 +15,8 @@
 
 typedef struct {
     NARC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     BGL * unk_0C;
     PaletteSys * unk_10;
     UnkStruct_02023FCC * unk_14;
diff --git a/include/struct_defs/struct_0208B878_sub1.h b/include/struct_defs/struct_0208B878_sub1.h
index 4534d56962..dab3d2cee0 100644
--- a/include/struct_defs/struct_0208B878_sub1.h
+++ b/include/struct_defs/struct_0208B878_sub1.h
@@ -8,8 +8,8 @@
 
 typedef struct {
     NARC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     PaletteSys * unk_0C;
 } UnkStruct_0208B878_sub1;
 
diff --git a/include/struct_defs/struct_0208D7BC.h b/include/struct_defs/struct_0208D7BC.h
index 53a4badd1e..95b789828a 100644
--- a/include/struct_defs/struct_0208D7BC.h
+++ b/include/struct_defs/struct_0208D7BC.h
@@ -29,9 +29,9 @@ typedef struct {
     UnkStruct_02091850 unk_350[4];
     UnkStruct_02091850 unk_3B0[4];
     u32 unk_410;
-    UnkStruct_0200C6E4 * unk_414;
-    UnkStruct_0200C704 * unk_418;
-    UnkStruct_02022550 * unk_41C[77];
+    CellTransferStateData * unk_414;
+    AnimationResourceCollection * unk_418;
+    GraphicElementData * unk_41C[77];
     CellActorData * unk_550[77];
     UnkStruct_0200C440 * unk_684;
     MessageLoader * unk_688;
diff --git a/include/struct_defs/struct_02093800.h b/include/struct_defs/struct_02093800.h
index 4c83f7bbf9..14cd236247 100644
--- a/include/struct_defs/struct_02093800.h
+++ b/include/struct_defs/struct_02093800.h
@@ -20,7 +20,7 @@ typedef struct {
     const Strbuf* unk_0C;
     const TrainerInfo * unk_10;
     UnkStruct_0202A750 * unk_14;
-    const UnkStruct_020279FC * unk_18;
+    const AnimationControlFlags * unk_18;
     SaveData * unk_1C;
     void * unk_20;
 } UnkStruct_02093800;
diff --git a/include/struct_defs/struct_02093BBC.h b/include/struct_defs/struct_02093BBC.h
index 49361dcec1..a7a976b122 100644
--- a/include/struct_defs/struct_02093BBC.h
+++ b/include/struct_defs/struct_02093BBC.h
@@ -17,7 +17,7 @@ typedef struct {
     int unk_14;
     const UnkStruct_02029D04 * unk_18;
     UnkStruct_02095C60 * unk_1C;
-    const UnkStruct_020279FC * unk_20;
+    const AnimationControlFlags * unk_20;
     const TrainerInfo * unk_24;
 } UnkStruct_02093BBC;
 
diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h
index 0e05888020..b067121631 100644
--- a/include/struct_defs/struct_02095C48.h
+++ b/include/struct_defs/struct_02095C48.h
@@ -30,7 +30,7 @@ typedef struct {
     u8 unk_569[1024];
     u8 unk_969[4][1024];
     u8 padding_1969[3];
-    const UnkStruct_020279FC * unk_196C;
+    const AnimationControlFlags * unk_196C;
     SaveData * unk_1970;
     Pokemon * unk_1974;
     const TrainerInfo * unk_1978;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index 98ccba01fe..d186acd68c 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -71,23 +71,23 @@ struct UnkStruct_02095E80_t {
     Strbuf* unk_188;
     Strbuf* unk_18C;
     Strbuf* unk_190;
-    UnkStruct_020218BC * unk_194;
+    GraphicElementManager * unk_194;
     UnkStruct_0200C738 unk_198;
     UnkStruct_02009714 * unk_324[4];
     UnkStruct_02009DC8 * unk_334[2][4];
     UnkStruct_ov19_021DA864 unk_354;
     UnkStruct_ov19_021DA864 unk_378;
-    UnkStruct_02022550 * unk_39C[14];
-    UnkStruct_02022550 * unk_3D4[12];
-    UnkStruct_02022550 * unk_404[12];
-    UnkStruct_02022550 * unk_434[12];
-    UnkStruct_02022550 * unk_464[6];
-    UnkStruct_02022550 * unk_47C;
+    GraphicElementData * unk_39C[14];
+    GraphicElementData * unk_3D4[12];
+    GraphicElementData * unk_404[12];
+    GraphicElementData * unk_434[12];
+    GraphicElementData * unk_464[6];
+    GraphicElementData * unk_47C;
     SysTask * unk_480[7];
     Window unk_49C[34];
-    UnkStruct_02001AF4 * unk_6BC;
-    UnkStruct_02013A04 * unk_6C0;
-    UnkStruct_02001AF4 * unk_6C4;
+    UIControlData * unk_6BC;
+    ResourceMetadata * unk_6C0;
+    UIControlData * unk_6C4;
     int unk_6C8;
     int unk_6CC;
     int unk_6D0;
@@ -127,7 +127,7 @@ struct UnkStruct_02095E80_t {
     int unk_36C8;
     UnkStruct_0200B358 * unk_36CC;
     MessageLoader * unk_36D0;
-    UnkStruct_02013A04 * unk_36D4;
+    ResourceMetadata * unk_36D4;
     UnkStruct_0200112C * unk_36D8;
     Window unk_36DC;
     UnkStruct_0202B370 * unk_36EC;
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 44959a8640..9a3106d0d5 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -29,15 +29,15 @@ struct UnkStruct_02095EAC_t {
     Strbuf* unk_28;
     Strbuf* unk_2C;
     int unk_30;
-    UnkStruct_020218BC * unk_34;
+    GraphicElementManager * unk_34;
     UnkStruct_0200C738 unk_38;
     UnkStruct_02009714 * unk_1C4[4];
     UnkStruct_02009DC8 * unk_1D4[2][4];
     UnkStruct_ov19_021DA864 unk_1F4;
     UnkStruct_ov19_021DA864 unk_218;
-    UnkStruct_02022550 * unk_23C[14];
-    UnkStruct_02022550 * unk_274[14];
-    UnkStruct_02022550 * unk_2AC[12];
+    GraphicElementData * unk_23C[14];
+    GraphicElementData * unk_274[14];
+    GraphicElementData * unk_2AC[12];
     Window unk_2DC[5];
     Window unk_32C;
     Window unk_33C;
diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h
index 510d16f5fd..b123b2c5fe 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -36,21 +36,21 @@ struct UnkStruct_020961E8_t {
     Strbuf* unk_44;
     Strbuf* unk_48;
     int unk_4C;
-    UnkStruct_020218BC * unk_50;
+    GraphicElementManager * unk_50;
     UnkStruct_0200C738 unk_54;
     UnkStruct_02009714 * unk_1E0[4];
     UnkStruct_02009DC8 * unk_1F0[3][4];
     UnkStruct_ov19_021DA864 unk_220;
     UnkStruct_ov19_021DA864 unk_244;
     UnkStruct_ov19_021DA864 unk_268;
-    UnkStruct_02022550 * unk_28C[14];
-    UnkStruct_02022550 * unk_2C4[14];
+    GraphicElementData * unk_28C[14];
+    GraphicElementData * unk_2C4[14];
     Window unk_2FC[5];
     Window unk_34C;
     Window unk_35C;
     Window unk_36C;
     Window * unk_37C[2];
-    UnkStruct_02001AF4 * unk_384;
+    UIControlData * unk_384;
     void * unk_388[2];
     NNSG2dCharacterData * unk_390[2];
     void * unk_398[2];
diff --git a/include/struct_defs/struct_020978D8.h b/include/struct_defs/struct_020978D8.h
index 412b963dcd..e1cc2075cb 100644
--- a/include/struct_defs/struct_020978D8.h
+++ b/include/struct_defs/struct_020978D8.h
@@ -10,7 +10,7 @@ typedef struct {
     u16 unk_00;
     u8 unk_02;
     u8 unk_03;
-    UnkStruct_020279FC * unk_04;
+    AnimationControlFlags * unk_04;
     u32 unk_08;
     u8 unk_0C;
     u8 unk_0D;
diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h
index 9442cfa757..a7661dd22d 100644
--- a/include/struct_defs/struct_02097F18.h
+++ b/include/struct_defs/struct_02097F18.h
@@ -12,7 +12,7 @@ typedef struct {
     Pokemon * unk_04[6];
     Party * unk_1C;
     UnkStruct_0202CA1C * unk_20;
-    UnkStruct_020279FC * unk_24;
+    AnimationControlFlags * unk_24;
     SaveData * unk_28;
     u8 unk_2C;
     u8 unk_2D;
diff --git a/include/struct_defs/struct_020985E4.h b/include/struct_defs/struct_020985E4.h
index 12bb2536d6..eeba60e837 100644
--- a/include/struct_defs/struct_020985E4.h
+++ b/include/struct_defs/struct_020985E4.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     int unk_00;
-    UnkStruct_020279FC * unk_04;
+    AnimationControlFlags * unk_04;
     const TrainerInfo * unk_08;
 } UnkStruct_020985E4;
 
diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h
index cbe1880d36..2430254beb 100644
--- a/include/struct_defs/struct_02098C44.h
+++ b/include/struct_defs/struct_02098C44.h
@@ -8,7 +8,7 @@ typedef struct {
     Party * unk_00;
     void * unk_04;
     void * unk_08;
-    UnkStruct_020279FC * unk_0C;
+    AnimationControlFlags * unk_0C;
     void * unk_10;
     void * unk_14;
     void * unk_18;
@@ -31,6 +31,6 @@ typedef struct {
     u16 unk_38;
     u8 padding_3A[2];
     int unk_3C;
-} UnkStruct_02098C44;
+} PartyManagementData;
 
 #endif // POKEPLATINUM_STRUCT_02098C44_H
diff --git a/include/struct_defs/struct_02098D38.h b/include/struct_defs/struct_02098D38.h
index 3a1c618044..8360ca5130 100644
--- a/include/struct_defs/struct_02098D38.h
+++ b/include/struct_defs/struct_02098D38.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     void * unk_00;
-    UnkStruct_020279FC * unk_04;
+    AnimationControlFlags * unk_04;
     const u16 * unk_08;
     u32 unk_0C;
     u8 unk_10;
diff --git a/include/struct_defs/struct_0209903C.h b/include/struct_defs/struct_0209903C.h
index 4d6434265f..b6596f3587 100644
--- a/include/struct_defs/struct_0209903C.h
+++ b/include/struct_defs/struct_0209903C.h
@@ -15,7 +15,7 @@ typedef struct {
     u16 unk_0A;
     u16 unk_0C;
     u16 unk_0E;
-    UnkStruct_020218BC * unk_10;
+    GraphicElementManager * unk_10;
     UnkStruct_0200C738 unk_14;
     UnkStruct_02009508 * unk_1A0;
     UnkStruct_02009714 * unk_1A4[4];
diff --git a/include/struct_defs/struct_020997B8.h b/include/struct_defs/struct_020997B8.h
index 889a186087..226d1595ec 100644
--- a/include/struct_defs/struct_020997B8.h
+++ b/include/struct_defs/struct_020997B8.h
@@ -8,7 +8,7 @@
 typedef struct {
     Pokemon * unk_00;
     TrainerInfo * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     u16 * unk_0C;
     u16 unk_10;
     u16 unk_12;
diff --git a/include/struct_defs/struct_0209BBA4.h b/include/struct_defs/struct_0209BBA4.h
index d765b0d955..12890184ad 100644
--- a/include/struct_defs/struct_0209BBA4.h
+++ b/include/struct_defs/struct_0209BBA4.h
@@ -31,7 +31,7 @@ typedef struct {
     u8 unk_9F;
     u8 unk_A0;
     u8 unk_A1[4];
-    UnkStruct_02098C44 * unk_A8;
+    PartyManagementData * unk_A8;
     UnkStruct_02098D38 * unk_AC;
     u16 * unk_B0;
 } UnkStruct_0209BBA4;
diff --git a/include/struct_defs/struct_0209C194_1.h b/include/struct_defs/struct_0209C194_1.h
index 002f6a6da5..200b273086 100644
--- a/include/struct_defs/struct_0209C194_1.h
+++ b/include/struct_defs/struct_0209C194_1.h
@@ -13,7 +13,7 @@ typedef struct {
     int unk_04;
     SaveData * unk_08;
     UnkStruct_0205C22C * unk_0C;
-    UnkStruct_020279FC * unk_10;
+    AnimationControlFlags * unk_10;
     UnkStruct_0202CD88 * unk_14;
     UnkStruct_0202B628 * unk_18;
     UnkStruct_0203CDB0 * unk_1C;
diff --git a/include/struct_defs/struct_020F1DB8.h b/include/struct_defs/struct_020F1DB8.h
index 3e72289d6d..10f82ab7bc 100644
--- a/include/struct_defs/struct_020F1DB8.h
+++ b/include/struct_defs/struct_020F1DB8.h
@@ -10,6 +10,6 @@ typedef struct {
     u8 unk_05;
     u8 unk_06;
     u8 unk_07;
-} UnkStruct_020F1DB8;
+} ByteFlagSet;
 
 #endif // POKEPLATINUM_STRUCT_020F1DB8_H
diff --git a/include/unk_0200112C.h b/include/unk_0200112C.h
index 8bb25effbd..884949ccee 100644
--- a/include/unk_0200112C.h
+++ b/include/unk_0200112C.h
@@ -17,6 +17,6 @@ void sub_020014DC(UnkStruct_0200112C * param0, u16 * param1, u16 * param2);
 u8 sub_020014F0(UnkStruct_0200112C * param0);
 u32 sub_020014F8(UnkStruct_0200112C * param0, u16 param1);
 u32 sub_02001504(UnkStruct_0200112C * param0, u8 param1);
-void sub_020015CC(UnkStruct_0200112C * param0, UnkStruct_02013A04 * param1);
+void sub_020015CC(UnkStruct_0200112C * param0, ResourceMetadata * param1);
 
 #endif // POKEPLATINUM_UNK_0200112C_H
diff --git a/include/unk_02001AF4.h b/include/unk_02001AF4.h
index caa859e62a..84a2dbdf5a 100644
--- a/include/unk_02001AF4.h
+++ b/include/unk_02001AF4.h
@@ -7,20 +7,20 @@
 #include "struct_defs/struct_02081CF4.h"
 #include "overlay061/struct_ov61_0222C884.h"
 
-UnkStruct_02001AF4 * sub_02001AF4(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5);
-UnkStruct_02001AF4 * sub_02001B7C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5);
-UnkStruct_02001AF4 * sub_02001B9C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2);
-void sub_02001BC4(UnkStruct_02001AF4 * param0, u8 * param1);
-u32 sub_02001BE0(UnkStruct_02001AF4 * param0);
-u32 sub_02001C94(UnkStruct_02001AF4 * param0, u16 param1);
-u32 sub_02001D44(UnkStruct_02001AF4 * param0, u8 param1);
-u8 sub_02001DC4(UnkStruct_02001AF4 * param0);
-u8 sub_02001DC8(UnkStruct_02001AF4 * param0);
-UnkStruct_02001AF4 * sub_02002054(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5);
-UnkStruct_02001AF4 * sub_02002100(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4);
-u32 sub_02002114(UnkStruct_02001AF4 * param0, u32 param1);
-u32 sub_02002134(UnkStruct_02001AF4 * param0, u8 param1, u32 param2);
-void sub_02002154(UnkStruct_02001AF4 * param0, u32 param1);
+UIControlData * sub_02001AF4(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5);
+UIControlData * sub_02001B7C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5);
+UIControlData * sub_02001B9C(const UnkStruct_02081CF4 * param0, u8 param1, u8 param2);
+void sub_02001BC4(UIControlData * param0, u8 * param1);
+u32 sub_02001BE0(UIControlData * param0);
+u32 sub_02001C94(UIControlData * param0, u16 param1);
+u32 sub_02001D44(UIControlData * param0, u8 param1);
+u8 sub_02001DC4(UIControlData * param0);
+u8 sub_02001DC8(UIControlData * param0);
+UIControlData * sub_02002054(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5);
+UIControlData * sub_02002100(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4);
+u32 sub_02002114(UIControlData * param0, u32 param1);
+u32 sub_02002134(UIControlData * param0, u8 param1, u32 param2);
+void sub_02002154(UIControlData * param0, u32 param1);
 void sub_02002180(Window * param0, u32 param1, u32 param2);
 
 #endif // POKEPLATINUM_UNK_02001AF4_H
diff --git a/include/unk_02003B60.h b/include/unk_02003B60.h
index b90f910f73..4e6cd564e4 100644
--- a/include/unk_02003B60.h
+++ b/include/unk_02003B60.h
@@ -7,7 +7,7 @@
 
 #include <nnsys.h>
 
-void sub_02003B60(ChatotCry * param0, UnkStruct_020279FC * param1);
+void sub_02003B60(ChatotCry * param0, AnimationControlFlags * param1);
 void sub_02003BD8(void);
 void sub_02003D0C(int param0);
 UnkStruct_02003D54 * sub_02003D54(void);
diff --git a/include/unk_020093B4.h b/include/unk_020093B4.h
index 292788f295..83a60a0b86 100644
--- a/include/unk_020093B4.h
+++ b/include/unk_020093B4.h
@@ -14,7 +14,7 @@ void sub_020093B4(UnkStruct_ov19_021DA864 * param0, int param1, int param2, int
 void sub_020094F0(UnkStruct_ov19_021DA864 * param0);
 UnkStruct_02009508 * sub_02009508(const UnkStruct_02009508_1 * param0, int param1, UnkStruct_02009714 * param2, UnkStruct_02009714 * param3, UnkStruct_02009714 * param4, UnkStruct_02009714 * param5, UnkStruct_02009714 * param6, UnkStruct_02009714 * param7);
 void sub_020095A8(UnkStruct_02009508 * param0);
-UnkStruct_020218BC * sub_020095C4(int param0, UnkStruct_0200C738 * param1, int param2);
+GraphicElementManager * sub_020095C4(int param0, UnkStruct_0200C738 * param1, int param2);
 void sub_0200962C(UnkStruct_0200C738 * param0, fx32 param1, fx32 param2);
 void sub_0200964C(UnkStruct_0200C738 * param0, fx32 param1, fx32 param2);
 void sub_0200966C(u32 param0, GXOBJVRamModeChar param1);
diff --git a/include/unk_0200C6E4.h b/include/unk_0200C6E4.h
index 3fec191424..bde8127e93 100644
--- a/include/unk_0200C6E4.h
+++ b/include/unk_0200C6E4.h
@@ -19,46 +19,46 @@
 #include <nitro/gx.h>
 #include <nnsys.h>
 
-UnkStruct_0200C6E4 * sub_0200C6E4(int param0);
-UnkStruct_0200C704 * sub_0200C704(UnkStruct_0200C6E4 * param0);
-UnkStruct_0200C738 * sub_0200C738(UnkStruct_0200C6E4 * param0);
-BOOL sub_0200C73C(UnkStruct_0200C6E4 * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3);
-BOOL sub_0200C7C0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2);
-void sub_0200C7E4(UnkStruct_02022550 * param0);
-void sub_0200C7EC(UnkStruct_0200C704 * param0);
+CellTransferStateData * sub_0200C6E4(int param0);
+AnimationResourceCollection * sub_0200C704(CellTransferStateData * param0);
+UnkStruct_0200C738 * sub_0200C738(CellTransferStateData * param0);
+BOOL sub_0200C73C(CellTransferStateData * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3);
+BOOL sub_0200C7C0(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2);
+void sub_0200C7E4(GraphicElementData * param0);
+void sub_0200C7EC(AnimationResourceCollection * param0);
 void sub_0200C800(void);
 void sub_0200C808(void);
-void sub_0200C810(UnkStruct_0200C704 * param0);
-void sub_0200C81C(UnkStruct_0200C704 * param0);
-void sub_0200C82C(UnkStruct_0200C704 * param0);
-void sub_0200C880(UnkStruct_0200C6E4 * param0);
-void sub_0200C8A0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1);
-void sub_0200C8B0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1);
-void sub_0200C8D4(UnkStruct_0200C6E4 * param0);
-BOOL sub_0200C8F0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov7_0224F2EC * param2);
-UnkStruct_02022550 * sub_0200CA08(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov7_0224F358 * param2);
-UnkStruct_02022550 * sub_0200CA44(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13);
-BOOL sub_0200CB30(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov104_02241308 * param2);
-BOOL sub_0200CBDC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5, int param6);
-BOOL sub_0200CC3C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6);
-s8 sub_0200CC9C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5, int param6, int param7);
-s8 sub_0200CD0C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7);
-u8 sub_0200CD7C(PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, int param4, int param5, int param6, int param7, int param8, int param9);
-u8 sub_0200CDC4(PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, NARC * param4, int param5, int param6, int param7, int param8, int param9);
-BOOL sub_0200CE0C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5);
-BOOL sub_0200CE24(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5);
-BOOL sub_0200CE3C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5);
-BOOL sub_0200CE54(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5);
-CellActorData * sub_0200CE6C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov104_0223F9E0 * param2);
-const NNSG2dImagePaletteProxy * sub_0200D04C(UnkStruct_0200C704 * param0, int param1);
-u32 sub_0200D05C(UnkStruct_0200C704 * param0, int param1, NNS_G2D_VRAM_TYPE param2);
-BOOL sub_0200D070(UnkStruct_0200C704 * param0, int param1);
-BOOL sub_0200D080(UnkStruct_0200C704 * param0, int param1);
-BOOL sub_0200D090(UnkStruct_0200C704 * param0, int param1);
-BOOL sub_0200D0A0(UnkStruct_0200C704 * param0, int param1);
-void sub_0200D0B0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1);
+void sub_0200C810(AnimationResourceCollection * param0);
+void sub_0200C81C(AnimationResourceCollection * param0);
+void sub_0200C82C(AnimationResourceCollection * param0);
+void sub_0200C880(CellTransferStateData * param0);
+void sub_0200C8A0(CellTransferStateData * param0, AnimationResourceCollection * param1);
+void sub_0200C8B0(CellTransferStateData * param0, AnimationResourceCollection * param1);
+void sub_0200C8D4(CellTransferStateData * param0);
+BOOL sub_0200C8F0(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F2EC * param2);
+GraphicElementData * sub_0200CA08(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F358 * param2);
+GraphicElementData * sub_0200CA44(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13);
+BOOL sub_0200CB30(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_02241308 * param2);
+BOOL sub_0200CBDC(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6);
+BOOL sub_0200CC3C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6);
+s8 sub_0200CC9C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6, int param7);
+s8 sub_0200CD0C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7);
+u8 sub_0200CD7C(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, int param4, int param5, int param6, int param7, int param8, int param9);
+u8 sub_0200CDC4(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NARC * param4, int param5, int param6, int param7, int param8, int param9);
+BOOL sub_0200CE0C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5);
+BOOL sub_0200CE24(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5);
+BOOL sub_0200CE3C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5);
+BOOL sub_0200CE54(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5);
+CellActorData * sub_0200CE6C(CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_0223F9E0 * param2);
+const NNSG2dImagePaletteProxy * sub_0200D04C(AnimationResourceCollection * param0, int param1);
+u32 sub_0200D05C(AnimationResourceCollection * param0, int param1, NNS_G2D_VRAM_TYPE param2);
+BOOL sub_0200D070(AnimationResourceCollection * param0, int param1);
+BOOL sub_0200D080(AnimationResourceCollection * param0, int param1);
+BOOL sub_0200D090(AnimationResourceCollection * param0, int param1);
+BOOL sub_0200D0A0(AnimationResourceCollection * param0, int param1);
+void sub_0200D0B0(CellTransferStateData * param0, AnimationResourceCollection * param1);
 void sub_0200D0F4(CellActorData * param0);
-void sub_0200D324(UnkStruct_02022550 * param0);
+void sub_0200D324(GraphicElementData * param0);
 void sub_0200D330(CellActorData * param0);
 void sub_0200D33C(CellActorData * param0);
 void sub_0200D34C(CellActorData * param0, fx32 param1);
@@ -66,72 +66,72 @@ u32 sub_0200D358(CellActorData * param0);
 void sub_0200D364(CellActorData * param0, u32 param1);
 void sub_0200D370(CellActorData * param0, u32 param1);
 u32 sub_0200D37C(CellActorData * param0);
-void sub_0200D388(UnkStruct_02022550 * param0, int param1);
+void sub_0200D388(GraphicElementData * param0, int param1);
 void sub_0200D390(CellActorData * param0, int param1);
-void sub_0200D39C(UnkStruct_02022550 * param0, fx32 param1);
+void sub_0200D39C(GraphicElementData * param0, fx32 param1);
 void sub_0200D3A4(CellActorData * param0, fx32 param1);
-BOOL sub_0200D3B0(UnkStruct_02022550 * param0);
+BOOL sub_0200D3B0(GraphicElementData * param0);
 BOOL sub_0200D3B8(CellActorData * param0);
-void sub_0200D3C4(UnkStruct_02022550 * param0, u16 param1);
+void sub_0200D3C4(GraphicElementData * param0, u16 param1);
 void sub_0200D3CC(CellActorData * param0, u16 param1);
-u16 sub_0200D3D8(UnkStruct_02022550 * param0);
+u16 sub_0200D3D8(GraphicElementData * param0);
 u16 sub_0200D3E0(CellActorData * param0);
-void sub_0200D3EC(UnkStruct_02022550 * param0, int param1);
+void sub_0200D3EC(GraphicElementData * param0, int param1);
 void sub_0200D3F4(CellActorData * param0, int param1);
-int sub_0200D400(UnkStruct_02022550 * param0);
+int sub_0200D400(GraphicElementData * param0);
 int sub_0200D408(CellActorData * param0);
-void sub_0200D414(UnkStruct_02022550 * param0, int param1);
+void sub_0200D414(GraphicElementData * param0, int param1);
 void sub_0200D41C(CellActorData * param0, int param1);
-void sub_0200D428(UnkStruct_02022550 * param0, int param1);
+void sub_0200D428(GraphicElementData * param0, int param1);
 void sub_0200D430(CellActorData * param0, int param1);
 int sub_0200D43C(CellActorData * param0);
-void sub_0200D448(UnkStruct_02022550 * param0, int param1);
+void sub_0200D448(GraphicElementData * param0, int param1);
 int  sub_0200D454(CellActorData * param0);
 void sub_0200D460(CellActorData * param0, int param1);
-void sub_0200D46C(UnkStruct_02022550 * param0, int param1);
+void sub_0200D46C(GraphicElementData * param0, int param1);
 void sub_0200D474(CellActorData * param0, int param1);
-u32 sub_0200D480(UnkStruct_02022550 * param0);
+u32 sub_0200D480(GraphicElementData * param0);
 u32 sub_0200D488(CellActorData * param0);
-void sub_0200D494(UnkStruct_02022550 * param0, s16 param1, s16 param2);
+void sub_0200D494(GraphicElementData * param0, s16 param1, s16 param2);
 void sub_0200D4C4(CellActorData * param0, s16 param1, s16 param2);
-void sub_0200D4D0(UnkStruct_02022550 * param0, s16 param1, s16 param2, fx32 param3);
+void sub_0200D4D0(GraphicElementData * param0, s16 param1, s16 param2, fx32 param3);
 void sub_0200D500(CellActorData * param0, s16 param1, s16 param2, fx32 param3);
-void sub_0200D50C(UnkStruct_02022550 * param0, s16 * param1, s16 * param2);
+void sub_0200D50C(GraphicElementData * param0, s16 * param1, s16 * param2);
 void sub_0200D550(CellActorData * param0, s16 * param1, s16 * param2);
-void sub_0200D55C(UnkStruct_02022550 * param0, s16 * param1, s16 * param2, fx32 param3);
+void sub_0200D55C(GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3);
 void sub_0200D5A0(CellActorData * param0, s16 * param1, s16 * param2, fx32 param3);
-void sub_0200D5AC(UnkStruct_02022550 * param0, s16 param1, s16 param2);
+void sub_0200D5AC(GraphicElementData * param0, s16 param1, s16 param2);
 void sub_0200D5DC(CellActorData * param0, s16 param1, s16 param2);
 void sub_0200D5E8(CellActorData * param0, fx32 param1, fx32 param2);
 void sub_0200D614(CellActorData * param0, fx32 param1, fx32 param2);
 void sub_0200D638(CellActorData * param0, fx32 * param1, fx32 * param2);
 void sub_0200D650(CellActorData * param0, fx32 param1, fx32 param2, fx32 param3);
 void sub_0200D67C(CellActorData * param0, fx32 * param1, fx32 * param2, fx32 param3);
-void sub_0200D69C(UnkStruct_02022550 * param0, int param1);
+void sub_0200D69C(GraphicElementData * param0, int param1);
 void sub_0200D6A4(CellActorData * param0, int param1);
-void sub_0200D6B0(UnkStruct_02022550 * param0, f32 param1, f32 param2);
+void sub_0200D6B0(GraphicElementData * param0, f32 param1, f32 param2);
 void sub_0200D6E8(CellActorData * param0, f32 param1, f32 param2);
-void sub_0200D6F4(UnkStruct_02022550 * param0, f32 param1, f32 param2);
+void sub_0200D6F4(GraphicElementData * param0, f32 param1, f32 param2);
 void sub_0200D74C(CellActorData * param0, f32 param1, f32 param2);
-void sub_0200D758(UnkStruct_02022550 * param0, f32 * param1, f32 * param2);
+void sub_0200D758(GraphicElementData * param0, f32 * param1, f32 * param2);
 void sub_0200D788(CellActorData * param0, f32 * param1, f32 * param2);
-void sub_0200D794(UnkStruct_02022550 * param0, u16 param1);
+void sub_0200D794(GraphicElementData * param0, u16 param1);
 void sub_0200D79C(CellActorData * param0, u16 param1);
-void sub_0200D7A8(UnkStruct_02022550 * param0, s32 param1);
+void sub_0200D7A8(GraphicElementData * param0, s32 param1);
 void sub_0200D7C0(CellActorData * param0, s32 param1);
-void sub_0200D7CC(UnkStruct_02022550 * param0, int param1);
+void sub_0200D7CC(GraphicElementData * param0, int param1);
 void sub_0200D7D4(CellActorData * param0, int param1);
 void sub_0200D7E0(CellActorData * param0, s16 param1, s16 param2);
 void sub_0200D7FC(CellActorData * param0, BOOL param1);
-void sub_0200D808(UnkStruct_02022550 * param0, GXOamMode param1);
+void sub_0200D808(GraphicElementData * param0, GXOamMode param1);
 void sub_0200D810(CellActorData * param0, GXOamMode param1);
 u32 sub_0200D81C(CellActorData * param0);
-BOOL sub_0200D828(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5, int param6);
-BOOL sub_0200D888(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5, int param6);
-BOOL sub_0200D8E8(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, BOOL param4, int param5, int param6);
-void sub_0200D948(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5);
-void sub_0200D97C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5);
-UnkStruct_020218BC * sub_0200D9B0(UnkStruct_0200C704 * param0);
-void sub_0200D9B4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, BOOL param4, int param5);
+BOOL sub_0200D828(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6);
+BOOL sub_0200D888(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6);
+BOOL sub_0200D8E8(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5, int param6);
+void sub_0200D948(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5);
+void sub_0200D97C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5);
+GraphicElementManager * sub_0200D9B0(AnimationResourceCollection * param0);
+void sub_0200D9B4(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5);
 
 #endif // POKEPLATINUM_UNK_0200C6E4_H
diff --git a/include/unk_02012744.h b/include/unk_02012744.h
index 8508a25e3c..9a174e94eb 100644
--- a/include/unk_02012744.h
+++ b/include/unk_02012744.h
@@ -32,6 +32,6 @@ FontOAM * sub_02012B60(const UnkStruct_020127E8 * param0, const UnkStruct_02012B
 void sub_02012BD8(FontOAM * param0);
 void sub_02012BE0(FontOAM * param0, const UnkStruct_02012B20 * param1, const Window * param2, int param3);
 void sub_02012C60(const Window * param0, int param1, int param2, int param3, int param4, char * param5);
-void sub_020131E0(FontOAM * param0, const UnkStruct_02022550 * param1);
+void sub_020131E0(FontOAM * param0, const GraphicElementData * param1);
 
 #endif // POKEPLATINUM_UNK_02012744_H
diff --git a/include/unk_02013A04.h b/include/unk_02013A04.h
index 5bcd020511..9a8387e498 100644
--- a/include/unk_02013A04.h
+++ b/include/unk_02013A04.h
@@ -5,11 +5,11 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "strbuf.h"
 
-UnkStruct_02013A04 * sub_02013A04(u32 param0, u32 param1);
-void sub_02013A3C(UnkStruct_02013A04 * param0);
-void sub_02013A4C(UnkStruct_02013A04 * param0, const MessageLoader * param1, u32 param2, u32 param3);
-void sub_02013A6C(UnkStruct_02013A04 * param0, const Strbuf *param1, u32 param2);
-void sub_02013A90(UnkStruct_02013A04 * param0, const UnkStruct_02013A04 * param1);
-void sub_02013AE8(UnkStruct_02013A04 * param0);
+ResourceMetadata * sub_02013A04(u32 param0, u32 param1);
+void sub_02013A3C(ResourceMetadata * param0);
+void sub_02013A4C(ResourceMetadata * param0, const MessageLoader * param1, u32 param2, u32 param3);
+void sub_02013A6C(ResourceMetadata * param0, const Strbuf *param1, u32 param2);
+void sub_02013A90(ResourceMetadata * param0, const ResourceMetadata * param1);
+void sub_02013AE8(ResourceMetadata * param0);
 
 #endif // POKEPLATINUM_UNK_02013A04_H
diff --git a/include/unk_0201E010.h b/include/unk_0201E010.h
index 1b4c777262..02010247d2 100644
--- a/include/unk_0201E010.h
+++ b/include/unk_0201E010.h
@@ -3,8 +3,8 @@
 
 #include "struct_defs/struct_020F1DB8.h"
 
-void sub_0201E010(const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2);
-void sub_0201E01C(const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2);
-u8 sub_0201E028(const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6);
+void sub_0201E010(const ByteFlagSet * param0, u8 * param1, u8 * param2);
+void sub_0201E01C(const ByteFlagSet * param0, u8 * param1, u8 * param2);
+u8 sub_0201E028(const ByteFlagSet * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6);
 
 #endif // POKEPLATINUM_UNK_0201E010_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 2b9a8cab11..5d537f9027 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -11,59 +11,59 @@
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
 
-UnkStruct_020218BC * sub_020218BC(const UnkStruct_020095C4 * param0);
-BOOL sub_02021964(UnkStruct_020218BC * param0);
-BOOL sub_020219A4(UnkStruct_020218BC * param0, u8 param1);
-BOOL sub_020219C0(UnkStruct_020218BC * param0);
-void sub_020219F8(const UnkStruct_020218BC * param0);
-void sub_02021A78(UnkStruct_02022550 * param0);
-UnkStruct_02022550 * sub_02021AA0(const UnkStruct_ov115_02261520 * param0);
-UnkStruct_02022550 * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
-void sub_02021BD4(UnkStruct_02022550 * param0);
-void sub_02021C50(UnkStruct_02022550 * param0, const VecFx32 * param1);
-void sub_02021C60(UnkStruct_02022550 * param0, const VecFx32 * param1);
-void sub_02021C70(UnkStruct_02022550 * param0, const VecFx32 * param1);
-void sub_02021C80(UnkStruct_02022550 * param0, const VecFx32 * param1, int param2);
-void sub_02021C94(UnkStruct_02022550 * param0, u16 param1);
-void sub_02021C98(UnkStruct_02022550 * param0, u16 param1, int param2);
-void sub_02021CAC(UnkStruct_02022550 * param0, int param1);
-void sub_02021CC8(UnkStruct_02022550 * param0, int param1);
-void sub_02021CE4(UnkStruct_02022550 * param0, fx32 param1);
-void sub_02021CF8(UnkStruct_02022550 * param0, int param1);
-void sub_02021D0C(UnkStruct_02022550 * param0, int param1);
-const VecFx32 * sub_02021D28(const UnkStruct_02022550 * param0);
-const VecFx32 * sub_02021D2C(const UnkStruct_02022550 * param0);
-u16 sub_02021D30(const UnkStruct_02022550 * param0);
-int sub_02021D34(const UnkStruct_02022550 * param0);
-int sub_02021D3C(const UnkStruct_02022550 * param0);
-u32 sub_02021D44(const UnkStruct_02022550 * param0);
-void sub_02021D6C(UnkStruct_02022550 * param0, u32 param1);
-void sub_02021DCC(UnkStruct_02022550 * param0, u32 param1);
-void sub_02021DE0(UnkStruct_02022550 * param0);
-u32 sub_02021E24(const UnkStruct_02022550 * param0);
-void sub_02021E2C(UnkStruct_02022550 * param0, fx32 param1);
-void sub_02021E50(UnkStruct_02022550 * param0, u16 param1);
-u16 sub_02021E74(const UnkStruct_02022550 * param0);
-void sub_02021E80(UnkStruct_02022550 * param0, u8 param1);
-u8 sub_02021E88(const UnkStruct_02022550 * param0);
-void sub_02021E90(UnkStruct_02022550 * param0, u32 param1);
-void sub_02021EC4(UnkStruct_02022550 * param0, u32 param1);
-u32 sub_02021EE8(const UnkStruct_02022550 * param0);
-void sub_02021EF0(UnkStruct_02022550 * param0, u32 param1);
-void sub_02021F24(UnkStruct_02022550 * param0, u32 param1);
-u32 sub_02021F48(const UnkStruct_02022550 * param0);
-void sub_02021F58(UnkStruct_02022550 * param0, u32 param1);
-u32 sub_02021F74(const UnkStruct_02022550 * param0);
-void sub_02021F7C(UnkStruct_02022550 * param0, const NNSG2dImageProxy * param1);
-NNSG2dImageProxy * sub_02021F98(UnkStruct_02022550 * param0);
-NNSG2dImagePaletteProxy * sub_02021F9C(UnkStruct_02022550 * param0);
-void sub_02021FA0(UnkStruct_02022550 * param0, BOOL param1);
-NNS_G2D_VRAM_TYPE sub_02021FC8(const UnkStruct_02022550 * param0);
-BOOL sub_02021FD0(UnkStruct_02022550 * param0);
-void sub_02021FE0(UnkStruct_02022550 * param0, GXOamMode param1);
+GraphicElementManager * sub_020218BC(const UnkStruct_020095C4 * param0);
+BOOL sub_02021964(GraphicElementManager * param0);
+BOOL sub_020219A4(GraphicElementManager * param0, u8 param1);
+BOOL sub_020219C0(GraphicElementManager * param0);
+void sub_020219F8(const GraphicElementManager * param0);
+void sub_02021A78(GraphicElementData * param0);
+GraphicElementData * sub_02021AA0(const UnkStruct_ov115_02261520 * param0);
+GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
+void sub_02021BD4(GraphicElementData * param0);
+void sub_02021C50(GraphicElementData * param0, const VecFx32 * param1);
+void sub_02021C60(GraphicElementData * param0, const VecFx32 * param1);
+void sub_02021C70(GraphicElementData * param0, const VecFx32 * param1);
+void sub_02021C80(GraphicElementData * param0, const VecFx32 * param1, int param2);
+void sub_02021C94(GraphicElementData * param0, u16 param1);
+void sub_02021C98(GraphicElementData * param0, u16 param1, int param2);
+void sub_02021CAC(GraphicElementData * param0, int param1);
+void sub_02021CC8(GraphicElementData * param0, int param1);
+void sub_02021CE4(GraphicElementData * param0, fx32 param1);
+void sub_02021CF8(GraphicElementData * param0, int param1);
+void sub_02021D0C(GraphicElementData * param0, int param1);
+const VecFx32 * sub_02021D28(const GraphicElementData * param0);
+const VecFx32 * sub_02021D2C(const GraphicElementData * param0);
+u16 sub_02021D30(const GraphicElementData * param0);
+int sub_02021D34(const GraphicElementData * param0);
+int sub_02021D3C(const GraphicElementData * param0);
+u32 sub_02021D44(const GraphicElementData * param0);
+void sub_02021D6C(GraphicElementData * param0, u32 param1);
+void sub_02021DCC(GraphicElementData * param0, u32 param1);
+void sub_02021DE0(GraphicElementData * param0);
+u32 sub_02021E24(const GraphicElementData * param0);
+void sub_02021E2C(GraphicElementData * param0, fx32 param1);
+void sub_02021E50(GraphicElementData * param0, u16 param1);
+u16 sub_02021E74(const GraphicElementData * param0);
+void sub_02021E80(GraphicElementData * param0, u8 param1);
+u8 sub_02021E88(const GraphicElementData * param0);
+void sub_02021E90(GraphicElementData * param0, u32 param1);
+void sub_02021EC4(GraphicElementData * param0, u32 param1);
+u32 sub_02021EE8(const GraphicElementData * param0);
+void sub_02021EF0(GraphicElementData * param0, u32 param1);
+void sub_02021F24(GraphicElementData * param0, u32 param1);
+u32 sub_02021F48(const GraphicElementData * param0);
+void sub_02021F58(GraphicElementData * param0, u32 param1);
+u32 sub_02021F74(const GraphicElementData * param0);
+void sub_02021F7C(GraphicElementData * param0, const NNSG2dImageProxy * param1);
+NNSG2dImageProxy * sub_02021F98(GraphicElementData * param0);
+NNSG2dImagePaletteProxy * sub_02021F9C(GraphicElementData * param0);
+void sub_02021FA0(GraphicElementData * param0, BOOL param1);
+NNS_G2D_VRAM_TYPE sub_02021FC8(const GraphicElementData * param0);
+BOOL sub_02021FD0(GraphicElementData * param0);
+void sub_02021FE0(GraphicElementData * param0, GXOamMode param1);
 void sub_02022014(int param0);
 void sub_0202204C(int param0);
-u32 sub_0202207C(const UnkStruct_02022550 * param0, u32 param1, u32 param2);
-u32 sub_020220F4(const UnkStruct_02022550 * param0);
+u32 sub_0202207C(const GraphicElementData * param0, u32 param1, u32 param2);
+u32 sub_020220F4(const GraphicElementData * param0);
 
 #endif // POKEPLATINUM_UNK_020218BC_H
diff --git a/include/unk_02024220.h b/include/unk_02024220.h
index 906a6842ba..eb9de9ac14 100644
--- a/include/unk_02024220.h
+++ b/include/unk_02024220.h
@@ -4,7 +4,7 @@
 #include "functypes/funcptr_02024220.h"
 #include "struct_defs/struct_0207C690.h"
 
-UnkStruct_0207C690 * sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5);
-void sub_020242C4(UnkStruct_0207C690 * param0);
+GenericPointerData * sub_02024220(u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5);
+void sub_020242C4(GenericPointerData * param0);
 
 #endif // POKEPLATINUM_UNK_02024220_H
diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h
index 8cb49ca08d..ede0f5e41d 100644
--- a/include/unk_02025E08.h
+++ b/include/unk_02025E08.h
@@ -10,7 +10,7 @@
 int Player_SaveSize(void);
 void Player_Init(UnkStruct_02025E0C * param0);
 TrainerInfo * sub_02025E38(SaveData * param0);
-UnkStruct_020279FC * sub_02025E44(SaveData * param0);
+AnimationControlFlags * sub_02025E44(SaveData * param0);
 u16 * sub_02025E50(SaveData * param0);
 UnkStruct_02025E5C * sub_02025E5C(SaveData * param0);
 
diff --git a/include/unk_020279FC.h b/include/unk_020279FC.h
index f7a9f8f55a..450e0c1c8c 100644
--- a/include/unk_020279FC.h
+++ b/include/unk_020279FC.h
@@ -4,22 +4,22 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
-UnkStruct_020279FC * sub_020279FC(u32 param0);
-void sub_02027A10(const UnkStruct_020279FC * param0, UnkStruct_020279FC * param1);
-void sub_02027A1C(UnkStruct_020279FC * param0);
+AnimationControlFlags * sub_020279FC(u32 param0);
+void sub_02027A10(const AnimationControlFlags * param0, AnimationControlFlags * param1);
+void sub_02027A1C(AnimationControlFlags * param0);
 void sub_02027A68(SaveData * param0, int param1);
-int sub_02027AA4(const UnkStruct_020279FC * param0);
-void sub_02027AAC(UnkStruct_020279FC * param0, int param1);
-u8 sub_02027AC0(const UnkStruct_020279FC * param0);
-int sub_02027ADC(const UnkStruct_020279FC * param0);
-void sub_02027AE4(UnkStruct_020279FC * param0, int param1);
-int GameConfig_BattleAnimations(const UnkStruct_020279FC * param0);
-void sub_02027B00(UnkStruct_020279FC * param0, int param1);
-int sub_02027B14(const UnkStruct_020279FC * param0);
-void sub_02027B1C(UnkStruct_020279FC * param0, int param1);
-int sub_02027B30(const UnkStruct_020279FC * param0);
-void sub_02027B38(UnkStruct_020279FC * param0, int param1);
-int sub_02027B50(const UnkStruct_020279FC * param0);
-void sub_02027B58(UnkStruct_020279FC * param0, int param1);
+int sub_02027AA4(const AnimationControlFlags * param0);
+void sub_02027AAC(AnimationControlFlags * param0, int param1);
+u8 sub_02027AC0(const AnimationControlFlags * param0);
+int sub_02027ADC(const AnimationControlFlags * param0);
+void sub_02027AE4(AnimationControlFlags * param0, int param1);
+int GameConfig_BattleAnimations(const AnimationControlFlags * param0);
+void sub_02027B00(AnimationControlFlags * param0, int param1);
+int sub_02027B14(const AnimationControlFlags * param0);
+void sub_02027B1C(AnimationControlFlags * param0, int param1);
+int sub_02027B30(const AnimationControlFlags * param0);
+void sub_02027B38(AnimationControlFlags * param0, int param1);
+int sub_02027B50(const AnimationControlFlags * param0);
+void sub_02027B58(AnimationControlFlags * param0, int param1);
 
 #endif // POKEPLATINUM_UNK_020279FC_H
diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h
index 34251e043b..ab390823a7 100644
--- a/include/unk_0203D1B8.h
+++ b/include/unk_0203D1B8.h
@@ -85,7 +85,7 @@ void sub_0203E414(UnkStruct_020508D4 * param0, int param1);
 void sub_0203E518(UnkStruct_020508D4 * param0);
 void * sub_0203E53C(UnkStruct_0203CDB0 * param0, int param1, int param2);
 void * sub_0203E564(UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 param3, int param4);
-UnkStruct_02098C44 * sub_0203E598(UnkStruct_0203CDB0 * param0, int param1, int param2);
+PartyManagementData * sub_0203E598(UnkStruct_0203CDB0 * param0, int param1, int param2);
 void * sub_0203E608(UnkStruct_0203CDB0 * param0, int param1);
 void * sub_0203E63C(int param0, UnkStruct_0203CDB0 * param1, u16 param2, u16 param3);
 void sub_0203E6C0(UnkStruct_0203CDB0 * param0, int param1, int param2);
diff --git a/include/unk_0205D8CC.h b/include/unk_0205D8CC.h
index 2abe746826..75775c8983 100644
--- a/include/unk_0205D8CC.h
+++ b/include/unk_0205D8CC.h
@@ -8,9 +8,9 @@
 
 void sub_0205D8CC(u32 param0, u32 param1);
 void sub_0205D8F4(BGL * param0, Window * param1, u32 param2);
-void sub_0205D944(Window * param0, const UnkStruct_020279FC * param1);
+void sub_0205D944(Window * param0, const AnimationControlFlags * param1);
 void sub_0205D988(Window * param0);
-u8 sub_0205D994(Window * param0, Strbuf *param1, const UnkStruct_020279FC * param2, u8 param3);
+u8 sub_0205D994(Window * param0, Strbuf *param1, const AnimationControlFlags * param2, u8 param3);
 u8 sub_0205D9CC(Window * param0, Strbuf *param1, int param2, int param3, u8 param4, int param5);
 u8 sub_0205DA04(u8 param0);
 void sub_0205DA1C(BGL * param0, Window * param1, u16 param2, u16 param3);
diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h
index fea8803d55..efa3ef7e42 100644
--- a/include/unk_0207AE68.h
+++ b/include/unk_0207AE68.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 
-UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
+UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, AnimationControlFlags * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
 BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0);
 void sub_0207B0E0(UnkStruct_0207AE68 * param0);
 
diff --git a/include/unk_0207C63C.h b/include/unk_0207C63C.h
index 4629d6bd91..da90e4e098 100644
--- a/include/unk_0207C63C.h
+++ b/include/unk_0207C63C.h
@@ -7,7 +7,7 @@
 
 void sub_0207C63C(void);
 void sub_0207C664(void);
-UnkStruct_0207C690 * sub_0207C690(int param0);
+GenericPointerData * sub_0207C690(int param0);
 void sub_0207C6AC(void);
 void sub_0207C730(void);
 void sub_0207C770(void);
diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h
index d3cf3b1854..476aedf023 100644
--- a/include/unk_0207C908.h
+++ b/include/unk_0207C908.h
@@ -15,20 +15,20 @@ u32 sub_0207C924(void);
 u32 sub_0207C928(void);
 u8 sub_0207C92C(int param0);
 u32 sub_0207C944(void);
-void sub_0207C948(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
-void sub_0207C97C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, u32 param3);
-void sub_0207C9B0(PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, NNS_G2D_VRAM_TYPE param4, u32 param5);
-void sub_0207C9EC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, u32 param3);
-void sub_0207CA34(UnkStruct_0200C704 * param0, u32 param1);
-void sub_0207CA3C(UnkStruct_0200C704 * param0, u32 param1);
-void sub_0207CA44(UnkStruct_0200C704 * param0, u32 param1, u32 param2);
-CellActorData * sub_0207CA58(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
+void sub_0207C948(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
+void sub_0207C97C(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, u32 param3);
+void sub_0207C9B0(PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NNS_G2D_VRAM_TYPE param4, u32 param5);
+void sub_0207C9EC(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3);
+void sub_0207CA34(AnimationResourceCollection * param0, u32 param1);
+void sub_0207CA3C(AnimationResourceCollection * param0, u32 param1);
+void sub_0207CA44(AnimationResourceCollection * param0, u32 param1, u32 param2);
+CellActorData * sub_0207CA58(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3);
 void sub_0207CA88(CellActorData * param0);
 u32 sub_0207CA90(int param0);
 u8 sub_0207CAA8(int param0);
 u32 sub_0207CAC0(void);
-void sub_0207CAC4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
-void sub_0207CAF8(UnkStruct_0200C704 * param0, u32 param1);
+void sub_0207CAC4(CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
+void sub_0207CAF8(AnimationResourceCollection * param0, u32 param1);
 void sub_0207CB00(CellActorData * param0);
 
 #endif // POKEPLATINUM_UNK_0207C908_H
diff --git a/include/unk_0207E0B8.h b/include/unk_0207E0B8.h
index 3450bdaf18..64562d4ff3 100644
--- a/include/unk_0207E0B8.h
+++ b/include/unk_0207E0B8.h
@@ -3,15 +3,15 @@
 
 #include "struct_defs/struct_0207F248.h"
 
-void sub_0207EA74(UnkStruct_0207F248 * param0, int param1);
-u8 sub_0207EF04(UnkStruct_0207F248 * param0, u8 param1);
-u8 sub_0207EF14(UnkStruct_0207F248 * param0, u8 param1);
-const u16 * sub_0207F248(UnkStruct_0207F248 * param0);
-void sub_0207F8F8(UnkStruct_0207F248 * param0, u8 param1);
-void sub_0207FD68(UnkStruct_0207F248 * param0, u8 param1);
-u8 sub_02080354(UnkStruct_0207F248 * param0, u8 param1);
-u8 sub_02080404(UnkStruct_0207F248 * param0, u8 param1);
-u8 sub_02080488(UnkStruct_0207F248 * param0, u8 param1);
+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);
 u8 sub_020805D0(u8 param0, u8 param1);
 u8 sub_02080BCC(u16 param0);
 u32 sub_02081930(void);
@@ -19,7 +19,7 @@ u32 sub_02081934(void);
 u32 sub_02081938(void);
 u32 sub_0208193C(void);
 void sub_02081940(u32 param0, u16 * param1, u16 * param2, u16 * param3);
-void sub_020819B4(UnkStruct_0207F248 * param0);
-void sub_020819CC(UnkStruct_0207F248 * param0);
+void sub_020819B4(GameWindowLayout * param0);
+void sub_020819CC(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_0207E0B8_H
diff --git a/include/unk_020819DC.h b/include/unk_020819DC.h
index d11864531d..289790be29 100644
--- a/include/unk_020819DC.h
+++ b/include/unk_020819DC.h
@@ -4,34 +4,34 @@
 #include "pokemon.h"
 #include "struct_defs/struct_0207F248.h"
 
-void sub_02081A24(UnkStruct_0207F248 * param0);
-void sub_02081B90(UnkStruct_0207F248 * param0);
-void sub_02081BC0(UnkStruct_0207F248 * param0);
-void sub_02081CAC(UnkStruct_0207F248 * param0, u16 param1, u8 param2);
-void sub_02081CF4(UnkStruct_0207F248 * param0, const u8 * param1, u8 param2);
-void sub_02081E08(UnkStruct_0207F248 * param0);
-void sub_02081ED8(UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2);
-void sub_02081F2C(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02081FFC(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02082058(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02082098(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02082104(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020821F8(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020822BC(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020822F4(UnkStruct_0207F248 * param0, u8 param1);
-void sub_0208232C(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020823C4(UnkStruct_0207F248 * param0, u8 param1);
-void sub_0208245C(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020824C0(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02082508(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020825B4(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020826E0(UnkStruct_0207F248 * param0, u32 param1, u8 param2);
-void sub_020826F4(UnkStruct_0207F248 * param0, u32 param1, u8 param2);
-void sub_02082708(UnkStruct_0207F248 * param0, u32 param1, u8 param2);
-void sub_0208274C(UnkStruct_0207F248 * param0);
-void sub_020827EC(UnkStruct_0207F248 * param0);
-void sub_020829DC(UnkStruct_0207F248 * param0);
-void sub_02082B58(UnkStruct_0207F248 * param0);
-void sub_02082C10(UnkStruct_0207F248 * param0);
+void sub_02081A24(GameWindowLayout * param0);
+void sub_02081B90(GameWindowLayout * param0);
+void sub_02081BC0(GameWindowLayout * param0);
+void sub_02081CAC(GameWindowLayout * param0, u16 param1, u8 param2);
+void sub_02081CF4(GameWindowLayout * param0, const u8 * param1, u8 param2);
+void sub_02081E08(GameWindowLayout * param0);
+void sub_02081ED8(GameWindowLayout * param0, Pokemon * param1, u32 param2);
+void sub_02081F2C(GameWindowLayout * param0, u8 param1);
+void sub_02081FFC(GameWindowLayout * param0, u8 param1);
+void sub_02082058(GameWindowLayout * param0, u8 param1);
+void sub_02082098(GameWindowLayout * param0, u8 param1);
+void sub_02082104(GameWindowLayout * param0, u8 param1);
+void sub_020821F8(GameWindowLayout * param0, u8 param1);
+void sub_020822BC(GameWindowLayout * param0, u8 param1);
+void sub_020822F4(GameWindowLayout * param0, u8 param1);
+void sub_0208232C(GameWindowLayout * param0, u8 param1);
+void sub_020823C4(GameWindowLayout * param0, u8 param1);
+void sub_0208245C(GameWindowLayout * param0, u8 param1);
+void sub_020824C0(GameWindowLayout * param0, u8 param1);
+void sub_02082508(GameWindowLayout * param0, u8 param1);
+void sub_020825B4(GameWindowLayout * param0, u8 param1);
+void sub_020826E0(GameWindowLayout * param0, u32 param1, u8 param2);
+void sub_020826F4(GameWindowLayout * param0, u32 param1, u8 param2);
+void sub_02082708(GameWindowLayout * param0, u32 param1, u8 param2);
+void sub_0208274C(GameWindowLayout * param0);
+void sub_020827EC(GameWindowLayout * param0);
+void sub_020829DC(GameWindowLayout * param0);
+void sub_02082B58(GameWindowLayout * param0);
+void sub_02082C10(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_020819DC_H
diff --git a/include/unk_02082C2C.h b/include/unk_02082C2C.h
index a0f79d133d..51a2903775 100644
--- a/include/unk_02082C2C.h
+++ b/include/unk_02082C2C.h
@@ -4,21 +4,21 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_defs/struct_0207F248.h"
 
-void sub_02082C2C(UnkStruct_0207F248 * param0);
-void sub_02082CEC(UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param3, NARC * param4);
-void sub_02082DA8(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02082E58(UnkStruct_0207F248 * param0);
-void sub_02082FAC(UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param3);
-void sub_02082FF4(UnkStruct_0207F248 * param0);
-void sub_02083014(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-void sub_02083040(UnkStruct_0207F248 * param0, u8 param1, u16 param2);
-void sub_02083080(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020830A0(UnkStruct_0207F248 * param0, u8 param1, s16 param2, s16 param3);
-void sub_020830D4(UnkStruct_0207F248 * param0, u8 param1);
-void sub_02083104(UnkStruct_0207F248 * param0, u8 param1);
-void sub_020831B4(UnkStruct_0207F248 * param0);
-void sub_0208327C(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-void sub_020832E4(UnkStruct_0207F248 * param0, s16 param1, s16 param2);
-void sub_02083334(UnkStruct_0207F248 * param0);
+void sub_02082C2C(GameWindowLayout * param0);
+void sub_02082CEC(GameWindowLayout * param0, u8 param1, u16 param2, u16 param3, NARC * param4);
+void sub_02082DA8(GameWindowLayout * param0, u8 param1);
+void sub_02082E58(GameWindowLayout * param0);
+void sub_02082FAC(GameWindowLayout * param0, u8 param1, u16 param2, u16 param3);
+void sub_02082FF4(GameWindowLayout * param0);
+void sub_02083014(GameWindowLayout * param0, u8 param1, u8 param2);
+void sub_02083040(GameWindowLayout * param0, u8 param1, u16 param2);
+void sub_02083080(GameWindowLayout * param0, u8 param1);
+void sub_020830A0(GameWindowLayout * param0, u8 param1, s16 param2, s16 param3);
+void sub_020830D4(GameWindowLayout * param0, u8 param1);
+void sub_02083104(GameWindowLayout * param0, u8 param1);
+void sub_020831B4(GameWindowLayout * param0);
+void sub_0208327C(GameWindowLayout * param0, u8 param1, u8 param2);
+void sub_020832E4(GameWindowLayout * param0, s16 param1, s16 param2);
+void sub_02083334(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_02082C2C_H
diff --git a/include/unk_02083370.h b/include/unk_02083370.h
index bbb1c392ef..4a8fe840d2 100644
--- a/include/unk_02083370.h
+++ b/include/unk_02083370.h
@@ -4,18 +4,18 @@
 #include "struct_defs/struct_0207F248.h"
 
 u32 sub_02083370(u8 param0);
-void sub_0208337C(UnkStruct_0207F248 * param0);
-int sub_02083658(UnkStruct_0207F248 * param0);
-int sub_020836A8(UnkStruct_0207F248 * param0);
-int sub_020836E4(UnkStruct_0207F248 * param0);
-int sub_020839BC(UnkStruct_0207F248 * param0);
+void sub_0208337C(GameWindowLayout * param0);
+int sub_02083658(GameWindowLayout * param0);
+int sub_020836A8(GameWindowLayout * param0);
+int sub_020836E4(GameWindowLayout * param0);
+int sub_020839BC(GameWindowLayout * param0);
 int sub_02083A78(void * param0);
 int sub_02083AA4(void * param0);
-void sub_02083B88(UnkStruct_0207F248 * param0);
-void sub_02083BD4(UnkStruct_0207F248 * param0);
-BOOL sub_02083D1C(UnkStruct_0207F248 * param0);
-int sub_020845A8(UnkStruct_0207F248 * param0);
-int sub_02084780(UnkStruct_0207F248 * param0);
-int sub_02084B34(UnkStruct_0207F248 * param0);
+void sub_02083B88(GameWindowLayout * param0);
+void sub_02083BD4(GameWindowLayout * param0);
+BOOL sub_02083D1C(GameWindowLayout * param0);
+int sub_020845A8(GameWindowLayout * param0);
+int sub_02084780(GameWindowLayout * param0);
+int sub_02084B34(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_02083370_H
diff --git a/include/unk_02084B70.h b/include/unk_02084B70.h
index 75e5d05f9e..b3fb1b0ead 100644
--- a/include/unk_02084B70.h
+++ b/include/unk_02084B70.h
@@ -4,17 +4,17 @@
 #include "pokemon.h"
 #include "struct_defs/struct_0207F248.h"
 
-void sub_020852B8(UnkStruct_0207F248 * param0);
+void sub_020852B8(GameWindowLayout * param0);
 int sub_02085348(void * param0);
 BOOL sub_020857A8(u16 param0);
-int sub_02085804(UnkStruct_0207F248 * param0);
-int sub_02085EF4(UnkStruct_0207F248 * param0);
-u8 sub_02086104(UnkStruct_0207F248 * param0, Pokemon * param1);
-int sub_0208615C(UnkStruct_0207F248 * param0);
-int sub_020862F8(UnkStruct_0207F248 * param0);
-int sub_020863A0(UnkStruct_0207F248 * param0);
-void sub_020866A0(UnkStruct_0207F248 * param0, u8 param1);
-int sub_02086774(UnkStruct_0207F248 * param0);
-void sub_020868B0(UnkStruct_0207F248 * param0);
+int sub_02085804(GameWindowLayout * param0);
+int sub_02085EF4(GameWindowLayout * param0);
+u8 sub_02086104(GameWindowLayout * param0, Pokemon * param1);
+int sub_0208615C(GameWindowLayout * param0);
+int sub_020862F8(GameWindowLayout * param0);
+int sub_020863A0(GameWindowLayout * param0);
+void sub_020866A0(GameWindowLayout * param0, u8 param1);
+int sub_02086774(GameWindowLayout * param0);
+void sub_020868B0(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_02084B70_H
diff --git a/include/unk_0208694C.h b/include/unk_0208694C.h
index 0fea018d76..a3451f30db 100644
--- a/include/unk_0208694C.h
+++ b/include/unk_0208694C.h
@@ -4,7 +4,7 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0208737C.h"
 
-UnkStruct_0208737C * sub_0208712C(int param0, int param1, int param2, int param3, UnkStruct_020279FC * param4);
+UnkStruct_0208737C * sub_0208712C(int param0, int param1, int param2, int param3, AnimationControlFlags * param4);
 void sub_0208716C(UnkStruct_0208737C * param0);
 
 #endif // POKEPLATINUM_UNK_0208694C_H
diff --git a/include/unk_020890F4.h b/include/unk_020890F4.h
index f52b8227ff..74f8b0ba01 100644
--- a/include/unk_020890F4.h
+++ b/include/unk_020890F4.h
@@ -4,9 +4,9 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_02089438.h"
 
-UnkStruct_02089438 * sub_020893B4(int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5);
-UnkStruct_02089438 * sub_02089400(int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5);
-UnkStruct_02089438 * sub_0208941C(int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5, u32 param6, u32 param7);
+UnkStruct_02089438 * sub_020893B4(int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5);
+UnkStruct_02089438 * sub_02089400(int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5);
+UnkStruct_02089438 * sub_0208941C(int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5, u32 param6, u32 param7);
 void sub_02089438(UnkStruct_02089438 * param0);
 
 #endif // POKEPLATINUM_UNK_020890F4_H
diff --git a/include/unk_0208B284.h b/include/unk_0208B284.h
index f91ed423db..0457a7496b 100644
--- a/include/unk_0208B284.h
+++ b/include/unk_0208B284.h
@@ -7,7 +7,7 @@
 #include "struct_defs/struct_0208B284.h"
 #include "struct_defs/struct_0208B878.h"
 
-UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, PaletteSys * param3);
+UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, CellTransferStateData * param1, AnimationResourceCollection * param2, PaletteSys * param3);
 void sub_0208B63C(UnkStruct_0208B878 * param0, int param1);
 BOOL sub_0208B878(UnkStruct_0208B878 * param0, int param1);
 BOOL sub_0208B8B0(UnkStruct_0208B878 * param0, BOOL param1);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 7c71374653..ae76a46ef7 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -99,10 +99,10 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
     }
 }
 
-UnkStruct_02022550 * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1)
+GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1)
 {
     UnkStruct_ov115_02261520 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
     VecFx32 v3;
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index eb098fc3c7..06e745a418 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -74,7 +74,7 @@ typedef struct {
 
 typedef struct UnkStruct_ov5_021D6FA8_tag {
     UnkStruct_ov5_021D6594 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     void * unk_08;
     s32 unk_0C[10];
     struct UnkStruct_ov5_021D6FA8_tag * unk_34;
@@ -118,7 +118,7 @@ typedef struct {
     UnkStruct_02009F38 * unk_10;
     NNSG2dRendererInstance unk_14;
     NNSG2dRenderSurface unk_C0;
-    UnkStruct_020218BC * unk_130;
+    GraphicElementManager * unk_130;
     SysTask * unk_134;
 } UnkStruct_ov5_021D61D0;
 
@@ -258,7 +258,7 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 * param0);
 static void ov5_021D6290(UnkStruct_02009F38 * param0, int param1, int param2);
 static void ov5_021D62BC(UnkStruct_ov5_021D61D0 * param0);
 static void ov5_021D6284(SysTask * param0, void * param1);
-static void ov5_021D630C(UnkStruct_02022550 * param0, VecFx32 * param1);
+static void ov5_021D630C(GraphicElementData * param0, VecFx32 * param1);
 static void ov5_021D6FA8(UnkStruct_ov5_021D6FA8 * param0);
 static void ov5_021D6FD8(UnkStruct_ov5_021D6FA8 * param0);
 static UnkStruct_ov5_021D6FA8 * ov5_021D6F00(UnkStruct_ov5_021DB4B8 * param0, int param1);
@@ -854,7 +854,7 @@ static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0)
     param0->unk_134 = NULL;
 }
 
-static void ov5_021D630C (UnkStruct_02022550 * param0, VecFx32 * param1)
+static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1)
 {
     if (param1->x > ((255 << FX32_SHIFT) + 64 * FX32_ONE)) {
         param1->x %= ((255 << FX32_SHIFT) + 64 * FX32_ONE);
@@ -1611,7 +1611,7 @@ static void ov5_021D6F4C (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D65
 
 static void ov5_021D6FA8 (UnkStruct_ov5_021D6FA8 * param0)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     param0->unk_38->unk_34 = param0->unk_34;
     param0->unk_34->unk_38 = param0->unk_38;
diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c
index f0ac40f2e8..4e90c0c3bd 100644
--- a/src/overlay005/ov5_021DC018.c
+++ b/src/overlay005/ov5_021DC018.c
@@ -62,13 +62,13 @@ struct UnkStruct_ov5_021DC1A4_t {
     u16 * unk_A4;
     u16 * unk_A8;
     UnkStruct_02081CF4 unk_AC;
-    UnkStruct_02001AF4 * unk_B8;
-    UnkStruct_02013A04 unk_BC[28];
+    UIControlData * unk_B8;
+    ResourceMetadata unk_BC[28];
     UnkStruct_ov84_02240FA8 unk_19C;
     UnkStruct_0200112C * unk_1BC;
     u16 unk_1C0;
     u16 unk_1C2;
-    UnkStruct_02013A04 unk_1C4[28];
+    ResourceMetadata unk_1C4[28];
     u16 unk_2A4[28];
     u16 unk_2DC;
 };
diff --git a/src/overlay005/ov5_021DDBE8.c b/src/overlay005/ov5_021DDBE8.c
index 49086491af..f75b5ad7fb 100644
--- a/src/overlay005/ov5_021DDBE8.c
+++ b/src/overlay005/ov5_021DDBE8.c
@@ -177,7 +177,7 @@ static void ov5_021DEDE8(SysTask * param0, void * param1);
 static void ov5_021DEE24(SysTask * param0, void * param1);
 static void ov5_021DEE50(UnkStruct_ov5_021EF43C * param0, void * param1);
 static void ov5_021DEE84(UnkStruct_ov5_021DED04 * param0);
-static void ov5_021DE67C(UnkStruct_02022550 * param0, void * param1, u32 param2);
+static void ov5_021DE67C(GraphicElementData * param0, void * param1, u32 param2);
 static void ov5_021DF258(SysTask * param0, void * param1);
 static void ov5_021DF28C(SysTask * param0, void * param1);
 static void ov5_021DF30C(UnkStruct_0203CDB0 * param0);
@@ -865,7 +865,7 @@ void ov5_021DE5A4 (UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * par
     }
 }
 
-void ov5_021DE5D0 (UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param3, u16 param4)
+void ov5_021DE5D0 (GraphicElementData * param0, u32 param1, u32 param2, u8 param3, u16 param4)
 {
     UnkStruct_ov5_021DE5D0 v0;
     NNSG2dPaletteData * v1;
@@ -883,10 +883,10 @@ void ov5_021DE5D0 (UnkStruct_02022550 * param0, u32 param1, u32 param2, u8 param
     Heap_FreeToHeap(v2);
 }
 
-UnkStruct_02022550 * ov5_021DE62C (UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5)
+GraphicElementData * ov5_021DE62C (UnkStruct_ov5_021DE47C * param0, UnkStruct_ov5_021DE5A4 * param1, fx32 param2, fx32 param3, fx32 param4, int param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     v0.unk_00 = param0->unk_00;
     v0.unk_04 = &param1->unk_10;
@@ -913,7 +913,7 @@ VecFx32 ov5_021DE660 (fx32 param0, fx32 param1, fx32 param2)
     return v0;
 }
 
-static void ov5_021DE67C (UnkStruct_02022550 * param0, void * param1, u32 param2)
+static void ov5_021DE67C (GraphicElementData * param0, void * param1, u32 param2)
 {
     NNSG2dImagePaletteProxy * v0;
 
diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c
index 81847724f3..41f9199e5c 100644
--- a/src/overlay005/ov5_021E2338.c
+++ b/src/overlay005/ov5_021E2338.c
@@ -520,7 +520,7 @@ typedef struct {
     UnkStruct_ov5_021DDF74 * unk_44;
     UnkStruct_ov5_021DE47C unk_48;
     UnkStruct_ov5_021DE5A4 unk_1E8;
-    UnkStruct_02022550 * unk_21C[2];
+    GraphicElementData * unk_21C[2];
     UnkStruct_020203AC * unk_224;
     UnkStruct_ov5_021DDE14 unk_228;
     s32 unk_240;
@@ -532,7 +532,7 @@ typedef struct {
     UnkStruct_ov5_021DE374 * unk_28;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    UnkStruct_02022550 * unk_200[2];
+    GraphicElementData * unk_200[2];
     UnkStruct_020203AC * unk_208;
     UnkStruct_ov5_021DDE14 unk_20C;
     s32 unk_224;
@@ -546,7 +546,7 @@ typedef struct {
     BOOL unk_4C;
     UnkStruct_ov5_021DE47C unk_50;
     UnkStruct_ov5_021DE5A4 unk_1F0;
-    UnkStruct_02022550 * unk_224[2];
+    GraphicElementData * unk_224[2];
     UnkStruct_020203AC * unk_22C;
     UnkStruct_ov5_021DDE14 unk_230;
     s32 unk_248;
@@ -555,7 +555,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    UnkStruct_02022550 * unk_1D4[3];
+    GraphicElementData * unk_1D4[3];
     UnkStruct_ov5_021DDD80 unk_1E0[3];
     UnkStruct_ov5_021DDD80 unk_21C[3];
     UnkStruct_ov5_021DE6BC * unk_258[3];
@@ -575,7 +575,7 @@ typedef struct {
     UnkStruct_ov5_021DDD80 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC;
-    UnkStruct_02022550 * unk_230;
+    GraphicElementData * unk_230;
     UnkStruct_020203AC * unk_234;
     UnkStruct_ov5_021DDE14 unk_238;
     s32 unk_250;
@@ -584,7 +584,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    UnkStruct_02022550 * unk_1D4[3];
+    GraphicElementData * unk_1D4[3];
     UnkStruct_ov5_021DDD80 unk_1E0[3];
     UnkStruct_ov5_021DDD80 unk_21C[3];
     BOOL unk_258[3];
@@ -1630,14 +1630,14 @@ typedef struct {
     UnkStruct_ov5_021DDE14 unk_14;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    UnkStruct_02022550 * unk_200;
+    GraphicElementData * unk_200;
     s32 unk_204;
 } UnkStruct_ov5_021E4260;
 
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    UnkStruct_02022550 * unk_1D4[4];
+    GraphicElementData * unk_1D4[4];
     UnkStruct_ov5_021DDE14 unk_1E4[2];
 } UnkStruct_ov5_021E44C0;
 
@@ -1892,7 +1892,7 @@ static const s32 Unk_ov5_021F9E94[6][8] = {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    UnkStruct_02022550 * unk_1D4[6];
+    GraphicElementData * unk_1D4[6];
     UnkStruct_ov5_021DDE14 unk_1EC[6];
     UnkStruct_ov5_021DDE14 unk_27C[6];
     UnkStruct_ov5_021DDE14 unk_30C[6];
@@ -1907,7 +1907,7 @@ typedef struct {
     UnkStruct_ov5_021DEC18 * unk_04;
     UnkStruct_ov5_021DE47C unk_08;
     UnkStruct_ov5_021DE5A4 unk_1A8;
-    UnkStruct_02022550 * unk_1DC;
+    GraphicElementData * unk_1DC;
     UnkStruct_ov5_021DDD80 unk_1E0;
     UnkStruct_ov5_021DDD80 unk_1F4;
     UnkStruct_ov5_021DDD80 unk_208;
@@ -2515,7 +2515,7 @@ static const UnkStruct_ov5_021F9D0C Unk_ov5_021F9D0C[5] = {
 typedef struct {
     s16 unk_00;
     s16 unk_02;
-    UnkStruct_02022550 * unk_04[4];
+    GraphicElementData * unk_04[4];
     UnkStruct_ov5_021DDDBC unk_14[4];
 } UnkStruct_ov5_021E5128;
 
@@ -2526,7 +2526,7 @@ typedef struct {
     UnkStruct_ov5_021DED04 * unk_40;
     UnkStruct_ov5_021DE47C unk_44;
     UnkStruct_ov5_021DE5A4 unk_1E4[2];
-    UnkStruct_02022550 * unk_24C;
+    GraphicElementData * unk_24C;
     UnkStruct_ov5_021E5128 unk_250;
     UnkStruct_ov5_021E52A8_sub1 unk_2B4;
     UnkStruct_ov5_021E52A8_sub2 unk_2BC;
@@ -2543,7 +2543,7 @@ typedef struct {
     UnkStruct_ov5_021DDD80 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC[4];
-    UnkStruct_02022550 * unk_2CC[4];
+    GraphicElementData * unk_2CC[4];
     VecFx32 unk_2DC;
     VecFx32 unk_2E8;
     UnkStruct_ov5_021E5128 unk_2F4;
diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c
index 043ae1d748..396186c0c4 100644
--- a/src/overlay005/ov5_021EA874.c
+++ b/src/overlay005/ov5_021EA874.c
@@ -44,7 +44,7 @@
 #include "overlay005/ov5_021EA874.h"
 
 typedef struct {
-    UnkStruct_02013A04 * unk_00;
+    ResourceMetadata * unk_00;
     UnkStruct_0200112C * unk_04;
     Strbuf* unk_08;
     Strbuf* unk_0C;
@@ -55,7 +55,7 @@ typedef struct {
     UnkStruct_0200B358 * unk_38;
     MessageLoader * unk_3C;
     int unk_40;
-    UnkStruct_02001AF4 * unk_44;
+    UIControlData * unk_44;
     int unk_48;
     int unk_4C[8];
     int unk_6C[8];
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index b32c2a6ae8..6a40cb2ae0 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -94,7 +94,7 @@ struct UnkStruct_ov5_021F6704_t {
     UnkStruct_0200112C * unk_23C;
     u16 unk_240;
     u16 unk_242;
-    UnkStruct_02013A04 unk_244[120];
+    ResourceMetadata unk_244[120];
     u16 unk_604[120];
     u16 unk_6F4;
 };
diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c
index d3b9d71d6b..2fc3066237 100644
--- a/src/overlay005/ov5_021F77A8.c
+++ b/src/overlay005/ov5_021F77A8.c
@@ -586,7 +586,7 @@ struct UnkStruct_ov5_021F7ED8_t {
     UnkStruct_0200112C * unk_F0;
     u16 unk_F4;
     u16 unk_F6;
-    UnkStruct_02013A04 unk_F8[39];
+    ResourceMetadata unk_F8[39];
     u16 unk_230[39];
     u16 unk_27E;
 };
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index b8d0c9efda..4d2a5435de 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -31,9 +31,9 @@ typedef struct UnkStruct_ov6_022426B8_t {
     void * unk_20;
     void * unk_24;
     ArchivedSprite unk_28;
-    UnkStruct_020218BC * unk_38;
+    GraphicElementManager * unk_38;
     UnkStruct_0200C738 unk_3C;
-    UnkStruct_02022550 * unk_1C8;
+    GraphicElementData * unk_1C8;
     BOOL unk_1CC;
     BOOL unk_1D0;
 } UnkStruct_ov6_022426B8;
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 9a10d644bf..ad86992a13 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -72,7 +72,7 @@ typedef struct {
     NNSG2dScreenData * unk_64;
     NNSG2dCharacterData * unk_68;
     NNSG2dPaletteData * unk_6C;
-    UnkStruct_020218BC * unk_70;
+    GraphicElementManager * unk_70;
     UnkStruct_0200C738 unk_74;
     UnkStruct_02009714 * unk_200;
     UnkStruct_02009714 * unk_204;
@@ -83,8 +83,8 @@ typedef struct {
     UnkStruct_02009DC8 * unk_22C[4];
     UnkStruct_02009DC8 * unk_23C[2];
     UnkStruct_020711EC * unk_244;
-    UnkStruct_02022550 * unk_248;
-    UnkStruct_02022550 * unk_24C;
+    GraphicElementData * unk_248;
+    GraphicElementData * unk_24C;
     UnkStruct_ov101_021D5D90 * unk_250;
     UnkStruct_ov101_021D5D90 * unk_254;
     ArchivedSprite unk_258;
@@ -123,7 +123,7 @@ typedef struct {
     fx32 unk_4C;
     fx32 unk_50;
     fx32 unk_54;
-    UnkStruct_02022550 * unk_58;
+    GraphicElementData * unk_58;
     UnkStruct_ov6_0224543C unk_5C;
     UnkStruct_ov101_021D5D90 * unk_60;
     SysTask * unk_64;
@@ -131,7 +131,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov6_02243FFC * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
 } UnkStruct_ov6_02245B4C;
 
 typedef struct {
@@ -141,7 +141,7 @@ typedef struct {
     int unk_0C;
     VecFx32 unk_10;
     UnkStruct_ov6_02243FFC * unk_1C;
-    UnkStruct_02022550 * unk_20;
+    GraphicElementData * unk_20;
 } UnkStruct_ov6_02245B74;
 
 typedef struct {
@@ -159,7 +159,7 @@ typedef struct {
     s8 unk_05;
     s8 unk_06;
     s8 unk_07;
-    UnkStruct_020218BC * unk_08;
+    GraphicElementManager * unk_08;
     UnkStruct_0200C738 unk_0C;
     UnkStruct_02009714 * unk_198;
     UnkStruct_02009714 * unk_19C;
@@ -179,7 +179,7 @@ typedef struct {
     int unk_10;
     UnkStruct_0203CDB0 * unk_14;
     UnkStruct_ov6_02243258 unk_18;
-    UnkStruct_02022550 * unk_1D0;
+    GraphicElementData * unk_1D0;
     UnkStruct_020711EC * unk_1D4;
     UnkStruct_ov101_021D5D90 * unk_1D8;
     SysTask * unk_1DC;
@@ -188,7 +188,7 @@ typedef struct {
 typedef struct {
     UnkStruct_020711EC * unk_00;
     UnkStruct_0203CDB0 * unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     UnkStruct_ov6_02243258 * unk_0C;
 } UnkStruct_ov6_02243888;
 
@@ -211,7 +211,7 @@ typedef struct {
     fx32 unk_50;
     fx32 unk_54;
     UnkStruct_ov6_02243888 unk_58;
-    UnkStruct_02022550 * unk_68;
+    GraphicElementData * unk_68;
     UnkStruct_ov101_021D5D90 * unk_6C;
     SysTask * unk_70;
 } UnkStruct_ov6_02249110;
@@ -226,7 +226,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     UnkStruct_ov6_02245328 unk_0C;
 } UnkStruct_ov6_02245364;
 
@@ -251,7 +251,7 @@ typedef struct {
 } UnkStruct_ov100_021D4890;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_ov6_02243FFC * unk_04;
 } UnkStruct_ov6_02245F80;
 
@@ -272,11 +272,11 @@ static NARC * ov6_0224491C(void);
 static void ov6_02244928(UnkStruct_ov6_02243FFC * param0, NARC * param1);
 static void ov6_02244B6C(UnkStruct_ov6_02243FFC * param0);
 static void ov6_02244C10(UnkStruct_ov6_02243FFC * param0);
-static UnkStruct_02022550 * ov6_02244C20(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
-static UnkStruct_02022550 * ov6_02244CD4(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3);
-static UnkStruct_02022550 * ov6_02244CFC(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
-static void ov6_02244D34(UnkStruct_02022550 * param0);
-static UnkStruct_02022550 * ov6_02244D4C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3);
+static GraphicElementData * ov6_02244C20(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static GraphicElementData * ov6_02244CD4(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3);
+static GraphicElementData * ov6_02244CFC(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
+static void ov6_02244D34(GraphicElementData * param0);
+static GraphicElementData * ov6_02244D4C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3);
 static void ov6_02244DB4(UnkStruct_ov6_02243FFC * param0);
 static void ov6_02244E54(NARC * param0, u32 param1, NNSG2dPaletteData ** param2);
 static void ov6_02244E7C(BGL * param0, NARC * param1, u32 param2, NNSG2dCharacterData ** param3);
@@ -299,7 +299,7 @@ static void ov6_02245118(UnkStruct_ov6_02243FFC * param0, void * param1);
 static UnkStruct_02009DC8 * ov6_0224514C(UnkStruct_ov6_02243FFC * param0, NARC * param1);
 static void ov6_02245170(UnkStruct_ov6_02243FFC * param0, void * param1);
 static void ov6_022451B8(UnkStruct_ov6_02243FFC * param0);
-static UnkStruct_02022550 * ov6_0224529C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
+static GraphicElementData * ov6_0224529C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
 static void ov6_022452BC(UnkStruct_ov6_02243FFC * param0, int param1);
 static void ov6_02245328(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, const VecFx32 * param2, int param3, int param4, int param5);
 static void ov6_0224543C(UnkStruct_ov6_02243FFC * param0);
@@ -308,7 +308,7 @@ static int ov6_02245470(UnkStruct_ov6_02243FFC * param0);
 static void ov6_02245480(UnkStruct_ov6_02243FFC * param0);
 static void ov6_0224551C(UnkStruct_ov6_02243FFC * param0);
 static void ov6_022456D4(UnkStruct_ov6_02243FFC * param0);
-static UnkStruct_ov101_021D5D90 * ov6_02245B4C(UnkStruct_020711EC * param0, UnkStruct_02022550 * param1);
+static UnkStruct_ov101_021D5D90 * ov6_02245B4C(UnkStruct_020711EC * param0, GraphicElementData * param1);
 static void ov6_02245B74(UnkStruct_ov101_021D5D90 * param0);
 static void ov6_02245B80(UnkStruct_ov101_021D5D90 * param0);
 static void ov6_02245BC8(UnkStruct_ov101_021D5D90 * param0);
@@ -539,11 +539,11 @@ static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa
     GF_ASSERT(FALSE);
 }
 
-static UnkStruct_02022550 * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     if (param5 == param0->unk_07) {
         param5 = 0xffffffff;
@@ -564,15 +564,15 @@ static UnkStruct_02022550 * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const
     return v2;
 }
 
-static void ov6_022437C8 (UnkStruct_02022550 * param0, VecFx32 * param1)
+static void ov6_022437C8 (GraphicElementData * param0, VecFx32 * param1)
 {
     const VecFx32 * v0 = sub_02021D28(param0);
     *param1 = *v0;
 }
 
-static UnkStruct_02022550 * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
+static GraphicElementData * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
     VecFx32 v1 = {0, 0, 0};
     VecFx32 v2 = {0, 0, 0};
     VecFx32 v3 = {0x1000, 0x1000, 0};
@@ -587,10 +587,10 @@ static UnkStruct_02022550 * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
     return v0;
 }
 
-static UnkStruct_02022550 * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int param1)
+static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int param1)
 {
     VecFx32 v0 = {0, 0, 0};
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
     u32 v2 = 0;
 
     if (param1 == 1) {
@@ -608,7 +608,7 @@ static UnkStruct_02022550 * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
 static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C;
 int(*const * const Unk_ov6_02249110[])(UnkStruct_ov6_02249110 *);
 
-static UnkStruct_ov101_021D5D90 * ov6_02243888 (UnkStruct_0203CDB0 * param0, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, UnkStruct_02022550 * param3)
+static UnkStruct_ov101_021D5D90 * ov6_02243888 (UnkStruct_0203CDB0 * param0, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, GraphicElementData * param3)
 {
     UnkStruct_ov101_021D5D90 * v0;
     VecFx32 v1 = {0, 0, 0};
@@ -729,7 +729,7 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
     ov5_021F0F10(v2->unk_70, 1, -((FX32_ONE * 120)), 12);
 
     {
-        UnkStruct_02022550 * v3;
+        GraphicElementData * v3;
         VecFx32 v4 = {0, 0, 0};
         VecFx32 v5 = {0x2000, 0x2000, 0};
 
@@ -748,8 +748,8 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
 static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_68;
-    UnkStruct_02022550 * v2 = param0->unk_58.unk_08;
+    GraphicElementData * v1 = param0->unk_68;
+    GraphicElementData * v2 = param0->unk_58.unk_08;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -821,7 +821,7 @@ static int ov6_02243BB8 (UnkStruct_ov6_02249110 * param0)
 static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_68;
+    GraphicElementData * v1 = param0->unk_68;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -913,7 +913,7 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
 static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_68;
+    GraphicElementData * v1 = param0->unk_68;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -1840,11 +1840,11 @@ static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
     }
 }
 
-static UnkStruct_02022550 * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     if (param5 == 4) {
         sub_020093B4(
@@ -1867,9 +1867,9 @@ static UnkStruct_02022550 * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const
     return v2;
 }
 
-static UnkStruct_02022550 * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
+static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2);
     sub_02021D6C(v0, param3);
@@ -1877,9 +1877,9 @@ static UnkStruct_02022550 * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const
     return v0;
 }
 
-static UnkStruct_02022550 * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
+static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
     u32 v1 = 0;
 
     if (param0->unk_0C == 1) {
@@ -1894,15 +1894,15 @@ static UnkStruct_02022550 * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
     return v0;
 }
 
-static void ov6_02244D34 (UnkStruct_02022550 * param0)
+static void ov6_02244D34 (GraphicElementData * param0)
 {
     sub_02021CC8(param0, 1);
     sub_02021CE4(param0, FX32_ONE);
 }
 
-static UnkStruct_02022550 * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
+static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
     VecFx32 v1 = {0, 0, 0};
     VecFx32 v2 = {0x1000, 0x1000, 0};
 
@@ -2174,9 +2174,9 @@ static void ov6_022451B8 (UnkStruct_ov6_02243FFC * param0)
     GF_ASSERT(v0 < 4);
 }
 
-static UnkStruct_02022550 * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
+static GraphicElementData * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     v0 = ov6_02244C20(param0, param1, 3, 2, 3, 0xffffffff, 0, 129);
     return v0;
@@ -2419,7 +2419,7 @@ static void ov6_0224551C (UnkStruct_ov6_02243FFC * param0)
 static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_58;
+    GraphicElementData * v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
 
@@ -2515,7 +2515,7 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
     ov5_021F0F10(v2->unk_64, 1, -((FX32_ONE * 120)), 12);
 
     {
-        UnkStruct_02022550 * v3;
+        GraphicElementData * v3;
         VecFx32 v4 = {0, 0, 0};
         VecFx32 v5 = {0x1000, 0x1000, 0};
 
@@ -2531,7 +2531,7 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
 static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_58;
+    GraphicElementData * v1 = param0->unk_58;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -2592,7 +2592,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
     }
 
     {
-        UnkStruct_02022550 * v2 = param0->unk_5C.unk_00->unk_248;
+        GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
         const VecFx32 * v3 = sub_02021D2C(v2);
         VecFx32 v4 = *v3;
 
@@ -2616,7 +2616,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
 
 static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 {
-    UnkStruct_02022550 * v0 = param0->unk_5C.unk_00->unk_248;
+    GraphicElementData * v0 = param0->unk_5C.unk_00->unk_248;
 
     sub_02021D6C(v0, 3);
 
@@ -2647,7 +2647,7 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1 = param0->unk_58;
+    GraphicElementData * v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -2683,7 +2683,7 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
     sub_02021C50(v1, &v0);
 
     {
-        UnkStruct_02022550 * v2 = param0->unk_5C.unk_00->unk_248;
+        GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
         const VecFx32 * v3 = sub_02021D2C(v2);
         VecFx32 v4 = v0;
         VecFx32 v5 = *v3;
@@ -2727,7 +2727,7 @@ static int(*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *) = {
     ov6_02245B48
 };
 
-static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, UnkStruct_02022550 * param1)
+static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, GraphicElementData * param1)
 {
     UnkStruct_ov101_021D5D90 * v0;
     UnkStruct_ov6_02245B4C v1;
diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c
index 3390557e18..ee64f411cb 100644
--- a/src/overlay007/ov7_02249960.c
+++ b/src/overlay007/ov7_02249960.c
@@ -56,8 +56,8 @@ typedef struct UnkStruct_ov7_02249C2C_t {
     UnkStruct_0200B358 * unk_54;
     UnkStruct_0200B358 * unk_58;
     UnkStruct_0200112C * unk_5C;
-    UnkStruct_02001AF4 * unk_60;
-    UnkStruct_02013A04 * unk_64;
+    UIControlData * unk_60;
+    ResourceMetadata * unk_64;
     UnkStruct_0203CDB0 * unk_68;
     UnkFuncPtr_ov7_02249C2C unk_6C;
     UnkFuncPtr_ov7_02249C2C_1 unk_70;
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index bc821c32d6..8d92efb405 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -41,8 +41,8 @@
 typedef struct {
     UnkStruct_0200112C * unk_00;
     UnkStruct_0200112C * unk_04;
-    UnkStruct_02013A04 * unk_08;
-    UnkStruct_02013A04 * unk_0C;
+    ResourceMetadata * unk_08;
+    ResourceMetadata * unk_0C;
     UnkStruct_0203CDB0 * unk_10;
     Strbuf* unk_14;
     Strbuf* unk_18;
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 73c68f8164..b56ea09038 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -104,7 +104,7 @@ typedef struct {
     u32 unk_00;
     Window * unk_04;
     UnkStruct_0200112C * unk_08;
-    UnkStruct_02013A04 unk_0C[23];
+    ResourceMetadata unk_0C[23];
     Strbuf* unk_C4[23];
     s32 unk_120;
     UnkStruct_0200B358 * unk_124;
@@ -115,14 +115,14 @@ typedef struct {
     void (* unk_134)(void *, u32);
     UnkStruct_02009714 * unk_138[4];
     UnkStruct_02009DC8 * unk_148[4];
-    UnkStruct_02022550 * unk_158[2];
+    GraphicElementData * unk_158[2];
 } UnkStruct_ov7_0224C768;
 
 typedef void (* UnkFuncPtr_ov7_0224C768)(void *, u32);
 
 typedef struct {
     u32 unk_00;
-    UnkStruct_02001AF4 * unk_04;
+    UIControlData * unk_04;
     u32 unk_08;
 } UnkStruct_ov7_0224CC44;
 
@@ -142,7 +142,7 @@ typedef struct UnkStruct_ov7_0224BEFC_t {
     UnkStruct_0207D3C0 * unk_10;
     BGL * unk_14;
     u32 unk_18;
-    UnkStruct_020218BC * unk_1C;
+    GraphicElementManager * unk_1C;
     UnkStruct_0200C738 unk_20;
     MessageLoader * unk_1AC;
     u32 unk_1B0;
@@ -168,7 +168,7 @@ static void ov7_0224C580(UnkStruct_ov7_0224C3EC * param0, MessageLoader * param1
 static void ov7_0224C620(UnkStruct_ov7_0224C620 * param0, BGL * param1, MessageLoader * param2, u32 param3);
 static void ov7_0224C698(UnkStruct_ov7_0224C620 * param0);
 static void ov7_0224C6DC(UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param2, u32 param3);
-static void ov7_0224C768(UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, UnkStruct_020218BC * param8);
+static void ov7_0224C768(UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager * param8);
 static void ov7_0224C934(UnkStruct_ov7_0224C768 * param0);
 static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 * param0);
 static void ov7_0224CA0C(UnkStruct_ov7_0224C768 * param0);
@@ -372,7 +372,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0)
 
 static void ov7_0224C338 (UnkStruct_ov7_0224BEFC * param0)
 {
-    UnkStruct_020279FC * v0 = sub_02025E44(param0->unk_08);
+    AnimationControlFlags * v0 = sub_02025E44(param0->unk_08);
 
     param0->unk_1B0 = sub_02027B50(v0);
     param0->unk_1B4 = sub_02027AC0(v0);
@@ -571,7 +571,7 @@ static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param
     Window_Show(param0->unk_04, 0, (1 + (18 + 12)), 11);
 }
 
-static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, UnkStruct_020218BC * param8)
+static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 param2, const UnkStruct_ov7_0224F1B4 * param3, u32 param4, MessageLoader * param5, void * param6, UnkFuncPtr_ov7_0224C768 param7, GraphicElementManager * param8)
 {
     int v0;
     Strbuf* v1;
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 81392f61a6..fb2a52db89 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -104,7 +104,7 @@ typedef struct {
 } UnkStruct_ov9_02251EC8;
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190;
     UnkStruct_02009714 * unk_194;
@@ -156,7 +156,7 @@ typedef struct {
     fx32 unk_00;
     fx32 unk_04;
     UnkStruct_ov9_0224B1B4 unk_08;
-    UnkStruct_02022550 * unk_40;
+    GraphicElementData * unk_40;
 } UnkStruct_ov9_0224B2C0;
 
 typedef struct {
@@ -934,7 +934,7 @@ static void ov9_0224AED8(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224AEE4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B064 * param1, NARC * param2);
 static void ov9_0224B064(UnkStruct_ov9_0224B064 * param0);
 static void ov9_0224B124(SysTask * param0, void * param1);
-static UnkStruct_02022550 * ov9_0224B130(UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static GraphicElementData * ov9_0224B130(UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
 static void ov9_0224B1B4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov5_021DF47C * param1, UnkStruct_ov9_0224B064 * param2);
 static void ov9_0224B3A8(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224B3F4(UnkStruct_ov9_02249B04 * param0);
@@ -2758,11 +2758,11 @@ static void ov9_0224B124 (SysTask * param0, void * param1)
     sub_020219F8(v0->unk_00);
 }
 
-static UnkStruct_02022550 * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v0, ((param2) + 0xff), ((param3) + 0xff), ((param4) + 0xff), ((param5) + 0xff), 0xffffffff, 0xffffffff, 0, param6, param0->unk_190, param0->unk_194, param0->unk_198, param0->unk_19C, NULL, NULL);
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 619f70d744..f90b99bfbc 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -105,8 +105,8 @@ typedef struct UnkStruct_ov10_0221FB28_t {
     PaletteSys * unk_08;
     BGL * unk_0C;
     Window unk_10[24];
-    UnkStruct_0200C6E4 * unk_190;
-    UnkStruct_0200C704 * unk_194;
+    CellTransferStateData * unk_190;
+    AnimationResourceCollection * unk_194;
     CellActorData * unk_198[30];
     u32 unk_210;
     UnkStruct_ov10_0221FB28_sub1 unk_214[6];
@@ -117,7 +117,7 @@ typedef struct UnkStruct_ov10_0221FB28_t {
     u16 unk_538[2][384];
     UnkStruct_02012744 * unk_B38;
     FontOAM * unk_B3C[4];
-    UnkStruct_0207C690 * unk_B4C;
+    GenericPointerData * unk_B4C;
     UnkStruct_02014014 * unk_B50;
     void * unk_B54;
     u8 unk_B58[4];
@@ -144,7 +144,7 @@ typedef struct UnkStruct_ov10_0221FB28_t {
     Strbuf* unk_BA8;
     int unk_BAC;
     int unk_BB0;
-    UnkStruct_02001AF4 * unk_BB4;
+    UIControlData * unk_BB4;
     void * unk_BB8;
     int unk_BBC;
     int unk_BC0;
diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c
index 995e68e407..aa848bf57a 100644
--- a/src/overlay012/ov12_0221FC20.c
+++ b/src/overlay012/ov12_0221FC20.c
@@ -74,7 +74,7 @@ typedef struct UnkStruct_ov12_02223178_t {
     int unk_18;
     UnkStruct_02014014 * unk_1C[16];
     UnkSPLStruct6 * unk_5C[20];
-    UnkStruct_0200C6E4 * unk_AC;
+    CellTransferStateData * unk_AC;
     UnkStruct_ov16_0223E0C8 * unk_B0[4];
     u8 unk_C0[4];
     Sprite * unk_C4[4];
@@ -100,7 +100,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     CellActorData * unk_08;
     BOOL unk_0C;
 } UnkStruct_ov12_02221810;
@@ -127,10 +127,10 @@ typedef struct UnkStruct_ov12_0221FCDC_t {
     UnkStruct_ov12_02223178 * unk_BC;
     BGL * unk_C0;
     PaletteSys * unk_C4;
-    UnkStruct_0200C704 * unk_C8[4];
+    AnimationResourceCollection * unk_C8[4];
     CellActorData * unk_D8[10];
     UnkStruct_ov104_0223F9E0 unk_100;
-    UnkStruct_0200C704 * unk_134;
+    AnimationResourceCollection * unk_134;
     CellActorData * unk_138[5];
     BOOL unk_14C[5];
     UnkStruct_ov12_0222118C * unk_160[5];
@@ -768,18 +768,18 @@ CellActorData * ov12_022202C0 (UnkStruct_ov12_0221FCDC * param0, int param1)
     return param0->unk_138[param1];
 }
 
-UnkStruct_0200C704 * ov12_022202EC (UnkStruct_ov12_0221FCDC * param0)
+AnimationResourceCollection * ov12_022202EC (UnkStruct_ov12_0221FCDC * param0)
 {
     GF_ASSERT(param0 != NULL);
     return param0->unk_134;
 }
 
-UnkStruct_0200C704 * ov12_02220300 (UnkStruct_ov12_0221FCDC * param0)
+AnimationResourceCollection * ov12_02220300 (UnkStruct_ov12_0221FCDC * param0)
 {
     return param0->unk_C8[0];
 }
 
-UnkStruct_0200C6E4 * ov12_02220308 (UnkStruct_ov12_0221FCDC * param0)
+CellTransferStateData * ov12_02220308 (UnkStruct_ov12_0221FCDC * param0)
 {
     return param0->unk_BC->unk_AC;
 }
diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c
index 66a98118d9..c0f90f482b 100644
--- a/src/overlay012/ov12_022269C0.c
+++ b/src/overlay012/ov12_022269C0.c
@@ -34,11 +34,11 @@ typedef struct {
 typedef struct {
     u8 unk_00;
     UnkStruct_ov12_0221FCDC * unk_04;
-    UnkStruct_0200C6E4 * unk_08;
-    UnkStruct_0200C704 * unk_0C;
+    CellTransferStateData * unk_08;
+    AnimationResourceCollection * unk_0C;
     CellActorData * unk_10;
     CellActorData * unk_14[100];
-    UnkStruct_02022550 * unk_1A4[10];
+    GraphicElementData * unk_1A4[10];
 } UnkStruct_ov12_02226AAC;
 
 void ov12_022269C0 (UnkStruct_ov12_0221FCDC * param0)
@@ -155,7 +155,7 @@ static void ov12_02226AAC (SysTask * param0, void * param1)
     }
 }
 
-void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02226B1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02226AAC * v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c
index 9fb17665bb..568b54176f 100644
--- a/src/overlay012/ov12_02226B84.c
+++ b/src/overlay012/ov12_02226B84.c
@@ -87,8 +87,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     CellActorData * unk_14;
@@ -119,7 +119,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     int unk_08;
     s16 unk_0C;
     s16 unk_0E;
@@ -153,7 +153,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     UnkStruct_ov12_02226454 unk_08;
 } UnkStruct_ov12_0222813C;
 
@@ -321,7 +321,7 @@ typedef struct {
     int unk_24;
     BGL * unk_28;
     UnkStruct_ov12_0221FCDC * unk_2C;
-    UnkStruct_0200C704 * unk_30;
+    AnimationResourceCollection * unk_30;
     UnkStruct_ov12_02235998 unk_34[4];
     UnkStruct_ov12_02235998 unk_84[4];
     UnkStruct_ov12_02225F6C unk_D4;
@@ -1038,7 +1038,7 @@ static void ov12_02227738 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222777C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02227620 * v0;
     Sprite * v1;
@@ -3219,7 +3219,7 @@ static void ov12_0222A178 (SysTask * param0, void * param1)
     sub_0200C7EC(v1->unk_00.unk_10);
 }
 
-void ov12_0222A1AC (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222A1AC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222A178 * v0 = NULL;
 
@@ -3366,7 +3366,7 @@ static void ov12_0222A1F4 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222A34C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222A1F478 * v0 = NULL;
 
@@ -3415,7 +3415,7 @@ static void ov12_0222A3DC (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222A410 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222A3DC * v0;
 
@@ -3505,7 +3505,7 @@ static void ov12_0222A4A0 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222A5C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222A4A0 * v0;
 
diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c
index 1373f0761c..62484fd2ff 100644
--- a/src/overlay012/ov12_0222AC70.c
+++ b/src/overlay012/ov12_0222AC70.c
@@ -39,8 +39,8 @@ typedef struct {
     u8 unk_05;
     u8 unk_06;
     UnkStruct_ov12_0221FCDC * unk_08;
-    UnkStruct_0200C6E4 * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    CellTransferStateData * unk_0C;
+    AnimationResourceCollection * unk_10;
     CellActorData * unk_14[3];
     UnkStruct_ov12_02225F6C unk_20;
 } UnkStruct_ov12_0222AC70;
@@ -79,7 +79,7 @@ typedef struct {
     s16 unk_0A;
     UnkStruct_ov12_0221FCDC * unk_0C;
     Sprite * unk_10;
-    UnkStruct_0200C704 * unk_14;
+    AnimationResourceCollection * unk_14;
     CellActorData * unk_18[4];
     UnkStruct_ov12_02225F6C unk_28[4];
 } UnkStruct_ov12_0222B4C8;
@@ -139,7 +139,7 @@ typedef struct {
     u8 unk_00;
     u8 unk_01;
     UnkStruct_ov12_0221FCDC * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    AnimationResourceCollection * unk_08;
     CellActorData * unk_0C;
     CellActorData * unk_10;
 } UnkStruct_ov12_0222BFF4;
@@ -159,7 +159,7 @@ typedef struct {
     s8 unk_08;
     Sprite * unk_0C;
     UnkStruct_ov12_0221FCDC * unk_10;
-    UnkStruct_0200C704 * unk_14;
+    AnimationResourceCollection * unk_14;
     UnkStruct_ov12_0222C1A4_sub1 unk_18[3];
 } UnkStruct_ov12_0222C1A4;
 
@@ -171,7 +171,7 @@ typedef struct {
     int unk_04;
     BGL * unk_08;
     UnkStruct_ov12_0221FCDC * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    AnimationResourceCollection * unk_10;
     UnkStruct_ov12_02235998 unk_14[4];
     UnkStruct_ov12_02235998 unk_64[4];
     UnkStruct_ov12_02225F6C unk_B4;
@@ -185,7 +185,7 @@ typedef struct {
     UnkStruct_ov12_02235350 unk_04;
     BGL * unk_08;
     UnkStruct_ov12_0221FCDC * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    AnimationResourceCollection * unk_10;
     Sprite * unk_14;
     CellActorData * unk_18;
     UnkStruct_ov12_02225F6C unk_1C;
@@ -269,8 +269,8 @@ typedef struct {
     int unk_08;
     u8 unk_0C;
     UnkStruct_ov12_0221FCDC * unk_10;
-    UnkStruct_0200C6E4 * unk_14;
-    UnkStruct_0200C704 * unk_18;
+    CellTransferStateData * unk_14;
+    AnimationResourceCollection * unk_18;
     Sprite * unk_1C;
     s16 unk_20;
     int unk_24;
@@ -379,7 +379,7 @@ static void ov12_0222AC70 (SysTask * param0, void * param1)
     sub_0200C7EC(v1->unk_10);
 }
 
-void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222AE68 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     UnkStruct_ov12_0222AC70 * v1;
@@ -1738,7 +1738,7 @@ static void ov12_0222CBFC (SysTask * param0, void * param1)
     sub_0200C7EC(v1->unk_10.unk_10);
 }
 
-void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222CC54 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     int v1;
@@ -2138,7 +2138,7 @@ static void ov12_0222D128 (SysTask * param0, void * param1)
     sub_0200C7EC(v1->unk_18);
 }
 
-void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222D56C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     UnkStruct_ov12_0222D128 * v1;
diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c
index d9fc27512b..6d3f070a93 100644
--- a/src/overlay012/ov12_0222D6B0.c
+++ b/src/overlay012/ov12_0222D6B0.c
@@ -34,8 +34,8 @@ typedef struct {
     u8 unk_06;
     u8 unk_07;
     UnkStruct_ov12_0221FCDC * unk_08;
-    UnkStruct_0200C6E4 * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    CellTransferStateData * unk_0C;
+    AnimationResourceCollection * unk_10;
     CellActorData * unk_14[3];
     UnkStruct_ov12_02225F6C unk_20;
 } UnkStruct_ov12_0222D6B0;
@@ -48,8 +48,8 @@ typedef struct {
     u8 unk_09;
     u8 unk_0A;
     UnkStruct_ov12_0221FCDC * unk_0C;
-    UnkStruct_0200C6E4 * unk_10;
-    UnkStruct_0200C704 * unk_14;
+    CellTransferStateData * unk_10;
+    AnimationResourceCollection * unk_14;
     CellActorData * unk_18[6];
     int unk_30;
     CellActorData * unk_34;
@@ -60,8 +60,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     u8 unk_0C;
     u8 unk_0D;
     u8 unk_0E;
@@ -79,8 +79,8 @@ typedef struct {
     u8 unk_03;
     u8 unk_04;
     UnkStruct_ov12_0221FCDC * unk_08;
-    UnkStruct_0200C6E4 * unk_0C;
-    UnkStruct_0200C704 * unk_10;
+    CellTransferStateData * unk_0C;
+    AnimationResourceCollection * unk_10;
     UnkStruct_ov12_0222DC98 unk_14[20];
     int unk_514[20];
 } UnkStruct_ov12_0222DE24;
@@ -188,7 +188,7 @@ static void ov12_0222D6B0 (SysTask * param0, void * param1)
     sub_0200C7EC(v1->unk_10);
 }
 
-void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222D7C0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     UnkStruct_ov12_0222D6B0 * v1;
@@ -409,7 +409,7 @@ static void ov12_0222D934 (SysTask * param0, void * param1)
     sub_0200C7EC(v2->unk_14);
 }
 
-void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222DB60 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     UnkStruct_ov12_0222D934 * v1;
@@ -632,7 +632,7 @@ static const s16 Unk_ov12_0223A19A[][4] = {
     {0x50, 0x92, 0x32, 0x35}
 };
 
-void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222DEFC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     int v0;
     int v1;
@@ -828,7 +828,7 @@ static void ov12_0222E25C (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222E2F8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222E25C * v0 = NULL;
 
@@ -967,7 +967,7 @@ static void ov12_0222E390 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222E61C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222E390 * v0 = NULL;
 
diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c
index 943a9e3a36..d0b625a09d 100644
--- a/src/overlay012/ov12_0222E91C.c
+++ b/src/overlay012/ov12_0222E91C.c
@@ -228,7 +228,7 @@ static void ov12_0222EC18 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_00.unk_10);
 }
 
-void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222EC90 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222EC18 * v0 = NULL;
 
diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c
index 214ec77946..a6d6d78ca1 100644
--- a/src/overlay012/ov12_0222F700.c
+++ b/src/overlay012/ov12_0222F700.c
@@ -34,7 +34,7 @@
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     Sprite * unk_08;
     UnkStruct_ov12_02225F6C unk_0C;
     CellActorData * unk_30[2];
@@ -68,8 +68,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     UnkStruct_ov12_0222FAFC unk_0C;
     UnkStruct_ov12_0222FAFC unk_58[2];
     int unk_EC;
@@ -80,7 +80,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     int unk_08;
     int unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
@@ -109,7 +109,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     int unk_08;
     int unk_0C;
     CellActorData * unk_10;
@@ -145,8 +145,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     CellActorData * unk_10;
     UnkStruct_ov12_02225F6C unk_14;
@@ -167,8 +167,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -182,8 +182,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     s16 unk_14;
@@ -200,7 +200,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     int unk_08;
     int unk_0C;
     Sprite * unk_10;
@@ -214,8 +214,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     UnkStruct_ov12_02225F6C unk_14;
@@ -231,8 +231,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     CellActorData * unk_14;
@@ -246,8 +246,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     Sprite * unk_14[4];
@@ -288,8 +288,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     CellActorData * unk_14;
@@ -330,8 +330,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -347,8 +347,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     UnkStruct_ov12_02225F6C unk_14;
@@ -362,7 +362,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     int unk_08;
     int unk_0C;
     int unk_10;
@@ -384,8 +384,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     Sprite * unk_10;
     UnkStruct_ov12_02225F6C unk_14;
@@ -398,8 +398,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -412,8 +412,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -448,8 +448,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     CellActorData * unk_10;
     UnkStruct_ov12_02226454 unk_14;
@@ -475,7 +475,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C704 * unk_04;
+    AnimationResourceCollection * unk_04;
     UnkStruct_ov12_02225F6C unk_08;
     CellActorData * unk_2C;
 } UnkStruct_ov12_02234290;
@@ -671,7 +671,7 @@ void ov12_0222F9E4 (UnkStruct_ov12_0221FCDC * param0)
     ov12_022201E8(v0->unk_00, ov12_0222F888, v0);
 }
 
-static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, const UnkStruct_ov104_0223F9E0 * param3, const UnkStruct_ov12_0222FAFC * param4)
+static void ov12_0222FAFC (UnkStruct_ov12_0222FAFC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, const UnkStruct_ov104_0223F9E0 * param3, const UnkStruct_ov12_0222FAFC * param4)
 {
     param0->unk_00 = sub_0200CE6C(param1, param2, param3);
     param0->unk_04 = param4->unk_04;
@@ -814,7 +814,7 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_0222FE30 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0222FC44 * v0;
     UnkStruct_ov104_0223F9E0 v1;
@@ -1453,7 +1453,7 @@ static void ov12_02230BE0 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02230CEC (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02230BE0 * v0;
     int v1;
@@ -1624,7 +1624,7 @@ static void ov12_02230F3C (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02231010 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02230F3C * v0;
     int v1;
@@ -1730,7 +1730,7 @@ static void ov12_022310D4 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_022312A4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_022310D4 * v0;
 
@@ -1912,7 +1912,7 @@ static void ov12_02231608 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02231650 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02231508 * v0;
     int v1;
@@ -2046,7 +2046,7 @@ static void ov12_0223181C (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02231950 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02231760 * v0;
 
@@ -2180,7 +2180,7 @@ static void ov12_02231A38 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02231C1C (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_022319AC * v0;
     int v1;
@@ -2559,7 +2559,7 @@ static void ov12_0223223C (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02232378 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02232084 * v0;
     Sprite * v1;
@@ -2869,7 +2869,7 @@ static void ov12_022328B8 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_022329E0 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02232720 * v0;
     UnkStruct_ov104_0223F9E0 v1;
@@ -2983,7 +2983,7 @@ static void ov12_02232B40 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02232CA8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02232B40 * v0;
     s16 v1, v2;
@@ -3332,7 +3332,7 @@ static void ov12_02233394 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02233454 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_022332E8 * v0;
     int v1;
@@ -3455,7 +3455,7 @@ static void ov12_02233644 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02233734 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_0223351C * v0;
     int v1;
@@ -3573,7 +3573,7 @@ static void ov12_02233988 (SysTask * param0, void * param1)
     }
 }
 
-void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_022339C4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02233900 * v0;
     int v1;
@@ -3858,7 +3858,7 @@ static void ov12_02233F4C (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02234008 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02233F4C * v0;
 
diff --git a/src/overlay012/ov12_022346A4.c b/src/overlay012/ov12_022346A4.c
index 8f5c9a1aaf..7232a20d05 100644
--- a/src/overlay012/ov12_022346A4.c
+++ b/src/overlay012/ov12_022346A4.c
@@ -24,7 +24,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0200C704 * unk_0C;
+    AnimationResourceCollection * unk_0C;
     int unk_10;
     CellActorData * unk_14[2];
     UnkStruct_ov12_02225F6C unk_1C[2];
@@ -35,7 +35,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_0200C704 * unk_0C;
+    AnimationResourceCollection * unk_0C;
     CellActorData * unk_10;
     UnkStruct_ov12_02226454 unk_14;
 } UnkStruct_ov12_022348C8;
@@ -43,7 +43,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
     int unk_04;
-    UnkStruct_0200C704 * unk_08;
+    AnimationResourceCollection * unk_08;
     CellActorData * unk_0C[6];
     int unk_24[6];
     int unk_3C[6];
@@ -51,8 +51,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC * unk_00;
-    UnkStruct_0200C6E4 * unk_04;
-    UnkStruct_0200C704 * unk_08;
+    CellTransferStateData * unk_04;
+    AnimationResourceCollection * unk_08;
     int unk_0C;
     int unk_10;
     int unk_14;
@@ -72,7 +72,7 @@ static BOOL ov12_02234B34(CellActorData * param0, int * param1, int * param2);
 static void ov12_02234AE0(CellActorData * param0, int * param1, int * param2, int param3, int param4);
 static void ov12_02234CA8(SysTask * param0, void * param1);
 
-void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_022346A4 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov104_0223F9E0 v0;
     UnkStruct_ov12_022346A4 * v1;
@@ -180,7 +180,7 @@ static BOOL ov12_0223489C (CellActorData * param0, UnkStruct_ov12_02225F6C * par
     return 1;
 }
 
-void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_022348C8 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_022348C8 * v0;
     int v1;
@@ -248,7 +248,7 @@ static void ov12_02234918 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_0C);
 }
 
-void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02234A10 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov104_0223F9E0 v0;
     UnkStruct_ov12_02234A10 * v1;
@@ -435,7 +435,7 @@ static void ov12_02234CA8 (SysTask * param0, void * param1)
     sub_0200C7EC(v0->unk_08);
 }
 
-void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, CellActorData * param3)
+void ov12_02234D98 (UnkStruct_ov12_0221FCDC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, CellActorData * param3)
 {
     UnkStruct_ov12_02234BD8 * v0;
     int v1;
diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c
index 1ee3bd0bef..a0b2171499 100644
--- a/src/overlay012/ov12_02235E94.c
+++ b/src/overlay012/ov12_02235E94.c
@@ -101,7 +101,7 @@ typedef struct BallRotation {
     s8 unk_22;
     BOOL unk_24;
     BOOL unk_28;
-    UnkStruct_0200C704 * unk_2C;
+    AnimationResourceCollection * unk_2C;
     CellActorData * unk_30;
     UnkStruct_ov12_02225D50 unk_34;
     UnkStruct_ov12_02225F6C unk_48[2];
diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c
index 3ce61f233e..2b5328d9b8 100644
--- a/src/overlay013/ov13_02224500.c
+++ b/src/overlay013/ov13_02224500.c
@@ -238,7 +238,7 @@ void ov13_02224500 (UnkStruct_ov13_022213F0 * param0)
 static void ov13_0222453C (UnkStruct_ov13_022213F0 * param0)
 {
     UnkStruct_ov104_02241308 v0 = {18, 6, 6, 6, 0, 0};
-    UnkStruct_0200C6E4 * v1 = ov16_0223E010(param0->unk_00->unk_08);
+    CellTransferStateData * v1 = ov16_0223E010(param0->unk_00->unk_08);
 
     param0->unk_1FB0 = sub_0200C704(v1);
 
@@ -248,7 +248,7 @@ static void ov13_0222453C (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224588 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
     NARC * v2;
 
@@ -272,7 +272,7 @@ static void ov13_02224588 (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224670 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_08);
+    CellTransferStateData * v0 = ov16_0223E010(param0->unk_00->unk_08);
     NARC * v1;
 
     v1 = NARC_ctor(NARC_INDEX_GRAPHIC__PL_PST_GRA, param0->unk_00->unk_0C);
@@ -286,7 +286,7 @@ static void ov13_02224670 (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224720 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_08);
@@ -303,7 +303,7 @@ static void ov13_02224720 (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224798 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
     NARC * v2;
 
@@ -319,7 +319,7 @@ static void ov13_02224798 (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224848 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_08);
+    CellTransferStateData * v0 = ov16_0223E010(param0->unk_00->unk_08);
 
     sub_0200CD7C(param0->unk_1E4, 3, v0, param0->unk_1FB0, 72, 27, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 45067);
     sub_0200CE0C(v0, param0->unk_1FB0, 72, 25, 0, 45067);
@@ -330,7 +330,7 @@ static void ov13_02224848 (UnkStruct_ov13_022213F0 * param0)
 static CellActorData * ov13_022248D8 (UnkStruct_ov13_022213F0 * param0, u32 param1)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
+    CellTransferStateData * v1;
 
     v1 = ov16_0223E010(param0->unk_00->unk_08);
 
@@ -364,7 +364,7 @@ static void ov13_02224948 (UnkStruct_ov13_022213F0 * param0)
 
 void ov13_02224970 (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_08);
@@ -398,7 +398,7 @@ static void ov13_022249CC (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_02224A0C (UnkStruct_ov13_022213F0 * param0, CellActorData * param1, u32 param2, u8 param3)
 {
-    UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_08);
+    CellTransferStateData * v0 = ov16_0223E010(param0->unk_00->unk_08);
 
     sub_0200D948(v0, param0->unk_1FB0, sub_0207C944(), sub_0207C908(param3), 1, param2);
     sub_0200D41C(param1, sub_0207C92C(param3) + 4);
@@ -406,7 +406,7 @@ static void ov13_02224A0C (UnkStruct_ov13_022213F0 * param0, CellActorData * par
 
 static void ov13_02224A5C (UnkStruct_ov13_022213F0 * param0, CellActorData * param1, u32 param2)
 {
-    UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_08);
+    CellTransferStateData * v0 = ov16_0223E010(param0->unk_00->unk_08);
 
     sub_0200D948(v0, param0->unk_1FB0, sub_0207CAC0(), sub_0207CA90(param2), 1, 45077);
     sub_0200D41C(param1, sub_0207CAA8(param2) + 4);
@@ -794,7 +794,7 @@ static void ov13_02225420 (UnkStruct_ov13_022213F0 * param0)
 
 static void ov13_0222554C (UnkStruct_ov13_022213F0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     UnkStruct_ov16_0226DC24 * v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_08);
@@ -810,7 +810,7 @@ static void ov13_022255B8 (UnkStruct_ov13_022213F0 * param0)
     ov16_0226DBFC(param0->unk_1FB0, 45080, 45068, 45068, 45068);
 }
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229464[] = {
+static const ByteFlagSet Unk_ov13_02229464[] = {
     {0x8, 0x8, 0x78, 0x28, 0x6, 0x2, 0x6, 0x1},
     {0x88, 0x10, 0xF8, 0x30, 0x4, 0x3, 0x0, 0x2},
     {0x8, 0x38, 0x78, 0x58, 0x0, 0x4, 0x1, 0x3},
@@ -820,21 +820,21 @@ static const UnkStruct_020F1DB8 Unk_ov13_02229464[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x0, 0x5, 0x0}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229344[] = {
+static const ByteFlagSet Unk_ov13_02229344[] = {
     {0x10, 0x10, 0xF0, 0x88, 0x0, 0x81, 0x0, 0x0},
     {0x8, 0xA0, 0x60, 0xB8, 0x0, 0x1, 0x1, 0x2},
     {0x70, 0xA0, 0xC8, 0xB8, 0x0, 0x2, 0x1, 0x3},
     {0xE0, 0xA0, 0xF8, 0xB8, 0x0, 0x3, 0x2, 0x3}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229304[] = {
+static const ByteFlagSet Unk_ov13_02229304[] = {
     {0x8, 0xA0, 0x20, 0xB8, 0x0, 0x0, 0x0, 0x1},
     {0x30, 0xA0, 0x48, 0xB8, 0x1, 0x1, 0x0, 0x2},
     {0x68, 0xA0, 0xC0, 0xB8, 0x2, 0x2, 0x1, 0x3},
     {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x3, 0x2, 0x3}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_022294D4[] = {
+static const ByteFlagSet Unk_ov13_022294D4[] = {
     {0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1},
     {0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1},
     {0x8, 0x68, 0x78, 0x88, 0x0, 0x84, 0x2, 0x3},
@@ -845,7 +845,7 @@ static const UnkStruct_020F1DB8 Unk_ov13_022294D4[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x7, 0x6, 0x7}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229364[] = {
+static const ByteFlagSet Unk_ov13_02229364[] = {
     {0x5C, 0x9D, 0x7C, 0xA5, 0x0, 0x2, 0x0, 0x1},
     {0x84, 0x9D, 0xA4, 0xA5, 0x1, 0x3, 0x0, 0x4},
     {0x5C, 0xAD, 0x7C, 0xB5, 0x0, 0x2, 0x2, 0x3},
@@ -853,7 +853,7 @@ static const UnkStruct_020F1DB8 Unk_ov13_02229364[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x4, 0x4, 0x83, 0x4}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_0222949C[] = {
+static const ByteFlagSet Unk_ov13_0222949C[] = {
     {0x8, 0x38, 0x78, 0x58, 0x5, 0x2, 0x0, 0x1},
     {0x88, 0x38, 0xF8, 0x58, 0x5, 0x3, 0x0, 0x1},
     {0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3},
@@ -863,13 +863,13 @@ static const UnkStruct_020F1DB8 Unk_ov13_0222949C[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x3, 0x6, 0x4, 0x6}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_022292D4[] = {
+static const ByteFlagSet Unk_ov13_022292D4[] = {
     {0x8, 0xA0, 0xC8, 0xB8, 0x1, 0x0, 0x0, 0x2},
     {0xC0, 0x8, 0xF8, 0x18, 0x1, 0x82, 0x0, 0x1},
     {0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x2, 0x0, 0x2}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_022293B4[] = {
+static const ByteFlagSet Unk_ov13_022293B4[] = {
     {0x8, 0x38, 0x78, 0x58, 0x0, 0x2, 0x0, 0x1},
     {0x88, 0x38, 0xF8, 0x58, 0x1, 0x3, 0x0, 0x1},
     {0x8, 0x68, 0x78, 0x88, 0x0, 0x4, 0x2, 0x3},
@@ -877,7 +877,7 @@ static const UnkStruct_020F1DB8 Unk_ov13_022293B4[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x4, 0x4, 0x4}
 };
 
-static const UnkStruct_020F1DB8 * const Unk_ov13_0222938C[] = {
+static const ByteFlagSet * const Unk_ov13_0222938C[] = {
     Unk_ov13_02229464,
     Unk_ov13_02229344,
     Unk_ov13_02229304,
diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c
index f04f4a36d4..2feb0bd969 100644
--- a/src/overlay013/ov13_02227BDC.c
+++ b/src/overlay013/ov13_02227BDC.c
@@ -79,7 +79,7 @@ void ov13_02227BDC (UnkStruct_ov13_02227244 * param0)
 static void ov13_02227C08 (UnkStruct_ov13_02227244 * param0)
 {
     UnkStruct_ov104_02241308 v0 = {8, 8, 3, 3, 0, 0};
-    UnkStruct_0200C6E4 * v1 = ov16_0223E010(param0->unk_00->unk_00);
+    CellTransferStateData * v1 = ov16_0223E010(param0->unk_00->unk_00);
 
     param0->unk_30C = sub_0200C704(v1);
 
@@ -89,7 +89,7 @@ static void ov13_02227C08 (UnkStruct_ov13_02227244 * param0)
 
 static void ov13_02227C54 (UnkStruct_ov13_02227244 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
     NARC * v2;
 
@@ -108,7 +108,7 @@ static void ov13_02227C54 (UnkStruct_ov13_02227244 * param0)
 
 static void ov13_02227D10 (UnkStruct_ov13_02227244 * param0, u16 param1, u32 param2)
 {
-    UnkStruct_0200C6E4 * v0 = ov16_0223E010(param0->unk_00->unk_00);
+    CellTransferStateData * v0 = ov16_0223E010(param0->unk_00->unk_00);
     sub_0200D948(v0, param0->unk_30C, 16, Item_FileID(param1, 1), 0, param2);
 }
 
@@ -120,7 +120,7 @@ static void ov13_02227D48 (UnkStruct_ov13_02227244 * param0, u16 param1, u16 par
 static CellActorData * ov13_02227D78 (UnkStruct_ov13_02227244 * param0, u32 param1)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
+    CellTransferStateData * v1;
 
     v1 = ov16_0223E010(param0->unk_00->unk_00);
 
@@ -152,7 +152,7 @@ static void ov13_02227DE8 (UnkStruct_ov13_02227244 * param0)
 
 void ov13_02227E08 (UnkStruct_ov13_02227244 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     u32 v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_00);
@@ -235,7 +235,7 @@ static void ov13_02227F38 (UnkStruct_ov13_02227244 * param0)
 
 static void ov13_02227F7C (UnkStruct_ov13_02227244 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     UnkStruct_ov16_0226DC24 * v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_00);
@@ -251,7 +251,7 @@ static void ov13_02227FDC (UnkStruct_ov13_02227244 * param0)
     ov16_0226DBFC(param0->unk_30C, 46270, 46270, 46265, 46265);
 }
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229C14[] = {
+static const ByteFlagSet Unk_ov13_02229C14[] = {
     {0x8, 0x10, 0x78, 0x48, 0x0, 0x1, 0x0, 0x2},
     {0x8, 0x58, 0x78, 0x90, 0x0, 0x4, 0x1, 0x3},
     {0x88, 0x10, 0xF8, 0x48, 0x2, 0x3, 0x0, 0x2},
@@ -260,7 +260,7 @@ static const UnkStruct_020F1DB8 Unk_ov13_02229C14[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x83, 0x5, 0x4, 0x5}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229C74[] = {
+static const ByteFlagSet Unk_ov13_02229C74[] = {
     {0x8, 0x10, 0x78, 0x30, 0x0, 0x2, 0x0, 0x1},
     {0x88, 0x10, 0xF8, 0x30, 0x1, 0x3, 0x0, 0x1},
     {0x8, 0x40, 0x78, 0x60, 0x0, 0x4, 0x2, 0x3},
@@ -272,12 +272,12 @@ static const UnkStruct_020F1DB8 Unk_ov13_02229C74[] = {
     {0xE0, 0xA0, 0xF8, 0xB8, 0x5, 0x8, 0x7, 0x8}
 };
 
-static const UnkStruct_020F1DB8 Unk_ov13_02229BD4[] = {
+static const ByteFlagSet Unk_ov13_02229BD4[] = {
     {0x8, 0xA0, 0xC8, 0xB8, 0x0, 0x0, 0x0, 0x1},
     {0xE0, 0xA0, 0xF8, 0xB8, 0x1, 0x1, 0x0, 0x1}
 };
 
-static const UnkStruct_020F1DB8 * const Unk_ov13_02229BC8[] = {
+static const ByteFlagSet * const Unk_ov13_02229BC8[] = {
     Unk_ov13_02229C14,
     Unk_ov13_02229C74,
     Unk_ov13_02229BD4
@@ -308,7 +308,7 @@ void ov13_02228050 (UnkStruct_ov13_02227244 * param0)
 
 static void ov13_02228070 (UnkStruct_ov13_02227244 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
+    CellTransferStateData * v0;
     UnkStruct_ov16_0226DEEC * v1;
 
     v0 = ov16_0223E010(param0->unk_00->unk_00);
diff --git a/src/overlay013/ov13_02228A38.c b/src/overlay013/ov13_02228A38.c
index 41b8f1253f..5aa6808ae6 100644
--- a/src/overlay013/ov13_02228A38.c
+++ b/src/overlay013/ov13_02228A38.c
@@ -16,7 +16,7 @@
 
 struct UnkStruct_ov13_02228A50_t {
     UnkStruct_ov16_0226DC24 * unk_00;
-    const UnkStruct_020F1DB8 * unk_04;
+    const ByteFlagSet * unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
@@ -70,7 +70,7 @@ void ov13_02228A90 (UnkStruct_ov13_02228A50 * param0)
     param0->unk_0A = 0xff;
 }
 
-void ov13_02228A9C (UnkStruct_ov13_02228A50 * param0, const UnkStruct_020F1DB8 * param1)
+void ov13_02228A9C (UnkStruct_ov13_02228A50 * param0, const ByteFlagSet * param1)
 {
     ov13_02228A90(param0);
 
@@ -103,7 +103,7 @@ static u8 ov13_02228ACC (UnkStruct_ov13_02228A50 * param0)
     return 0;
 }
 
-static u8 ov13_02228B18 (const UnkStruct_020F1DB8 * param0, u8 param1)
+static u8 ov13_02228B18 (const ByteFlagSet * param0, u8 param1)
 {
     switch (param1) {
     case 0:
diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c
index af4e71e199..123f2e35c7 100644
--- a/src/overlay016/battle_script.c
+++ b/src/overlay016/battle_script.c
@@ -12213,8 +12213,8 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov16_0226E6F8 = {
 static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScriptTaskData * param1, Pokemon * param2)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     MessageLoader * v4;
     UnkStruct_0200B358 * v5;
@@ -12301,7 +12301,7 @@ static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScri
 
 static void BattleScript_FreePartyLevelUpIcon (BattleSystem * param0, BattleScriptTaskData * param1)
 {
-    UnkStruct_0200C704 * v0;
+    AnimationResourceCollection * v0;
 
     v0 = ov16_0223E018(param0);
 
diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c
index 91e5146057..ccf96212f1 100644
--- a/src/overlay016/ov16_0223B140.c
+++ b/src/overlay016/ov16_0223B140.c
@@ -134,8 +134,8 @@ static void ov16_0223CE68(void * param0);
 static void ov16_0223CF1C(void * param0);
 static void ov16_0223CF48(SysTask * param0, void * param1);
 static void ov16_0223CF8C(SysTask * param0, void * param1);
-static UnkStruct_0207C690 * ov16_0223CD7C(void);
-static void ov16_0223CE20(UnkStruct_0207C690 * param0);
+static GenericPointerData * ov16_0223CD7C(void);
+static void ov16_0223CE20(GenericPointerData * param0);
 static void ov16_0223CD9C(void);
 static void ov16_0223DD4C(BattleSystem * param0);
 static void ov16_0223D0C4(SysTask * param0, void * param1);
@@ -1434,9 +1434,9 @@ static BOOL ov16_0223CD3C (u16 param0)
     return 0;
 }
 
-static UnkStruct_0207C690 * ov16_0223CD7C (void)
+static GenericPointerData * ov16_0223CD7C (void)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(5, 0, 2, 0, 2, ov16_0223CD9C);
     return v0;
@@ -1457,7 +1457,7 @@ static void ov16_0223CD9C (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov16_0223CE20 (UnkStruct_0207C690 * param0)
+static void ov16_0223CE20 (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c
index 033f35b9af..62ab361cf0 100644
--- a/src/overlay016/ov16_0223DF00.c
+++ b/src/overlay016/ov16_0223DF00.c
@@ -90,8 +90,8 @@ int BattleSystem_PartyCount(BattleSystem *battleSys, int battler);
 Pokemon* BattleSystem_PartyPokemon(BattleSystem *battleSys, int battler, int slot);
 UnkStruct_02007768 * ov16_0223E000(BattleSystem * param0);
 UnkStruct_ov12_0221FCDC * ov16_0223E008(BattleSystem * param0);
-UnkStruct_0200C6E4 * ov16_0223E010(BattleSystem * param0);
-UnkStruct_0200C704 * ov16_0223E018(BattleSystem * param0);
+CellTransferStateData * ov16_0223E010(BattleSystem * param0);
+AnimationResourceCollection * ov16_0223E018(BattleSystem * param0);
 UnkStruct_ov16_02268520 * ov16_0223E020(BattleSystem * param0, int param1);
 UnkStruct_ov16_02268A14 * ov16_0223E02C(BattleSystem * param0);
 UnkStruct_0200C440 * ov16_0223E04C(BattleSystem * param0);
@@ -137,7 +137,7 @@ u8 ov16_0223ED60(BattleSystem * param0);
 u8 ov16_0223ED6C(BattleSystem * param0);
 int BattleSystem_NumSafariBalls(BattleSystem * param0);
 void BattleSystem_SetSafariBalls(BattleSystem * param0, int param1);
-UnkStruct_020279FC * ov16_0223EDA4(BattleSystem * param0);
+AnimationControlFlags * ov16_0223EDA4(BattleSystem * param0);
 BOOL BattleSystem_AnimationsOn(BattleSystem *battleSys);
 int ov16_0223EDE0(BattleSystem * param0);
 u8 BattleSystem_TextSpeed(BattleSystem * param0);
@@ -311,12 +311,12 @@ UnkStruct_ov12_0221FCDC * ov16_0223E008 (BattleSystem * param0)
     return param0->unk_8C;
 }
 
-UnkStruct_0200C6E4 * ov16_0223E010 (BattleSystem * param0)
+CellTransferStateData * ov16_0223E010 (BattleSystem * param0)
 {
     return param0->unk_90;
 }
 
-UnkStruct_0200C704 * ov16_0223E018 (BattleSystem * param0)
+AnimationResourceCollection * ov16_0223E018 (BattleSystem * param0)
 {
     return param0->unk_94;
 }
@@ -1017,7 +1017,7 @@ void BattleSystem_SetSafariBalls (BattleSystem * param0, int param1)
     param0->safariBalls = param1;
 }
 
-UnkStruct_020279FC * ov16_0223EDA4 (BattleSystem * param0)
+AnimationControlFlags * ov16_0223EDA4 (BattleSystem * param0)
 {
     return param0->unk_1B0;
 }
diff --git a/src/overlay016/ov16_0225BFFC.c b/src/overlay016/ov16_0225BFFC.c
index cdd984d53e..a18ef51804 100644
--- a/src/overlay016/ov16_0225BFFC.c
+++ b/src/overlay016/ov16_0225BFFC.c
@@ -832,8 +832,8 @@ static void ov16_0225C8A4 (BattleSystem * param0, BattlerData * param1)
 
 static void ov16_0225C8E0 (BattleSystem * param0, BattlerData * param1)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
 
     v0 = ov16_0223E010(param0);
@@ -847,7 +847,7 @@ static void ov16_0225C8E0 (BattleSystem * param0, BattlerData * param1)
 
 static void ov16_0225C91C (BattleSystem * param0, BattlerData * param1)
 {
-    UnkStruct_0200C704 * v0;
+    AnimationResourceCollection * v0;
 
     v0 = ov16_0223E018(param0);
 
diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/ov16_0225CBB8.c
index 30b3c0993c..32497c1b9d 100644
--- a/src/overlay016/ov16_0225CBB8.c
+++ b/src/overlay016/ov16_0225CBB8.c
@@ -2675,7 +2675,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1)
                 }
             } else if (v1 >= (256 + 40)) {
                 {
-                    UnkStruct_0200C704 * v8;
+                    AnimationResourceCollection * v8;
 
                     v8 = ov16_0223E018(v0->unk_00);
                     sub_0200D0F4(v0->unk_04->unk_18);
@@ -2728,7 +2728,7 @@ static void ov16_0225FD5C (SysTask * param0, void * param1)
 
         if (v1 <= -40) {
             {
-                UnkStruct_0200C704 * v10;
+                AnimationResourceCollection * v10;
 
                 v10 = ov16_0223E018(v0->unk_00);
 
@@ -2819,7 +2819,7 @@ static void    ov16_02260284 (SysTask * param0, void * param1)
         break;
     case 1:
     {
-        UnkStruct_0200C704 * v3;
+        AnimationResourceCollection * v3;
 
         v3 = ov16_0223E018(v0->unk_00);
         sub_0200D0F4(v0->unk_04->unk_18);
@@ -6217,8 +6217,8 @@ static void ov16_02264360 (BattleSystem * param0, BattlerData * param1, BattleMe
 
 static CellActorData * ov16_022643B8 (BattleSystem * param0, int param1, int param2, int param3, s16 param4, s16 param5)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
     CellActorData * v3;
     int v4;
diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c
index 43a0fad510..7494799d7b 100644
--- a/src/overlay016/ov16_02266F1C.c
+++ b/src/overlay016/ov16_02266F1C.c
@@ -67,7 +67,7 @@ static void ov16_02267C58(UnkStruct_ov16_022674C4 * param0);
 static void ov16_02267CA8(UnkStruct_ov16_022674C4 * param0, int param1);
 static void ov16_02267CE8(UnkStruct_ov16_022674C4 * param0, u32 param1);
 static void ov16_02267DC4(UnkStruct_ov16_022674C4 * param0, u32 param1);
-static void ov16_02266FE4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, int param4);
+static void ov16_02266FE4(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, int param4);
 static void ov16_02267244(UnkStruct_ov16_022674C4 * param0);
 static void ov16_0226728C(UnkStruct_ov16_022674C4 * param0);
 static const UnkStruct_ov104_0223F9E0 * ov16_022682B0(u8 param0);
@@ -409,7 +409,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov16_0226F57C = {
 
 #include "overlay016/rodata_ov16_0226F6AC.h"
 
-void ov16_02266F1C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, int param4)
+void ov16_02266F1C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, int param4)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
 
@@ -426,7 +426,7 @@ void ov16_02266F1C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NA
     }
 }
 
-static void ov16_02266FE4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, int param4)
+static void ov16_02266FE4 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, int param4)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
 
@@ -440,7 +440,7 @@ static void ov16_02266FE4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * par
     }
 }
 
-CellActorData * ov16_02267060 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2)
+CellActorData * ov16_02267060 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
     CellActorData * v1;
@@ -592,8 +592,8 @@ static void ov16_02267244 (UnkStruct_ov16_022674C4 * param0)
 
 void ov16_02267258 (UnkStruct_ov16_022674C4 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     const UnkStruct_ov104_0223F9E0 * v2;
 
     v2 = ov16_022682B0(param0->unk_25);
@@ -607,8 +607,8 @@ void ov16_02267258 (UnkStruct_ov16_022674C4 * param0)
 
 static void ov16_0226728C (UnkStruct_ov16_022674C4 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     const UnkStruct_ov104_0223F9E0 * v2;
 
     v2 = ov16_02268314(param0->unk_25);
@@ -628,8 +628,8 @@ static void ov16_0226728C (UnkStruct_ov16_022674C4 * param0)
 void ov16_022672C4 (UnkStruct_ov16_022674C4 * param0)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     NARC * v4;
 
@@ -1614,7 +1614,7 @@ void ov16_0226834C (UnkStruct_ov16_022674C4 * param0, u8 * param1)
 static void ov16_02268380 (SysTask * param0, void * param1)
 {
     UnkStruct_ov16_0226834C * v0 = param1;
-    UnkStruct_0200C704 * v1;
+    AnimationResourceCollection * v1;
     int v2;
     PaletteSys * v3;
 
diff --git a/src/overlay016/ov16_02268520.c b/src/overlay016/ov16_02268520.c
index 2f734d2bbd..a3f81c6394 100644
--- a/src/overlay016/ov16_02268520.c
+++ b/src/overlay016/ov16_02268520.c
@@ -174,8 +174,8 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270134[][3] = {
 
 void ov16_02268520 (UnkStruct_ov16_02268520 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     const UnkStruct_ov104_0223F9E0 * v2;
     int v3, v4, v5, v6, v7, v8;
     int v9;
@@ -213,8 +213,8 @@ void ov16_02268520 (UnkStruct_ov16_02268520 * param0)
 
 void ov16_0226862C (UnkStruct_ov16_02268520 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     const UnkStruct_ov104_0223F9E0 * v2;
 
     v0 = ov16_0223E010(param0->unk_04);
@@ -237,7 +237,7 @@ void ov16_02268660 (UnkStruct_ov16_02268520 * param0)
 
 void ov16_02268674 (UnkStruct_ov16_02268520 * param0)
 {
-    UnkStruct_0200C704 * v0;
+    AnimationResourceCollection * v0;
     int v1, v2, v3;
 
     v0 = ov16_0223E018(param0->unk_04);
diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c
index 46c433294a..e23341b019 100644
--- a/src/overlay016/ov16_0226871C.c
+++ b/src/overlay016/ov16_0226871C.c
@@ -1212,8 +1212,8 @@ void ov16_02268A14 (UnkStruct_ov16_02268A14 * param0)
 void ov16_02268A88 (UnkStruct_ov16_02268A14 * param0)
 {
     BGL * v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     int v4;
 
@@ -1250,8 +1250,8 @@ void ov16_02268A88 (UnkStruct_ov16_02268A14 * param0)
 void ov16_02268B8C (UnkStruct_ov16_02268A14 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     v1 = ov16_0223E010(param0->unk_00);
     v2 = ov16_0223E018(param0->unk_00);
@@ -1274,8 +1274,8 @@ void ov16_02268C04 (NARC * param0, NARC * param1, UnkStruct_ov16_02268A14 * para
     const UnkStruct_ov16_02270670 * v0, * v1;
     int v2;
     BGL * v3;
-    UnkStruct_0200C6E4 * v4;
-    UnkStruct_0200C704 * v5;
+    CellTransferStateData * v4;
+    AnimationResourceCollection * v5;
 
     if (param5 != NULL) {
         MI_CpuCopy8(param5, &param2->unk_1A, sizeof(UnkStruct_ov16_02268A14_sub2));
@@ -1341,8 +1341,8 @@ void ov16_02268C04 (NARC * param0, NARC * param1, UnkStruct_ov16_02268A14 * para
 void ov16_02268D40 (NARC * param0, UnkStruct_ov16_02268A14 * param1)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     GF_ASSERT(param1->unk_5BC[0] == NULL && param1->unk_5D4[0] == NULL);
 
@@ -1383,8 +1383,8 @@ void ov16_02268D40 (NARC * param0, UnkStruct_ov16_02268A14 * param1)
 static void ov16_02268F00 (UnkStruct_ov16_02268A14 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL);
 
@@ -2439,8 +2439,8 @@ static int ov16_0226A634 (UnkStruct_ov16_02268A14 * param0, int param1, int para
 
 static void ov16_0226A698 (UnkStruct_ov16_02268A14 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     int v2, v3, v4;
     PaletteSys * v5;
 
@@ -2455,7 +2455,7 @@ static void ov16_0226A698 (UnkStruct_ov16_02268A14 * param0)
 
 static void ov16_0226A718 (UnkStruct_ov16_02268A14 * param0)
 {
-    UnkStruct_0200C704 * v0;
+    AnimationResourceCollection * v0;
 
     v0 = ov16_0223E018(param0->unk_00);
 
@@ -2486,8 +2486,8 @@ static void ov16_0226A768 (UnkStruct_ov16_02268A14 * param0)
 
 static CellActorData * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon * param1, int param2, int param3, int param4, int param5)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     u32 v2;
     UnkStruct_ov104_0223F9E0 v3;
     CellActorData * v4;
@@ -2620,7 +2620,7 @@ static void ov16_0226A98C (UnkStruct_ov16_02268A14 * param0, UnkStruct_ov16_0226
     int v3;
     FontOAM * v4;
     BGL * v5;
-    UnkStruct_0200C704 * v6;
+    AnimationResourceCollection * v6;
     int v7, v8;
 
     GF_ASSERT(param1->unk_00 == NULL);
@@ -2866,8 +2866,8 @@ static void ov16_0226AEA0 (UnkStruct_ov16_02268A14 * param0, const Strbuf *param
 static void ov16_0226AF0C (UnkStruct_ov16_02268A14 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     UnkStruct_ov104_0223F9E0 v3;
     UnkStruct_ov16_02260C00 * v4;
     int v5;
@@ -2909,8 +2909,8 @@ static void ov16_0226AF0C (UnkStruct_ov16_02268A14 * param0)
 static void ov16_0226AFF4 (UnkStruct_ov16_02268A14 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     v1 = ov16_0223E010(param0->unk_00);
     v2 = ov16_0223E018(param0->unk_00);
@@ -2926,8 +2926,8 @@ static void ov16_0226AFF4 (UnkStruct_ov16_02268A14 * param0)
 static void ov16_0226B028 (UnkStruct_ov16_02268A14 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     v1 = ov16_0223E010(param0->unk_00);
     v2 = ov16_0223E018(param0->unk_00);
@@ -4493,8 +4493,8 @@ static int(*const Unk_ov16_0227020C[])(UnkStruct_ov16_02268A14 *) = {
 
 static int ov16_0226CD18 (UnkStruct_ov16_02268A14 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
     int v3;
 
diff --git a/src/overlay016/ov16_0226D094.c b/src/overlay016/ov16_0226D094.c
index 58dcef030f..88b3edcdfb 100644
--- a/src/overlay016/ov16_0226D094.c
+++ b/src/overlay016/ov16_0226D094.c
@@ -60,9 +60,9 @@ typedef struct UnkStruct_ov16_0226D160_t {
     s8 unk_13C;
 } UnkStruct_ov16_0226D160;
 
-static void ov16_0226D2A0(UnkStruct_ov16_0226D2A0 * param0, UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_3 param2, UnkStruct_0200C6E4 * param3, UnkStruct_0200C704 * param4);
+static void ov16_0226D2A0(UnkStruct_ov16_0226D2A0 * param0, UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_3 param2, CellTransferStateData * param3, AnimationResourceCollection * param4);
 static void ov16_0226D3F8(UnkStruct_ov16_0226D2A0 * param0, UnkEnum_ov16_0226D220 param1);
-static void ov16_0226D540(UnkStruct_ov16_0226D540 * param0, s8 * param1, UnkEnum_ov16_0226D194 param2, UnkEnum_ov16_0226D194_1 param3, UnkEnum_ov16_0226D194_3 param4, int param5, int param6, UnkStruct_0200C6E4 * param7, UnkStruct_0200C704 * param8);
+static void ov16_0226D540(UnkStruct_ov16_0226D540 * param0, s8 * param1, UnkEnum_ov16_0226D194 param2, UnkEnum_ov16_0226D194_1 param3, UnkEnum_ov16_0226D194_3 param4, int param5, int param6, CellTransferStateData * param7, AnimationResourceCollection * param8);
 static void ov16_0226D938(UnkStruct_ov16_0226D540 * param0, int param1, UnkEnum_ov16_0226D194_2 param2, s16 * param3);
 static void ov16_0226D34C(SysTask * param0, void * param1);
 static void ov16_0226D434(SysTask * param0, void * param1);
@@ -125,7 +125,7 @@ __attribute__((aligned(4))) static const u16 Unk_ov16_02270A1C[] = {
     0x32
 };
 
-void ov16_0226D094 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2)
+void ov16_0226D094 (CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2)
 {
     NARC * v0;
 
@@ -138,7 +138,7 @@ void ov16_0226D094 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, Pa
     NARC_dtor(v0);
 }
 
-void ov16_0226D12C (UnkStruct_0200C704 * param0)
+void ov16_0226D12C (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 20413);
     sub_0200D080(param0, 20037);
@@ -161,7 +161,7 @@ static void ov16_0226D17C (UnkStruct_ov16_0226D160 * param0)
     Heap_FreeToHeap(param0);
 }
 
-UnkStruct_ov16_0226D160 * ov16_0226D194 (u8 param0[], UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_1 param2, UnkEnum_ov16_0226D194_3 param3, UnkStruct_0200C6E4 * param4, UnkStruct_0200C704 * param5)
+UnkStruct_ov16_0226D160 * ov16_0226D194 (u8 param0[], UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_1 param2, UnkEnum_ov16_0226D194_3 param3, CellTransferStateData * param4, AnimationResourceCollection * param5)
 {
     UnkStruct_ov16_0226D160 * v0;
     int v1, v2;
@@ -241,7 +241,7 @@ void ov16_0226D27C (UnkStruct_ov16_0226D160 * param0)
     ov16_0226D17C(param0);
 }
 
-static void ov16_0226D2A0 (UnkStruct_ov16_0226D2A0 * param0, UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_3 param2, UnkStruct_0200C6E4 * param3, UnkStruct_0200C704 * param4)
+static void ov16_0226D2A0 (UnkStruct_ov16_0226D2A0 * param0, UnkEnum_ov16_0226D194 param1, UnkEnum_ov16_0226D194_3 param2, CellTransferStateData * param3, AnimationResourceCollection * param4)
 {
     GF_ASSERT(param0->unk_00 == NULL && param0->unk_04 == NULL);
 
@@ -379,7 +379,7 @@ static void ov16_0226D434 (SysTask * param0, void * param1)
     }
 }
 
-static void ov16_0226D540 (UnkStruct_ov16_0226D540 * param0, s8 * param1, UnkEnum_ov16_0226D194 param2, UnkEnum_ov16_0226D194_1 param3, UnkEnum_ov16_0226D194_3 param4, int param5, int param6, UnkStruct_0200C6E4 * param7, UnkStruct_0200C704 * param8)
+static void ov16_0226D540 (UnkStruct_ov16_0226D540 * param0, s8 * param1, UnkEnum_ov16_0226D194 param2, UnkEnum_ov16_0226D194_1 param3, UnkEnum_ov16_0226D194_3 param4, int param5, int param6, CellTransferStateData * param7, AnimationResourceCollection * param8)
 {
     GF_ASSERT(param0->unk_00 == NULL && param0->unk_04 == NULL);
 
diff --git a/src/overlay016/ov16_0226DB7C.c b/src/overlay016/ov16_0226DB7C.c
index 7e708c06a0..c7758d2676 100644
--- a/src/overlay016/ov16_0226DB7C.c
+++ b/src/overlay016/ov16_0226DB7C.c
@@ -22,9 +22,9 @@ typedef struct UnkStruct_ov16_0226DC24_t {
 } UnkStruct_ov16_0226DC24;
 
 static void ov16_0226DE10(SysTask * param0, void * param1);
-void ov16_0226DB7C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
-void ov16_0226DBFC(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov16_0226DC24 * ov16_0226DC24(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov16_0226DB7C(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7);
+void ov16_0226DBFC(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov16_0226DC24 * ov16_0226DC24(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov16_0226DCA8(UnkStruct_ov16_0226DC24 * param0);
 void ov16_0226DD7C(UnkStruct_ov16_0226DC24 * param0, int param1, int param2, int param3, int param4);
 void ov16_0226DDE8(UnkStruct_ov16_0226DC24 * param0);
@@ -42,7 +42,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov16_02270AA4 = {
     0x0
 };
 
-void ov16_0226DB7C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7)
+void ov16_0226DB7C (CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, u32 param4, u32 param5, u32 param6, u32 param7)
 {
     NARC * v0;
 
@@ -55,7 +55,7 @@ void ov16_0226DB7C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, Pa
     NARC_dtor(v0);
 }
 
-void ov16_0226DBFC (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4)
+void ov16_0226DBFC (AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4)
 {
     sub_0200D070(param0, param1);
     sub_0200D080(param0, param2);
@@ -63,7 +63,7 @@ void ov16_0226DBFC (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 par
     sub_0200D0A0(param0, param4);
 }
 
-UnkStruct_ov16_0226DC24 * ov16_0226DC24 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
+UnkStruct_ov16_0226DC24 * ov16_0226DC24 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
 {
     UnkStruct_ov16_0226DC24 * v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay016/ov16_0226DE44.c b/src/overlay016/ov16_0226DE44.c
index 0ee2a7af61..349ac1dd56 100644
--- a/src/overlay016/ov16_0226DE44.c
+++ b/src/overlay016/ov16_0226DE44.c
@@ -32,9 +32,9 @@ typedef struct UnkStruct_ov16_0226DEEC_t {
     u8 unk_1E;
 } UnkStruct_ov16_0226DEEC;
 
-void ov16_0226DE44(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7);
-void ov16_0226DEC4(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov16_0226DEEC * ov16_0226DEEC(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov16_0226DE44(CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7);
+void ov16_0226DEC4(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov16_0226DEEC * ov16_0226DEEC(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov16_0226DF68(UnkStruct_ov16_0226DEEC * param0);
 void ov16_0226DFB0(UnkStruct_ov16_0226DEEC * param0, int param1, int param2);
 void ov16_0226DFBC(UnkStruct_ov16_0226DEEC * param0);
@@ -54,7 +54,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov16_02270AD8 = {
     0x0
 };
 
-void ov16_0226DE44 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7)
+void ov16_0226DE44 (CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, PaletteSys * param3, u32 param4, u32 param5, u32 param6, u32 param7)
 {
     NARC * v0 = NARC_ctor(NARC_INDEX_GRAPHIC__EV_POKESELECT, param2);
 
@@ -65,7 +65,7 @@ void ov16_0226DE44 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u3
     NARC_dtor(v0);
 }
 
-void ov16_0226DEC4 (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4)
+void ov16_0226DEC4 (AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4)
 {
     sub_0200D070(param0, param1);
     sub_0200D080(param0, param2);
@@ -73,7 +73,7 @@ void ov16_0226DEC4 (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 par
     sub_0200D0A0(param0, param4);
 }
 
-UnkStruct_ov16_0226DEEC * ov16_0226DEEC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
+UnkStruct_ov16_0226DEEC * ov16_0226DEEC (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
 {
     UnkStruct_ov16_0226DEEC * v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c
index eb8096c526..16b75ced25 100644
--- a/src/overlay017/ov17_0223F118.c
+++ b/src/overlay017/ov17_0223F118.c
@@ -83,9 +83,9 @@ static void NitroStaticInit (void)
     Overlay_LoadByID(FS_OVERLAY_ID(overlay22), 2);
 }
 
-UnkStruct_0207C690 * ov17_0223F140 (int param0)
+GenericPointerData * ov17_0223F140 (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 2, 0, 2, ov17_0223F15C);
     return v0;
@@ -106,12 +106,12 @@ static void ov17_0223F15C (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-void ov17_0223F1E0 (UnkStruct_0207C690 * param0)
+void ov17_0223F1E0 (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
 
-void ov17_0223F1E8 (int param0, BGL * param1, UnkStruct_0200C704 * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
+void ov17_0223F1E8 (int param0, BGL * param1, AnimationResourceCollection * param2, UnkStruct_02012744 * param3, UnkStruct_ov17_0223F2E4 * param4, const Strbuf *param5, int param6, u32 param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
 {
     UnkStruct_020127E8 v0;
     Window v1;
@@ -314,7 +314,7 @@ void ov17_0223F374 (UnkStruct_02095C48 * param0)
     }
 }
 
-void ov17_0223F560 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, int param4, int param5, int param6)
+void ov17_0223F560 (CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6)
 {
     if (param3 != -1) {
         sub_0200CBDC(param0, param1, 46, 73, 1, NNS_G2D_VRAM_TYPE_2DMAIN, param3);
@@ -333,7 +333,7 @@ void ov17_0223F560 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, Pa
     }
 }
 
-void ov17_0223F5E8 (UnkStruct_0200C704 * param0, int param1, int param2, int param3, int param4)
+void ov17_0223F5E8 (AnimationResourceCollection * param0, int param1, int param2, int param3, int param4)
 {
     if (param1 != -1) {
         sub_0200D070(param0, param1);
@@ -352,7 +352,7 @@ void ov17_0223F5E8 (UnkStruct_0200C704 * param0, int param1, int param2, int par
     }
 }
 
-void ov17_0223F630 (UnkStruct_ov17_0223F6E8 * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10)
+void ov17_0223F630 (UnkStruct_ov17_0223F6E8 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, u32 param10)
 {
     int v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c
index b47e079ba9..06c6bd8581 100644
--- a/src/overlay017/ov17_0223F7E4.c
+++ b/src/overlay017/ov17_0223F7E4.c
@@ -641,8 +641,8 @@ void ov17_0223F9C4 (UnkStruct_ov17_0223F7E4 * param0, int param1, int param2, vo
     const UnkStruct_ov17_02253558 * v0, * v1;
     int v2;
     BGL * v3;
-    UnkStruct_0200C6E4 * v4;
-    UnkStruct_0200C704 * v5;
+    CellTransferStateData * v4;
+    AnimationResourceCollection * v5;
 
     param0->unk_0C = param3;
 
@@ -960,7 +960,7 @@ static void ov17_02240138 (UnkStruct_ov17_0223F7E4 * param0, UnkStruct_ov17_0224
     int v3;
     FontOAM * v4;
     BGL * v5;
-    UnkStruct_0200C704 * v6;
+    AnimationResourceCollection * v6;
     int v7, v8;
 
     GF_ASSERT(param1->unk_00 == NULL);
@@ -1057,8 +1057,8 @@ static void ov17_022402A8 (UnkStruct_ov17_0223F7E4 * param0)
 static void ov17_022402E8 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[])
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     UnkStruct_ov104_0223F9E0 v3;
     int v4;
 
@@ -1085,8 +1085,8 @@ static void ov17_022402E8 (UnkStruct_ov17_0223F7E4 * param0, u16 param1[])
 static void ov17_02240388 (UnkStruct_ov17_0223F7E4 * param0)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
 
     v1 = param0->unk_04->unk_18;
     v2 = param0->unk_04->unk_1C;
diff --git a/src/overlay017/ov17_02241270.c b/src/overlay017/ov17_02241270.c
index a6e7ffb62c..6d2b7124fc 100644
--- a/src/overlay017/ov17_02241270.c
+++ b/src/overlay017/ov17_02241270.c
@@ -50,14 +50,14 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov17_02253680 = {
     0x0
 };
 
-void ov17_02241270 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_02241270 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 42, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33019);
     sub_0200CE24(param0, param1, param2, 43, 1, 33014);
     sub_0200CE54(param0, param1, param2, 44, 1, 33014);
 }
 
-CellActorData * ov17_022412C0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2)
+CellActorData * ov17_022412C0 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2)
 {
     CellActorData * v0;
 
@@ -68,7 +68,7 @@ CellActorData * ov17_022412C0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 *
     return v0;
 }
 
-void ov17_022412F0 (UnkStruct_0200C704 * param0)
+void ov17_022412F0 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33019);
     sub_0200D090(param0, 33014);
@@ -80,14 +80,14 @@ void ov17_02241314 (CellActorData * param0)
     sub_0200D0F4(param0);
 }
 
-void ov17_0224131C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224131C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 45, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33018);
     sub_0200CE24(param0, param1, param2, 46, 1, 33013);
     sub_0200CE54(param0, param1, param2, 47, 1, 33013);
 }
 
-CellActorData * ov17_0224136C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4)
+CellActorData * ov17_0224136C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4)
 {
     CellActorData * v0;
 
@@ -108,7 +108,7 @@ void ov17_022413AC (CellActorData * param0)
     sub_0200D0F4(param0);
 }
 
-void ov17_022413B4 (UnkStruct_0200C704 * param0)
+void ov17_022413B4 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33018);
     sub_0200D090(param0, 33013);
diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
index 63fb003787..52fc2d5092 100644
--- a/src/overlay017/ov17_022413D8.c
+++ b/src/overlay017/ov17_022413D8.c
@@ -547,7 +547,7 @@ void ov17_022416E4 (UnkStruct_ov17_0223F88C * param0)
     param0->unk_98.unk_00 = NULL;
 }
 
-static CellActorData * ov17_02241720 (PaletteSys * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, const UnkStruct_020954F0 * param3, int param4, NARC * param5)
+static CellActorData * ov17_02241720 (PaletteSys * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, const UnkStruct_020954F0 * param3, int param4, NARC * param5)
 {
     CellActorData * v0;
     UnkStruct_ov104_0223F9E0 v1;
@@ -593,7 +593,7 @@ static CellActorData * ov17_02241720 (PaletteSys * param0, UnkStruct_0200C6E4 *
     return v0;
 }
 
-static void ov17_02241814 (UnkStruct_0200C704 * param0, CellActorData * param1, int param2)
+static void ov17_02241814 (AnimationResourceCollection * param0, CellActorData * param1, int param2)
 {
     sub_0200D0F4(param1);
     sub_0200D070(param0, 33001 + param2);
@@ -602,7 +602,7 @@ static void ov17_02241814 (UnkStruct_0200C704 * param0, CellActorData * param1,
     sub_0200D0A0(param0, 33001 + param2);
 }
 
-static void ov17_02241854 (PaletteSys * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, NARC * param3)
+static void ov17_02241854 (PaletteSys * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, NARC * param3)
 {
     u32 v0, v1, v2;
 
@@ -615,7 +615,7 @@ static void ov17_02241854 (PaletteSys * param0, UnkStruct_0200C6E4 * param1, Unk
     sub_0200CE54(param1, param2, param3, v2, 1, 33004);
 }
 
-static CellActorData * ov17_022418A4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2)
+static CellActorData * ov17_022418A4 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2)
 {
     CellActorData * v0;
     UnkStruct_ov104_0223F9E0 v1;
@@ -639,7 +639,7 @@ static void ov17_02241900 (CellActorData * param0)
     sub_0200D0F4(param0);
 }
 
-static void ov17_02241908 (UnkStruct_0200C704 * param0)
+static void ov17_02241908 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33004);
     sub_0200D090(param0, 33004);
@@ -670,7 +670,7 @@ void ov17_0224197C (UnkStruct_ov17_0223F88C * param0)
     ov17_02241908(param0->unk_1C);
 }
 
-void ov17_022419AC (PaletteSys * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, NARC * param3)
+void ov17_022419AC (PaletteSys * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, NARC * param3)
 {
     u32 v0, v1, v2;
 
@@ -683,7 +683,7 @@ void ov17_022419AC (PaletteSys * param0, UnkStruct_0200C6E4 * param1, UnkStruct_
     sub_0200CE54(param1, param2, param3, v2, 1, 33011);
 }
 
-void ov17_02241A00 (UnkStruct_0200C704 * param0)
+void ov17_02241A00 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33013);
     sub_0200D090(param0, 33011);
@@ -892,14 +892,14 @@ void ov17_02241E24 (UnkStruct_ov17_0223F88C * param0)
     param0->unk_C0 = NULL;
 }
 
-void ov17_02241E58 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_02241E58 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 17, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33006);
     sub_0200CE24(param0, param1, param2, 16, 1, 33006);
     sub_0200CE54(param0, param1, param2, 15, 1, 33006);
 }
 
-void ov17_02241EA4 (UnkStruct_0200C704 * param0)
+void ov17_02241EA4 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33006);
     sub_0200D090(param0, 33006);
@@ -932,7 +932,7 @@ void ov17_02241EF0 (UnkStruct_ov17_0223F88C * param0)
     }
 }
 
-static CellActorData * ov17_02241F08 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3)
+static CellActorData * ov17_02241F08 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3)
 {
     CellActorData * v0;
 
@@ -1031,7 +1031,7 @@ static void ov17_0224207C (SysTask * param0, void * param1)
     }
 }
 
-void ov17_02242154 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_02242154 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 26, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33008);
     sub_0200CE24(param0, param1, param2, 25, 1, 33008);
@@ -1041,7 +1041,7 @@ void ov17_02242154 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NA
     sub_0200CE54(param0, param1, param2, 27, 1, 33007);
 }
 
-void ov17_022421E0 (UnkStruct_0200C704 * param0)
+void ov17_022421E0 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33008);
     sub_0200D090(param0, 33008);
@@ -1077,7 +1077,7 @@ void ov17_02242248 (UnkStruct_ov17_0223F88C * param0)
     }
 }
 
-static CellActorData * ov17_02242260 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3)
+static CellActorData * ov17_02242260 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3)
 {
     CellActorData * v0;
 
@@ -1089,7 +1089,7 @@ static CellActorData * ov17_02242260 (UnkStruct_0200C6E4 * param0, UnkStruct_020
     return v0;
 }
 
-static CellActorData * ov17_0224228C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3)
+static CellActorData * ov17_0224228C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3)
 {
     CellActorData * v0;
 
@@ -1629,14 +1629,14 @@ void ov17_02242FE8 (UnkStruct_ov17_02246F24 * param0)
     }
 }
 
-void ov17_02243040 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_02243040 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 23, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33009);
     sub_0200CE24(param0, param1, param2, 22, 1, 33009);
     sub_0200CE54(param0, param1, param2, 21, 1, 33009);
 }
 
-void ov17_0224308C (UnkStruct_0200C704 * param0)
+void ov17_0224308C (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33009);
     sub_0200D090(param0, 33009);
diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c
index ef74f32816..40203fe33f 100644
--- a/src/overlay017/ov17_022476F8.c
+++ b/src/overlay017/ov17_022476F8.c
@@ -98,14 +98,14 @@ void ov17_02247734 (UnkStruct_ov17_022476F8 * param0)
     }
 }
 
-void ov17_0224774C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224774C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 67, 1, NNS_G2D_VRAM_TYPE_2DSUB, 33002);
     sub_0200CE24(param0, param1, param2, 68, 1, 33002);
     sub_0200CE54(param0, param1, param2, 69, 1, 33002);
 }
 
-void ov17_02247798 (UnkStruct_0200C704 * param0)
+void ov17_02247798 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33002);
     sub_0200D090(param0, 33002);
diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c
index 2994f330b1..e8f3b055bb 100644
--- a/src/overlay017/ov17_022492DC.c
+++ b/src/overlay017/ov17_022492DC.c
@@ -417,8 +417,8 @@ void ov17_02249640 (UnkStruct_ov17_022492DC * param0, int param1, int param2, vo
     const UnkStruct_ov17_02254578 * v0, * v1;
     int v2;
     BGL * v3;
-    UnkStruct_0200C6E4 * v4;
-    UnkStruct_0200C704 * v5;
+    CellTransferStateData * v4;
+    AnimationResourceCollection * v5;
 
     param0->unk_08 = param3;
 
@@ -688,7 +688,7 @@ static void ov17_02249BC4 (UnkStruct_ov17_022492DC * param0, UnkStruct_ov17_0224
     int v3;
     FontOAM * v4;
     BGL * v5;
-    UnkStruct_0200C704 * v6;
+    AnimationResourceCollection * v6;
     int v7, v8;
 
     GF_ASSERT(param1->unk_00 == NULL);
@@ -759,7 +759,7 @@ static void ov17_02249CD0 (UnkStruct_ov17_022492DC * param0)
 
 static void ov17_02249CFC (UnkStruct_ov17_022492DC * param0, int param1)
 {
-    UnkStruct_0200C704 * v0;
+    AnimationResourceCollection * v0;
     int v1;
     int v2, v3;
 
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 6e66a1b061..8711263bf1 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -390,12 +390,12 @@ void ov17_0224A1EC (UnkStruct_ov17_0224A1EC * param0)
     }
 }
 
-void ov17_0224A20C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1)
+void ov17_0224A20C (CellTransferStateData * param0, AnimationResourceCollection * param1)
 {
     return;
 }
 
-void ov17_0224A210 (UnkStruct_0200C704 * param0)
+void ov17_0224A210 (AnimationResourceCollection * param0)
 {
     return;
 }
@@ -508,7 +508,7 @@ void ov17_0224A368 (UnkStruct_ov17_0224A1EC * param0, int param1, int param2, in
     ov17_0224A214(param0, v0, param3);
 }
 
-void ov17_0224A390 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224A390 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 58, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33003);
     sub_0200CC3C(param0, param1, param2, 59, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33004);
@@ -518,7 +518,7 @@ void ov17_0224A390 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NA
     sub_0200CE54(param0, param1, param2, 63, 1, 33003);
 }
 
-void ov17_0224A428 (UnkStruct_0200C704 * param0)
+void ov17_0224A428 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33003);
     sub_0200D070(param0, 33004);
@@ -528,7 +528,7 @@ void ov17_0224A428 (UnkStruct_0200C704 * param0)
     sub_0200D0A0(param0, 33003);
 }
 
-static int ov17_0224A46C (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, int param3, int param4, int param5, int param6, int param7)
+static int ov17_0224A46C (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, int param5, int param6, int param7)
 {
     CellActorData * v0;
     int v1;
@@ -605,21 +605,21 @@ void ov17_0224A580 (UnkStruct_ov17_0224A1EC * param0)
     }
 }
 
-void ov17_0224A5A8 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224A5A8 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 55, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33007);
     sub_0200CE24(param0, param1, param2, 56, 1, 33004);
     sub_0200CE54(param0, param1, param2, 57, 1, 33004);
 }
 
-void ov17_0224A5F8 (UnkStruct_0200C704 * param0)
+void ov17_0224A5F8 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33007);
     sub_0200D090(param0, 33004);
     sub_0200D0A0(param0, 33004);
 }
 
-void ov17_0224A61C (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2)
+void ov17_0224A61C (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2)
 {
     CellActorData * v0;
     int v1;
@@ -676,7 +676,7 @@ void ov17_0224A7B8 (UnkStruct_ov17_0224A1EC * param0)
     }
 }
 
-void ov17_0224A7E0 (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, int param3, int param4, u8 param5)
+void ov17_0224A7E0 (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2, int param3, int param4, u8 param5)
 {
     CellActorData * v0;
     int v1, v2, v3, v4;
@@ -762,21 +762,21 @@ void ov17_0224A95C (UnkStruct_ov17_0224A1EC * param0)
     }
 }
 
-void ov17_0224A984 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224A984 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 64, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33008);
     sub_0200CE24(param0, param1, param2, 65, 1, 33005);
     sub_0200CE54(param0, param1, param2, 66, 1, 33005);
 }
 
-void ov17_0224A9D4 (UnkStruct_0200C704 * param0)
+void ov17_0224A9D4 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33008);
     sub_0200D090(param0, 33005);
     sub_0200D0A0(param0, 33005);
 }
 
-void ov17_0224A9F8 (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2)
+void ov17_0224A9F8 (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2)
 {
     CellActorData * v0;
 
@@ -818,21 +818,21 @@ static void ov17_0224AA68 (SysTask * param0, void * param1)
     sub_0200D500(v0->unk_14.unk_1E8, v1, v2 - 8 * 5, (256 * FX32_ONE));
 }
 
-void ov17_0224AA94 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224AA94 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 90, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33010);
     sub_0200CE24(param0, param1, param2, 89, 1, 33007);
     sub_0200CE54(param0, param1, param2, 88, 1, 33007);
 }
 
-void ov17_0224AAE4 (UnkStruct_0200C704 * param0)
+void ov17_0224AAE4 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33010);
     sub_0200D090(param0, 33007);
     sub_0200D0A0(param0, 33007);
 }
 
-void ov17_0224AB08 (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2)
+void ov17_0224AB08 (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2)
 {
     int v0;
 
@@ -907,21 +907,21 @@ void ov17_0224AC78 (UnkStruct_ov17_0224ABFC * param0, int param1, int param2)
     param0->unk_12 = param2;
 }
 
-void ov17_0224AC80 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224AC80 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 93, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33011);
     sub_0200CE24(param0, param1, param2, 92, 1, 33008);
     sub_0200CE54(param0, param1, param2, 91, 1, 33008);
 }
 
-void ov17_0224ACD0 (UnkStruct_0200C704 * param0)
+void ov17_0224ACD0 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33011);
     sub_0200D090(param0, 33008);
     sub_0200D0A0(param0, 33008);
 }
 
-void ov17_0224ACF4 (UnkStruct_ov17_0224A1EC * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2)
+void ov17_0224ACF4 (UnkStruct_ov17_0224A1EC * param0, CellTransferStateData * param1, AnimationResourceCollection * param2)
 {
     return;
 }
@@ -931,14 +931,14 @@ void ov17_0224ACF8 (UnkStruct_ov17_0224A1EC * param0)
     return;
 }
 
-void ov17_0224ACFC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224ACFC (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 96, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33012);
     sub_0200CE24(param0, param1, param2, 95, 1, 33009);
     sub_0200CE54(param0, param1, param2, 94, 1, 33009);
 }
 
-void ov17_0224AD4C (UnkStruct_0200C704 * param0)
+void ov17_0224AD4C (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33012);
     sub_0200D090(param0, 33009);
@@ -1065,14 +1065,14 @@ static void ov17_0224AF3C (UnkStruct_ov17_0224DF54 * param0, int param1, int par
     }
 }
 
-void ov17_0224AFA8 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224AFA8 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 99, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33013);
     sub_0200CE24(param0, param1, param2, 98, 1, 33010);
     sub_0200CE54(param0, param1, param2, 97, 1, 33010);
 }
 
-void ov17_0224AFF8 (UnkStruct_0200C704 * param0)
+void ov17_0224AFF8 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33013);
     sub_0200D090(param0, 33010);
@@ -1968,21 +1968,21 @@ int ov17_0224C300 (UnkStruct_ov17_0224DF54 * param0)
     return Message_Printing(param0->unk_14.unk_A18);
 }
 
-void ov17_0224C310 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2)
+void ov17_0224C310 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2)
 {
     sub_0200CC3C(param0, param1, param2, 76, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 33009);
     sub_0200CE24(param0, param1, param2, 77, 1, 33006);
     sub_0200CE54(param0, param1, param2, 78, 1, 33006);
 }
 
-void ov17_0224C360 (UnkStruct_0200C704 * param0)
+void ov17_0224C360 (AnimationResourceCollection * param0)
 {
     sub_0200D070(param0, 33009);
     sub_0200D090(param0, 33006);
     sub_0200D0A0(param0, 33006);
 }
 
-void ov17_0224C384 (UnkStruct_ov17_0224DF54 * param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2)
+void ov17_0224C384 (UnkStruct_ov17_0224DF54 * param0, CellTransferStateData * param1, AnimationResourceCollection * param2)
 {
     UnkStruct_ov17_0224C384 * v0;
 
diff --git a/src/overlay017/ov17_0224F080.c b/src/overlay017/ov17_0224F080.c
index 3468a3c26b..60ecb3a7df 100644
--- a/src/overlay017/ov17_0224F080.c
+++ b/src/overlay017/ov17_0224F080.c
@@ -53,29 +53,29 @@ u32 ov17_0224F0B8 (void)
     return 46;
 }
 
-void ov17_0224F0BC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
+void ov17_0224F0BC (CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
 {
     sub_0200CBDC(param0, param1, ov17_0224F0B8(), ov17_0224F080(param3), 1, param2, param4);
 }
 
-void ov17_0224F0F0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, u32 param3)
+void ov17_0224F0F0 (CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3)
 {
     sub_0200CE0C(param0, param1, ov17_0224F0B8(), ov17_0224F098(), 1, param2);
     sub_0200CE3C(param0, param1, ov17_0224F0B8(), ov17_0224F09C(), 1, param3);
 }
 
-void ov17_0224F138 (UnkStruct_0200C704 * param0, u32 param1)
+void ov17_0224F138 (AnimationResourceCollection * param0, u32 param1)
 {
     sub_0200D070(param0, param1);
 }
 
-void ov17_0224F140 (UnkStruct_0200C704 * param0, u32 param1, u32 param2)
+void ov17_0224F140 (AnimationResourceCollection * param0, u32 param1, u32 param2)
 {
     sub_0200D090(param0, param1);
     sub_0200D0A0(param0, param2);
 }
 
-CellActorData * ov17_0224F154 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3)
+CellActorData * ov17_0224F154 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3)
 {
     CellActorData * v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c
index 60a35345c6..c5b35582fe 100644
--- a/src/overlay017/ov17_02252AB0.c
+++ b/src/overlay017/ov17_02252AB0.c
@@ -20,9 +20,9 @@ typedef struct UnkStruct_ov17_02252B48_t {
 } UnkStruct_ov17_02252B48;
 
 static void ov17_02252CB8(SysTask * param0, void * param1);
-void ov17_02252AB0(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6);
-void ov17_02252B20(UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov17_02252B48 * ov17_02252B48(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
+void ov17_02252AB0(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6);
+void ov17_02252B20(AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov17_02252B48 * ov17_02252B48(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov17_02252BCC(UnkStruct_ov17_02252B48 * param0);
 void ov17_02252C9C(UnkStruct_ov17_02252B48 * param0);
 
@@ -39,7 +39,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov17_02254D9C = {
     0x0
 };
 
-void ov17_02252AB0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6)
+void ov17_02252AB0 (CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, u32 param3, u32 param4, u32 param5, u32 param6)
 {
     sub_0200CD7C(param2, 3, param0, param1, 27, 80, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, param4);
     sub_0200CBDC(param0, param1, 27, 250, 1, NNS_G2D_VRAM_TYPE_2DSUB, param3);
@@ -47,7 +47,7 @@ void ov17_02252AB0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, Pa
     sub_0200CE3C(param0, param1, 27, 252, 1, param6);
 }
 
-void ov17_02252B20 (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 param3, u32 param4)
+void ov17_02252B20 (AnimationResourceCollection * param0, u32 param1, u32 param2, u32 param3, u32 param4)
 {
     sub_0200D070(param0, param1);
     sub_0200D080(param0, param2);
@@ -55,7 +55,7 @@ void ov17_02252B20 (UnkStruct_0200C704 * param0, u32 param1, u32 param2, u32 par
     sub_0200D0A0(param0, param4);
 }
 
-UnkStruct_ov17_02252B48 * ov17_02252B48 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
+UnkStruct_ov17_02252B48 * ov17_02252B48 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8)
 {
     UnkStruct_ov17_02252B48 * v0;
     UnkStruct_ov104_0223F9E0 v1;
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 1442bda6bb..05f99c8437 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -141,7 +141,7 @@ typedef struct UnkStruct_ov19_021D5DF8_t {
     MessageLoader * unk_198;
     UnkStruct_0200B358 * unk_19C;
     Pokemon * unk_1A0;
-    UnkStruct_020279FC * unk_1A4;
+    AnimationControlFlags * unk_1A4;
     int (* unk_1A8)(struct UnkStruct_ov19_021D5DF8_t * param0);
     void (* unk_1AC)(struct UnkStruct_ov19_021D5DF8_t * param0, u32 * param1);
     u32 unk_1B0;
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 625079b860..aef512cf27 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -66,7 +66,7 @@ struct UnkStruct_ov19_021D61B0_t {
     SysTask * unk_00;
     SysTask * unk_04;
     SysTask * unk_08[4];
-    UnkStruct_020218BC * unk_18;
+    GraphicElementManager * unk_18;
     UnkStruct_0200C738 unk_1C;
     NNSG2dImagePaletteProxy unk_1A8;
     UnkStruct_02007768 * unk_1BC;
@@ -1940,10 +1940,10 @@ void ov19_021D783C (UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1,
     param0->unk_1C = 0;
 }
 
-UnkStruct_02022550 * ov19_021D785C (UnkStruct_020218BC * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
+GraphicElementData * ov19_021D785C (GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     v0.unk_00 = param0;
     v0.unk_04 = param1;
@@ -1969,7 +1969,7 @@ UnkStruct_02022550 * ov19_021D785C (UnkStruct_020218BC * param0, UnkStruct_ov19_
     return v1;
 }
 
-void ov19_021D78AC (UnkStruct_02022550 * param0, u32 param1)
+void ov19_021D78AC (GraphicElementData * param0, u32 param1)
 {
     OSIntrMode v0 = OS_DisableInterrupts();
 
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index 095811b5c8..4ded3b8cc9 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -106,7 +106,7 @@ static const u16 Unk_ov19_021E0138[] = {
     9, 10,
 };
 
-BOOL ov19_021D79F8 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4)
+BOOL ov19_021D79F8 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4)
 {
     param0->unk_00 = param2->unk_40.unk_00;
     param0->unk_01 = 11;
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 035b01ddbe..807863a238 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -27,7 +27,7 @@
 #include "overlay019/ov19_021DE3E8.h"
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     u16 unk_04;
     u16 unk_06;
     u32 unk_08;
@@ -46,7 +46,7 @@ static void ov19_021D8EE0(const UnkStruct_ov19_021D8E00 * param0, BOOL * param1,
 static void ov19_021D9088(SysTask * param0, void * param1);
 static void ov19_021D928C(SysTask * param0, void * param1);
 static void ov19_021D93D0(SysTask * param0, void * param1);
-static void ov19_021D9554(UnkStruct_ov19_021D8E00 * param0, UnkStruct_02022550 * param1, fx32 param2, s32 param3, u32 param4);
+static void ov19_021D9554(UnkStruct_ov19_021D8E00 * param0, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4);
 static BOOL ov19_021D95E0(UnkStruct_ov19_021D8E00 * param0);
 static void ov19_021D95F4(void * param0);
 static void ov19_021D9600(SysTask * param0, void * param1);
@@ -63,9 +63,9 @@ static void ov19_021DA06C(UnkStruct_ov19_021D8E00 * param0);
 static void ov19_021DA110(UnkStruct_ov19_021D8E00 * param0);
 static void ov19_021DA1F8(UnkStruct_ov19_021D8E00 * param0);
 static void ov19_021DA204(UnkStruct_ov19_021D8E00 * param0);
-static UnkStruct_02022550 * ov19_021DA224(UnkStruct_ov19_021D8E00 * param0);
+static GraphicElementData * ov19_021DA224(UnkStruct_ov19_021D8E00 * param0);
 
-BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4)
+BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4)
 {
     param0->unk_794 = param1;
     param0->unk_790 = param2;
@@ -507,7 +507,7 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
 void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     sub_02021D6C(param0->unk_04, 1);
 
@@ -534,7 +534,7 @@ BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0)
     return 0;
 }
 
-static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_02022550 * param1, fx32 param2, s32 param3, u32 param4)
+static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4)
 {
     UnkStruct_ov19_021D9554 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D9554));
 
@@ -1149,7 +1149,7 @@ static void ov19_021DA204 (UnkStruct_ov19_021D8E00 * param0)
     param0->unk_754 = 0;
 }
 
-static UnkStruct_02022550 * ov19_021DA224 (UnkStruct_ov19_021D8E00 * param0)
+static GraphicElementData * ov19_021DA224 (UnkStruct_ov19_021D8E00 * param0)
 {
     UnkStruct_ov19_021DCD18 * v0;
     u32 v1;
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 5e100b83ea..ee56c1c622 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -21,7 +21,7 @@
 #include "overlay019/ov19_021D61B0.h"
 #include "overlay019/ov19_021DA270.h"
 
-BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4)
+BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dPaletteData * v1;
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index c5cdf06d4d..2f1a276924 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -15,7 +15,7 @@
 #include "overlay019/ov19_021D61B0.h"
 #include "overlay019/ov19_021DA814.h"
 
-BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, UnkStruct_020218BC * param3, NARC * param4)
+BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4)
 {
     param0->unk_44 = param1;
     param0->unk_3C = param3;
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 52c7ae937b..4775bc0d7f 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -62,7 +62,7 @@ static void ov19_021DAE60(Window * param0, UnkStruct_ov19_021DA9E0 * param1, u32
 static void ov19_021DB0E4(UnkStruct_ov19_021DA9E0 * param0);
 static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 * param0, u8 param1);
 
-BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, const MessageLoader * param5, NARC * param6)
+BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6)
 {
     int v0;
 
diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c
index eb39838b5e..fe64fe7a77 100644
--- a/src/overlay019/ov19_021DB2FC.c
+++ b/src/overlay019/ov19_021DB2FC.c
@@ -34,7 +34,7 @@ static void ov19_021DB7BC(BGL * param0, u32 param1, u32 param2, u32 param3, u32
 static void ov19_021DB84C(BGL * param0, Window * param1);
 static void ov19_021DB898(BGL * param0, Window * param1);
 
-BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8)
+BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, const UnkStruct_0200B358 * param6, int param7, NARC * param8)
 {
     param0->unk_0C = param1;
     param0->unk_00 = param3;
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index b9be6988f9..23e17e0f88 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -73,7 +73,7 @@ static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C * param0, u32 param1);
 static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C * param0, fx32 param1);
 static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C * param0);
 
-BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, NARC * param5)
+BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5)
 {
     int v0;
 
diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c
index 34afb8313b..b0d5fd9523 100644
--- a/src/overlay019/ov19_021DC5F0.c
+++ b/src/overlay019/ov19_021DC5F0.c
@@ -47,7 +47,7 @@ static void ov19_021DCE50(UnkStruct_ov19_021DC680 * param0, fx32 param1);
 static void ov19_021DCEB8(UnkStruct_ov19_021DC680 * param0, BOOL param1);
 static void ov19_021DCF50(UnkStruct_ov19_021DC680 * param0);
 
-BOOL ov19_021DC5F0 (UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, NARC * param5)
+BOOL ov19_021DC5F0 (UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, NARC * param5)
 {
     param0->unk_00 = param1;
     param0->unk_0C = param2;
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index a3edba19b5..66e19428a8 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -35,7 +35,7 @@
 typedef struct {
     UnkStruct_ov19_021DCF88 * unk_00;
     u32 unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     u16 unk_0C;
     s16 unk_0E;
     fx32 unk_10;
@@ -45,7 +45,7 @@ typedef struct {
 
 typedef struct {
     void * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     fx32 unk_08;
     fx32 unk_0C;
     fx32 unk_10;
@@ -61,7 +61,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov19_021DCF88 * unk_00;
-    UnkStruct_02022550 ** unk_04;
+    GraphicElementData ** unk_04;
     UnkStruct_ov19_021DDBD0 unk_08[10];
     u8 unk_1C0[10];
     u8 unk_1CA;
@@ -74,14 +74,14 @@ struct UnkStruct_ov19_021DCF88_t {
     UnkStruct_ov19_021D61B0 * unk_00;
     const UnkStruct_ov19_021D4DF0 * unk_04;
     BGL * unk_08;
-    UnkStruct_020218BC * unk_0C;
+    GraphicElementManager * unk_0C;
     u32 unk_10;
     SysTask * unk_14;
     NNSG2dImagePaletteProxy unk_18;
-    UnkStruct_02022550 * unk_2C;
-    UnkStruct_02022550 * unk_30;
-    UnkStruct_02022550 * unk_34[8];
-    UnkStruct_02022550 * unk_54[10];
+    GraphicElementData * unk_2C;
+    GraphicElementData * unk_30;
+    GraphicElementData * unk_34[8];
+    GraphicElementData * unk_54[10];
     int unk_7C;
     int unk_80;
     Strbuf* unk_84;
@@ -119,7 +119,7 @@ static void ov19_021DDA7C(UnkStruct_ov19_021DCF88 * param0);
 static void ov19_021DDA9C(SysTask * param0, void * param1);
 static void ov19_021DDB20(SysTask * param0, void * param1);
 static void ov19_021DDBD0(SysTask * param0, UnkStruct_ov19_021DDBD0 * param1);
-static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 * param0, UnkStruct_02022550 * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7);
+static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 * param0, GraphicElementData * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7);
 static void ov19_021DDC74(UnkStruct_ov19_021DDBF8 * param0, UnkStruct_ov19_021DDBD0 * param1, u32 param2, u32 param3, u32 param4);
 static void ov19_021DDCC0(SysTask * param0, void * param1);
 static void ov19_021DDD78(void * param0);
@@ -307,7 +307,7 @@ static const u16 Unk_ov19_021E0264[] = {
     0x0
 };
 
-BOOL ov19_021DCF88 (UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4)
+BOOL ov19_021DCF88 (UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4)
 {
     if (ov19_021D5E08(param2) == 4) {
         *param0 = NULL;
@@ -1051,7 +1051,7 @@ static void ov19_021DDBD0 (SysTask * param0, UnkStruct_ov19_021DDBD0 * param1)
     SysTask_Done(param0);
 }
 
-static void ov19_021DDBF8 (UnkStruct_ov19_021DDBF8 * param0, UnkStruct_02022550 * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7)
+static void ov19_021DDBF8 (UnkStruct_ov19_021DDBF8 * param0, GraphicElementData * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7)
 {
     SysTaskFunc v0;
 
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 2aa7118bdb..dfdac8885f 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -38,10 +38,10 @@ struct UnkStruct_ov19_021DE3E8_t {
     UnkStruct_ov19_021D61B0 * unk_04;
     const UnkStruct_ov19_021D4DF0 * unk_08;
     BGL * unk_0C;
-    UnkStruct_020218BC * unk_10;
+    GraphicElementManager * unk_10;
     UnkStruct_ov19_021DA384 * unk_14;
     UnkStruct_ov19_021D8E00 * unk_18;
-    UnkStruct_02022550 * unk_1C[3];
+    GraphicElementData * unk_1C[3];
     int unk_28[3];
     int unk_34;
     int unk_38;
@@ -49,7 +49,7 @@ struct UnkStruct_ov19_021DE3E8_t {
 
 typedef struct {
     UnkStruct_ov19_021DE3E8 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     VecFx32 unk_08;
     VecFx32 unk_14;
     fx32 unk_20;
@@ -71,7 +71,7 @@ static void ov19_021DE718(UnkStruct_ov19_021DE3E8 * param0, int param1, int para
 static void ov19_021DE858(UnkStruct_ov19_021DE3E8 * param0, int param1, const VecFx32 * param2, int param3, int param4);
 static void ov19_021DE8E0(SysTask * param0, void * param1);
 
-BOOL ov19_021DE3E8 (UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4)
+BOOL ov19_021DE3E8 (UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4)
 {
     UnkStruct_ov19_021DE3E8 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8));
 
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 1ac605012c..4ddc7e5009 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -41,13 +41,13 @@ struct UnkStruct_ov19_021DEC04_t {
     UnkStruct_ov19_021D61B0 * unk_04;
     const UnkStruct_ov19_021D4DF0 * unk_08;
     BGL * unk_0C;
-    UnkStruct_020218BC * unk_10;
+    GraphicElementManager * unk_10;
     UnkStruct_ov19_021DA384 * unk_14;
     u32 unk_18[2];
-    UnkStruct_02022550 * unk_20[2];
-    UnkStruct_02022550 * unk_28[2];
-    UnkStruct_02022550 * unk_30;
-    UnkStruct_02022550 * unk_34[2][5];
+    GraphicElementData * unk_20[2];
+    GraphicElementData * unk_28[2];
+    GraphicElementData * unk_30;
+    GraphicElementData * unk_34[2][5];
     void * unk_5C;
     NNSG2dCellDataBank * unk_60;
     void * unk_64;
@@ -90,7 +90,7 @@ static void ov19_021DF834(UnkStruct_ov19_021DEC04 * param0);
 static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 * param0, int param1);
 static void ov19_021DF930(SysTask * param0, void * param1);
 
-BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, UnkStruct_020218BC * param4, MessageLoader * param5, NARC * param6)
+BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, GraphicElementManager * param4, MessageLoader * param5, NARC * param6)
 {
     if (ov19_021D5E08(param2) != 4) {
         *param0 = NULL;
@@ -677,7 +677,7 @@ static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0)
 {
     int v0 = ov19_021D5F9C(param0->unk_08);
     const UnkStruct_ov19_021D5FAC * v1 = ov19_021D5FAC(param0->unk_08, v0);
-    UnkStruct_02022550 * v2 = param0->unk_20[v0];
+    GraphicElementData * v2 = param0->unk_20[v0];
     BoxPokemon * v3 = (BoxPokemon *)(v1->unk_00);
     NNSG2dCharacterData * v4;
 
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index ecdb63915a..a49103d8e3 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -49,7 +49,7 @@ typedef struct UnkStruct_ov20_021D2128_t {
     const UnkStruct_ov20_021D16E8 * unk_18;
     const UnkStruct_020998EC * unk_1C;
     BGL * unk_20;
-    UnkStruct_020218BC * unk_24;
+    GraphicElementManager * unk_24;
     UnkStruct_0200C738 unk_28;
     NNSG2dImageProxy unk_1B4[2];
     NNSG2dImagePaletteProxy unk_1FC[2];
@@ -966,7 +966,7 @@ BGL * ov20_021D2E04 (UnkStruct_ov20_021D2128 * param0)
     return param0->unk_20;
 }
 
-UnkStruct_020218BC * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
+GraphicElementManager * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
 {
     return param0->unk_24;
 }
@@ -984,10 +984,10 @@ void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 *
     param1->unk_1C = 0;
 }
 
-UnkStruct_02022550 * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
+GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
     OSIntrMode v2;
 
     v0.unk_00 = param0->unk_24;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 79855d7221..a44ffc91d6 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -50,9 +50,9 @@ typedef struct UnkStruct_ov20_021D30F8_t {
     Window unk_0C;
     Window unk_1C;
     Window unk_2C;
-    UnkStruct_02022550 * unk_3C;
-    UnkStruct_02022550 * unk_40;
-    UnkStruct_02022550 * unk_44;
+    GraphicElementData * unk_3C;
+    GraphicElementData * unk_40;
+    GraphicElementData * unk_44;
     MessageLoader * unk_48;
     Strbuf* unk_4C;
     UnkStruct_020149F0 * unk_50;
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index e76fe948b5..afc1eeecd7 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -28,7 +28,7 @@ typedef struct UnkStruct_ov20_021D3980_t {
     UnkStruct_ov20_021D2128 * unk_00;
     const UnkStruct_ov20_021D16E8 * unk_04;
     const UnkStruct_020998EC * unk_08;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
 } UnkStruct_ov20_021D3980;
 
 static void ov20_021D390C(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u32 param2);
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index e85bf81354..30be2b48c9 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -43,7 +43,7 @@ typedef struct UnkStruct_ov20_021D3E0C_t {
     SysTask * unk_18;
     UnkStruct_ov20_021D4FF0 unk_1C;
     UnkStruct_ov20_021D4E8C unk_3C;
-    UnkStruct_02022550 * unk_5C;
+    GraphicElementData * unk_5C;
 } UnkStruct_ov20_021D3E0C;
 
 static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2);
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 4dff7e9d2d..5bebe4ba1c 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -32,9 +32,9 @@ typedef struct UnkStruct_ov20_021D4210_t {
     BGL * unk_0C;
     Window unk_10;
     Window unk_20;
-    UnkStruct_02022550 * unk_30;
-    UnkStruct_02022550 * unk_34;
-    UnkStruct_02022550 * unk_38;
+    GraphicElementData * unk_30;
+    GraphicElementData * unk_34;
+    GraphicElementData * unk_38;
     Strbuf* unk_3C;
     UnkStruct_ov20_021D4FF0 unk_40;
     UnkStruct_ov20_021D4E8C unk_60;
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index 551adfe455..a3e1dfc5da 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -40,9 +40,9 @@ typedef struct UnkStruct_ov20_021D4AD4_t {
     const UnkStruct_ov20_021D16E8 * unk_04;
     const UnkStruct_020998EC * unk_08;
     BGL * unk_0C;
-    UnkStruct_020218BC * unk_10;
-    UnkStruct_02022550 * unk_14;
-    UnkStruct_02022550 * unk_18;
+    GraphicElementManager * unk_10;
+    GraphicElementData * unk_14;
+    GraphicElementData * unk_18;
     UnkStruct_ov20_021D4B2C unk_1C;
     u16 unk_2C[8][77];
     SysTask * unk_4FC;
@@ -69,7 +69,7 @@ static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 * param0);
 static void ov20_021D4AF8(UnkStruct_ov20_021D4B2C * param0, NARC * param1, u32 param2, u32 param3);
 static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C * param0);
 static void ov20_021D4C40(SysTask * param0, void * param1);
-static UnkStruct_02022550 * ov20_021D4B40(UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7);
+static GraphicElementData * ov20_021D4B40(UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7);
 
 UnkStruct_ov20_021D4AD4 * ov20_021D4728 (UnkStruct_ov20_021D2128 * param0, const UnkStruct_ov20_021D16E8 * param1, const UnkStruct_020998EC * param2)
 {
@@ -345,11 +345,11 @@ static void ov20_021D4B2C (UnkStruct_ov20_021D4B2C * param0)
     Heap_FreeToHeap(param0->unk_08);
 }
 
-static UnkStruct_02022550 * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7)
+static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     v0.unk_00 = param1;
     v0.unk_08 = param2;
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index c79441c6aa..852c96453e 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -541,7 +541,7 @@ UnkStruct_ov21_021E68F4 * ov21_021D1430 (UnkStruct_ov21_021D0F60 * param0, int p
     return &param0->unk_1C24[param1];
 }
 
-void ov21_021D144C (UnkStruct_02022550 * param0, int param1)
+void ov21_021D144C (GraphicElementData * param0, int param1)
 {
     switch (param1) {
     case 0:
@@ -564,7 +564,7 @@ void ov21_021D144C (UnkStruct_02022550 * param0, int param1)
     }
 }
 
-void ov21_021D1498 (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2)
+void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2)
 {
     int v0 = sub_02021E74(param0);
     int v1, v2;
@@ -593,7 +593,7 @@ void ov21_021D1498 (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param
     }
 }
 
-void ov21_021D1524 (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     int v0;
 
@@ -721,8 +721,8 @@ Window * ov21_021D172C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2
 
 void ov21_021D1778 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3320 * param1, int param2, int param3, fx32 param4, fx32 param5)
 {
-    UnkStruct_02022550 * v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v0;
+    GraphicElementData * v1;
     UnkStruct_ov21_021D4CB8 v2;
     Window * v3;
     UnkStruct_02009DC8 * v4;
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 486745e613..62d6efe7f9 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -221,13 +221,13 @@ void ov21_021D2280 (const UnkStruct_ov21_021D13FC * param0, BOOL param1, int par
     }
 }
 
-UnkStruct_02022550 * ov21_021D22A8 (const UnkStruct_ov21_021D13FC * param0)
+GraphicElementData * ov21_021D22A8 (const UnkStruct_ov21_021D13FC * param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_00);
     return param0->unk_1B0.unk_00;
 }
 
-UnkStruct_02022550 * ov21_021D22C4 (const UnkStruct_ov21_021D13FC * param0)
+GraphicElementData * ov21_021D22C4 (const UnkStruct_ov21_021D13FC * param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_04);
     return param0->unk_1B0.unk_04;
@@ -904,7 +904,7 @@ static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
     }
 }
 
-void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, int param4)
+void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c
index a203474635..714785c8da 100644
--- a/src/overlay021/ov21_021D4C0C.c
+++ b/src/overlay021/ov21_021D4C0C.c
@@ -25,7 +25,7 @@
 
 typedef struct UnkStruct_ov21_021D4C0C_t {
     UnkStruct_02012744 * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     BGL * unk_08;
     UnkStruct_ov21_021D4CA0 * unk_0C;
     int unk_10;
diff --git a/src/overlay021/ov21_021D57B4.c b/src/overlay021/ov21_021D57B4.c
index 2f17d310ab..3785d076f1 100644
--- a/src/overlay021/ov21_021D57B4.c
+++ b/src/overlay021/ov21_021D57B4.c
@@ -131,7 +131,7 @@ u32 ov21_021D5948 (u8 * param0, int param1, int param2, const UnkStruct_ov21_021
     return v2;
 }
 
-void ov21_021D59D8 (UnkStruct_02022550 * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7)
+void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7)
 {
     VecFx32 v0;
 
@@ -149,7 +149,7 @@ void ov21_021D59D8 (UnkStruct_02022550 * param0, int param1, int param2, int par
     }
 }
 
-int ov21_021D5A20 (UnkStruct_02022550 ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13)
+int ov21_021D5A20 (GraphicElementData ** param0, int param1, int param2, int param3, int param4, int param5, int param6, const UnkStruct_ov21_021D5868 * param7, const UnkStruct_ov21_021D5844 * param8, int param9, int param10, const u8 * param11, u32 param12, u32 * param13)
 {
     int v0, v1;
     int v2 = param1;
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 4301a7eb30..9c40729c4f 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -65,14 +65,14 @@ typedef struct {
 } UnkStruct_ov21_021D7464;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[9];
+    GraphicElementData * unk_00[9];
     int unk_24;
     UnkStruct_ov21_021D4CA0 * unk_28[9];
     int unk_4C;
-    UnkStruct_02022550 * unk_50[9];
-    UnkStruct_02022550 * unk_74;
+    GraphicElementData * unk_50[9];
+    GraphicElementData * unk_74;
     fx32 unk_78;
-    UnkStruct_02022550 * unk_7C;
+    GraphicElementData * unk_7C;
     UnkStruct_02009714 * unk_80[4];
     UnkStruct_ov19_021DA864 unk_90;
     UnkStruct_ov19_021DA864 unk_B4;
@@ -155,7 +155,7 @@ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D1
 static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3);
 static void ov21_021D6D78(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3, int param4, int param5);
 static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2, int param3, int param4);
-static void ov21_021D6CA4(UnkStruct_02022550 * param0, int * param1, int * param2);
+static void ov21_021D6CA4(GraphicElementData * param0, int * param1, int * param2);
 static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3);
 static void ov21_021D6F20(UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2);
 static void ov21_021D6F74(const UnkStruct_ov21_021D5B68 * param0);
@@ -1202,7 +1202,7 @@ static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     }
 }
 
-static void ov21_021D6CA4 (UnkStruct_02022550 * param0, int * param1, int * param2)
+static void ov21_021D6CA4 (GraphicElementData * param0, int * param1, int * param2)
 {
     const VecFx32 * v0;
 
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index e85e44c441..09f33a75c3 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -74,11 +74,11 @@ typedef struct {
 } UnkStruct_ov21_021D7B8C;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[3];
+    GraphicElementData * unk_00[3];
     UnkStruct_ov21_021D4CA0 * unk_0C[3];
-    UnkStruct_02022550 * unk_18;
-    UnkStruct_02022550 * unk_1C;
-    UnkStruct_02022550 * unk_20;
+    GraphicElementData * unk_18;
+    GraphicElementData * unk_1C;
+    GraphicElementData * unk_20;
     UnkStruct_ov21_021D4CA0 * unk_24;
     u16 unk_28;
     u16 unk_2A;
@@ -98,7 +98,7 @@ static int ov21_021D78AC(UnkStruct_ov21_021E6A68 * param0, void * param1);
 static int ov21_021D78C0(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3);
 static int ov21_021D7950(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3);
 static int ov21_021D79E4(void * param0, UnkStruct_ov21_021E6B20 * param1, const void * param2, const UnkStruct_ov21_021E6A68 * param3);
-static void ov21_021D84A8(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+static void ov21_021D84A8(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 static void ov21_021D7A64(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1, int param2);
 static void ov21_021D7B20(UnkStruct_ov21_021D7A64 * param0, UnkStruct_ov21_021D77D4 * param1);
 static void ov21_021D7B70(UnkStruct_ov21_021D7A64 * param0);
@@ -921,7 +921,7 @@ static void ov21_021D8434 (UnkStruct_ov21_021D7A64 * param0, int param1, int par
     }
 }
 
-static void ov21_021D84A8 (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021D84A8 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index cf99ff8cae..fdaa324706 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -72,10 +72,10 @@ typedef struct {
     int unk_14;
     BOOL unk_18;
     int unk_1C;
-    UnkStruct_02022550 * unk_20;
+    GraphicElementData * unk_20;
     UnkStruct_02009DC8 * unk_24[4];
     UnkStruct_ov21_021D157C unk_34;
-    UnkStruct_02022550 * unk_58;
+    GraphicElementData * unk_58;
     void * unk_5C;
     NNSG2dScreenData * unk_60;
 } UnkStruct_ov21_021D9320;
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index abfa6a70c9..5b2cd3b27e 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -87,11 +87,11 @@ typedef struct {
 } UnkStruct_ov21_021D9B24;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[6];
+    GraphicElementData * unk_00[6];
     UnkStruct_ov21_021D4CA0 * unk_18[6];
-    UnkStruct_02022550 * unk_30[15];
+    GraphicElementData * unk_30[15];
     UnkStruct_ov21_021D4CA0 * unk_6C[15];
-    UnkStruct_02022550 * unk_A8[15];
+    GraphicElementData * unk_A8[15];
     UnkStruct_02009DC8 * unk_E4[4];
     UnkStruct_02009DC8 * unk_F4[4];
     int unk_104;
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 5db210129c..59fcf842a4 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -103,10 +103,10 @@ typedef struct {
 
 typedef struct {
     int unk_00;
-    UnkStruct_02022550 * unk_04[44];
+    GraphicElementData * unk_04[44];
     UnkStruct_02009DC8 * unk_B4[4];
     int unk_C4;
-    UnkStruct_02022550 * unk_C8;
+    GraphicElementData * unk_C8;
     UnkStruct_ov21_021D4CA0 * unk_CC;
     UnkStruct_02009DC8 * unk_D0[4];
     UnkStruct_ov21_021D4CA0 * unk_E0[3];
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index a427dad554..33a84e8185 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -65,7 +65,7 @@ typedef struct {
 } UnkStruct_ov21_021DDE4C;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_02009DC8 * unk_04[4];
     void * unk_14;
     int unk_18;
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 3ec757e2b3..41159d2546 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -52,8 +52,8 @@ typedef struct {
 } UnkStruct_ov21_021DE760;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[3];
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_00[3];
+    GraphicElementData * unk_0C;
     UnkStruct_ov21_021D4CA0 * unk_10;
     UnkStruct_02009DC8 * unk_14[4];
     UnkStruct_02009DC8 * unk_24[4];
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index daa1ac0fe6..c982b7d9d9 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -54,13 +54,13 @@ typedef struct {
 } UnkStruct_ov21_021DF858;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[4];
+    GraphicElementData * unk_00[4];
     UnkStruct_02009DC8 * unk_10[4];
     UnkStruct_ov21_021D4CA0 * unk_20[2];
     UnkStruct_ov21_021D2648 unk_28[4];
     int unk_A8[4];
     int unk_B8;
-    UnkStruct_02022550 * unk_BC;
+    GraphicElementData * unk_BC;
     int unk_C0;
     BOOL unk_C4;
     int unk_C8;
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index c66fcc8dba..41ade15c8a 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -58,7 +58,7 @@ typedef struct {
 } UnkStruct_ov21_021E0D7C;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_ov21_021D4CA0 * unk_04;
     UnkStruct_02009DC8 * unk_08[4];
     UnkStruct_ov21_021D2648 unk_18;
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index e8b7cf916f..2c60614c53 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -76,10 +76,10 @@ typedef struct {
 } UnkStruct_ov21_021E1E74;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[8];
+    GraphicElementData * unk_00[8];
     UnkStruct_ov21_021D4CA0 * unk_20[8];
     UnkStruct_02009DC8 * unk_40[4];
-    UnkStruct_02022550 * unk_50[8];
+    GraphicElementData * unk_50[8];
     UnkStruct_02009DC8 * unk_70[4];
     int unk_80[8];
     void * unk_A0[8];
@@ -107,10 +107,10 @@ static void ov21_021E1D40(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1
 static void ov21_021E1E00(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1);
 static void ov21_021E1E74(UnkStruct_ov21_021E1E74 * param0);
 static void ov21_021E1E8C(u32 param0, u32 param1, void * param2);
-static void ov21_021E26A0(UnkStruct_ov21_021E1A90 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
-static void ov21_021E274C(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+static void ov21_021E26A0(UnkStruct_ov21_021E1A90 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
+static void ov21_021E274C(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 static void ov21_021E28D0(UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov21_021E1E74 * param1);
-static void ov21_021E29A4(UnkStruct_02022550 * param0, int param1, int param2);
+static void ov21_021E29A4(GraphicElementData * param0, int param1, int param2);
 static void ov21_021E2968(UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E1A7C * param1);
 static void ov21_021E2014(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2);
 static void ov21_021E2044(UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2);
@@ -914,7 +914,7 @@ static BOOL ov21_021E2664 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     return 0;
 }
 
-static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
+static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
 {
     int v0;
     NNSG2dPaletteData * v1;
@@ -964,7 +964,7 @@ static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, UnkStruct_02022550
     }
 }
 
-static void ov21_021E274C (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E274C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
@@ -1143,7 +1143,7 @@ static void ov21_021E2968 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E
     }
 }
 
-static void ov21_021E29A4 (UnkStruct_02022550 * param0, int param1, int param2)
+static void ov21_021E29A4 (GraphicElementData * param0, int param1, int param2)
 {
     int v0;
 
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 5b765e58fc..ae9db7bb21 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -109,7 +109,7 @@ typedef struct {
 } UnkStruct_ov21_021E37B4;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[6];
+    GraphicElementData * unk_00[6];
     UnkStruct_02009DC8 * unk_18[4];
 } UnkStruct_ov21_021E3900;
 
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index 09e0f634fb..5bd122a1ee 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -57,12 +57,12 @@ typedef struct {
 } UnkStruct_ov21_021E4898;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
 } UnkStruct_ov21_021E4B30_sub1;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_ov21_021E4B30_sub2;
@@ -120,7 +120,7 @@ static void ov21_021E4AF4(UnkStruct_ov21_021E4360 * param0);
 static void ov21_021E4B10(UnkStruct_ov21_021E4360 * param0, const UnkStruct_ov21_021E4898 * param1);
 static void ov21_021E4B30(UnkStruct_ov21_021E4B30 * param0, int param1);
 static void ov21_021E4B94(UnkStruct_ov21_021E4B30 * param0, int param1);
-static void ov21_021E4C38(UnkStruct_02022550 * param0, int param1);
+static void ov21_021E4C38(GraphicElementData * param0, int param1);
 
 void ov21_021E3FFC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2)
 {
@@ -813,7 +813,7 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
     }
 }
 
-static void ov21_021E4C38 (UnkStruct_02022550 * param0, int param1)
+static void ov21_021E4C38 (GraphicElementData * param0, int param1)
 {
     VecFx32 v0;
     const VecFx32 * v1;
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 54ef4680d3..8801217187 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -100,12 +100,12 @@ typedef struct {
 } UnkStruct_ov21_021E5C80;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_00;
+    GraphicElementData * unk_04;
     UnkStruct_ov21_021E5C80 unk_08;
-    UnkStruct_02022550 * unk_20;
+    GraphicElementData * unk_20;
     UnkStruct_ov21_021E5C80 unk_24;
-    UnkStruct_02022550 * unk_3C;
+    GraphicElementData * unk_3C;
     int unk_40;
     fx32 unk_44;
     int unk_48;
@@ -149,9 +149,9 @@ static void ov21_021E5DE8(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4
 static void ov21_021E5E18(UnkStruct_ov21_021E51DC * param0);
 static void ov21_021E5E48(UnkStruct_ov21_021E51DC * param0, UnkStruct_ov21_021E4D90 * param1);
 static void ov21_021E5E78(UnkStruct_ov21_021E51DC * param0, BOOL param1);
-static void ov21_021E5C80(UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, BOOL param3);
-static void ov21_021E5CF8(UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3);
-static void ov21_021E5D90(UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2);
+static void ov21_021E5C80(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, BOOL param3);
+static void ov21_021E5CF8(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3);
+static void ov21_021E5D90(GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2);
 static void ov21_021E59B4(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1);
 static void ov21_021E5A04(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1);
 static void ov21_021E5A2C(UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1);
@@ -1168,7 +1168,7 @@ static void ov21_021E5C4C (UnkStruct_ov21_021E5004 * param0)
     }
 }
 
-static void ov21_021E5C80 (UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
+static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1202,7 +1202,7 @@ static void ov21_021E5C80 (UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80
     }
 }
 
-static void ov21_021E5CF8 (UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
+static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1241,7 +1241,7 @@ static void ov21_021E5CF8 (UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80
     }
 }
 
-static void ov21_021E5D90 (UnkStruct_02022550 * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2)
+static void ov21_021E5D90 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2)
 {
     int v0;
 
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 5402e808d4..19515ef9c6 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -55,7 +55,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_02022550 * unk_10;
+    GraphicElementData * unk_10;
 } UnkStruct_ov21_021E6274;
 
 static UnkStruct_ov21_021E6104 * ov21_021E608C(int param0, UnkStruct_ov21_021D0F60 * param1);
@@ -88,9 +88,9 @@ static void ov21_021E6600(UnkStruct_ov21_021E6118 * param0, int param1);
 static void ov21_021E66B0(UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1, int param2);
 static void ov21_021E67C8(UnkStruct_ov21_021E6118 * param0, const UnkStruct_ov21_021E6104 * param1);
 static void ov21_021E6844(UnkStruct_ov21_021E6118 * param0);
-static void ov21_021E6860(UnkStruct_02022550 * param0, short param1);
+static void ov21_021E6860(GraphicElementData * param0, short param1);
 static void ov21_021E687C(Sprite * param0, short param1);
-static void ov21_021E688C(UnkStruct_02022550 * param0, short param1);
+static void ov21_021E688C(GraphicElementData * param0, short param1);
 static void ov21_021E68B0(Sprite * param0, short param1);
 
 void ov21_021E6014 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2)
@@ -545,7 +545,7 @@ static void ov21_021E6844 (UnkStruct_ov21_021E6118 * param0)
     sub_02008780(v0);
 }
 
-static void ov21_021E6860 (UnkStruct_02022550 * param0, short param1)
+static void ov21_021E6860 (GraphicElementData * param0, short param1)
 {
     VecFx32 v0;
 
@@ -560,7 +560,7 @@ static void ov21_021E687C (Sprite * param0, short param1)
     sub_02007DEC(param0, 1, 88 + param1);
 }
 
-static void ov21_021E688C (UnkStruct_02022550 * param0, short param1)
+static void ov21_021E688C (GraphicElementData * param0, short param1)
 {
     VecFx32 v0;
 
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index e24c0ef98a..35ab79c4ba 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -67,10 +67,10 @@ typedef struct {
 } UnkStruct_ov21_021E6DAC;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[2];
+    GraphicElementData * unk_00[2];
     UnkStruct_ov21_021D4CA0 * unk_08[2];
     UnkStruct_02009DC8 * unk_10[4];
-    UnkStruct_02022550 * unk_20[4];
+    GraphicElementData * unk_20[4];
     int unk_30[2];
     void * unk_38[2];
 } UnkStruct_ov21_021E6C60;
@@ -97,8 +97,8 @@ static void ov21_021E6DAC(UnkStruct_ov21_021E6DAC * param0);
 static void ov21_021E6DBC(UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1);
 static void ov21_021E6DEC(UnkStruct_ov21_021E6DAC * param0);
 static void ov21_021E6E04(u32 param0, u32 param1, void * param2);
-static void ov21_021E71D0(UnkStruct_ov21_021E6A34 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
-static void ov21_021E727C(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+static void ov21_021E71D0(UnkStruct_ov21_021E6A34 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
+static void ov21_021E727C(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 static void ov21_021E728C(UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, const UnkStruct_ov21_021E6DAC * param2, int param3);
 static void ov21_021E72E8(UnkStruct_ov21_021E6DAC * param0, UnkStruct_ov21_021E6A20 * param1);
 static void ov21_021E732C(UnkStruct_ov21_021E6A34 * param0, const UnkStruct_ov21_021E6A20 * param1);
@@ -660,7 +660,7 @@ static void ov21_021E71B8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
     }
 }
 
-static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
+static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
 {
     int v0;
     NNSG2dPaletteData * v1;
@@ -710,7 +710,7 @@ static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, UnkStruct_02022550
     }
 }
 
-static void ov21_021E727C (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E727C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index d22fd668af..dfc8b7bd5f 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -81,10 +81,10 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02015214 * unk_00;
-    UnkStruct_02022550 * unk_04;
-    UnkStruct_02022550 * unk_08;
-    UnkStruct_02022550 * unk_0C;
-    UnkStruct_02022550 * unk_10;
+    GraphicElementData * unk_04;
+    GraphicElementData * unk_08;
+    GraphicElementData * unk_0C;
+    GraphicElementData * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -97,10 +97,10 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02015214 * unk_00;
-    UnkStruct_02022550 * unk_04;
-    UnkStruct_02022550 * unk_08;
-    UnkStruct_02022550 * unk_0C;
-    UnkStruct_02022550 * unk_10;
+    GraphicElementData * unk_04;
+    GraphicElementData * unk_08;
+    GraphicElementData * unk_0C;
+    GraphicElementData * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -108,7 +108,7 @@ typedef struct {
 } UnkStruct_ov21_021E81F8;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     fx32 unk_04;
     fx32 unk_08;
     s16 unk_0C;
@@ -119,10 +119,10 @@ typedef struct {
 } UnkStruct_ov21_021E82C8;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
-    UnkStruct_02022550 * unk_04;
-    UnkStruct_02022550 * unk_08;
-    UnkStruct_02022550 * unk_0C[2];
+    GraphicElementData * unk_00;
+    GraphicElementData * unk_04;
+    GraphicElementData * unk_08;
+    GraphicElementData * unk_0C[2];
     UnkStruct_02009DC8 * unk_14[4];
     UnkStruct_02009DC8 * unk_24[4];
     const UnkStruct_ov21_021E9DB0 * unk_34;
@@ -167,7 +167,7 @@ static void ov21_021E7F20(UnkStruct_ov21_021E747C * param0);
 static void ov21_021E7F40(UnkStruct_ov21_021E747C * param0, int param1);
 static void ov21_021E7F7C(UnkStruct_ov21_021E747C * param0);
 static const UnkStruct_ov21_021E9DB0 * ov21_021E83D8(const UnkStruct_ov21_021E9DB0 * param0, int param1, int param2);
-static void ov21_021E80D4(UnkStruct_02015214 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, UnkStruct_02022550 * param3, UnkStruct_02022550 * param4, u16 param5);
+static void ov21_021E80D4(UnkStruct_02015214 * param0, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5);
 static void ov21_021E7F88(UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, int param2);
 static void ov21_021E7FD0(SysTask * param0, void * param1);
 static void ov21_021E8084(UnkStruct_ov21_021E8084 * param0);
@@ -909,7 +909,7 @@ static void ov21_021E8084 (UnkStruct_ov21_021E8084 * param0)
     ov21_021E80D4(param0->unk_00, param0->unk_04, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_1C);
 }
 
-static void ov21_021E80D4 (UnkStruct_02015214 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, UnkStruct_02022550 * param3, UnkStruct_02022550 * param4, u16 param5)
+static void ov21_021E80D4 (UnkStruct_02015214 * param0, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5)
 {
     fx32 v0, v1;
     VecFx32 v2;
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 0e0ebbea7d..f503ce2a78 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -67,10 +67,10 @@ typedef struct {
 } UnkStruct_ov21_021E88B0;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[1];
+    GraphicElementData * unk_00[1];
     UnkStruct_ov21_021D4CA0 * unk_04[1];
     UnkStruct_02009DC8 * unk_08[4];
-    UnkStruct_02022550 * unk_18[4];
+    GraphicElementData * unk_18[4];
     int unk_28[1];
     void * unk_2C[1];
 } UnkStruct_ov21_021E8794;
@@ -97,8 +97,8 @@ static void ov21_021E88B0(UnkStruct_ov21_021E88B0 * param0);
 static void ov21_021E88B8(UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1);
 static void ov21_021E88D0(UnkStruct_ov21_021E88B0 * param0);
 static void ov21_021E88E8(u32 param0, u32 param1, void * param2);
-static void ov21_021E8BE8(UnkStruct_ov21_021E8584 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
-static void ov21_021E8C94(UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+static void ov21_021E8BE8(UnkStruct_ov21_021E8584 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10);
+static void ov21_021E8C94(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 static void ov21_021E8CBC(UnkStruct_ov21_021E8584 * param0, UnkStruct_ov21_021E8794 * param1, const UnkStruct_ov21_021E88B0 * param2, int param3);
 static void ov21_021E8D3C(const UnkStruct_ov21_021E8570 * param0);
 static void ov21_021E8CF0(UnkStruct_ov21_021E88B0 * param0, UnkStruct_ov21_021E8570 * param1);
@@ -612,7 +612,7 @@ static void ov21_021E8BDC (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
     }
 }
 
-static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, UnkStruct_02022550 * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
+static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData * param1, UnkStruct_ov21_021D4CA0 * param2, int param3, int param4, int param5, int * param6, int param7, int param8, int param9, void ** param10)
 {
     int v0;
     NNSG2dPaletteData * v1;
@@ -662,7 +662,7 @@ static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, UnkStruct_02022550
     }
 }
 
-static void ov21_021E8C94 (UnkStruct_02022550 * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E8C94 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     int v0;
 
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 87b88bf0b2..6ab690b8ed 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -57,17 +57,17 @@
 #include "overlay021/ov21_021E8D48.h"
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_02009DC8 * unk_04[4];
 } UnkStruct_ov21_021E94F8;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_ov21_021D4CA0 * unk_04;
 } UnkStruct_ov21_021E95B0;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[2];
+    GraphicElementData * unk_00[2];
     UnkStruct_02009DC8 * unk_08[4];
 } UnkStruct_ov21_021E968C;
 
@@ -85,7 +85,7 @@ typedef struct UnkStruct_ov21_021E8D48_t {
     PaletteSys * unk_08;
     Sprite * unk_0C;
     UnkStruct_0200C738 unk_10;
-    UnkStruct_020218BC * unk_19C;
+    GraphicElementManager * unk_19C;
     UnkStruct_02009714 * unk_1A0[4];
     UnkStruct_ov21_021D4C0C * unk_1B0;
     UnkStruct_ov21_021D22F8 unk_1B4;
@@ -121,15 +121,15 @@ static void ov21_021E93C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** pa
 static void ov21_021E93F8(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3);
 static void ov21_021E9458(UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1, int param2, int param3);
 static void ov21_021E94A4(UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714 ** param1);
-static void ov21_021E94B0(UnkStruct_ov21_021E94F8 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3);
+static void ov21_021E94B0(UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3);
 static void ov21_021E94F8(UnkStruct_ov21_021E94F8 * param0);
-static void ov21_021E9504(UnkStruct_ov21_021E95B0 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4);
+static void ov21_021E9504(UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4);
 static void ov21_021E9554(UnkStruct_ov21_021E95B0 * param0);
 static void ov21_021E9560(UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, UnkStruct_02009DC8 * param4);
 static void ov21_021E95B0(UnkStruct_ov21_021E95B0 * param0);
 static void ov21_021E95BC(UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1, int param2, int param3, NARC * param4);
 static void ov21_021E95EC(UnkStruct_ov21_021E968C * param0, UnkStruct_02009714 ** param1);
-static void ov21_021E95F8(UnkStruct_ov21_021E968C * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, int param4);
+static void ov21_021E95F8(UnkStruct_ov21_021E968C * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4);
 static void ov21_021E968C(UnkStruct_ov21_021E968C * param0);
 static void ov21_021E96A8(BGL * param0, int param1, NARC * param2);
 static void ov21_021E97C4(BGL * param0, int param1, NARC * param2);
@@ -509,7 +509,7 @@ static void ov21_021E94A4 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714
     ov21_021E93C4(param0->unk_04, param1);
 }
 
-static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3)
+static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3)
 {
     UnkStruct_ov83_0223D9A8 v0;
     UnkStruct_ov19_021DA864 v1;
@@ -533,7 +533,7 @@ static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0)
     sub_02021BD4(param0->unk_00);
 }
 
-static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
+static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
 {
     UnkStruct_ov83_0223D9A8 v0;
     UnkStruct_ov19_021DA864 v1;
@@ -597,7 +597,7 @@ static void ov21_021E95EC (UnkStruct_ov21_021E968C * param0, UnkStruct_02009714
     ov21_021E93C4(param0->unk_08, param1);
 }
 
-static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, int param4)
+static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
     UnkStruct_ov83_0223D9A8 v0;
     UnkStruct_ov19_021DA864 v1;
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 2b14fcf7cc..321b4119bb 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -156,7 +156,7 @@ void ov22_022551D0 (UnkStruct_ov22_0225A0E4 * param0)
     sub_020151EC(param0->unk_00);
 }
 
-UnkStruct_02022550 * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
+GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index 07dfbbdce1..d86f8b4f76 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -110,7 +110,7 @@ typedef struct {
     int unk_72C;
     int unk_730;
     UnkStruct_02095C60 * unk_734;
-    const UnkStruct_020279FC * unk_738;
+    const AnimationControlFlags * unk_738;
     u32 unk_73C;
     Strbuf* unk_740;
     UnkStruct_0200B358 * unk_744;
@@ -155,8 +155,8 @@ static void ov22_02256B04(UnkStruct_ov22_02259C58 * param0, void * param1);
 static void ov22_02256B24(UnkStruct_ov22_02259C58 * param0, void * param1);
 static void ov22_02256B44(UnkStruct_ov22_02259C58 * param0, void * param1);
 static void ov22_02256B78(UnkStruct_ov22_02259C58 * param0, void * param1);
-static void ov22_02256BAC(UnkStruct_ov22_02255D44 * param0, const UnkStruct_020279FC * param1);
-static void ov22_02256BF4(UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const UnkStruct_020279FC * param4);
+static void ov22_02256BAC(UnkStruct_ov22_02255D44 * param0, const AnimationControlFlags * param1);
+static void ov22_02256BF4(UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const AnimationControlFlags * param4);
 static void ov22_02256C38(UnkStruct_ov22_02255D44 * param0);
 static void ov22_02256C48(UnkStruct_ov22_02255D44 * param0, BOOL * param1);
 static void ov22_02256C70(SysTask * param0, void * param1);
@@ -935,7 +935,7 @@ static void ov22_02256B78 (UnkStruct_ov22_02259C58 * param0, void * param1)
     }
 }
 
-static void ov22_02256BAC (UnkStruct_ov22_02255D44 * param0, const UnkStruct_020279FC * param1)
+static void ov22_02256BAC (UnkStruct_ov22_02255D44 * param0, const AnimationControlFlags * param1)
 {
     UnkStruct_ov22_02256BAC v0;
 
@@ -951,7 +951,7 @@ static void ov22_02256BAC (UnkStruct_ov22_02255D44 * param0, const UnkStruct_020
     ov22_0225A428(&param0->unk_5C4, &v0, (1 | 2 | 4 | 8));
 }
 
-static void ov22_02256BF4 (UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const UnkStruct_020279FC * param4)
+static void ov22_02256BF4 (UnkStruct_ov22_02255D44 * param0, int param1, int param2, UnkStruct_02095C60 * param3, const AnimationControlFlags * param4)
 {
     UnkStruct_ov22_02256BAC v0;
     BOOL v1;
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 6277925dba..74b8e6d737 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -41,7 +41,7 @@
 #include "overlay022/ov22_0225A428.h"
 
 static void ov22_0225A6E0(UnkStruct_ov22_022597BC * param0, BGL * param1);
-static void ov22_0225A718(BGL * param0, const UnkStruct_020279FC * param1);
+static void ov22_0225A718(BGL * param0, const AnimationControlFlags * param1);
 static void ov22_0225A748(Window ** param0, BGL * param1, int param2, int param3, int param4, int param5, int param6, BOOL param7);
 static void ov22_0225A7B8(UnkStruct_ov22_022597BC * param0);
 static void ov22_0225A7C0(Window * param0);
@@ -49,10 +49,10 @@ static s32 ov22_0225A7CC(Window * param0, int param1, int param2, int param3, in
 static s32 ov22_0225A814(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, Strbuf **param7);
 static s32 ov22_0225A860(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7);
 static s32 ov22_0225A8B4(Window * param0, int param1, int param2, int param3, int param4, int param5, u32 param6, u32 param7, Strbuf **param8);
-static void ov22_0225A914(UnkStruct_ov22_0225A914 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4);
+static void ov22_0225A914(UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4);
 static void ov22_0225A9C8(UnkStruct_ov22_0225A914 * param0, int param1);
 static void ov22_0225AA10(UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714 ** param1);
-static void ov22_0225AB54(UnkStruct_ov22_0225AB54 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6);
+static void ov22_0225AB54(UnkStruct_ov22_0225AB54 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6);
 static void ov22_0225AC58(UnkStruct_ov22_0225AB54 * param0, UnkStruct_02009714 ** param1);
 static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 * param0);
 static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 * param0);
@@ -202,7 +202,7 @@ static void ov22_0225A6E0 (UnkStruct_ov22_022597BC * param0, BGL * param1)
     ov22_022597BC(param0, &v0);
 }
 
-static void ov22_0225A718 (BGL * param0, const UnkStruct_020279FC * param1)
+static void ov22_0225A718 (BGL * param0, const AnimationControlFlags * param1)
 {
     int v0 = sub_02027B50(param1);
 
@@ -292,7 +292,7 @@ static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, i
     return v1;
 }
 
-static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
+static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
@@ -385,7 +385,7 @@ static void ov22_0225AAF4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p
     sub_020093B4(param2, sub_02009E08(param0[0]), sub_02009E08(param0[1]), sub_02009E08(param0[2]), sub_02009E08(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL);
 }
 
-static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_020218BC * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
+static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index 06e6037413..6896ede20c 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -46,7 +46,7 @@ typedef struct {
     u32 unk_0C;
     UnkStruct_ov22_0225B1BC * unk_10;
     UnkStruct_ov22_0225A0E4 unk_14;
-    UnkStruct_02022550 * unk_1FC;
+    GraphicElementData * unk_1FC;
     Window * unk_200;
 } UnkStruct_ov22_0225B85C;
 
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 6915fd05b6..154d214429 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -150,15 +150,15 @@ typedef struct {
     UnkStruct_0203CDB0 * unk_00;
     BGL * unk_04;
     MATHRandContext32 unk_08;
-    UnkStruct_020218BC * unk_20;
+    GraphicElementManager * unk_20;
     UnkStruct_0200C738 unk_24;
     UnkStruct_02009714 * unk_1B0[4];
     UnkStruct_02009DC8 * unk_1C0[8];
     UnkStruct_ov19_021DA864 unk_1E0;
     UnkStruct_ov19_021DA864 unk_204[2];
-    UnkStruct_02022550 * unk_24C[8];
+    GraphicElementData * unk_24C[8];
     UnkStruct_ov23_0223E6F8 unk_26C[250];
-    UnkStruct_02001AF4 * unk_848;
+    UIControlData * unk_848;
     UnkStruct_ov23_0223E6F8 * unk_84C[8];
     u8 unk_86C[8];
     UnkStruct_ov23_0223FC9C unk_874[8];
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index c229213b4e..34d1cfced1 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -121,14 +121,14 @@ typedef struct {
     UnkStruct_ov23_02248A6C * unk_00[8];
     SysTask * unk_20[8];
     UnkStruct_0203CDB0 * unk_40;
-    UnkStruct_020218BC * unk_44;
+    GraphicElementManager * unk_44;
     UnkStruct_0200C738 unk_48;
     UnkStruct_02009714 * unk_1D4[2][4];
     UnkStruct_02009DC8 * unk_1F4[2][4];
     UnkStruct_ov19_021DA864 unk_214;
     UnkStruct_ov19_021DA864 unk_238;
-    UnkStruct_02022550 * unk_25C[32];
-    UnkStruct_02022550 * unk_2DC[4];
+    GraphicElementData * unk_25C[32];
+    GraphicElementData * unk_2DC[4];
     UnkStruct_020508D4 * unk_2EC;
     SysTask * unk_2F0;
     SysTask * unk_2F4;
diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c
index 00a0599054..d8d1463591 100644
--- a/src/overlay023/ov23_02248C08.c
+++ b/src/overlay023/ov23_02248C08.c
@@ -39,7 +39,7 @@ UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 p
         v0->unk_1D = param3;
 
         {
-            UnkStruct_02013A04 * v1 = sub_02013A04(param0->unk_10, v0->unk_1D);
+            ResourceMetadata * v1 = sub_02013A04(param0->unk_10, v0->unk_1D);
             int v2;
 
             for (v2 = 0; v2 < param0->unk_10; v2++) {
@@ -89,7 +89,7 @@ u32 ov23_02248D20 (UnkStruct_ov23_02248D20 * param0)
     u16 v1, v2, v3;
     int v4, v5;
     u32 v6;
-    UnkStruct_02013A04 * v7;
+    ResourceMetadata * v7;
 
     if (param0->unk_00) {
         int v8 = sub_02001504(v0, 2);
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 85e3128806..3ec0255cdb 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -57,13 +57,13 @@ struct UnkStruct_ov23_0224942C_t {
     int unk_A4[17][4];
     UnkStruct_0203CDB0 * unk_1B4;
     BGL * unk_1B8;
-    UnkStruct_020218BC * unk_1BC;
+    GraphicElementManager * unk_1BC;
     UnkStruct_0200C738 unk_1C0;
     UnkStruct_02009714 * unk_34C[4];
     UnkStruct_02009DC8 * unk_35C[4];
     UnkStruct_ov19_021DA864 unk_36C;
-    UnkStruct_02022550 * unk_390[8];
-    UnkStruct_02022550 * unk_3B0[17];
+    GraphicElementData * unk_390[8];
+    GraphicElementData * unk_3B0[17];
     Window unk_3F4;
     int unk_404;
     int unk_408;
@@ -77,7 +77,7 @@ static void ov23_0224944C(BGL * param0, Window * param1);
 static void ov23_02249584(UnkStruct_ov23_0224942C * param0);
 static void ov23_02249214(UnkStruct_0205E884 * const param0, int param1[][2], int param2[][3]);
 static void ov23_022491CC(int param0[][2], int param1[][3]);
-static void ov23_022492C8(int param0[][3], UnkStruct_02022550 * param1[]);
+static void ov23_022492C8(int param0[][3], GraphicElementData * param1[]);
 static void ov23_0224944C(BGL * param0, Window * param1);
 static void ov23_02249438(BGL * param0);
 static void ov23_0224966C(BGL * param0, Window * param1, int * param2, int * param3, int * param4, UnkStruct_ov23_02249724 * param5);
@@ -86,7 +86,7 @@ static void ov23_02249778(UnkStruct_ov23_02249724 * param0);
 static int ov23_02249844(UnkStruct_ov23_02249724 * param0, Strbuf *param1);
 static Strbuf* ov23_022498C4(UnkStruct_ov23_02249724 * param0);
 static int ov23_02249900(UnkStruct_ov23_02249724 * param0);
-static void ov23_0224937C(int param0[][4], UnkStruct_02022550 * param1[]);
+static void ov23_0224937C(int param0[][4], GraphicElementData * param1[]);
 static void ov23_02249334(int param0[][4]);
 
 static UnkStruct_ov23_0224942C * Unk_ov23_02257768;
@@ -254,7 +254,7 @@ static void ov23_02249214 (UnkStruct_0205E884 * const param0, int param1[][2], i
     }
 }
 
-static void ov23_022492C8 (int param0[][3], UnkStruct_02022550 * param1[])
+static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[])
 {
     int v0;
 
@@ -295,7 +295,7 @@ static void ov23_02249334 (int param0[][4])
     }
 }
 
-static void ov23_0224937C (int param0[][4], UnkStruct_02022550 * param1[])
+static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
 {
     int v0;
 
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 3fa397fd38..81cb7c6e6c 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -126,7 +126,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_0203CDB0 * unk_00;
-    UnkStruct_02001AF4 * unk_04;
+    UIControlData * unk_04;
     SysTask * unk_08;
     int unk_0C;
     int unk_10;
@@ -147,7 +147,7 @@ typedef struct {
 typedef struct {
     UnkStruct_0203CDB0 * unk_00;
     SysTask * unk_04;
-    UnkStruct_02001AF4 * unk_08;
+    UIControlData * unk_08;
     int unk_0C;
     u8 unk_10;
     u8 unk_11;
@@ -1013,11 +1013,11 @@ static int ov23_0224BD1C (int param0, BOOL param1)
     return v1;
 }
 
-static UnkStruct_02001AF4 * ov23_0224BD90 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4)
+static UIControlData * ov23_0224BD90 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4)
 {
     UnkStruct_02081CF4 v0;
     MessageLoader * v1 = ov23_02253E3C(ov23_0224219C());
-    UnkStruct_02013A04 * v2;
+    ResourceMetadata * v2;
 
     v2 = sub_02013A04(2, param4);
 
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index 5f6249c909..e811415070 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -67,9 +67,9 @@ typedef struct {
     UnkStruct_ov23_02250CD4 * unk_04;
     UnkStruct_0203CDB0 * unk_08;
     Window unk_0C;
-    UnkStruct_02013A04 * unk_1C;
+    ResourceMetadata * unk_1C;
     UnkStruct_0200112C * unk_20;
-    UnkStruct_02001AF4 * unk_24;
+    UIControlData * unk_24;
     UnkStruct_ov23_0224F184 unk_28;
     UnkFuncPtr_ov23_0224DCB8 unk_2C;
     u16 unk_30;
@@ -89,9 +89,9 @@ typedef struct {
     SysTask * unk_00;
     UnkStruct_0203CDB0 * unk_04;
     Window unk_08;
-    UnkStruct_02013A04 * unk_18;
+    ResourceMetadata * unk_18;
     UnkStruct_0200112C * unk_1C;
-    UnkStruct_02001AF4 * unk_20;
+    UIControlData * unk_20;
     UnkStruct_ov23_0224F184 unk_24;
     UnkFuncPtr_ov23_0224DCB8 unk_28;
     u16 unk_2C;
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index dba63a2f52..23aa4a07bd 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -82,10 +82,10 @@ typedef struct {
 
 static void ov23_0224F460(UnkStruct_ov23_02250CD4 * param0);
 static void ov23_0224F498(UnkStruct_ov23_02250CD4 * param0);
-static void ov23_0224F4D0(UnkStruct_02022550 * param0, u32 param1);
-static void ov23_0224F500(UnkStruct_02022550 * param0, u16 param1, u16 param2);
+static void ov23_0224F4D0(GraphicElementData * param0, u32 param1);
+static void ov23_0224F500(GraphicElementData * param0, u16 param1, u16 param2);
 static void ov23_0224F52C(UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2);
-static void ov23_0224F560(UnkStruct_02022550 * param0);
+static void ov23_0224F560(GraphicElementData * param0);
 static void ov23_0224F914(SysTask * param0, void * param1);
 static BOOL ov23_0224FA58(SysTask * param0, void * param1);
 static void ov23_0224FE38(UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_02248D20 param1);
@@ -250,7 +250,7 @@ static void ov23_0224F498 (UnkStruct_ov23_02250CD4 * param0)
     }
 }
 
-static void ov23_0224F4D0 (UnkStruct_02022550 * param0, u32 param1)
+static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1)
 {
     VecFx32 v0;
 
@@ -260,7 +260,7 @@ static void ov23_0224F4D0 (UnkStruct_02022550 * param0, u32 param1)
     sub_02021C50(param0, &v0);
 }
 
-static void ov23_0224F500 (UnkStruct_02022550 * param0, u16 param1, u16 param2)
+static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2)
 {
     u32 v0 = sub_02021E24(param0);
 
@@ -274,7 +274,7 @@ static void ov23_0224F52C (UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 par
     ov23_0224F500(param0->unk_23C[1 + param2]->unk_00, 1, 1);
 }
 
-static void ov23_0224F560 (UnkStruct_02022550 * param0)
+static void ov23_0224F560 (GraphicElementData * param0)
 {
     if ((sub_02021E24(param0) % 3) != 1) {
         return;
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index eb58bef672..22aeda595d 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -73,7 +73,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_0203CDB0 * unk_04;
-    UnkStruct_02001AF4 * unk_08;
+    UIControlData * unk_08;
     UnkStruct_ov23_022513B0 unk_0C;
     SysTask * unk_10;
 } UnkStruct_ov23_02252038;
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index 4315b996ee..680c033ca5 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -46,7 +46,7 @@ typedef struct {
     UnkFuncPtr_ov23_02253834 unk_00;
     void * unk_04;
     Window unk_08;
-    UnkStruct_02013A04 * unk_18;
+    ResourceMetadata * unk_18;
     UnkStruct_0200112C * unk_1C;
     UnkFuncPtr_ov23_0224DCB8 unk_20;
     u16 unk_24;
diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c
index ae938c829e..ca665b48bb 100644
--- a/src/overlay023/ov23_022542CC.c
+++ b/src/overlay023/ov23_022542CC.c
@@ -38,7 +38,7 @@ typedef struct UnkStruct_ov23_022542D8_t {
     UnkStruct_0203CDB0 * unk_00;
     Window unk_04;
     Window unk_14;
-    UnkStruct_02013A04 * unk_24;
+    ResourceMetadata * unk_24;
     UnkStruct_0200112C * unk_28;
     Strbuf* unk_2C;
     u16 * unk_30;
@@ -53,7 +53,7 @@ typedef struct UnkStruct_ov23_02254594_t {
     UnkStruct_0206A844 * unk_04;
     Window unk_08;
     Window unk_18;
-    UnkStruct_02013A04 * unk_28;
+    ResourceMetadata * unk_28;
     UnkStruct_ov23_02248D20 * unk_2C;
     UnkStruct_0200112C * unk_30;
     Strbuf* unk_34;
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index c6d6c18468..9c2700a5ff 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -87,12 +87,12 @@ struct UnkStruct_ov56_02256468_t {
     MessageLoader * unk_1C;
     u16 * unk_20;
     NNSG2dScreenData * unk_24;
-    UnkStruct_020218BC * unk_28;
+    GraphicElementManager * unk_28;
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[4];
     UnkStruct_02009DC8 * unk_1C8[4];
     UnkStruct_ov19_021DA864 unk_1D8;
-    UnkStruct_02022550 * unk_1FC[8];
+    GraphicElementData * unk_1FC[8];
     int unk_21C;
     int unk_220;
     int unk_224;
@@ -123,7 +123,7 @@ static void ov56_022568E0(UnkStruct_ov56_02256468 * param0);
 static void ov56_022567FC(UnkStruct_ov56_02256468 * param0, int param1, UnkStruct_0205C924 * param2);
 static void ov56_02256D04(UnkStruct_ov56_02256468 * param0);
 static void ov56_022569E0(UnkStruct_ov56_02256468 * param0);
-static void ov56_02256994(UnkStruct_02022550 * param0, int param1);
+static void ov56_02256994(GraphicElementData * param0, int param1);
 static void ov56_02257098(UnkStruct_ov56_02256468 * param0);
 static void ov56_02256EE8(UnkStruct_ov56_02256468 * param0, u32 param1, Sentence * param2, TrainerInfo * param3);
 static int ov56_02256FC8(UnkStruct_ov56_02256468 * param0, Sentence * param1, int param2);
@@ -534,7 +534,7 @@ static const UnkUnion_02022594 Unk_ov56_02257250[] = {
     {0xff, 0x0, 0x0, 0x0}
 };
 
-static void ov56_02256994 (UnkStruct_02022550 * param0, int param1)
+static void ov56_02256994 (GraphicElementData * param0, int param1)
 {
     VecFx32 v0;
 
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 546f06a9b6..129f85efb4 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -86,7 +86,7 @@ static void ov58_021D1554(UnkStruct_02095EAC * param0, NARC * param1);
 static void ov58_021D16D8(UnkStruct_02095EAC * param0);
 static void ov58_021D18AC(UnkStruct_02095EAC * param0, UnkStruct_020067E8 * param1);
 static void ov58_021D19D4(UnkStruct_02095EAC * param0);
-static void ov58_021D1A10(UnkStruct_02022550 * param0, int param1, int param2);
+static void ov58_021D1A10(GraphicElementData * param0, int param1, int param2);
 static void ov58_021D1A80(UnkStruct_02095EAC * param0);
 static int ov58_021D1CF4(UnkStruct_02095EAC * param0, int param1);
 static void ov58_021D1D40(UnkStruct_02095EAC * param0);
@@ -124,8 +124,8 @@ static int ov58_021D2A30(void);
 static int ov58_021D1DBC(UnkStruct_02095EAC * param0, int param1);
 static int ov58_021D1D64(UnkStruct_02095EAC * param0, int param1);
 static int ov58_021D1DC8(UnkStruct_02095EAC * param0, int param1);
-static void ov58_021D1CAC(UnkStruct_02022550 ** param0, int param1);
-static void ov58_021D1CDC(UnkStruct_02022550 ** param0, BOOL param1);
+static void ov58_021D1CAC(GraphicElementData ** param0, int param1);
+static void ov58_021D1CDC(GraphicElementData ** param0, BOOL param1);
 static void ov58_021D2528(Window * param0, void * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov58_021D2B3C(UnkStruct_02095EAC * param0, int param1);
 static int ov58_021D2B5C(UnkStruct_02095EAC * param0);
@@ -775,7 +775,7 @@ static void ov58_021D19D4 (UnkStruct_02095EAC * param0)
     BGL_DeleteWindow(&param0->unk_33C);
 }
 
-static void ov58_021D1A10 (UnkStruct_02022550 * param0, int param1, int param2)
+static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -908,7 +908,7 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
     }
 }
 
-static void ov58_021D1CAC (UnkStruct_02022550 ** param0, int param1)
+static void ov58_021D1CAC (GraphicElementData ** param0, int param1)
 {
     int v0;
 
@@ -921,7 +921,7 @@ static void ov58_021D1CAC (UnkStruct_02022550 ** param0, int param1)
     }
 }
 
-static void ov58_021D1CDC (UnkStruct_02022550 ** param0, BOOL param1)
+static void ov58_021D1CDC (GraphicElementData ** param0, BOOL param1)
 {
     if (param1 == 1) {
         sub_02021D6C(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c
index 33219d89c6..fe295ece55 100644
--- a/src/overlay061/ov61_0222BF44.c
+++ b/src/overlay061/ov61_0222BF44.c
@@ -77,13 +77,13 @@ typedef struct {
     Window unk_54;
     Window unk_64;
     Window unk_74;
-    UnkStruct_02001AF4 * unk_84;
+    UIControlData * unk_84;
     void * unk_88;
     int unk_8C;
     int unk_90;
     int unk_94;
     int unk_98;
-    UnkStruct_02013A04 * unk_9C;
+    ResourceMetadata * unk_9C;
     UnkStruct_0200112C * unk_A0;
     UnkStruct_ov61_0222C3B0 unk_A4;
 } UnkStruct_ov61_0222C664;
@@ -104,7 +104,7 @@ static void ov61_0222C7F8(UnkStruct_ov61_0222C664 * param0, int param1, int para
 static int ov61_0222C834(int param0);
 static void ov61_0222C850(UnkStruct_ov61_0222C664 * param0);
 static void ov61_0222C86C(UnkStruct_ov61_0222C664 * param0);
-static UnkStruct_02001AF4 * ov61_0222C884(BGL * param0, int param1, int param2);
+static UIControlData * ov61_0222C884(BGL * param0, int param1, int param2);
 static void ov61_0222C8B8(UnkStruct_ov61_0222C664 * param0, MessageLoader * param1, int param2, int param3, u16 param4);
 static void ov61_0222C920(UnkStruct_ov61_0222C664 * param0, int param1, int param2);
 static BOOL ov61_0222C928(int param0, int param1);
@@ -560,7 +560,7 @@ static void ov61_0222C86C (UnkStruct_ov61_0222C664 * param0)
     }
 }
 
-static UnkStruct_02001AF4 * ov61_0222C884 (BGL * param0, int param1, int param2)
+static UIControlData * ov61_0222C884 (BGL * param0, int param1, int param2)
 {
     UnkStruct_ov61_0222C884 v0;
 
diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c
index f74bca24d3..7a12cf4757 100644
--- a/src/overlay062/ov62_022300D8.c
+++ b/src/overlay062/ov62_022300D8.c
@@ -50,8 +50,8 @@ void ov62_022300D8 (UnkStruct_0208C06C * param0)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
 
     if (param0->unk_00 == 0) {
@@ -81,8 +81,8 @@ void ov62_022302A8 (UnkStruct_0208C06C * param0, int param1, BOOL param2)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
     int v5 = 2;
 
@@ -98,8 +98,8 @@ void ov62_022302F0 (UnkStruct_0208C06C * param0, int param1)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
     int v5 = 1;
 
@@ -111,8 +111,8 @@ void ov62_02230330 (UnkStruct_0208C06C * param0)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
 
     if (param0->unk_00 == 0) {
@@ -134,8 +134,8 @@ void ov62_02230330 (UnkStruct_0208C06C * param0)
 void ov62_02230464 (UnkStruct_0208C06C * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v2 = param0->unk_14.unk_08;
+    CellTransferStateData * v1 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v2 = param0->unk_14.unk_08;
     PaletteSys * v3 = param0->unk_14.unk_14;
 
     v0.unk_00 = 0;
@@ -256,8 +256,8 @@ void ov62_022306B8 (UnkStruct_0208C06C * param0)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
     int v5;
     int v6;
@@ -353,8 +353,8 @@ void ov62_0223088C (UnkStruct_0208C06C * param0)
     int v0;
     UnkStruct_ov62_022307C0 * v1 = &param0->unk_534;
     UnkStruct_ov104_0223F9E0 v2;
-    UnkStruct_0200C6E4 * v3 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v4 = param0->unk_14.unk_08;
+    CellTransferStateData * v3 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v4 = param0->unk_14.unk_08;
     PaletteSys * v5 = param0->unk_14.unk_14;
 
     v2.unk_00 = 42;
@@ -825,8 +825,8 @@ void ov62_022312CC (UnkStruct_0208C06C * param0, int param1)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
 
     sub_0200CC3C(v2, v3, v0, 49, 0, param1, 11924);
@@ -838,8 +838,8 @@ void ov62_0223131C (UnkStruct_0208C06C * param0, int param1)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
 
     sub_0200CC3C(v2, v3, v0, 122, 0, param1, 11924);
@@ -851,8 +851,8 @@ void ov62_0223136C (UnkStruct_0208C06C * param0, int param1)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
     int v5 = 30;
     int v6 = 32;
diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c
index 9bef31e065..31c8ad8cb3 100644
--- a/src/overlay062/ov62_02231690.c
+++ b/src/overlay062/ov62_02231690.c
@@ -138,8 +138,8 @@ int ov62_02231710 (UnkStruct_0208C06C * param0, int param1)
 void ov62_022317CC (UnkStruct_0208C06C * param0, int param1)
 {
     PaletteSys * v0 = param0->unk_14.unk_14;
-    UnkStruct_0200C6E4 * v1 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v2 = param0->unk_14.unk_08;
+    CellTransferStateData * v1 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v2 = param0->unk_14.unk_08;
     NARC * v3 = param0->unk_14.unk_00;
 
     PaletteSys_LoadPalette(v0, 162, ov62_02231710(param0, 3), 102, 0, 0x20 * (8 + 1), 0);
@@ -832,8 +832,8 @@ static void ov62_022320EC (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C
     int v2;
     int v3;
     u8 v4;
-    UnkStruct_0200C6E4 * v5;
-    UnkStruct_0200C704 * v6;
+    CellTransferStateData * v5;
+    AnimationResourceCollection * v6;
     PaletteSys * v7;
     UnkStruct_ov104_0223F9E0 v8;
 
@@ -948,8 +948,8 @@ int ov62_02232234 (int param0, int param1)
 static void ov62_0223226C (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C06C * param1)
 {
     int v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     UnkStruct_ov104_0223F9E0 v4;
     int v5 = 13;
@@ -2251,8 +2251,8 @@ void ov62_0223331C (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * param
     UnkStruct_ov104_0223F9E0 v1;
     NARC * v2 = param1->unk_14.unk_00;
     BGL * v3 = param1->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v4 = param1->unk_14.unk_04;
-    UnkStruct_0200C704 * v5 = param1->unk_14.unk_08;
+    CellTransferStateData * v4 = param1->unk_14.unk_04;
+    AnimationResourceCollection * v5 = param1->unk_14.unk_08;
     PaletteSys * v6 = param1->unk_14.unk_14;
 
     sub_0200CC3C(v4, v5, v2, 127, 0, param2, 200000);
@@ -2693,8 +2693,8 @@ void ov62_022339A0 (UnkStruct_0208C06C * param0)
 
 void ov62_022339DC (UnkStruct_0208C06C * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
 
     v0 = param0->unk_14.unk_04;
@@ -2729,8 +2729,8 @@ void ov62_02233A74 (NARC * param0)
 CellActorData * ov62_02233A7C (UnkStruct_0208C06C * param0, NARC * param1, int param2, int param3, int param4, int param5)
 {
     CellActorData * v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     UnkStruct_ov104_0223F9E0 v4;
     int v5;
@@ -3012,8 +3012,8 @@ static void ov62_02234000 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C
     int v7[12];
     int v8[12];
     int v9;
-    UnkStruct_0200C6E4 * v10;
-    UnkStruct_0200C704 * v11;
+    CellTransferStateData * v10;
+    AnimationResourceCollection * v11;
     PaletteSys * v12;
     s16 v13[][12][2] = {
         {
diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c
index cc301530e6..95782e4fa6 100644
--- a/src/overlay062/ov62_02236CBC.c
+++ b/src/overlay062/ov62_02236CBC.c
@@ -89,8 +89,8 @@ static void ov62_02236CF8 (UnkStruct_0208C06C * param0, int param1)
 {
     NARC * v0 = param0->unk_14.unk_00;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
 
     sub_0200CC3C(v2, v3, v0, 50, 0, param1, 11924);
@@ -137,8 +137,8 @@ static void ov62_02236E14 (UnkStruct_0208C06C * param0)
     UnkStruct_ov62_02236CBC * v0 = param0->unk_860;
     NARC * v1 = param0->unk_14.unk_00;
     BGL * v2 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v3 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v4 = param0->unk_14.unk_08;
+    CellTransferStateData * v3 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v4 = param0->unk_14.unk_08;
     PaletteSys * v5 = param0->unk_14.unk_14;
 
     sub_020070E8(param0->unk_14.unk_00, 62, param0->unk_14.unk_10, 6, 0, 0, 0, 102);
@@ -223,8 +223,8 @@ static void ov62_0223712C (UnkStruct_0208C06C * param0)
 {
     UnkStruct_ov62_02236CBC * v0 = param0->unk_860;
     BGL * v1 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_14.unk_08;
+    CellTransferStateData * v2 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v3 = param0->unk_14.unk_08;
     PaletteSys * v4 = param0->unk_14.unk_14;
     int v5;
     int v6[5];
@@ -264,8 +264,8 @@ static void ov62_022371CC (UnkStruct_0208C06C * param0)
     int v3[5];
     UnkStruct_ov62_02236CBC * v4 = param0->unk_860;
     BGL * v5 = param0->unk_14.unk_10;
-    UnkStruct_0200C6E4 * v6 = param0->unk_14.unk_04;
-    UnkStruct_0200C704 * v7 = param0->unk_14.unk_08;
+    CellTransferStateData * v6 = param0->unk_14.unk_04;
+    AnimationResourceCollection * v7 = param0->unk_14.unk_08;
     PaletteSys * v8 = param0->unk_14.unk_14;
     UnkStruct_ov104_0223F9E0 v9;
 
diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c
index 7fb347cecb..12646e5778 100644
--- a/src/overlay062/ov62_02239D60.c
+++ b/src/overlay062/ov62_02239D60.c
@@ -1073,8 +1073,8 @@ static void ov62_0223ADC0 (UnkStruct_0208C06C * param0, int param1)
 static void ov62_0223AE60 (UnkStruct_0208C06C * param0)
 {
     UnkStruct_ov62_02239DBC * v0 = param0->unk_860;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     UnkStruct_ov104_0223F9E0 v4;
 
diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c
index d24d7d5b52..b81aeadc8d 100644
--- a/src/overlay062/ov62_02246B00.c
+++ b/src/overlay062/ov62_02246B00.c
@@ -27,7 +27,7 @@
 
 static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 * param0, int param1, s16 param2, s16 param3);
 
-UnkStruct_ov62_02246B00 * ov62_02246B00 (int param0, int param1, int param2[], UnkStruct_020279FC * param3)
+UnkStruct_ov62_02246B00 * ov62_02246B00 (int param0, int param1, int param2[], AnimationControlFlags * param3)
 {
     int v0;
     UnkStruct_ov62_02246B00 * v1 = NULL;
@@ -585,8 +585,8 @@ void ov62_02247574 (UnkStruct_ov62_02246BF4 * param0)
 {
     NARC * v0;
     BGL * v1;
-    UnkStruct_0200C6E4 * v2;
-    UnkStruct_0200C704 * v3;
+    CellTransferStateData * v2;
+    AnimationResourceCollection * v3;
     PaletteSys * v4;
 
     v2 = param0->unk_220.unk_04;
@@ -639,8 +639,8 @@ void ov62_02247754 (UnkStruct_ov62_02246BF4 * param0)
     int v1 = 0;
     int v2 = 0;
     UnkStruct_ov104_0223F9E0 v3;
-    UnkStruct_0200C6E4 * v4;
-    UnkStruct_0200C704 * v5;
+    CellTransferStateData * v4;
+    AnimationResourceCollection * v5;
     PaletteSys * v6;
 
     v4 = param0->unk_220.unk_04;
@@ -684,8 +684,8 @@ void ov62_02247754 (UnkStruct_ov62_02246BF4 * param0)
 void ov62_0224784C (UnkStruct_ov62_02246BF4 * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
 
     v1 = param0->unk_220.unk_04;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index b9137ac6d0..d16207bb63 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -35,8 +35,8 @@ typedef struct {
 
 typedef struct UnkStruct_ov63_0222BB38_t {
     const UnkStruct_ov63_0222BB38_sub1 * unk_00;
-    UnkStruct_02022550 * unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_04;
+    GraphicElementData * unk_08;
     int unk_0C;
     int unk_10;
     s16 unk_14;
@@ -49,7 +49,7 @@ typedef struct {
 } UnkStruct_ov63_0222B96C;
 
 typedef struct UnkStruct_ov63_0222AE60_t {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     PaletteSys * unk_04;
     UnkStruct_ov63_0222BB38 * unk_08;
     u32 unk_0C;
@@ -302,7 +302,7 @@ static const u8 Unk_ov63_0222D904[10] = {
     0x0
 };
 
-UnkStruct_ov63_0222AE60 * ov63_0222AE60 (UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3)
+UnkStruct_ov63_0222AE60 * ov63_0222AE60 (GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3)
 {
     UnkStruct_ov63_0222AE60 * v0;
     int v1;
@@ -521,7 +521,7 @@ void ov63_0222B210 (UnkStruct_ov63_0222BB38 * param0)
     memset(param0, 0, sizeof(UnkStruct_ov63_0222BB38));
 }
 
-const UnkStruct_02022550 * ov63_0222B234 (const UnkStruct_ov63_0222BB38 * param0)
+const GraphicElementData * ov63_0222B234 (const UnkStruct_ov63_0222BB38 * param0)
 {
     return param0->unk_04;
 }
diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c
index d320b7f697..beb63e5ba2 100644
--- a/src/overlay063/ov63_0222CCE4.c
+++ b/src/overlay063/ov63_0222CCE4.c
@@ -23,7 +23,7 @@ static int ov63_0222D0C4(const UnkStruct_ov63_0222BB38 * param0, int param1);
 static void ov63_0222D0E0(const UnkStruct_ov63_0222CE44 * param0, s16 * param1, s16 * param2);
 static void ov63_0222D110(UnkStruct_ov63_0222CE44 * param0, int param1, int param2);
 
-UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3, u32 param4)
+UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, u32 param4)
 {
     UnkStruct_ov63_0222CD2C * v0;
 
@@ -40,7 +40,7 @@ UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (UnkStruct_020218BC * param0, PaletteSys
     return v0;
 }
 
-UnkStruct_ov63_0222CD2C * ov63_0222CD2C (UnkStruct_020218BC * param0, PaletteSys * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
+UnkStruct_ov63_0222CD2C * ov63_0222CD2C (GraphicElementManager * param0, PaletteSys * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
 {
     UnkStruct_ov63_0222CD2C * v0;
 
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index c7b250bf15..995ef8fbf3 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -140,7 +140,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     NNSG2dRenderSurface unk_08;
     UnkStruct_0200C738 unk_78;
     UnkStruct_02009714 * unk_204[4];
@@ -153,7 +153,7 @@ typedef struct {
     u32 unk_238;
     UnkStruct_ov19_021DA864 unk_23C;
     UnkStruct_02009DC8 * unk_260[4];
-    UnkStruct_02022550 * unk_270[2];
+    GraphicElementData * unk_270[2];
     UnkStruct_ov64_022300E4 unk_278;
 } UnkStruct_ov64_0222E21C;
 
@@ -163,7 +163,7 @@ typedef struct {
     void * unk_14;
     NNSG2dScreenData * unk_18;
     Window unk_1C;
-    UnkStruct_02001AF4 * unk_2C;
+    UIControlData * unk_2C;
     u32 unk_30;
     u32 unk_34;
     Strbuf* unk_38;
@@ -195,11 +195,11 @@ typedef struct {
     u32 unk_D8;
     u32 unk_DC;
     Window unk_E0;
-    UnkStruct_02013A04 * unk_F0[2];
+    ResourceMetadata * unk_F0[2];
     UnkStruct_0200112C * unk_F8;
-    UnkStruct_02001AF4 * unk_FC;
+    UIControlData * unk_FC;
     s32 unk_100;
-    UnkStruct_02022550 * unk_104;
+    GraphicElementData * unk_104;
     u32 unk_108;
 } UnkStruct_ov64_0222F0C4;
 
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index b4d109c272..393b8dff2c 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -119,7 +119,7 @@ typedef struct {
     u8 unk_14;
     u8 unk_15;
     u16 unk_16;
-    UnkStruct_020218BC * unk_18;
+    GraphicElementManager * unk_18;
     UnkStruct_0200C738 unk_1C;
     UnkStruct_02009714 * unk_1A8[4];
     UnkStruct_ov63_0222BE18 * unk_1B8;
@@ -130,7 +130,7 @@ typedef struct {
     Window unk_210;
     Window unk_220;
     Window unk_230;
-    UnkStruct_02001AF4 * unk_240;
+    UIControlData * unk_240;
     void * unk_244;
     NNSG2dScreenData * unk_248;
     void * unk_24C;
diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c
index 46cc590ceb..bd4e5bb732 100644
--- a/src/overlay067/ov67_0225C700.c
+++ b/src/overlay067/ov67_0225C700.c
@@ -74,7 +74,7 @@ typedef struct {
     UnkStruct_ov67_0225D210 unk_40;
     UnkStruct_ov67_0225D210 unk_70;
     UnkStruct_ov67_0225D210 unk_A0;
-    UnkStruct_02001AF4 * unk_D0;
+    UIControlData * unk_D0;
     UnkStruct_ov61_0222C3B0 unk_D4;
 } UnkStruct_ov67_0225D154;
 
@@ -591,7 +591,7 @@ static void ov67_0225CE30 (UnkStruct_ov67_0225D154 * param0, u32 param1)
     }
 
     {
-        UnkStruct_020279FC * v1;
+        AnimationControlFlags * v1;
         u8 v2;
 
         v1 = sub_02025E44(param0->unk_00);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index cde624dc3b..b4f4fe6a29 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -82,7 +82,7 @@ typedef struct {
 typedef struct {
     Window unk_00[1];
     s32 unk_10;
-    UnkStruct_02022550 * unk_14;
+    GraphicElementData * unk_14;
     UnkStruct_02009DC8 * unk_18[4];
     u16 unk_28;
     u16 unk_2A;
@@ -115,7 +115,7 @@ typedef struct {
     Window unk_08;
     Strbuf* unk_18;
     void * unk_1C;
-    UnkStruct_02001AF4 * unk_20;
+    UIControlData * unk_20;
 } UnkStruct_ov68_0225D128;
 
 typedef struct {
@@ -128,7 +128,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NARC * unk_1A4;
@@ -146,7 +146,7 @@ static void ov68_0225C91C(UnkStruct_ov68_0225C91C * param0, SaveData * param1, u
 static void ov68_0225C960(UnkStruct_ov68_0225C91C * param0);
 static void ov68_0225C980(UnkStruct_ov68_0225C91C * param0);
 static void ov68_0225C98C(UnkStruct_ov68_0225C91C * param0);
-static void ov68_0225C9A0(UnkStruct_ov68_0225C91C * param0, UnkStruct_020279FC * param1, u32 param2);
+static void ov68_0225C9A0(UnkStruct_ov68_0225C91C * param0, AnimationControlFlags * param1, u32 param2);
 static void ov68_0225CA8C(UnkStruct_ov68_0225C91C * param0);
 static void ov68_0225CAB4(UnkStruct_ov68_0225C91C * param0, u32 param1);
 static void ov68_0225CB44(UnkStruct_ov68_0225C91C * param0);
@@ -453,7 +453,7 @@ static void ov68_0225C914 (void * param0)
 
 static void ov68_0225C91C (UnkStruct_ov68_0225C91C * param0, SaveData * param1, u32 param2)
 {
-    UnkStruct_020279FC * v0;
+    AnimationControlFlags * v0;
 
     v0 = sub_02025E44(param1);
     param0->unk_1A4 = NARC_ctor(NARC_INDEX_GRAPHIC__WIFI_LOBBY_OTHER, param2);
@@ -485,7 +485,7 @@ static void ov68_0225C98C (UnkStruct_ov68_0225C91C * param0)
     sub_0201DCAC();
 }
 
-static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, UnkStruct_020279FC * param1, u32 param2)
+static void ov68_0225C9A0 (UnkStruct_ov68_0225C91C * param0, AnimationControlFlags * param1, u32 param2)
 {
     sub_02018368(&Unk_ov68_0225DD48);
 
@@ -921,7 +921,7 @@ static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225
     param0->unk_18 = Strbuf_Init(256, param3);
 
     {
-        UnkStruct_020279FC * v0;
+        AnimationControlFlags * v0;
 
         v0 = sub_02025E44(param2);
         param0->unk_04 = sub_02027AC0(v0);
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index e216baa403..e907457d67 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -126,10 +126,10 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
-    UnkStruct_0207C690 * unk_1A4;
+    GenericPointerData * unk_1A4;
     NARC * unk_1A8;
 } UnkStruct_ov69_0225D35C;
 
@@ -200,7 +200,7 @@ typedef struct {
     s16 unk_32;
     u8 unk_34[4];
     u8 unk_38[4];
-    UnkStruct_02022550 * unk_3C[12];
+    GraphicElementData * unk_3C[12];
     UnkStruct_02009DC8 * unk_6C[12][4];
 } UnkStruct_ov69_0225EB60;
 
@@ -268,7 +268,7 @@ typedef struct {
     u16 unk_02;
     UnkStruct_ov69_0225DA74 unk_04;
     UnkStruct_0202C878 * unk_0C;
-    UnkStruct_020279FC * unk_10;
+    AnimationControlFlags * unk_10;
     int unk_14;
     int unk_18;
     UnkStruct_ov66_02231428 unk_1C;
@@ -301,11 +301,11 @@ static u32 ov69_0225D194(const VecFx32 * param0, const VecFx32 * param1);
 static u32 ov69_0225D1E0(const UnkStruct_ov69_0225CE64 * param0, u32 param1, UnkStruct_ov66_02231428 param2);
 static BOOL ov69_0225D268(UnkStruct_ov69_0225CE64 * param0, u8 param1, u8 param2);
 static void ov69_0225D2A8(UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov66_02230F50 * param1);
-static void ov69_0225D318(UnkStruct_ov69_0225D35C * param0, UnkStruct_020279FC * param1, u32 param2);
+static void ov69_0225D318(UnkStruct_ov69_0225D35C * param0, AnimationControlFlags * param1, u32 param2);
 static void ov69_0225D35C(UnkStruct_ov69_0225D35C * param0);
 static void ov69_0225D384(UnkStruct_ov69_0225D35C * param0);
 static void ov69_0225D390(UnkStruct_ov69_0225D35C * param0);
-static void ov69_0225D3A4(UnkStruct_ov69_0225D35C * param0, UnkStruct_020279FC * param1, u32 param2);
+static void ov69_0225D3A4(UnkStruct_ov69_0225D35C * param0, AnimationControlFlags * param1, u32 param2);
 static void ov69_0225D504(UnkStruct_ov69_0225D35C * param0);
 static void ov69_0225D53C(UnkStruct_ov69_0225D35C * param0, u32 param1);
 static void ov69_0225D5D8(UnkStruct_ov69_0225D35C * param0);
@@ -1391,7 +1391,7 @@ static void ov69_0225D2A8 (UnkStruct_ov69_0225CE64 * param0, const UnkStruct_ov6
     }
 }
 
-static void ov69_0225D318 (UnkStruct_ov69_0225D35C * param0, UnkStruct_020279FC * param1, u32 param2)
+static void ov69_0225D318 (UnkStruct_ov69_0225D35C * param0, AnimationControlFlags * param1, u32 param2)
 {
     param0->unk_1A8 = NARC_ctor(NARC_INDEX_GRAPHIC__WORLDTIMER, param2);
 
@@ -1425,7 +1425,7 @@ static void ov69_0225D390 (UnkStruct_ov69_0225D35C * param0)
     sub_0201DCAC();
 }
 
-static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, UnkStruct_020279FC * param1, u32 param2)
+static void ov69_0225D3A4 (UnkStruct_ov69_0225D35C * param0, AnimationControlFlags * param1, u32 param2)
 {
     sub_02018368(&Unk_ov69_0225F040);
 
@@ -1962,7 +1962,7 @@ static void ov69_0225DD60 (UnkStruct_ov69_0225DDC8 * param0, UnkStruct_ov69_0225
     memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48));
 
     {
-        UnkStruct_020279FC * v0;
+        AnimationControlFlags * v0;
 
         v0 = sub_02025E44(param3);
         param0->unk_08 = sub_02027AC0(v0);
@@ -2910,7 +2910,7 @@ static void ov69_0225EE68 (const UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov6
 static void ov69_0225EEC4 (UnkStruct_ov69_0225EB60 * param0, u32 param1)
 {
     VecFx32 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     ov69_0225ED78(&param0->unk_00[param1], &v0);
 
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index a0beee3b2e..315a502458 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -120,11 +120,11 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NNSG2dCellTransferState * unk_1A4;
-    UnkStruct_0207C690 * unk_1A8;
+    GenericPointerData * unk_1A8;
 } UnkStruct_ov70_0225E4EC;
 
 typedef struct {
@@ -139,16 +139,16 @@ typedef struct {
     UnkStruct_ov84_02240FA8 unk_00;
     Window unk_20;
     UnkStruct_0200112C * unk_30;
-    UnkStruct_02013A04 * unk_34;
+    ResourceMetadata * unk_34;
     u16 unk_38;
     u16 unk_3A;
     BOOL unk_3C;
     UnkStruct_02009DC8 * unk_40[4];
-    UnkStruct_02022550 * unk_50[2];
+    GraphicElementData * unk_50[2];
 } UnkStruct_ov70_0225EC20;
 
 typedef struct {
-    UnkStruct_02013A04 * unk_00;
+    ResourceMetadata * unk_00;
     UnkStruct_ov84_02240FA8 unk_04;
 } UnkStruct_ov70_0225F098;
 
@@ -184,11 +184,11 @@ typedef struct {
 typedef struct {
     u32 unk_00;
     Window unk_04[5];
-    UnkStruct_02022550 * unk_54;
+    GraphicElementData * unk_54;
     UnkStruct_02009DC8 * unk_58[4];
-    UnkStruct_02022550 * unk_68;
+    GraphicElementData * unk_68;
     UnkStruct_02009DC8 * unk_6C[4];
-    UnkStruct_02022550 * unk_7C[12];
+    GraphicElementData * unk_7C[12];
     UnkStruct_02009DC8 * unk_AC[4];
     UnkStruct_02009DC8 * unk_BC[12];
     UnkStruct_02009DC8 * unk_EC[4];
@@ -278,7 +278,7 @@ static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E
 static void ov70_0225EDA8(UnkStruct_ov70_0225EC20 * param0, u32 param1, u32 param2, u32 param3);
 static void ov70_0225EDE0(UnkStruct_ov70_0225EC20 * param0);
 static void ov70_0225EDF8(UnkStruct_ov70_0225EC20 * param0, const Strbuf *param1, u32 param2);
-static const UnkStruct_02013A04 * ov70_0225EE04(const UnkStruct_ov70_0225EC20 * param0);
+static const ResourceMetadata * ov70_0225EE04(const UnkStruct_ov70_0225EC20 * param0);
 static BOOL ov70_0225EE08(const UnkStruct_ov70_0225EC20 * param0, u32 param1);
 static void ov70_0225EE30(UnkStruct_ov70_0225EC20 * param0, const UnkStruct_ov84_02240FA8 * param1, UnkStruct_ov70_0225E4EC * param2, u16 param3, u16 param4, u32 param5, u8 param6, u8 param7, u8 param8);
 static u32 ov70_0225EED8(UnkStruct_ov70_0225EC20 * param0);
@@ -1001,7 +1001,7 @@ void ov70_0225E044 (UnkStruct_ov70_0225DEE8 * param0, const Strbuf *param1, u32
     ov70_0225EDF8(&param0->unk_39C, param1, param2);
 }
 
-const UnkStruct_02013A04 * ov70_0225E054 (const UnkStruct_ov70_0225DEE8 * param0)
+const ResourceMetadata * ov70_0225E054 (const UnkStruct_ov70_0225DEE8 * param0)
 {
     return ov70_0225EE04(&param0->unk_39C);
 }
@@ -1314,7 +1314,7 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1,
     }
 
     {
-        UnkStruct_020279FC * v1;
+        AnimationControlFlags * v1;
         u8 v2;
 
         v1 = sub_02025E44(param1);
@@ -1549,7 +1549,7 @@ static void ov70_0225E9C8 (UnkStruct_ov70_0225E9C8 * param0, UnkStruct_ov70_0225
     param0->unk_18 = Strbuf_Init(384, param3);
 
     {
-        UnkStruct_020279FC * v0;
+        AnimationControlFlags * v0;
 
         v0 = sub_02025E44(param2);
         param0->unk_14 = sub_02027AC0(v0);
@@ -1758,7 +1758,7 @@ static void ov70_0225EDF8 (UnkStruct_ov70_0225EC20 * param0, const Strbuf *param
     sub_02013A6C(param0->unk_34, param1, param2);
 }
 
-static const UnkStruct_02013A04 * ov70_0225EE04 (const UnkStruct_ov70_0225EC20 * param0)
+static const ResourceMetadata * ov70_0225EE04 (const UnkStruct_ov70_0225EC20 * param0)
 {
     return param0->unk_34;
 }
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 9eec87217f..d2a182d0d3 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -95,8 +95,8 @@ static void ov72_0223E910(Window * param0, int param1, u32 param2, UnkStruct_ov7
 static void ov72_0223E914(UnkStruct_ov72_0223DB98 * param0);
 static void ov72_0223E930(UnkStruct_ov72_0223DB98 * param0, int param1);
 static int ov72_0223E99C(int param0);
-static void ov72_0223E388(UnkStruct_02022550 ** param0, int param1);
-static void ov72_0223E3A8(UnkStruct_02022550 ** param0, BOOL param1);
+static void ov72_0223E388(GraphicElementData ** param0, int param1);
+static void ov72_0223E3A8(GraphicElementData ** param0, BOOL param1);
 static int ov72_0223E528(UnkStruct_ov72_0223DB98 * param0, int param1);
 static void ov72_0223E430(BGL * param0, UnkStruct_02015920 * param1);
 static void ov72_0223E9B4(u8 * param0, u8 * param1);
@@ -151,7 +151,7 @@ int ov72_0223D7A0 (UnkStruct_020067E8 * param0, int * param1)
 
             v0->unk_5BFC = (u8 *)sub_0202C840(sub_0202C834(v2));
             v0->unk_08 = (UnkStruct_0202CD88 *)sub_0202CD88((SaveData *)sub_02006840(param0));
-            v0->unk_0C = (UnkStruct_020279FC *)sub_02025E44((SaveData *)sub_02006840(param0));
+            v0->unk_0C = (AnimationControlFlags *)sub_02025E44((SaveData *)sub_02006840(param0));
         }
 
         ov72_0223DCA8(v0, v1);
@@ -697,7 +697,7 @@ static void ov72_0223E2A8 (UnkStruct_ov72_0223DB98 * param0)
     }
 }
 
-static void ov72_0223E388 (UnkStruct_02022550 ** param0, int param1)
+static void ov72_0223E388 (GraphicElementData ** param0, int param1)
 {
     int v0;
 
@@ -710,7 +710,7 @@ static void ov72_0223E388 (UnkStruct_02022550 ** param0, int param1)
     }
 }
 
-static void ov72_0223E3A8 (UnkStruct_02022550 ** param0, BOOL param1)
+static void ov72_0223E3A8 (GraphicElementData ** param0, BOOL param1)
 {
     if (param1 == 1) {
         sub_02021D6C(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c
index 759b966933..aa23b3d118 100644
--- a/src/overlay073/ov73_021D0D80.c
+++ b/src/overlay073/ov73_021D0D80.c
@@ -68,7 +68,7 @@ FS_EXTERN_OVERLAY(overlay57);
 typedef struct {
     int unk_00;
     SaveData * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     int unk_0C;
     int unk_10;
     UnkStruct_020067E8 * unk_14;
@@ -77,7 +77,7 @@ typedef struct {
     int unk_2C;
     Window unk_30;
     UnkStruct_0200112C * unk_40;
-    UnkStruct_02013A04 * unk_44;
+    ResourceMetadata * unk_44;
     int unk_48;
     MessageLoader * unk_4C;
     int unk_50;
diff --git a/src/overlay074/ov74_021D0D80.c b/src/overlay074/ov74_021D0D80.c
index 99de640acc..be9480b7f6 100644
--- a/src/overlay074/ov74_021D0D80.c
+++ b/src/overlay074/ov74_021D0D80.c
@@ -63,16 +63,16 @@ typedef struct UnkStruct_ov74_021D0D80_t {
     u32 unk_10_22 : 10;
     BGL * unk_14;
     UnkStruct_0203D8EC unk_18;
-    UnkStruct_020279FC * unk_1C;
+    AnimationControlFlags * unk_1C;
     MessageLoader * unk_20;
     void * unk_24;
     NNSG2dScreenData * unk_28;
     Window unk_2C[3];
     UnkStruct_ov74_021D1720 unk_5C[7];
-    UnkStruct_02001AF4 * unk_2A8;
+    UIControlData * unk_2A8;
     u32 unk_2AC;
-    UnkStruct_0200C6E4 * unk_2B0;
-    UnkStruct_0200C704 * unk_2B4;
+    CellTransferStateData * unk_2B0;
+    AnimationResourceCollection * unk_2B4;
     CellActorData * unk_2B8;
 } UnkStruct_ov74_021D0D80;
 
@@ -103,9 +103,9 @@ static u32 ov74_021D1BD0(UnkStruct_ov74_021D0D80 * param0);
 int ov74_021D0D80 (UnkStruct_020067E8 * param0, int * param1)
 {
     UnkStruct_ov74_021D0D80 * v0 = NULL;
-    UnkStruct_020279FC * v1;
+    AnimationControlFlags * v1;
 
-    v1 = (UnkStruct_020279FC *)sub_02006840(param0);
+    v1 = (AnimationControlFlags *)sub_02006840(param0);
 
     Heap_Create(3, 38, 0x10000);
 
diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c
index fbf5374135..07b30d102c 100644
--- a/src/overlay075/ov75_021D0D80.c
+++ b/src/overlay075/ov75_021D0D80.c
@@ -99,9 +99,9 @@ typedef struct {
     NNSG2dScreenData * unk_3C;
     NNSG2dScreenData * unk_40;
     Window unk_44[6];
-    UnkStruct_02001AF4 * unk_A4;
-    UnkStruct_0200C6E4 * unk_A8;
-    UnkStruct_0200C704 * unk_AC;
+    UIControlData * unk_A4;
+    CellTransferStateData * unk_A8;
+    AnimationResourceCollection * unk_AC;
     CellActorData * unk_B0[3];
 } UnkStruct_ov75_021D1184;
 
diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c
index 35e5cde45d..993934f8d4 100644
--- a/src/overlay076/ov76_0223B140.c
+++ b/src/overlay076/ov76_0223B140.c
@@ -176,8 +176,8 @@ void ov76_0223B36C (UnkStruct_ov76_0223DE00 * param0, u8 param1, u8 param2)
 {
     int v0;
     int v1;
-    UnkStruct_0200C6E4 * v2;
-    UnkStruct_0200C704 * v3;
+    CellTransferStateData * v2;
+    AnimationResourceCollection * v3;
     PaletteSys * v4;
 
     v2 = param0->unk_D4.unk_08;
@@ -277,8 +277,8 @@ BOOL ov76_0223B52C (UnkStruct_ov76_0223DE00 * param0, u8 param1)
     int v1;
     UnkStruct_ov76_0223B52C * v2;
     UnkStruct_ov104_0223F9E0 v3;
-    UnkStruct_0200C6E4 * v4;
-    UnkStruct_0200C704 * v5;
+    CellTransferStateData * v4;
+    AnimationResourceCollection * v5;
     PaletteSys * v6;
 
     v4 = param0->unk_D4.unk_08;
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index bce7b00ec9..c5074908d8 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -76,7 +76,7 @@ void ov76_0223C32C(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C354(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C398(UnkStruct_ov76_0223C398 * param0);
 void ov76_0223C424(UnkStruct_ov76_0223C398 * param0);
-void ov76_0223C5A4(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
+void ov76_0223C5A4(CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10);
 void ov76_0223C61C(UnkStruct_ov76_0223DE00 * param0, NARC * param1);
 void ov76_0223C7E0(UnkStruct_ov76_0223DE00 * param0);
 void ov76_0223C80C(UnkStruct_ov76_0223DE00 * param0, int param1, int param2);
@@ -238,8 +238,8 @@ void ov76_0223BB04 (UnkStruct_ov76_0223DE00 * param0)
 {
     int v0;
     int v1;
-    UnkStruct_0200C6E4 * v2;
-    UnkStruct_0200C704 * v3;
+    CellTransferStateData * v2;
+    AnimationResourceCollection * v3;
     PaletteSys * v4;
 
     v2 = param0->unk_D4.unk_08;
@@ -261,8 +261,8 @@ void ov76_0223BBAC (UnkStruct_ov76_0223DE00 * param0)
     int v0;
     UnkStruct_ov76_0223BBAC * v1;
     UnkStruct_ov104_0223F9E0 v2;
-    UnkStruct_0200C6E4 * v3;
-    UnkStruct_0200C704 * v4;
+    CellTransferStateData * v3;
+    AnimationResourceCollection * v4;
     PaletteSys * v5;
 
     v3 = param0->unk_D4.unk_08;
@@ -389,9 +389,9 @@ void ov76_0223BD30 (UnkStruct_ov76_0223DE00 * param0, s8 param1, int param2)
     SysTask_Start(ov76_0223BCA0, v0, 0x1000);
 }
 
-UnkStruct_0207C690 * ov76_0223BE6C (void)
+GenericPointerData * ov76_0223BE6C (void)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(53, 0, 2, 0, 2, ov76_0223BE8C);
     return v0;
@@ -541,8 +541,8 @@ void ov76_0223C0EC (int param0, s16 * param1, s16 * param2)
 
 void ov76_0223C110 (UnkStruct_ov76_0223DE00 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
 
     v0 = param0->unk_D4.unk_08;
@@ -769,7 +769,7 @@ void ov76_0223C588 (UnkStruct_ov76_0223DE00 * param0)
     }
 }
 
-void ov76_0223C5A4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10)
+void ov76_0223C5A4 (CellTransferStateData * param0, AnimationResourceCollection * param1, PaletteSys * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, NARC * param10)
 {
     sub_0200CC3C(param0, param1, param10, param3, 1, param7, (param3 + 11000));
     sub_0200CDC4(param2, param8, param0, param1, param10, param4, 0, param9, param7, (param4 + 11000));
@@ -1143,8 +1143,8 @@ void ov76_0223CF88 (UnkStruct_ov76_0223DE00 * param0, NARC * param1)
 
 void ov76_0223CFEC (UnkStruct_ov76_0223DE00 * param0, NARC * param1)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
 
     v0 = param0->unk_D4.unk_08;
@@ -1171,8 +1171,8 @@ void ov76_0223D16C (UnkStruct_ov76_0223DE00 * param0)
     int v0;
     UnkStruct_ov76_0223BBAC * v1;
     UnkStruct_ov104_0223F9E0 v2;
-    UnkStruct_0200C6E4 * v3;
-    UnkStruct_0200C704 * v4;
+    CellTransferStateData * v3;
+    AnimationResourceCollection * v4;
     PaletteSys * v5;
 
     v3 = param0->unk_D4.unk_08;
diff --git a/src/overlay077/ov77_021D0D80.c b/src/overlay077/ov77_021D0D80.c
index 74d91b1016..24a1aab2cb 100644
--- a/src/overlay077/ov77_021D0D80.c
+++ b/src/overlay077/ov77_021D0D80.c
@@ -118,7 +118,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     BGL * unk_04;
-    UnkStruct_0207C690 * unk_08;
+    GenericPointerData * unk_08;
     UnkStruct_ov77_021D17B4_sub1 unk_0C;
     UnkStruct_ov77_021D1568 unk_238;
     u16 unk_4E8;
diff --git a/src/overlay077/ov77_021D25B0.c b/src/overlay077/ov77_021D25B0.c
index 68439c58b6..066abb0941 100644
--- a/src/overlay077/ov77_021D25B0.c
+++ b/src/overlay077/ov77_021D25B0.c
@@ -136,7 +136,7 @@ typedef struct {
     int unk_04;
     BOOL unk_08;
     BGL * unk_0C;
-    UnkStruct_0207C690 * unk_10;
+    GenericPointerData * unk_10;
     u32 unk_14;
     UnkStruct_ov77_021D2F38 unk_18;
     UnkStruct_ov77_021D37C0 unk_34;
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index ff283bb8b2..dcb18eb126 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -31,11 +31,11 @@ SDK_COMPILER_ASSERT(((3 + 1 + 1 + 2 + 4) + 6) == 17);
 void include_data_ov77_021D79B8(void);
 
 typedef struct UnkStruct_ov77_021D5564_t {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[11][4];
-    UnkStruct_02022550 * unk_250[17];
+    GraphicElementData * unk_250[17];
     UnkStruct_ov19_021DA864 unk_294[3];
     NNSG2dCellTransferState * unk_300;
 } UnkStruct_ov77_021D5564;
@@ -377,7 +377,7 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
     int v0;
     UnkStruct_ov19_021DA864 v1;
     UnkStruct_ov115_02261520 v2;
-    UnkStruct_02022550 ** v3;
+    GraphicElementData ** v3;
 
     {
         ov77_021D54E8(5, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
@@ -394,7 +394,7 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1)
 {
     int v0;
-    UnkStruct_02022550 ** v1;
+    GraphicElementData ** v1;
 
     for (v0 = 0; v0 < 16; v0++) {
         v1 = ov77_021D6794(param1, v0);
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 13c678b4b4..2fb814ff7c 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -28,7 +28,7 @@
 typedef struct {
     u8 unk_00;
     u8 unk_01;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     SysTask * unk_08;
 } UnkStruct_ov77_021D6ADC;
 
@@ -54,7 +54,7 @@ typedef struct {
 } UnkStruct_ov77_021D6A0C;
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[4];
@@ -163,7 +163,7 @@ void ov77_021D6760 (UnkStruct_ov77_021D6734 * param0)
     Heap_FreeToHeap(param0);
 }
 
-UnkStruct_02022550 ** ov77_021D6794 (UnkStruct_ov77_021D6734 * param0, const int param1)
+GraphicElementData ** ov77_021D6794 (UnkStruct_ov77_021D6734 * param0, const int param1)
 {
     GF_ASSERT(param1 < param0->unk_00);
     return &param0->unk_04[param1].unk_04;
diff --git a/src/overlay078/ov78_021D0D80.c b/src/overlay078/ov78_021D0D80.c
index f54d8e2f62..bc33512c7c 100644
--- a/src/overlay078/ov78_021D0D80.c
+++ b/src/overlay078/ov78_021D0D80.c
@@ -118,7 +118,7 @@ typedef struct {
 } UnkStruct_ov78_021D235C;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_02009DC8 * unk_04[6];
     VecFx32 unk_1C;
     SysTask * unk_28;
@@ -166,9 +166,9 @@ typedef struct {
     int unk_A8;
     Strbuf* unk_AC;
     UnkStruct_ov61_0222C884 unk_B0;
-    UnkStruct_02001AF4 * unk_B8;
+    UIControlData * unk_B8;
     UnkStruct_0200C738 unk_BC;
-    UnkStruct_020218BC * unk_248;
+    GraphicElementManager * unk_248;
     UnkStruct_02009714 * unk_24C[6];
     UnkStruct_02007768 * unk_264;
     Sprite * unk_268[3];
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 8c9ffb5c21..c78de4fdfc 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -100,7 +100,7 @@ struct UnkStruct_ov79_021D29B4_t {
     int unk_08;
     UnkStruct_ov79_021D2C50 unk_0C;
     UnkStruct_ov79_021D2C50 unk_68;
-    UnkStruct_02022550 * unk_C4;
+    GraphicElementData * unk_C4;
     Sprite * unk_C8;
     UnkStruct_ov79_021D29E4 unk_CC[4];
 };
@@ -121,7 +121,7 @@ typedef struct {
     UnkStruct_0209916C * unk_60[2];
     BGL * unk_68;
     Window unk_6C;
-    UnkStruct_0200C6E4 * unk_7C;
+    CellTransferStateData * unk_7C;
     UnkStruct_ov79_021D29B4 unk_80;
 } UnkStruct_ov79_021D2928;
 
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index 2b34211385..6269c7326a 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -43,7 +43,7 @@ typedef struct {
     u16 unk_08;
     u8 unk_0A;
     u8 unk_0B;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
 } UnkStruct_ov80_021D1744;
 
 typedef struct {
@@ -79,9 +79,9 @@ typedef struct {
     UnkStruct_ov80_021D2C1C * unk_9C;
     UnkStruct_ov80_021D2AF4 * unk_A0;
     UnkStruct_ov80_021D2570 unk_A4;
-    UnkStruct_02022550 * unk_100;
-    UnkStruct_02022550 * unk_104;
-    UnkStruct_02022550 * unk_108;
+    GraphicElementData * unk_100;
+    GraphicElementData * unk_104;
+    GraphicElementData * unk_108;
     SysTask * unk_10C;
 } UnkStruct_ov80_021D1478;
 
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 07d31e6359..f290326fe0 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -41,7 +41,7 @@ const UnkStruct_ov80_021D2C5C_sub1 Unk_ov80_021D31D8[20] = {
 	{ 0xAC, 0x44, 0x0, 0x1, 0x3, 0xB6, 0x77 }
 };
 
-UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u8 * param2, short param3, int param4)
+UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (CellTransferStateData * param0, AnimationResourceCollection * param1, u8 * param2, short param3, int param4)
 {
     UnkStruct_ov80_021D2C1C * v0;
     UnkStruct_ov80_021D2C5C * v1;
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index b6af8ba5af..ad6420a37a 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -271,10 +271,10 @@ void ov83_0223D95C (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C *
     }
 }
 
-UnkStruct_02022550 * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
+GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     v0.unk_00 = param0->unk_00;
     v0.unk_04 = &param1->unk_14;
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 35a94bcac2..f67c6c6d3d 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -75,10 +75,10 @@ typedef struct {
     UnkStruct_0203E234 * unk_0C;
     BGL * unk_10;
     Window unk_14;
-    UnkStruct_020218BC * unk_24;
+    GraphicElementManager * unk_24;
     UnkStruct_0200C738 unk_28;
-    UnkStruct_02022550 * unk_1B4[6];
-    UnkStruct_02022550 * unk_1CC;
+    GraphicElementData * unk_1B4[6];
+    GraphicElementData * unk_1CC;
     void * unk_1D0;
     void * unk_1D4;
     SpriteAnimationFrame unk_1D8[6][10];
@@ -128,14 +128,14 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BDE0;
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BEA0;
@@ -171,7 +171,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     const SpriteAnimationFrame * unk_0C;
     UnkStruct_02008900 unk_10;
     NNSG2dImageProxy unk_24[2];
@@ -208,7 +208,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    UnkStruct_02022550 ** unk_08;
+    GraphicElementData ** unk_08;
     UnkStruct_ov86_0223B3C8 * unk_0C;
     int unk_10;
     int unk_14;
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 1150dabbfe..cd2e201a9a 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -52,9 +52,9 @@ typedef struct UnkStruct_ov87_021D106C_t {
     int unk_0C;
     BGL * unk_10;
     Window unk_14[2];
-    UnkStruct_020218BC * unk_34;
+    GraphicElementManager * unk_34;
     UnkStruct_0200C738 unk_38;
-    UnkStruct_02022550 * unk_1C4[6];
+    GraphicElementData * unk_1C4[6];
     void * unk_1DC;
     void * unk_1E0;
     MessageLoader * unk_1E4;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index fae9363c2e..0674c65ae0 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -102,7 +102,7 @@
 #include "overlay088/ov88_0223B140.h"
 #include "overlay088/ov88_0223E9C4.h"
 
-static void ov88_0223B2F0(NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, UnkStruct_02022550 * param5);
+static void ov88_0223B2F0(NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, GraphicElementData * param5);
 static void ov88_0223B320(UnkStruct_02095E80 * param0);
 static void ov88_0223C0E0(void * param0);
 static void ov88_0223C15C(void);
@@ -118,8 +118,8 @@ static void ov88_0223CE34(u32 * param0);
 static void ov88_0223CE74(UnkStruct_02095E80 * param0);
 static void ov88_0223CEF0(u16 * param0);
 static int ov88_0223CF30(int param0, int param1, UnkStruct_ov88_0223C8AC * param2);
-static void ov88_0223CF68(int param0, UnkStruct_02022550 * param1, int param2);
-static int ov88_0223CFF4(u32 * param0, int * param1, UnkStruct_02022550 * param2, UnkStruct_ov88_0223C8AC * param3, int param4);
+static void ov88_0223CF68(int param0, GraphicElementData * param1, int param2);
+static int ov88_0223CFF4(u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4);
 static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3);
 static void ov88_0223E7F0(UnkStruct_0202B628 * param0, Pokemon * param1);
 static void ov88_0223D140(ChatotCry * param0);
@@ -139,7 +139,7 @@ static void ov88_0223BFD8(UnkStruct_02095E80 * param0);
 static void ov88_0223BE28(UnkStruct_02095E80 * param0);
 static void ov88_0223CB34(Window * param0, int param1, UnkStruct_02095E80 * param2);
 static void ov88_0223BD18(Pokemon * param0, UnkStruct_ov88_0223C8AC * param1);
-static void ov88_0223E87C(UnkStruct_02022550 * param0, int param1, int param2);
+static void ov88_0223E87C(GraphicElementData * param0, int param1, int param2);
 static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3);
 static void ov88_0223D0C0(SaveData * param0);
 static int ov88_0223B914(UnkStruct_02095E80 * param0);
@@ -169,7 +169,7 @@ static void ov88_0223DFF4(UnkStruct_02095E80 * param0);
 static void ov88_0223E1AC(UnkStruct_02095E80 * param0);
 static void ov88_0223E1C0(UnkStruct_02095E80 * param0, int param1, int param2);
 static void ov88_0223DE68(VecFx32 param0[], int param1, int param2, int param3, int param4);
-static void ov88_0223DE7C(UnkStruct_02022550 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5);
+static void ov88_0223DE7C(GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5);
 static void ov88_0223BDA4(UnkStruct_02095E80 * param0, int param1);
 static void ov88_0223E848(UnkStruct_02095E80 * param0);
 static void ov88_0223C860(Window * param0, Party * param1, int param2, int param3, int param4);
@@ -349,7 +349,7 @@ int ov88_0223B140 (UnkStruct_020067E8 * param0, int * param1)
     return 1;
 }
 
-static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, UnkStruct_02022550 * param5)
+static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, GraphicElementData * param5)
 {
     u8 * v0;
 
@@ -1588,7 +1588,7 @@ static const int Unk_ov88_0223EE50[][3] = {
     {0x11, 0x12, 0x13}
 };
 
-static void ov88_0223CF68 (int param0, UnkStruct_02022550 * param1, int param2)
+static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2)
 {
     VecFx32 v0;
 
@@ -1611,7 +1611,7 @@ static void ov88_0223CF68 (int param0, UnkStruct_02022550 * param1, int param2)
     }
 }
 
-static int ov88_0223CFF4 (u32 * param0, int * param1, UnkStruct_02022550 * param2, UnkStruct_ov88_0223C8AC * param3, int param4)
+static int ov88_0223CFF4 (u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4)
 {
     int v0 = *param0 - 1;
     int v1 = 0;
@@ -2232,7 +2232,7 @@ static void ov88_0223DE68 (VecFx32 param0[], int param1, int param2, int param3,
     param0[1].y = FX32_ONE * param4;
 }
 
-static void ov88_0223DE7C (UnkStruct_02022550 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5)
+static void ov88_0223DE7C (GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5)
 {
     VecFx32 v0, v1, v2;
 
@@ -2559,7 +2559,7 @@ static void ov88_0223E848 (UnkStruct_02095E80 * param0)
     sub_02019184(param0->unk_174, 3, 0, param0->unk_2310);
 }
 
-static void ov88_0223E87C (UnkStruct_02022550 * param0, int param1, int param2)
+static void ov88_0223E87C (GraphicElementData * param0, int param1, int param2)
 {
     VecFx32 v0;
 
diff --git a/src/overlay088/ov88_0223E9C4.c b/src/overlay088/ov88_0223E9C4.c
index b65ca2fb5d..f93000d452 100644
--- a/src/overlay088/ov88_0223E9C4.c
+++ b/src/overlay088/ov88_0223E9C4.c
@@ -57,7 +57,7 @@ static const u16 Unk_ov88_0223F170[][2] = {
     {0x14, 0xA}
 };
 
-void ov88_0223E9C4 (BGL * param0, Window * param1, UnkStruct_020279FC * param2)
+void ov88_0223E9C4 (BGL * param0, Window * param1, AnimationControlFlags * param2)
 {
     int v0;
 
@@ -165,7 +165,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov88_0223F148 = {
     0x112
 };
 
-u32 ov88_0223ED2C (BGL * param0, UnkStruct_02001AF4 ** param1, int * param2)
+u32 ov88_0223ED2C (BGL * param0, UIControlData ** param1, int * param2)
 {
     u32 v0 = 0xffffffff;
 
@@ -212,7 +212,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov88_0223F150 = {
     NULL
 };
 
-UnkStruct_0200112C * ov88_0223ED94 (UnkStruct_02013A04 * param0, int param1, Window * param2, BGL * param3)
+UnkStruct_0200112C * ov88_0223ED94 (ResourceMetadata * param0, int param1, Window * param2, BGL * param3)
 {
     UnkStruct_0200112C * v0;
     UnkStruct_ov84_02240FA8 v1;
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index a160842500..3e9309cbde 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -91,16 +91,16 @@ typedef struct {
     u8 unk_0F;
     BGL * unk_10;
     UnkStruct_ov90_021D0D80 * unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     UnkStruct_0203068C * unk_1C;
     UnkStruct_0202D750 * unk_20;
     UnkStruct_0202D764 * unk_24;
     UnkStruct_ov90_021D0ECC_sub1 unk_28;
     Window unk_6C[5];
     UnkStruct_ov90_021D17F8 unk_BC[30];
-    UnkStruct_0200C6E4 * unk_29C;
-    UnkStruct_0200C704 * unk_2A0;
-    UnkStruct_02022550 * unk_2A4[4];
+    CellTransferStateData * unk_29C;
+    AnimationResourceCollection * unk_2A0;
+    GraphicElementData * unk_2A4[4];
 } UnkStruct_ov90_021D0ECC;
 
 static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC * param0);
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index 2ed260aea0..fdf7e3356e 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -72,10 +72,10 @@ typedef struct {
     UnkStruct_0200B358 * unk_FC;
     Strbuf* unk_100;
     UnkStruct_0200112C * unk_104;
-    UnkStruct_02013A04 * unk_108;
-    UnkStruct_02001AF4 * unk_10C;
-    UnkStruct_0200C6E4 * unk_110;
-    UnkStruct_0200C704 * unk_114;
+    ResourceMetadata * unk_108;
+    UIControlData * unk_10C;
+    CellTransferStateData * unk_110;
+    AnimationResourceCollection * unk_114;
     CellActorData * unk_118[13];
     UnkStruct_02098D38 unk_14C;
     UnkStruct_020067E8 * unk_17C;
@@ -85,12 +85,12 @@ typedef struct {
     u8 unk_186;
 } UnkStruct_ov91_021D0ED8;
 
-typedef int (* UnkFuncPtr_0207F248_1)(UnkStruct_ov91_021D0ED8 *);
+typedef int (* GenericFunctionPtr_1)(UnkStruct_ov91_021D0ED8 *);
 
 typedef struct {
-    UnkFuncPtr_0207F248_1 unk_00;
-    UnkFuncPtr_0207F248_1 unk_04;
-} UnkStruct_0207F248_1;
+    GenericFunctionPtr_1 unk_00;
+    GenericFunctionPtr_1 unk_04;
+} GameWindowLayout_1;
 
 static void ov91_021D0ED8(UnkStruct_ov91_021D0ED8 * param0);
 static void ov91_021D0F6C(UnkStruct_ov91_021D0ED8 * param0);
@@ -197,7 +197,7 @@ static const u32 Unk_ov91_021D282C[2][11] = {
     {0xB, 0xC, 0xD, 0xE, 0xF, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15}
 };
 
-static const UnkStruct_0207F248_1 Unk_ov91_021D27DC[] = {
+static const GameWindowLayout_1 Unk_ov91_021D27DC[] = {
     {ov91_021D1EC8, ov91_021D1EE8},
     {ov91_021D1F38, ov91_021D1F44},
     {ov91_021D1F94, ov91_021D1FA0},
diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c
index 11d133532c..4a9ac4eb0f 100644
--- a/src/overlay092/ov92_021D0D80.c
+++ b/src/overlay092/ov92_021D0D80.c
@@ -85,7 +85,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_0202C878 * unk_04;
-    UnkStruct_020279FC * unk_08;
+    AnimationControlFlags * unk_08;
     UnkStruct_ov92_021D1B24_sub1 unk_0C;
     BGL * unk_B810;
     Window unk_B814;
@@ -93,8 +93,8 @@ typedef struct {
     Window unk_B834;
     Window unk_B844;
     UnkStruct_0200112C * unk_B854;
-    UnkStruct_02013A04 * unk_B858;
-    UnkStruct_02001AF4 * unk_B85C;
+    ResourceMetadata * unk_B858;
+    UIControlData * unk_B85C;
     MessageLoader * unk_B860;
     int unk_B864;
     int unk_B868;
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 3bf5f56033..544c8889c2 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -413,7 +413,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov94_022459F8 = {
     0x0
 };
 
-UnkStruct_02001AF4 * ov94_0223C3C0 (BGL * param0, int param1, int param2)
+UIControlData * ov94_0223C3C0 (BGL * param0, int param1, int param2)
 {
     UnkStruct_ov61_0222C884 v0;
 
@@ -430,7 +430,7 @@ void ov94_0223C3F4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2)
     param0->unk_30 = param2;
 }
 
-void ov94_0223C3FC (UnkStruct_02022550 * param0, int param1, int param2)
+void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2)
 {
     VecFx32 v0;
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index ce8f71b29c..6640514dd1 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -54,7 +54,7 @@
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     u8 unk_0C[512];
 } UnkStruct_ov94_02240FA0;
 
@@ -75,7 +75,7 @@ static int ov94_02240AE8(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_02240D08(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_02240D28(UnkStruct_ov94_0223FD4C * param0);
 static void ov94_02240D58(UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4, int param5);
-static void ov94_02240DF8(int param0, int param1, int param2, int param3, UnkStruct_02022550 * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6);
+static void ov94_02240DF8(int param0, int param1, int param2, int param3, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6);
 static void ov94_02240FA0(UnkStruct_ov94_0223FD4C * param0, int param1);
 static int ov94_022405CC(int param0, int param1, int param2);
 static void ov94_022404F0(UnkStruct_ov94_0223FD4C * param0);
@@ -91,10 +91,10 @@ static int ov94_02240C84(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_02240CA8(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_02241384(BoxPokemon * param0, UnkStruct_ov94_0223BA88_sub3 * param1);
 static void ov94_022413BC(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1);
-static void ov94_02240EAC(BoxPokemon * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7);
+static void ov94_02240EAC(BoxPokemon * param0, GraphicElementData * param1, GraphicElementData * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7);
 void * ov94_02240DD0(NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3);
 static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1);
-static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_02022550 ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3);
+static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3);
 static int ov94_0224121C(Party * param0, PCBoxes * param1, int param2, int param3);
 static int ov94_022412F4(Party * param0, PCBoxes * param1, int param2, int param3);
 static int ov94_02240BB0(UnkStruct_ov94_0223FD4C * param0);
@@ -1049,7 +1049,7 @@ void * ov94_02240DD0 (NARC * param0, u32 param1, NNSG2dCharacterData ** param2,
     return v0;
 }
 
-static void ov94_02240DF8 (int param0, int param1, int param2, int param3, UnkStruct_02022550 * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6)
+static void ov94_02240DF8 (int param0, int param1, int param2, int param3, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6)
 {
     u8 * v0;
     u8 * v1;
@@ -1089,7 +1089,7 @@ static void ov94_02240E5C (void * param0)
     Heap_FreeToHeap(v0->unk_1114);
 }
 
-static void ov94_02240EAC (BoxPokemon * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7)
+static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, GraphicElementData * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7)
 {
     int v0, v1, v2, v3;
 
@@ -1401,7 +1401,7 @@ static void ov94_022413BC (UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223
     param0->unk_F0 = v1;
 }
 
-static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_02022550 ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3)
+static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3)
 {
     int v0, v1;
 
diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c
index e59773d731..da337cb0fa 100644
--- a/src/overlay094/ov94_022414B8.c
+++ b/src/overlay094/ov94_022414B8.c
@@ -87,7 +87,7 @@ static int ov94_02242040(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_02242068(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_0224208C(UnkStruct_ov94_0223FD4C * param0);
 static void ov94_02242668(UnkStruct_ov94_0223BA88 * param0, UnkStruct_ov94_0223FD4C * param1);
-static int ov94_02242718(UnkStruct_02013A04 ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7);
+static int ov94_02242718(ResourceMetadata ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7);
 static u32 ov94_022421E8(int param0, u32 param1);
 
 static int (* Unk_ov94_0224695C[])(UnkStruct_ov94_0223FD4C *) = {
@@ -1100,7 +1100,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov94_0224608C = {
     NULL
 };
 
-UnkStruct_0200112C * ov94_022426A8 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, Window * param2, MessageLoader * param3)
+UnkStruct_0200112C * ov94_022426A8 (UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1;
@@ -1133,7 +1133,7 @@ static u16 Unk_ov94_02246928[] = {
     0x1ED
 };
 
-static int ov94_02242718 (UnkStruct_02013A04 ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7)
+static int ov94_02242718 (ResourceMetadata ** param0, MessageLoader * param1, MessageLoader * param2, u16 * param3, u8 * param4, int param5, int param6, UnkStruct_02026324 * param7)
 {
     int v0, v1, v2 = 0;
     int v3 = Unk_ov94_02246928[param6 + 1] - Unk_ov94_02246928[param6];
@@ -1176,7 +1176,7 @@ static int ov94_02242718 (UnkStruct_02013A04 ** param0, MessageLoader * param1,
     return v2 + 1;
 }
 
-UnkStruct_0200112C * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, UnkStruct_02013A04 ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6)
+UnkStruct_0200112C * ov94_022427C0 (UnkStruct_ov94_0223FD4C * param0, ResourceMetadata ** param1, Window * param2, MessageLoader * param3, MessageLoader * param4, UnkStruct_ov94_0223FD4C_sub3 * param5, UnkStruct_02026324 * param6)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1, v2, v3;
@@ -1203,7 +1203,7 @@ static Unk_ov94_0224693C[][2] = {
     {0x79, 0xFFFFFFFE}
 };
 
-UnkStruct_0200112C * ov94_02242840 (UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2)
+UnkStruct_0200112C * ov94_02242840 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1;
@@ -1224,7 +1224,7 @@ UnkStruct_0200112C * ov94_02242840 (UnkStruct_02013A04 ** param0, Window * param
     return sub_0200112C(&v0, 0, 0, 62);
 }
 
-UnkStruct_0200112C * ov94_022428B0 (UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2, int param3)
+UnkStruct_0200112C * ov94_022428B0 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2, int param3)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1;
@@ -1294,7 +1294,7 @@ int ov94_02242970 (int param0, int param1, int param2)
     return 0;
 }
 
-UnkStruct_0200112C * ov94_022429B4 (UnkStruct_02013A04 ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3)
+UnkStruct_0200112C * ov94_022429B4 (ResourceMetadata ** param0, Window * param1, MessageLoader * param2, MessageLoader * param3)
 {
     UnkStruct_ov84_02240FA8 v0;
     int v1;
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index 6c83b416b7..dd5b4970c1 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -29,7 +29,7 @@ typedef struct {
 
 static void ov94_0224400C(SysTask * param0, void * param1);
 static void ov94_022440FC(SysTask * param0, void * param1);
-static void ov94_022441A0(UnkStruct_02022550 * param0, int param1, int param2);
+static void ov94_022441A0(GraphicElementData * param0, int param1, int param2);
 static void ov94_02243FF0(UnkStruct_ov94_02243FF0 * param0, int param1);
 static void ov94_0224432C(UnkStruct_ov94_0223FD4C * param0);
 static void ov94_02244378(NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3, int param4);
@@ -202,7 +202,7 @@ static void ov94_022440FC (SysTask * param0, void * param1)
     }
 }
 
-static void ov94_022441A0 (UnkStruct_02022550 * param0, int param1, int param2)
+static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2)
 {
     VecFx32 v0;
 
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 871674c0da..71dfe21489 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -59,7 +59,7 @@ struct UnkStruct_ov95_02247628_t {
     UnkStruct_0200B358 * unk_0C;
     MessageLoader * unk_10;
     Strbuf* unk_14;
-    UnkStruct_020218BC * unk_18;
+    GraphicElementManager * unk_18;
     UnkStruct_0200C738 unk_1C;
     SysTask * unk_1A8;
     BOOL unk_1AC;
@@ -650,9 +650,9 @@ void ov95_022475C4 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 *
     param0->unk_1C = 0;
 }
 
-UnkStruct_02022550 * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
+GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
     UnkStruct_ov83_0223D9A8 v1;
 
     v1.unk_00 = param0->unk_18;
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 245c45ceba..09ae1dd979 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -54,7 +54,7 @@ typedef struct {
     UnkStruct_02007768 * unk_0C;
     Sprite * unk_10;
     SpriteAnimationFrame unk_14[10];
-    UnkStruct_02022550 * unk_3C[2];
+    GraphicElementData * unk_3C[2];
     UnkStruct_ov95_02247568 unk_44;
     BGL * unk_54;
     Window unk_58;
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 4a7f73dd85..6be41afa02 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -131,7 +131,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     UnkStruct_ov95_02247568 unk_0C;
-    UnkStruct_02022550 * unk_1C[20][2];
+    GraphicElementData * unk_1C[20][2];
     u32 unk_BC;
     BGL * unk_C0;
     UnkStruct_ov95_02247004 * unk_C4;
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 0cd917b712..4195d5432a 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -93,7 +93,7 @@ typedef struct {
     int unk_08;
     BOOL unk_0C;
     UnkStruct_ov95_02247568 unk_10;
-    UnkStruct_02022550 * unk_20[1];
+    GraphicElementData * unk_20[1];
     BGL * unk_24;
     UnkStruct_ov95_0224773C * unk_28;
     UnkStruct_ov95_02247958 * unk_2C;
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index 01b8c880b2..563b107e64 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -89,7 +89,7 @@ typedef struct {
     int unk_08;
     BOOL unk_0C;
     UnkStruct_ov95_02247568 unk_10;
-    UnkStruct_02022550 * unk_20[1];
+    GraphicElementData * unk_20[1];
     BGL * unk_24;
     UnkStruct_ov95_0224773C * unk_28;
     UnkStruct_ov95_02247958 * unk_2C;
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 1b1d242f01..7c6b4cae07 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -71,7 +71,7 @@ typedef struct {
     UnkStruct_02007768 * unk_10;
     Sprite * unk_14;
     SpriteAnimationFrame unk_18[10];
-    UnkStruct_02022550 * unk_40[2];
+    GraphicElementData * unk_40[2];
     UnkStruct_ov95_02247568 unk_48;
     BGL * unk_58;
     Window unk_5C;
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 5b9ac2a119..9097b0de95 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -335,7 +335,7 @@ static const UnkStruct_ov61_0222C884 Unk_ov96_0223DA78 = {
     0x0
 };
 
-UnkStruct_02001AF4 * ov96_0223BBC8 (BGL * param0, int param1, int param2)
+UIControlData * ov96_0223BBC8 (BGL * param0, int param1, int param2)
 {
     UnkStruct_ov61_0222C884 v0;
 
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index ef9420a806..d563d425a6 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -133,7 +133,7 @@ typedef struct {
     int unk_150;
     BOOL unk_154[1];
     Window unk_158;
-    UnkStruct_02022550 * unk_168[2];
+    GraphicElementData * unk_168[2];
     int unk_170;
 } UnkStruct_0222AE60;
 
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index f7d67a27fd..09a129a46f 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -366,7 +366,7 @@ typedef struct {
     SaveData * unk_08;
     UnkStruct_02026324 * unk_0C;
     TrainerInfo * unk_10;
-    UnkStruct_020279FC * unk_14;
+    AnimationControlFlags * unk_14;
     Window unk_18;
     Window unk_28;
     Window unk_38;
@@ -385,7 +385,7 @@ typedef struct {
     int unk_168;
     u8 unk_16C[12288];
     UnkStruct_020067E8 * unk_316C;
-    UnkStruct_02022550 * unk_3170;
+    GraphicElementData * unk_3170;
     MysteryGift * unk_3174;
     int unk_3178;
     int unk_317C;
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 31dc13aeaf..1e2b1babb0 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -89,7 +89,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     BOOL unk_08;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
     VecFx32 unk_10;
     fx32 unk_1C;
     fx32 unk_20;
@@ -1177,9 +1177,9 @@ static void ov97_0222E398 (UnkStruct_ov97_0222E398 * param0)
     sub_020093B4(&param0->unk_10[v9 + 1], v7, v7, v7, v7, 0xffffffff, 0xffffffff, 0, 0, param0->unk_0C->unk_190[0], param0->unk_0C->unk_190[1], param0->unk_0C->unk_190[2], param0->unk_0C->unk_190[3], NULL, NULL);
 }
 
-static UnkStruct_02022550 * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int param1)
+static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int param1)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     {
         UnkStruct_ov115_02261520 v1;
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index aaf9640f13..707bca193b 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -94,14 +94,14 @@ typedef struct {
     void * unk_2BFC;
     MysteryGift * unk_2C00;
     SaveData * unk_2C04;
-    UnkStruct_020279FC * unk_2C08;
+    AnimationControlFlags * unk_2C08;
     int unk_2C0C;
     int unk_2C10;
     UnkStruct_0202DBAC * unk_2C14[3];
     int unk_2C20;
     int unk_2C24;
     UnkStruct_0200112C * unk_2C28;
-    UnkStruct_02013A04 * unk_2C2C;
+    ResourceMetadata * unk_2C2C;
     Window unk_2C30;
     Window unk_2C40;
     int unk_2C50;
@@ -114,13 +114,13 @@ typedef struct {
     void (* unk_2C98)(void *);
     int unk_2C9C;
     int unk_2CA0;
-    UnkStruct_020218BC * unk_2CA4;
+    GraphicElementManager * unk_2CA4;
     UnkStruct_0200C738 unk_2CA8;
     UnkStruct_02009714 * unk_2E34[6];
     UnkStruct_02009DC8 * unk_2E4C[6];
     UnkStruct_ov19_021DA864 unk_2E64;
-    UnkStruct_02022550 * unk_2E88[2];
-    UnkStruct_02022550 * unk_2E90[3];
+    GraphicElementData * unk_2E88[2];
+    GraphicElementData * unk_2E90[3];
     UnkUnion_ov97_0222D2B0 unk_2E9C;
     UnkStruct_ov97_02231318 unk_31F4;
     void (* unk_3E0C)(void *);
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 4a7bdb5b91..b480262285 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -108,13 +108,13 @@ typedef struct {
 } UnkStruct_ov97_02233DAC;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_00;
+    GraphicElementData * unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub1;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub2;
@@ -128,7 +128,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
     u8 unk_0C[512];
 } UnkStruct_ov97_0223F434;
 
@@ -139,23 +139,23 @@ typedef struct {
     int unk_0C;
     SaveData * unk_10;
     TrainerInfo * unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     int unk_1C;
     BGL * unk_20;
     int unk_24;
-    UnkStruct_020218BC * unk_28;
+    GraphicElementManager * unk_28;
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[6];
     UnkStruct_02009DC8 * unk_1D0[6];
     UnkStruct_ov19_021DA864 unk_1E8;
     UnkStruct_ov97_02234A2C_sub1 unk_20C[30];
     UnkUnion_02022594 unk_374[34];
-    UnkStruct_02022550 * unk_3FC[4];
-    UnkStruct_02022550 * unk_40C[4];
-    UnkStruct_02022550 * unk_41C[4];
+    GraphicElementData * unk_3FC[4];
+    GraphicElementData * unk_40C[4];
+    GraphicElementData * unk_41C[4];
     UnkStruct_ov97_02234A2C_sub2 unk_42C[6];
     int unk_474;
-    UnkStruct_02022550 * unk_478[6];
+    GraphicElementData * unk_478[6];
     UnkStruct_ov97_02233DAC unk_490;
     Window unk_4DC;
     Window unk_4EC;
@@ -651,7 +651,7 @@ static u8 GBASpeciesToDSFormId (int param0, u32 param1, int param2)
     return v0;
 }
 
-static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int param4, UnkStruct_02022550 * param5)
+static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int param4, GraphicElementData * param5)
 {
     u8 * v0;
     u8 v1;
@@ -669,7 +669,7 @@ static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int p
     Heap_FreeToHeap(v0);
 }
 
-static void ov97_022342E4 (int param0, int param1, int param2, int param3, UnkStruct_02022550 * param4, void * param5, NARC * param6)
+static void ov97_022342E4 (int param0, int param1, int param2, int param3, GraphicElementData * param4, void * param5, NARC * param6)
 {
     u32 v0;
     NNSG2dCharacterData * v1;
@@ -799,10 +799,10 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
     }
 }
 
-static UnkStruct_02022550 * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4)
+static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4)
 {
     UnkStruct_ov115_02261520 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
 
     ov97_022340FC(&v0, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 14b7991bb0..7968569e81 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -68,7 +68,7 @@ typedef struct {
     int unk_20;
     BOOL unk_24[4];
     UnkStruct_ov97_02237AEC unk_34;
-    UnkStruct_02022550 * unk_26C;
+    GraphicElementData * unk_26C;
     int unk_270;
     fx32 unk_274;
     u8 unk_278[3200];
@@ -439,7 +439,7 @@ void ov97_02237CAC (int param0)
     }
 }
 
-UnkStruct_02022550 * ov97_02237D14 (int param0, UnkStruct_02022550 * param1, int param2, int param3, int param4)
+GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int param2, int param3, int param4)
 {
     UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550;
 
@@ -573,7 +573,7 @@ static int ov97_02237EA8 (int param0)
     return 0;
 }
 
-static void ov97_02237EF8 (UnkStruct_02022550 * param0, Pokemon * param1, int param2, int param3, u8 * param4, ArchivedSprite * param5)
+static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int param2, int param3, u8 * param4, ArchivedSprite * param5)
 {
     int v0, v1;
     u32 v2;
diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c
index 8d46eaa950..816a254b2e 100644
--- a/src/overlay098/ov98_022471C8.c
+++ b/src/overlay098/ov98_022471C8.c
@@ -89,13 +89,13 @@ typedef struct {
     Window unk_58;
     Window unk_68;
     Window unk_78;
-    UnkStruct_02001AF4 * unk_88;
+    UIControlData * unk_88;
     void * unk_8C;
     int unk_90;
     int unk_94;
     int unk_98;
     int unk_9C;
-    UnkStruct_02013A04 * unk_A0;
+    ResourceMetadata * unk_A0;
     UnkStruct_0200112C * unk_A4;
     int unk_A8;
     int unk_AC;
@@ -128,7 +128,7 @@ static void ov98_02247ACC(UnkStruct_ov98_02247704 * param0);
 static void ov98_02247AE8(UnkStruct_ov98_02247704 * param0, int param1, int param2);
 static void ov98_02247AF0(UnkStruct_ov98_02247704 * param0);
 static void ov98_02247B0C(UnkStruct_ov98_02247704 * param0);
-static UnkStruct_02001AF4 * ov98_02247B24(BGL * param0, int param1, int param2);
+static UIControlData * ov98_02247B24(BGL * param0, int param1, int param2);
 static int ov98_02247B98(UnkStruct_ov98_02247704 * param0);
 static int ov98_02247D30(UnkStruct_ov98_02247704 * param0);
 static int ov98_02247D50(UnkStruct_ov98_02247704 * param0);
@@ -722,7 +722,7 @@ static void ov98_02247B0C (UnkStruct_ov98_02247704 * param0)
     }
 }
 
-static UnkStruct_02001AF4 * ov98_02247B24 (BGL * param0, int param1, int param2)
+static UIControlData * ov98_02247B24 (BGL * param0, int param1, int param2)
 {
     UnkStruct_ov61_0222C884 v0;
 
@@ -733,7 +733,7 @@ static UnkStruct_02001AF4 * ov98_02247B24 (BGL * param0, int param1, int param2)
     return sub_02002100(param0, &v0, (1 + (18 + 12)), 11, 109);
 }
 
-static UnkStruct_02001AF4 * ov98_02247B58 (BGL * param0, int param1, int param2, int param3)
+static UIControlData * ov98_02247B58 (BGL * param0, int param1, int param2, int param3)
 {
     UnkStruct_ov61_0222C884 v0;
 
diff --git a/src/overlay099/ov99_021D0D80.c b/src/overlay099/ov99_021D0D80.c
index 437209f1e3..c51540d96b 100644
--- a/src/overlay099/ov99_021D0D80.c
+++ b/src/overlay099/ov99_021D0D80.c
@@ -83,9 +83,9 @@ static void ov99_021D1380(BGL * param0);
 static void ov99_021D1720(UnkStruct_ov99_021D2CB0 * param0);
 static void ov99_021D1918(UnkStruct_ov99_021D2CB0 * param0);
 static void ov99_021D19A0(UnkStruct_ov99_021D2CB0 * param0);
-static UnkStruct_0207C690 * ov99_021D19AC(int param0);
+static GenericPointerData * ov99_021D19AC(int param0);
 static void ov99_021D19C8(void);
-static void ov99_021D1A4C(UnkStruct_0207C690 * param0);
+static void ov99_021D1A4C(GenericPointerData * param0);
 static void ov99_021D16E4(UnkStruct_ov99_021D2CB0 * param0);
 static void ov99_021D1270(UnkStruct_ov99_021D2CB0 * param0);
 static void ov99_021D1314(UnkStruct_ov99_021D2CB0 * param0);
@@ -774,9 +774,9 @@ static void ov99_021D19A0 (UnkStruct_ov99_021D2CB0 * param0)
     sub_020203B8(param0->unk_28);
 }
 
-static UnkStruct_0207C690 * ov99_021D19AC (int param0)
+static GenericPointerData * ov99_021D19AC (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 1, 0, 1, ov99_021D19C8);
     return v0;
@@ -797,7 +797,7 @@ static void ov99_021D19C8 (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov99_021D1A4C (UnkStruct_0207C690 * param0)
+static void ov99_021D1A4C (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c
index 27f963e4fb..dfea306b45 100644
--- a/src/overlay100/ov100_021D13E4.c
+++ b/src/overlay100/ov100_021D13E4.c
@@ -233,8 +233,8 @@ static void ov100_021D1808 (UnkStruct_ov100_021D1808 * param0)
 {
     NARC * v0 = param0->unk_7C4->unk_00;
     BGL * v1 = param0->unk_7C4->unk_0C;
-    UnkStruct_0200C6E4 * v2 = param0->unk_7C4->unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_7C4->unk_08;
+    CellTransferStateData * v2 = param0->unk_7C4->unk_04;
+    AnimationResourceCollection * v3 = param0->unk_7C4->unk_08;
     PaletteSys * v4 = param0->unk_7C4->unk_10;
     int v5 = 50000;
 
@@ -289,8 +289,8 @@ static void ov100_021D1A54 (UnkStruct_ov100_021D1808 * param0)
     int v0;
     NARC * v1 = param0->unk_7C4->unk_00;
     BGL * v2 = param0->unk_7C4->unk_0C;
-    UnkStruct_0200C6E4 * v3 = param0->unk_7C4->unk_04;
-    UnkStruct_0200C704 * v4 = param0->unk_7C4->unk_08;
+    CellTransferStateData * v3 = param0->unk_7C4->unk_04;
+    AnimationResourceCollection * v4 = param0->unk_7C4->unk_08;
     PaletteSys * v5 = param0->unk_7C4->unk_10;
     UnkStruct_ov104_0223F9E0 v6;
 
diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c
index 48882feefc..daa994bff4 100644
--- a/src/overlay100/ov100_021D1C44.c
+++ b/src/overlay100/ov100_021D1C44.c
@@ -74,8 +74,8 @@ static void ov100_021D1C98 (UnkStruct_ov100_021D1C98 * param0)
 {
     NARC * v0 = param0->unk_1EBC->unk_00;
     BGL * v1 = param0->unk_1EBC->unk_0C;
-    UnkStruct_0200C6E4 * v2 = param0->unk_1EBC->unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_1EBC->unk_08;
+    CellTransferStateData * v2 = param0->unk_1EBC->unk_04;
+    AnimationResourceCollection * v3 = param0->unk_1EBC->unk_08;
     PaletteSys * v4 = param0->unk_1EBC->unk_10;
     int v5 = 50000;
 
@@ -198,8 +198,8 @@ static void ov100_021D2250 (UnkStruct_ov100_021D1C98 * param0)
     int v0;
     NARC * v1 = param0->unk_1EBC->unk_00;
     BGL * v2 = param0->unk_1EBC->unk_0C;
-    UnkStruct_0200C6E4 * v3 = param0->unk_1EBC->unk_04;
-    UnkStruct_0200C704 * v4 = param0->unk_1EBC->unk_08;
+    CellTransferStateData * v3 = param0->unk_1EBC->unk_04;
+    AnimationResourceCollection * v4 = param0->unk_1EBC->unk_08;
     PaletteSys * v5 = param0->unk_1EBC->unk_10;
     UnkStruct_ov104_0223F9E0 v6;
 
diff --git a/src/overlay100/ov100_021D2F0C.c b/src/overlay100/ov100_021D2F0C.c
index 09022dfe36..f40b9f32c3 100644
--- a/src/overlay100/ov100_021D2F0C.c
+++ b/src/overlay100/ov100_021D2F0C.c
@@ -59,8 +59,8 @@ static void ov100_021D2F64 (UnkStruct_ov100_021D3084 * param0)
 {
     NARC * v0 = param0->unk_1D28->unk_00;
     BGL * v1 = param0->unk_1D28->unk_0C;
-    UnkStruct_0200C6E4 * v2 = param0->unk_1D28->unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_1D28->unk_08;
+    CellTransferStateData * v2 = param0->unk_1D28->unk_04;
+    AnimationResourceCollection * v3 = param0->unk_1D28->unk_08;
     PaletteSys * v4 = param0->unk_1D28->unk_10;
 
     ov100_021D4AC8(&param0->unk_0C.unk_934[0], 84, param0->unk_1D28->unk_00);
@@ -87,8 +87,8 @@ static void ov100_021D3084 (UnkStruct_ov100_021D3084 * param0)
 {
     NARC * v0 = param0->unk_1D28->unk_00;
     BGL * v1 = param0->unk_1D28->unk_0C;
-    UnkStruct_0200C6E4 * v2 = param0->unk_1D28->unk_04;
-    UnkStruct_0200C704 * v3 = param0->unk_1D28->unk_08;
+    CellTransferStateData * v2 = param0->unk_1D28->unk_04;
+    AnimationResourceCollection * v3 = param0->unk_1D28->unk_08;
     PaletteSys * v4 = param0->unk_1D28->unk_10;
 
     ov100_021D4AC8(&param0->unk_0C.unk_04, 46, param0->unk_1D28->unk_00);
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index dbf27d5f7e..5ee5e6bd2e 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -1468,7 +1468,7 @@ static void ov101_021D6E3C (UnkStruct_ov101_021D5D90 * param0, void * param1)
     }
 }
 
-static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, UnkStruct_02022550 * param5, int param6)
+static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, GraphicElementData * param5, int param6)
 {
     VecFx32 v0, v1;
 
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index a2f10a18a1..21b7458dca 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -36,7 +36,7 @@ typedef struct UnkStruct_ov101_021D7E48_t {
     u8 unk_09;
     u8 unk_0A;
     u8 unk_0B;
-    UnkStruct_020218BC * unk_0C;
+    GraphicElementManager * unk_0C;
     UnkStruct_0200C738 unk_10;
     NNSG2dCellTransferState * unk_19C;
     UnkStruct_02009714 * unk_1A0;
@@ -325,7 +325,7 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
 {
     UnkStruct_ov19_021DA864 v0;
     UnkStruct_ov83_0223D9A8 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     if (param8 == param0->unk_0B) {
         param8 = 0xffffffff;
@@ -362,13 +362,13 @@ void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0)
     param0->unk_04 = NULL;
 }
 
-void ov101_021D8560 (UnkStruct_02022550 * param0, VecFx32 * param1)
+void ov101_021D8560 (GraphicElementData * param0, VecFx32 * param1)
 {
     const VecFx32 * v0 = sub_02021D28(param0);
     *param1 = *v0;
 }
 
-void ov101_021D8574 (UnkStruct_02022550 * param0, VecFx32 * param1)
+void ov101_021D8574 (GraphicElementData * param0, VecFx32 * param1)
 {
     const VecFx32 * v0 = sub_02021D2C(param0);
     *param1 = *v0;
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 281bc73977..d5ad4bd710 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -42,8 +42,8 @@
 #include "overlay104/ov104_0222DCE0.h"
 
 void ov104_0222E1C0(SaveData * param0, Party * param1, Pokemon * param2);
-void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1);
-void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(GraphicElementData * param0, u8 param1);
+void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3);
 u8 ov104_0222E240(u16 param0, u16 param1);
 void ov104_0222E278(UnkStruct_ov104_0223A348 * param0, u16 param1, int param2, int param3);
 void ov104_0222E284(BattleParams * param0, UnkStruct_ov104_0223A348_sub1 * param1, int param2, int param3, int param4);
@@ -385,7 +385,7 @@ void ov104_0222E1C0 (SaveData * param0, Party * param1, Pokemon * param2)
     return;
 }
 
-void ov104_0222E1D8 (UnkStruct_02022550 * param0, u8 param1)
+void ov104_0222E1D8 (GraphicElementData * param0, u8 param1)
 {
     if (sub_02021E24(param0) == param1) {
         return;
@@ -397,7 +397,7 @@ void ov104_0222E1D8 (UnkStruct_02022550 * param0, u8 param1)
     return;
 }
 
-void ov104_0222E204 (UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3)
+void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 param3)
 {
     VecFx32 v0;
 
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 43f37c1d35..27e080656f 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -141,7 +141,7 @@ typedef struct {
     UnkStruct_ov104_0223EBD0 * unk_2C;
 } UnkStruct_ov104_02231148;
 
-void ov104_0223DC7C(int param0, BGL * param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7);
+void ov104_0223DC7C(int param0, BGL * param1, CellTransferStateData * param2, AnimationResourceCollection * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7);
 u16 ov104_0222FC8C(UnkStruct_ov104_0222E930 * param0, u16 param1);
 u16 * ov104_0222FC14(UnkStruct_ov104_0222E930 * param0, u16 param1);
 static BOOL ov104_0222FCA0(UnkStruct_ov104_0222E930 * param0);
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index 172994f552..e330ab3ccc 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -94,13 +94,13 @@ typedef struct UnkStruct_ov104_02232B5C_t {
     u16 * unk_9C;
     u16 * unk_A0;
     UnkStruct_02081CF4 unk_A4;
-    UnkStruct_02001AF4 * unk_B0;
-    UnkStruct_02013A04 unk_B4[28];
+    UIControlData * unk_B0;
+    ResourceMetadata unk_B4[28];
     UnkStruct_ov84_02240FA8 unk_194;
     UnkStruct_0200112C * unk_1B4;
     u16 unk_1B8;
     u16 unk_1BA;
-    UnkStruct_02013A04 unk_1BC[28];
+    ResourceMetadata unk_1BC[28];
     u16 unk_29C[28];
     u16 unk_2D4;
 } UnkStruct_ov104_02232B5C;
@@ -873,8 +873,8 @@ void ov104_02232C80 (UnkStruct_ov63_0222CCB8 * param0, UnkStruct_ov63_0222BEC0 *
 
 void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, u16 param9)
 {
-    UnkStruct_0200C6E4 * v0 = param0->unk_34.unk_00;
-    UnkStruct_0200C704 * v1 = param0->unk_34.unk_04;
+    CellTransferStateData * v0 = param0->unk_34.unk_00;
+    AnimationResourceCollection * v1 = param0->unk_34.unk_04;
     PaletteSys * v2 = param0->unk_04;
     ArchivedSprite v3;
     void * v4;
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 1bc93e5047..e0a4bc27a3 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -406,24 +406,24 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
             {
                 VecFx32 v21;
                 VecFx32 v22;
-                UnkStruct_02022550 * v23;
-                UnkStruct_02022550 * v24;
+                GraphicElementData * v23;
+                GraphicElementData * v24;
 
                 for (v11 = 0; v11 < v4; v11++) {
                     v23 = v3->unk_30[v11]->unk_00;
-                    v21 = *(sub_02021D28((const UnkStruct_02022550 *)v23));
+                    v21 = *(sub_02021D28((const GraphicElementData *)v23));
 
                     v24 = v3->unk_40[v11]->unk_00;
-                    v22 = *(sub_02021D28((const UnkStruct_02022550 *)v24));
+                    v22 = *(sub_02021D28((const GraphicElementData *)v24));
 
                     sub_02021C50(v23, &v22);
                     sub_02021C50(v24, &v21);
 
                     v23 = v3->unk_50[v11]->unk_00;
-                    v21 = *(sub_02021D28((const UnkStruct_02022550 *)v23));
+                    v21 = *(sub_02021D28((const GraphicElementData *)v23));
 
                     v24 = v3->unk_60[v11]->unk_00;
-                    v22 = *(sub_02021D28((const UnkStruct_02022550 *)v24));
+                    v22 = *(sub_02021D28((const GraphicElementData *)v24));
 
                     sub_02021C50(v23, &v22);
                     sub_02021C50(v24, &v21);
@@ -524,7 +524,7 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
             {
                 u32 v25;
                 UnkStruct_ov104_0223C634 * v26;
-                UnkStruct_02022550 * v27;
+                GraphicElementData * v27;
 
                 v26 = ov104_0223D5A8(param0->unk_00->unk_00, v19);
                 v25 = ov63_0222D050(v26->unk_04);
diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c
index 4c02f9e2be..962ac6bc61 100644
--- a/src/overlay104/ov104_02239C58.c
+++ b/src/overlay104/ov104_02239C58.c
@@ -109,8 +109,8 @@ static void ov104_02239D1C (UnkStruct_0209B75C * param0, UnkStruct_0209BBA4 * pa
 {
     u8 v0;
 
-    param1->unk_A8 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
-    MI_CpuClearFast(param1->unk_A8, sizeof(UnkStruct_02098C44));
+    param1->unk_A8 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
+    MI_CpuClearFast(param1->unk_A8, sizeof(PartyManagementData));
 
     param1->unk_A8->unk_00 = Party_GetFromSavedata(param1->unk_00);
     param1->unk_A8->unk_04 = sub_0207D990(param1->unk_00);
diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c
index 30b4e8fa83..8e5db33920 100644
--- a/src/overlay104/ov104_0223C2D4.c
+++ b/src/overlay104/ov104_0223C2D4.c
@@ -79,9 +79,9 @@ UnkStruct_ov104_0223C4CC * ov104_0223C2D4(UnkStruct_0209B75C * param0);
 void ov104_0223C4CC(UnkStruct_ov104_0223C4CC * param0);
 static void ov104_0223C8E8(UnkStruct_ov104_0223C4CC * param0);
 static void ov104_0223CC10(UnkStruct_ov104_0223C4CC * param0);
-static UnkStruct_0207C690 * ov104_0223CF4C(int param0);
+static GenericPointerData * ov104_0223CF4C(int param0);
 static void ov104_0223CF68(void);
-static void ov104_0223CFEC(UnkStruct_0207C690 * param0);
+static void ov104_0223CFEC(GenericPointerData * param0);
 static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC * param0);
 static void ov104_0223D498(UnkStruct_ov104_0223C4CC * param0);
 static void ov104_0223D570(UnkStruct_ov104_0223C634 * param0, UnkStruct_ov104_0223D570 * param1);
@@ -784,9 +784,9 @@ static void ov104_0223CEEC (UnkStruct_ov104_0223C4CC * param0)
     ov63_0222D7B4(param0->unk_30);
 }
 
-static UnkStruct_0207C690 * ov104_0223CF4C (int param0)
+static GenericPointerData * ov104_0223CF4C (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 1, 0, 1, ov104_0223CF68);
     return v0;
@@ -807,7 +807,7 @@ static void ov104_0223CF68 (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov104_0223CFEC (UnkStruct_0207C690 * param0)
+static void ov104_0223CFEC (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
diff --git a/src/overlay104/ov104_0223D768.c b/src/overlay104/ov104_0223D768.c
index 24bf7923bc..7d1ab6718f 100644
--- a/src/overlay104/ov104_0223D768.c
+++ b/src/overlay104/ov104_0223D768.c
@@ -63,7 +63,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov104_022417D8[] = {
     }
 };
 
-void ov104_0223D768 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, PaletteSys * param3, u16 param4)
+void ov104_0223D768 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, PaletteSys * param3, u16 param4)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
 
@@ -76,7 +76,7 @@ void ov104_0223D768 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, N
     sub_0200CE54(param0, param1, param2, v0->unk_14[3], 1, v0->unk_14[3]);
 }
 
-void ov104_0223D7EC (UnkStruct_0200C704 * param0, u16 param1)
+void ov104_0223D7EC (AnimationResourceCollection * param0, u16 param1)
 {
     const UnkStruct_ov104_0223F9E0 * v0;
 
@@ -89,7 +89,7 @@ void ov104_0223D7EC (UnkStruct_0200C704 * param0, u16 param1)
     sub_0200D0A0(param0, v0->unk_14[3]);
 }
 
-CellActorData * ov104_0223D828 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u16 param2)
+CellActorData * ov104_0223D828 (CellTransferStateData * param0, AnimationResourceCollection * param1, u16 param2)
 {
     CellActorData * v0;
 
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index d189780056..b39df4b65c 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -75,8 +75,8 @@ typedef struct {
     int unk_08;
     void * unk_0C;
     BGL * unk_10;
-    UnkStruct_0200C6E4 * unk_14;
-    UnkStruct_0200C704 * unk_18;
+    CellTransferStateData * unk_14;
+    AnimationResourceCollection * unk_18;
     PaletteSys * unk_1C;
     u16 * unk_20;
     NARC * unk_24;
@@ -130,7 +130,7 @@ typedef struct {
     u8 unk_0B;
 } UnkStruct_ov104_0224191C;
 
-void ov104_0223DC7C(int param0, BGL * param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7);
+void ov104_0223DC7C(int param0, BGL * param1, CellTransferStateData * param2, AnimationResourceCollection * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7);
 static void ov104_0223DD30(UnkStruct_ov104_0223DD30 * param0, SysTask * param1);
 static void ov104_0223DD5C(SysTask * param0, void * param1);
 static void ov104_0223DDB4(SysTask * param0, void * param1);
@@ -186,7 +186,7 @@ static const UnkStruct_ov104_0223F9E0 Unk_ov104_022418E8 = {
     0x0
 };
 
-void ov104_0223DC7C (int param0, BGL * param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7)
+void ov104_0223DC7C (int param0, BGL * param1, CellTransferStateData * param2, AnimationResourceCollection * param3, PaletteSys * param4, u16 * param5, s16 param6, s16 param7)
 {
     SysTask * v0;
     UnkStruct_ov104_0223DD30 * v1;
@@ -435,7 +435,7 @@ static void ov104_0223E29C (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0
     int v3;
     FontOAM * v4;
     BGL * v5;
-    UnkStruct_0200C704 * v6;
+    AnimationResourceCollection * v6;
     int v7, v8;
 
     GF_ASSERT(param1->unk_00 == NULL);
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 478aa4513e..a73a84d52b 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -114,13 +114,13 @@ struct UnkStruct_ov105_02241FF4_t {
     BGL * unk_4C;
     Window unk_50[10];
     UnkStruct_02081CF4 unk_F0;
-    UnkStruct_02001AF4 * unk_FC;
-    UnkStruct_02013A04 unk_100[4];
+    UIControlData * unk_FC;
+    ResourceMetadata unk_100[4];
     PaletteSys * unk_120;
-    UnkStruct_0207C690 * unk_124;
+    GenericPointerData * unk_124;
     UnkStruct_02007768 * unk_128;
     Sprite * unk_12C[3];
-    UnkStruct_020279FC * unk_138;
+    AnimationControlFlags * unk_138;
     SaveData * unk_13C;
     UnkStruct_02098D38 * unk_140;
     UnkStruct_ov105_02245AAC unk_144;
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index a24cabcf08..0a8cbeffcc 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -19,7 +19,7 @@
 #include "overlay105/ov105_02245AAC.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0);
-UnkStruct_02022550 * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
 void ov105_02245C50(UnkStruct_ov105_02245AAC * param0);
 static void ov105_02245C98(void);
 
@@ -60,11 +60,11 @@ void ov105_02245AAC (UnkStruct_ov105_02245AAC * param0)
     return;
 }
 
-UnkStruct_02022550 * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
+GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
 {
     int v0;
     UnkStruct_ov19_021DA864 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, param4, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 0adf218fe0..09bcfaaa0b 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -14,7 +14,7 @@
 struct UnkStruct_ov105_02245E1C_t {
     int unk_00;
     int unk_04;
-    UnkStruct_02022550 * unk_08;
+    GraphicElementData * unk_08;
 };
 
 UnkStruct_ov105_02245E1C * ov105_02245DC4(UnkStruct_ov105_02245AAC * param0, u32 param1, int param2, int param3, u32 param4);
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 8133082b10..554948a650 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -16,7 +16,7 @@ struct UnkStruct_ov105_02245EA8_t {
     u16 unk_02;
     int unk_04;
     int unk_08;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
 };
 
 UnkStruct_ov105_02245EA8 * ov105_02245E54(UnkStruct_ov105_02245AAC * param0, int param1, int param2, u32 param3);
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index a5d4b18d02..0ea339f997 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -21,7 +21,7 @@ struct UnkStruct_ov105_02246060_t {
     u8 unk_03;
     const UnkStruct_ov105_02246394 * unk_04;
     const u8 * unk_08;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
     u8 unk_10;
 };
 
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 8996424a91..88c4537fd4 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -105,11 +105,11 @@ struct UnkStruct_ov106_02243118_t {
     BGL * unk_48;
     Window unk_4C[4];
     UnkStruct_02081CF4 unk_8C;
-    UnkStruct_02001AF4 * unk_98;
-    UnkStruct_02013A04 unk_9C[2];
+    UIControlData * unk_98;
+    ResourceMetadata unk_9C[2];
     PaletteSys * unk_AC;
     UnkStruct_0200C440 * unk_B0;
-    UnkStruct_020279FC * unk_B4;
+    AnimationControlFlags * unk_B4;
     SaveData * unk_B8;
     UnkStruct_02098D38 * unk_BC;
     UnkStruct_ov106_02243310 unk_C0;
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 78d4f03606..d2e1e20b9e 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -23,7 +23,7 @@
 #include "overlay106/ov106_02243310.h"
 
 void ov106_02243310(UnkStruct_ov106_02243310 * param0, Pokemon * param1);
-UnkStruct_02022550 * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
+GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
 void ov106_02243570(UnkStruct_ov106_02243310 * param0);
 static void ov106_022435C8(void);
 
@@ -73,11 +73,11 @@ void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1)
     return;
 }
 
-UnkStruct_02022550 * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4)
+GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4)
 {
     int v0;
     UnkStruct_ov19_021DA864 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, 1, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 804c3fe0f8..2f84feaab3 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -18,7 +18,7 @@ struct UnkStruct_ov106_02243650_t {
     u32 unk_04;
     u32 unk_08;
     const u8 * unk_0C;
-    UnkStruct_02022550 * unk_10;
+    GraphicElementData * unk_10;
 };
 
 UnkStruct_ov106_02243650 * ov106_022435FC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5);
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index a51faa1a2d..e90286edac 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -263,14 +263,14 @@ struct UnkStruct_ov107_02241D6C_t {
     BGL * unk_4C;
     Window unk_50[18];
     UnkStruct_02081CF4 unk_170;
-    UnkStruct_02001AF4 * unk_17C;
-    UnkStruct_02013A04 unk_180[3];
+    UIControlData * unk_17C;
+    ResourceMetadata unk_180[3];
     UnkStruct_0200112C * unk_198;
-    UnkStruct_02013A04 * unk_19C;
+    ResourceMetadata * unk_19C;
     UnkStruct_ov84_02240FA8 unk_1A0;
     PaletteSys * unk_1C0;
     UnkStruct_0200C440 * unk_1C4;
-    UnkStruct_020279FC * unk_1C8;
+    AnimationControlFlags * unk_1C8;
     SaveData * unk_1CC;
     UnkStruct_020302DC * unk_1D0;
     UnkStruct_0203041C * unk_1D4;
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 625043938d..26955d31a0 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -118,13 +118,13 @@ struct UnkStruct_ov107_02246170_t {
     BGL * unk_4C;
     Window unk_50[12];
     UnkStruct_02081CF4 unk_110;
-    UnkStruct_02001AF4 * unk_11C;
-    UnkStruct_02013A04 unk_120[3];
+    UIControlData * unk_11C;
+    ResourceMetadata unk_120[3];
     UnkStruct_0200112C * unk_138;
-    UnkStruct_02013A04 * unk_13C;
+    ResourceMetadata * unk_13C;
     PaletteSys * unk_140;
     UnkStruct_0200C440 * unk_144;
-    UnkStruct_020279FC * unk_148;
+    AnimationControlFlags * unk_148;
     SaveData * unk_14C;
     UnkStruct_020302DC * unk_150;
     UnkStruct_0203041C * unk_154;
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 8f404f1562..2d05ac2d7d 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -29,7 +29,7 @@
 #include "overlay107/ov107_02249604.h"
 
 void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2);
-UnkStruct_02022550 * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov107_02249954(UnkStruct_ov107_02249954 * param0);
 void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1);
 void ov107_022499FC(UnkStruct_ov107_02249954 * param0, u16 param1);
@@ -112,11 +112,11 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param
     return;
 }
 
-UnkStruct_02022550 * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
     UnkStruct_ov19_021DA864 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v1, param1, param2, param3, param3, 0xffffffff, 0xffffffff, 0, param6, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 692d69e797..7fd244c3bf 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -18,7 +18,7 @@
 struct UnkStruct_ov107_02249B8C_t {
     s16 unk_00;
     s16 unk_02;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
 };
 
 UnkStruct_ov107_02249B8C * ov107_02249B1C(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, s16 param5, s16 param6, int param7, const u8 * param8);
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index a79c5a3f33..5d3d391351 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -209,10 +209,10 @@ struct UnkStruct_ov108_02241DB0_t {
     BGL * unk_90;
     Window unk_94[2];
     UnkStruct_02081CF4 unk_B4;
-    UnkStruct_02001AF4 * unk_C0;
-    UnkStruct_02013A04 unk_C4[2];
+    UIControlData * unk_C0;
+    ResourceMetadata unk_C4[2];
     PaletteSys * unk_D4;
-    UnkStruct_020279FC * unk_D8;
+    AnimationControlFlags * unk_D8;
     SaveData * unk_DC;
     UnkStruct_020304A0 * unk_E0;
     UnkStruct_020305B8 * unk_E4;
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 99c7de2ebd..62beecaec9 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -31,7 +31,7 @@ static const u8 Unk_ov108_02243760[4] = {
 };
 
 void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3);
-UnkStruct_02022550 * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov108_02243194(UnkStruct_ov108_02243030 * param0);
 static void ov108_022431FC(void);
 static void ov108_02243230(UnkStruct_ov108_02243030 * param0);
@@ -74,11 +74,11 @@ void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party *
     return;
 }
 
-UnkStruct_02022550 * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
     UnkStruct_ov19_021DA864 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v1, param1, param2, param3, param3, 0xffffffff, 0xffffffff, 0, param6, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index b0603736ef..8456eb474e 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -21,7 +21,7 @@ struct UnkStruct_ov108_02243594_t {
     u8 unk_0B;
     u16 unk_0C;
     u16 unk_0E;
-    UnkStruct_02022550 * unk_10;
+    GraphicElementData * unk_10;
 };
 
 UnkStruct_ov108_02243594 * ov108_0224351C(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u16 param5, u16 param6, u32 param7, int param8, u8 param9);
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 771b3ef650..2e8474d07c 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -307,8 +307,8 @@ typedef struct UnkStruct_ov109_021D0F70_t {
     NNSG2dScreenData * unk_D88;
     NNSG2dCharacterData * unk_D8C;
     NNSG2dPaletteData * unk_D90;
-    UnkStruct_0200C6E4 * unk_D94;
-    UnkStruct_0200C704 * unk_D98;
+    CellTransferStateData * unk_D94;
+    AnimationResourceCollection * unk_D98;
     PaletteSys * unk_D9C;
     GXRgb unk_DA0[8];
     SysTask * unk_DB0;
@@ -1963,8 +1963,8 @@ static void ov109_021D2368 (UnkStruct_ov109_021D0F70 * param0)
 
 static void ov109_021D2408 (UnkStruct_ov109_021D0F70 * param0)
 {
-    UnkStruct_0200C6E4 * v0 = param0->unk_D94;
-    UnkStruct_0200C704 * v1 = param0->unk_D98;
+    CellTransferStateData * v0 = param0->unk_D94;
+    AnimationResourceCollection * v1 = param0->unk_D98;
     PaletteSys * v2 = param0->unk_D9C;
     NARC * v3 = param0->unk_D80;
 
diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c
index b4789b2783..3684f38343 100644
--- a/src/overlay110/ov110_021D0D80.c
+++ b/src/overlay110/ov110_021D0D80.c
@@ -62,7 +62,7 @@ typedef struct {
     Strbuf* unk_118;
     Strbuf* unk_11C;
     PaletteSys * unk_120;
-    const UnkStruct_020279FC * unk_124;
+    const AnimationControlFlags * unk_124;
     SaveData * unk_128;
     UnkStruct_0203068C * unk_12C;
 } UnkStruct_ov110_021D0F78;
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index a615ee9214..f3a2a23397 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -94,7 +94,7 @@ struct UnkStruct_ov111_021D0F7C_t {
     Window unk_5C[16];
     PaletteSys * unk_15C;
     UnkStruct_0200C440 * unk_160;
-    UnkStruct_020279FC * unk_164;
+    AnimationControlFlags * unk_164;
     SaveData * unk_168;
     UnkStruct_ov111_021D2F80 unk_16C;
     UnkStruct_ov111_021D33F4 * unk_35C[4];
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 4d4f1c51fb..232057927c 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -22,7 +22,7 @@
 #include "overlay111/ov111_021D2F80.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0);
-UnkStruct_02022550 * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
 void ov111_021D3320(UnkStruct_ov111_021D2F80 * param0);
 void ov111_021D33B0(UnkStruct_ov111_021D2F80 * param0, int param1);
 static void ov111_021D3378(void);
@@ -113,11 +113,11 @@ static void ov111_021D31F4 (UnkStruct_ov111_021D2F80 * param0, int param1)
     return;
 }
 
-UnkStruct_02022550 * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
+GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
 {
     int v0;
     UnkStruct_ov19_021DA864 v1;
-    UnkStruct_02022550 * v2;
+    GraphicElementData * v2;
 
     sub_020093B4(&v1, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, param3, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index f68cb39052..46308b1dc8 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -17,7 +17,7 @@ struct UnkStruct_ov111_021D33F4_t {
     u8 unk_03;
     u32 unk_04;
     u32 unk_08;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
 };
 
 UnkStruct_ov111_021D33F4 * ov111_021D33F4(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u16 param3, u16 param4, u8 param5, u32 param6, u32 param7);
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index 2cd2f6b41f..96b678944d 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -125,7 +125,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    UnkStruct_020218BC * unk_04;
+    GraphicElementManager * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NARC * unk_1A4;
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 6df4af976e..f3985023c5 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -107,10 +107,10 @@ typedef struct UnkStruct_ov113_0225DBCC_t {
     BGL * unk_08;
     PaletteSys * unk_0C;
     UnkStruct_02012744 * unk_10;
-    UnkStruct_0207C690 * unk_14;
+    GenericPointerData * unk_14;
     SysTask * unk_18;
-    UnkStruct_0200C6E4 * unk_1C;
-    UnkStruct_0200C704 * unk_20;
+    CellTransferStateData * unk_1C;
+    AnimationResourceCollection * unk_20;
     UnkStruct_02015920 * unk_24;
     u8 unk_28;
     u8 unk_29;
@@ -157,9 +157,9 @@ static void ov113_0225D12C(BGL * param0);
 static void ov113_0225D160(UnkStruct_ov113_0225DBCC * param0, NARC * param1);
 static void ov113_0225DBCC(UnkStruct_ov113_0225DBCC * param0);
 static void ov113_0225DC4C(UnkStruct_ov113_0225DBCC * param0);
-static UnkStruct_0207C690 * ov113_0225DC6C(int param0);
+static GenericPointerData * ov113_0225DC6C(int param0);
 static void ov113_0225DC88(void);
-static void ov113_0225DD0C(UnkStruct_0207C690 * param0);
+static void ov113_0225DD0C(GenericPointerData * param0);
 static void ov113_0225D9FC(UnkStruct_ov113_0225DBCC * param0);
 static void ov113_0225DA9C(UnkStruct_ov113_0225DBCC * param0);
 static void ov113_0225DAA8(UnkStruct_ov113_0225DBCC * param0, NARC * param1);
@@ -1282,9 +1282,9 @@ static void ov113_0225DC4C (UnkStruct_ov113_0225DBCC * param0)
     }
 }
 
-static UnkStruct_0207C690 * ov113_0225DC6C (int param0)
+static GenericPointerData * ov113_0225DC6C (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 2, 0, 2, ov113_0225DC88);
     return v0;
@@ -1305,7 +1305,7 @@ static void ov113_0225DC88 (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov113_0225DD0C (UnkStruct_0207C690 * param0)
+static void ov113_0225DD0C (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
@@ -1521,7 +1521,7 @@ static void ov113_0225E15C (UnkStruct_ov113_0225DBCC * param0, UnkStruct_ov113_0
     int v3;
     FontOAM * v4;
     BGL * v5;
-    UnkStruct_0200C704 * v6;
+    AnimationResourceCollection * v6;
     int v7, v8;
 
     GF_ASSERT(param1->unk_00 == NULL);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index d21226363a..a5e724ad39 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -97,7 +97,7 @@ typedef struct {
 } UnkStruct_ov114_0225CCD0;
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_0200C738 unk_04;
 } UnkStruct_ov114_0225CFCC;
 
@@ -135,8 +135,8 @@ typedef struct {
 
 typedef struct {
     Window unk_00;
-    UnkStruct_02022550 * unk_10;
-    UnkStruct_02022550 * unk_14;
+    GraphicElementData * unk_10;
+    GraphicElementData * unk_14;
     u16 unk_18;
     u8 unk_1A;
     u8 unk_1B;
@@ -206,7 +206,7 @@ typedef struct {
 typedef struct {
     void * unk_00;
     NNSG2dScreenData * unk_04;
-    UnkStruct_02022550 * unk_08[15];
+    GraphicElementData * unk_08[15];
     UnkStruct_ov114_0225CDB4 * unk_44;
     u8 unk_48;
     u8 unk_49;
@@ -252,7 +252,7 @@ typedef struct UnkStruct_ov114_0225E854_t {
 } UnkStruct_ov114_0225E854;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[2];
+    GraphicElementData * unk_00[2];
     s16 unk_08;
     s16 unk_0A;
     u8 unk_0C[2][192];
@@ -266,12 +266,12 @@ typedef struct UnkStruct_ov114_02025CAD4_t {
     u32 unk_00;
     u16 unk_04;
     s16 unk_06;
-    UnkStruct_020218BC * unk_08;
+    GraphicElementManager * unk_08;
     NARC * unk_0C;
     UnkStruct_ov114_0225CCD0 unk_10;
     UnkStruct_ov114_0225CDB4 * unk_28;
     SysTask * unk_2C;
-    UnkStruct_02022550 * unk_30;
+    GraphicElementData * unk_30;
     UnkStruct_ov114_0225FAB8 unk_34;
 } UnkStruct_ov114_0225CAD4;
 
@@ -286,7 +286,7 @@ static void ov114_0225CCB0(NNSG2dScreenData * param0, u32 param1);
 static void ov114_0225CCD0(UnkStruct_ov114_0225CCD0 * param0, u32 param1, u32 param2);
 static void ov114_0225CD10(UnkStruct_ov114_0225CCD0 * param0);
 static UnkStruct_ov114_0225CDB4 * ov114_0225CD54(UnkStruct_ov114_0225CCD0 * param0, NARC * param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
-static UnkStruct_02022550 * ov114_0225CDB4(UnkStruct_ov114_0225CDB4 * param0, UnkStruct_020218BC * param1, s16 param2, s16 param3, u16 param4, u32 param5);
+static GraphicElementData * ov114_0225CDB4(UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5);
 static void ov114_0225CDE0(UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1, NARC * param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9);
 static void ov114_0225CEB8(UnkStruct_ov114_0225CCD0 * param0, UnkStruct_ov114_0225CDB4 * param1);
 static void ov114_0225CEF0(UnkStruct_ov114_0225CEF0 * param0, const UnkStruct_ov84_0223BA5C * param1, const UnkStruct_ov114_02260284 * param2, u32 param3, u32 param4);
@@ -383,7 +383,7 @@ static BOOL ov114_0225F7D8(UnkStruct_ov114_0225E854 * param0);
 static void ov114_0225F83C(UnkStruct_ov114_0225E854 * param0);
 static BOOL ov114_0225F860(UnkStruct_ov114_0225E854 * param0);
 static void ov114_0225F890(UnkStruct_ov114_0225E854 * param0);
-static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, UnkStruct_020218BC * param2, u32 param3);
+static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, GraphicElementManager * param2, u32 param3);
 static BOOL ov114_0225FAB8(UnkStruct_ov114_0225FAB8 * param0);
 static BOOL ov114_0225FAD8(UnkStruct_ov114_0225FAB8 * param0);
 static void ov114_0225FB10(UnkStruct_ov114_0225FAB8 * param0, s32 param1);
@@ -1109,7 +1109,7 @@ BOOL ov114_0225CA98 (const UnkStruct_ov114_0225C76C * param0)
     return 0;
 }
 
-UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (UnkStruct_020218BC * param0, u32 param1)
+UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (GraphicElementManager * param0, u32 param1)
 {
     UnkStruct_ov114_0225CAD4 * v0;
 
@@ -1285,7 +1285,7 @@ static UnkStruct_ov114_0225CDB4 * ov114_0225CD54 (UnkStruct_ov114_0225CCD0 * par
     return v1;
 }
 
-static UnkStruct_02022550 * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, UnkStruct_020218BC * param1, s16 param2, s16 param3, u16 param4, u32 param5)
+static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
 
@@ -3654,7 +3654,7 @@ static void ov114_0225F988 (UnkStruct_ov114_0225E854 * param0)
     }
 }
 
-static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, UnkStruct_020218BC * param2, u32 param3)
+static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, GraphicElementManager * param2, u32 param3)
 {
     int v0;
     int v1;
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 7fbafefc8c..e6ddaded71 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -174,7 +174,7 @@ typedef struct {
 } UnkStruct_ov115_02264A40;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     UnkStruct_02017294 unk_04;
     UnkStruct_02017294 unk_7C;
     BOOL unk_F4;
@@ -188,12 +188,12 @@ typedef struct {
 
 typedef struct {
     BOOL unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
 } UnkStruct_ov115_02264BA0;
 
 typedef struct {
     BOOL unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_04;
     VecFx32 unk_08;
     s32 unk_14;
     BOOL unk_18;
@@ -204,7 +204,7 @@ typedef struct {
 } UnkStruct_ov115_02264C90;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00[3];
+    GraphicElementData * unk_00[3];
     u32 unk_0C[3];
     VecFx32 unk_18[3];
     BOOL unk_3C;
@@ -250,7 +250,7 @@ typedef struct {
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     UnkStruct_ov19_021DA864 unk_10;
-    UnkStruct_02022550 * unk_34;
+    GraphicElementData * unk_34;
     u8 unk_38;
     u8 unk_39;
     u8 unk_3A;
@@ -267,7 +267,7 @@ typedef struct {
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     UnkStruct_ov19_021DA864 unk_10;
-    UnkStruct_02022550 * unk_34;
+    GraphicElementData * unk_34;
     Window unk_38;
     FontOAM * unk_48;
     UnkStruct_02012B20 * unk_4C;
@@ -297,8 +297,8 @@ typedef struct {
     Strbuf* unk_10;
     u16 unk_14;
     u16 unk_16;
-    UnkStruct_0207C690 * unk_18;
-    UnkStruct_020218BC * unk_1C;
+    GenericPointerData * unk_18;
+    GraphicElementManager * unk_1C;
     UnkStruct_0200C738 unk_20;
     UnkStruct_02009714 * unk_1AC[4];
     UnkStruct_ov19_021DA864 unk_1BC;
diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c
index b01380629f..d97c7d46ee 100644
--- a/src/overlay116/ov116_02261870.c
+++ b/src/overlay116/ov116_02261870.c
@@ -232,8 +232,8 @@ static const s16 Unk_ov116_02267A78[][3] = {
 void ov116_02261D08 (UnkStruct_ov116_02262A8C * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1 = param0->unk_14->unk_08;
-    UnkStruct_0200C704 * v2 = param0->unk_14->unk_0C;
+    CellTransferStateData * v1 = param0->unk_14->unk_08;
+    AnimationResourceCollection * v2 = param0->unk_14->unk_0C;
     PaletteSys * v3 = param0->unk_14->unk_14;
     int v4;
 
@@ -250,8 +250,8 @@ void ov116_02261D08 (UnkStruct_ov116_02262A8C * param0)
 void ov116_02261D70 (UnkStruct_ov116_02262A8C * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1 = param0->unk_14->unk_08;
-    UnkStruct_0200C704 * v2 = param0->unk_14->unk_0C;
+    CellTransferStateData * v1 = param0->unk_14->unk_08;
+    AnimationResourceCollection * v2 = param0->unk_14->unk_0C;
     PaletteSys * v3 = param0->unk_14->unk_14;
     int v4;
     s16 v5[] = {72, 180, 24, 232};
@@ -577,8 +577,8 @@ void ov116_022622C8 (UnkStruct_ov116_0226139C * param0)
     NARC * v0 = param0->unk_48.unk_00;
     NARC * v1 = param0->unk_48.unk_04;
     BGL * v2 = param0->unk_48.unk_10;
-    UnkStruct_0200C6E4 * v3 = param0->unk_48.unk_08;
-    UnkStruct_0200C704 * v4 = param0->unk_48.unk_0C;
+    CellTransferStateData * v3 = param0->unk_48.unk_08;
+    AnimationResourceCollection * v4 = param0->unk_48.unk_0C;
     PaletteSys * v5 = param0->unk_48.unk_14;
     NARC * v6;
     int v7;
@@ -682,8 +682,8 @@ void ov116_022622C8 (UnkStruct_ov116_0226139C * param0)
 void ov116_022625A8 (UnkStruct_ov116_0226139C * param0, UnkStruct_ov116_02262A8C * param1)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1 = param1->unk_14->unk_08;
-    UnkStruct_0200C704 * v2 = param1->unk_14->unk_0C;
+    CellTransferStateData * v1 = param1->unk_14->unk_08;
+    AnimationResourceCollection * v2 = param1->unk_14->unk_0C;
     PaletteSys * v3 = param1->unk_14->unk_14;
     int v4;
     int v5 = 0;
@@ -723,8 +723,8 @@ CellActorData * ov116_022626E8 (UnkStruct_ov116_02262A8C * param0, s16 param1, s
 {
     CellActorData * v0;
     UnkStruct_ov104_0223F9E0 v1;
-    UnkStruct_0200C6E4 * v2 = param0->unk_14->unk_08;
-    UnkStruct_0200C704 * v3 = param0->unk_14->unk_0C;
+    CellTransferStateData * v2 = param0->unk_14->unk_08;
+    AnimationResourceCollection * v3 = param0->unk_14->unk_0C;
     PaletteSys * v4 = param0->unk_14->unk_14;
 
     ov116_02261CD8(&v1, param1, param2, 1, 0, 9003);
@@ -743,8 +743,8 @@ void ov116_02262724 (UnkStruct_ov116_02262A8C * param0)
     int v0;
     CellActorData * v1;
     UnkStruct_ov104_0223F9E0 v2;
-    UnkStruct_0200C6E4 * v3 = param0->unk_14->unk_08;
-    UnkStruct_0200C704 * v4 = param0->unk_14->unk_0C;
+    CellTransferStateData * v3 = param0->unk_14->unk_08;
+    AnimationResourceCollection * v4 = param0->unk_14->unk_0C;
     PaletteSys * v5 = param0->unk_14->unk_14;
 
     for (v0 = 0; v0 < 2; v0++) {
@@ -789,8 +789,8 @@ void ov116_02262840 (UnkStruct_ov116_02262A8C * param0)
     int v0;
     CellActorData * v1;
     UnkStruct_ov104_0223F9E0 v2;
-    UnkStruct_0200C6E4 * v3 = param0->unk_14->unk_08;
-    UnkStruct_0200C704 * v4 = param0->unk_14->unk_0C;
+    CellTransferStateData * v3 = param0->unk_14->unk_08;
+    AnimationResourceCollection * v4 = param0->unk_14->unk_0C;
     PaletteSys * v5 = param0->unk_14->unk_14;
 
     ov116_02261CD8(&v2, 128, 128, 1, 7, 9007);
@@ -815,8 +815,8 @@ void ov116_022628B8 (UnkStruct_ov116_0226139C * param0)
     NARC * v0 = param0->unk_48.unk_00;
     NARC * v1 = param0->unk_48.unk_04;
     BGL * v2 = param0->unk_48.unk_10;
-    UnkStruct_0200C6E4 * v3 = param0->unk_48.unk_08;
-    UnkStruct_0200C704 * v4 = param0->unk_48.unk_0C;
+    CellTransferStateData * v3 = param0->unk_48.unk_08;
+    AnimationResourceCollection * v4 = param0->unk_48.unk_0C;
     PaletteSys * v5 = param0->unk_48.unk_14;
     NARC * v6 = v0;
 
diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c
index 0919d626aa..266b919154 100644
--- a/src/overlay117/ov117_02260668.c
+++ b/src/overlay117/ov117_02260668.c
@@ -69,9 +69,9 @@
 #include "overlay117/ov117_022666C0.h"
 
 static void ov117_02260DA0(void * param0);
-static UnkStruct_0207C690 * ov117_02260E14(int param0);
+static GenericPointerData * ov117_02260E14(int param0);
 static void ov117_02260E34(void);
-static void ov117_02260EB8(UnkStruct_0207C690 * param0);
+static void ov117_02260EB8(GenericPointerData * param0);
 static void ov117_02260F7C(SysTask * param0, void * param1);
 static void ov117_022610D8(BGL * param0);
 static void ov117_02261280(UnkStruct_ov117_02261280 * param0);
@@ -517,9 +517,9 @@ static void ov117_02260DA0 (void * param0)
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
 
-static UnkStruct_0207C690 * ov117_02260E14 (int param0)
+static GenericPointerData * ov117_02260E14 (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 1, 0, 2, ov117_02260E34);
     return v0;
@@ -540,7 +540,7 @@ static void ov117_02260E34 (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov117_02260EB8 (UnkStruct_0207C690 * param0)
+static void ov117_02260EB8 (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c
index eb1882ea27..2ea967dbf7 100644
--- a/src/overlay117/ov117_02263AF0.c
+++ b/src/overlay117/ov117_02263AF0.c
@@ -2012,7 +2012,7 @@ static BOOL ov117_02265C3C (UnkStruct_ov117_02265C3C * param0, UnkStruct_ov117_0
     return 1;
 }
 
-void ov117_02265DB8 (BGL * param0, UnkStruct_0200C704 * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
+void ov117_02265DB8 (BGL * param0, AnimationResourceCollection * param1, UnkStruct_02012744 * param2, UnkStruct_ov117_02265EB0 * param3, const Strbuf *param4, int param5, u32 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14)
 {
     UnkStruct_020127E8 v0;
     Window v1;
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index ea62b16381..c5e1f7729a 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -31,7 +31,7 @@
 #include "unk_02082C2C.h"
 #include "overlay118/ov118_021D0D80.h"
 
-typedef struct UnkStruct_ov118_021D0FDC_t {
+typedef struct OverlayMetadata_t {
     int unk_00;
     int unk_04;
     int unk_08;
@@ -39,15 +39,15 @@ typedef struct UnkStruct_ov118_021D0FDC_t {
     u32 unk_10;
     int unk_14;
     UnkStruct_02014014 * unk_18;
-} UnkStruct_ov118_021D0FDC;
+} OverlayMetadata;
 
-static void ov118_021D0F70(UnkStruct_0207F248 * param0);
-static void ov118_021D0F88(UnkStruct_0207F248 * param0);
-static void ov118_021D0FB8(UnkStruct_0207F248 * param0);
-static void ov118_021D0FDC(UnkStruct_ov118_021D0FDC * param0);
-static void ov118_021D1028(UnkStruct_ov118_021D0FDC * param0);
+static void ov118_021D0F70(GameWindowLayout * param0);
+static void ov118_021D0F88(GameWindowLayout * param0);
+static void ov118_021D0FB8(GameWindowLayout * param0);
+static void ov118_021D0FDC(OverlayMetadata * param0);
+static void ov118_021D1028(OverlayMetadata * param0);
 static int ov118_021D10E8(void);
-static void ov118_021D110C(UnkStruct_ov118_021D0FDC * param0);
+static void ov118_021D110C(OverlayMetadata * param0);
 static u32 ov118_021D1128(u32 param0, BOOL param1);
 static u32 ov118_021D114C(u32 param0, BOOL param1);
 static void ov118_021D10B0(UnkSPLStruct6 * param0);
@@ -61,18 +61,18 @@ static const fx32 Unk_ov118_021D1170[][2] = {
     {0x1388, 0xFFFFFFFFFFFFEE6C}
 };
 
-void ov118_021D0D80 (UnkStruct_0207F248 * param0)
+void ov118_021D0D80 (GameWindowLayout * param0)
 {
     GF_ASSERT(param0->unk_B24 == NULL);
 
-    param0->unk_B24 = Heap_AllocFromHeap(12, sizeof(UnkStruct_ov118_021D0FDC));
-    MI_CpuClear8(param0->unk_B24, sizeof(UnkStruct_ov118_021D0FDC));
+    param0->unk_B24 = Heap_AllocFromHeap(12, sizeof(OverlayMetadata));
+    MI_CpuClear8(param0->unk_B24, sizeof(OverlayMetadata));
     param0->unk_B24->unk_14 = param0->unk_B11;
 }
 
-int ov118_021D0DBC (UnkStruct_0207F248 * param0)
+int ov118_021D0DBC (GameWindowLayout * param0)
 {
-    UnkStruct_ov118_021D0FDC * v0 = param0->unk_B24;
+    OverlayMetadata * v0 = param0->unk_B24;
     Pokemon * v1 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
 
     switch (v0->unk_00) {
@@ -166,13 +166,13 @@ int ov118_021D0DBC (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static void ov118_021D0F70 (UnkStruct_0207F248 * param0)
+static void ov118_021D0F70 (GameWindowLayout * param0)
 {
     Heap_FreeToHeap(param0->unk_B24);
     param0->unk_B24 = NULL;
 }
 
-static void ov118_021D0F88 (UnkStruct_0207F248 * param0)
+static void ov118_021D0F88 (GameWindowLayout * param0)
 {
     sub_0207EA74(param0, 0);
     ov118_021D0FDC(param0->unk_B24);
@@ -180,7 +180,7 @@ static void ov118_021D0F88 (UnkStruct_0207F248 * param0)
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_ALL, 31, 0);
 }
 
-static void ov118_021D0FB8 (UnkStruct_0207F248 * param0)
+static void ov118_021D0FB8 (GameWindowLayout * param0)
 {
     ov118_021D110C(param0->unk_B24);
     sub_0207EA74(param0, 1);
@@ -188,7 +188,7 @@ static void ov118_021D0FB8 (UnkStruct_0207F248 * param0)
     G2_BlendNone();
 }
 
-static void ov118_021D0FDC (UnkStruct_ov118_021D0FDC * param0)
+static void ov118_021D0FDC (OverlayMetadata * param0)
 {
     void * v0;
     UnkStruct_020203AC * v1;
@@ -202,7 +202,7 @@ static void ov118_021D0FDC (UnkStruct_ov118_021D0FDC * param0)
     sub_020206BC((FX32_ONE), (FX32_ONE * 900), v1);
 }
 
-static void ov118_021D1028 (UnkStruct_ov118_021D0FDC * param0)
+static void ov118_021D1028 (OverlayMetadata * param0)
 {
     void * v0;
 
@@ -226,7 +226,7 @@ static void ov118_021D1028 (UnkStruct_ov118_021D0FDC * param0)
 
 static void ov118_021D10B0 (UnkSPLStruct6 * param0)
 {
-    UnkStruct_ov118_021D0FDC * v0;
+    OverlayMetadata * v0;
 
     v0 = sub_02014764();
 
@@ -252,7 +252,7 @@ static int ov118_021D10E8 (void)
     return v0;
 }
 
-static void ov118_021D110C (UnkStruct_ov118_021D0FDC * param0)
+static void ov118_021D110C (OverlayMetadata * param0)
 {
     void * v0;
 
diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c
index 0a165b4545..e3d4a91a81 100644
--- a/src/overlay119/ov119_021D0D80.c
+++ b/src/overlay119/ov119_021D0D80.c
@@ -57,7 +57,7 @@
 
 void ov119_021D0D80(void);
 void ov119_021D0DA8(void);
-UnkStruct_0207C690 * ov119_021D0DD4(void);
+GenericPointerData * ov119_021D0DD4(void);
 void ov119_021D0DF4(void);
 void ov119_021D0E78(void);
 static u32 ov119_021D13B4(u32 param0, BOOL param1);
@@ -81,9 +81,9 @@ void ov119_021D0DA8 (void)
     G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8);
 }
 
-UnkStruct_0207C690 * ov119_021D0DD4 (void)
+GenericPointerData * ov119_021D0DD4 (void)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(71, 0, 2, 0, 2, ov119_021D0DF4);
     return v0;
@@ -536,8 +536,8 @@ void ov119_021D150C (UnkStruct_ov119_021D14DC * param0)
 
 void ov119_021D1514 (UnkStruct_ov119_021D0FD0 * param0)
 {
-    UnkStruct_0200C6E4 * v0;
-    UnkStruct_0200C704 * v1;
+    CellTransferStateData * v0;
+    AnimationResourceCollection * v1;
     PaletteSys * v2;
     int v3[][4] = {
         {4, 9, 3, 2},
diff --git a/src/overlay121/ov121_021D0D80.c b/src/overlay121/ov121_021D0D80.c
index cb557d7f1a..92c35ed224 100644
--- a/src/overlay121/ov121_021D0D80.c
+++ b/src/overlay121/ov121_021D0D80.c
@@ -32,7 +32,7 @@
 #include "overlay121/ov121_021D0D80.h"
 
 typedef struct {
-    UnkStruct_0207C690 * unk_00;
+    GenericPointerData * unk_00;
     UnkStruct_020203AC * unk_04;
     SysTask * unk_08;
     int unk_0C;
@@ -57,9 +57,9 @@ static void ov121_021D1068(UnkStruct_ov121_021D0FF4 * param0);
 static void ov121_021D1074(UnkStruct_ov121_021D0FF4 * param0);
 static void ov121_021D1184(UnkStruct_ov121_021D0FF4 * param0);
 static void ov121_021D11A8(UnkStruct_ov121_021D0FF4 * param0);
-static UnkStruct_0207C690 * ov121_021D1270(int param0);
+static GenericPointerData * ov121_021D1270(int param0);
 static void ov121_021D128C(void);
-static void ov121_021D1310(UnkStruct_0207C690 * param0);
+static void ov121_021D1310(GenericPointerData * param0);
 static void ov121_021D1318(UnkStruct_ov121_021D0FF4 * param0);
 
 int ov121_021D0D80 (UnkStruct_020067E8 * param0, int * param1)
@@ -326,9 +326,9 @@ static void ov121_021D11A8 (UnkStruct_ov121_021D0FF4 * param0)
     NNS_G3dGePopMtx(1);
 }
 
-static UnkStruct_0207C690 * ov121_021D1270 (int param0)
+static GenericPointerData * ov121_021D1270 (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 2, 0, 2, ov121_021D128C);
     return v0;
@@ -350,7 +350,7 @@ static void ov121_021D128C (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void ov121_021D1310 (UnkStruct_0207C690 * param0)
+static void ov121_021D1310 (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
diff --git a/src/pokemon.c b/src/pokemon.c
index 7551bdfd80..fc73eeb6df 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -2976,7 +2976,7 @@ static const int Unk_020F0588[] = {
     0x1
 };
 
-CellActorData *sub_02076994(UnkStruct_0200C6E4 *param0, UnkStruct_0200C704 *param1, PaletteSys *param2, int param3, int param4, int param5, int param6, int param7, int heapID)
+CellActorData *sub_02076994(CellTransferStateData *param0, AnimationResourceCollection *param1, PaletteSys *param2, int param3, int param4, int param5, int param6, int param7, int heapID)
 {
     UnkStruct_ov104_0223F9E0 v0;
     CellActorData *v1;
diff --git a/src/unk_0200112C.c b/src/unk_0200112C.c
index 669777c83d..b71aa19355 100644
--- a/src/unk_0200112C.c
+++ b/src/unk_0200112C.c
@@ -309,7 +309,7 @@ u32 sub_02001504 (UnkStruct_0200112C * param0, u8 param1)
     return v0;
 }
 
-void sub_020015CC (UnkStruct_0200112C * param0, UnkStruct_02013A04 * param1)
+void sub_020015CC (UnkStruct_0200112C * param0, ResourceMetadata * param1)
 {
     param0->unk_00.unk_00 = param1;
 }
diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c
index d0944b1efd..f1adc1865f 100644
--- a/src/unk_02001AF4.c
+++ b/src/unk_02001AF4.c
@@ -24,7 +24,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 
-typedef struct UnkStruct_02001AF4_t {
+typedef struct UIControlData_t {
     UnkStruct_02081CF4 unk_00;
     UnkStruct_020149F0 * unk_0C;
     u32 unk_10;
@@ -37,20 +37,20 @@ typedef struct UnkStruct_02001AF4_t {
     u8 unk_1A;
     u8 unk_1B;
     u8 unk_1C;
-} UnkStruct_02001AF4;
+} UIControlData;
 
 static void sub_0200DB10(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7);
 static void sub_0200DD7C(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u16 param7);
-static BOOL sub_02001DCC(UnkStruct_02001AF4 * param0, u8 param1, u16 param2);
-static u8 sub_02001E24(UnkStruct_02001AF4 * param0, u8 param1);
-static u8 sub_02001F1C(UnkStruct_02001AF4 * param0);
-static void sub_02001F5C(UnkStruct_02001AF4 * param0);
-static void sub_02001FE8(UnkStruct_02001AF4 * param0);
-static void sub_02002018(UnkStruct_02001AF4 * param0, u8 * param1, u8 * param2, u8 param3);
-
-UnkStruct_02001AF4 * sub_02001AF4 (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5)
+static BOOL sub_02001DCC(UIControlData * param0, u8 param1, u16 param2);
+static u8 sub_02001E24(UIControlData * param0, u8 param1);
+static u8 sub_02001F1C(UIControlData * param0);
+static void sub_02001F5C(UIControlData * param0);
+static void sub_02001FE8(UIControlData * param0);
+static void sub_02002018(UIControlData * param0, u8 * param1, u8 * param2, u8 param3);
+
+UIControlData * sub_02001AF4 (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5)
 {
-    UnkStruct_02001AF4 * v0 = (UnkStruct_02001AF4 *)Heap_AllocFromHeap(param4, sizeof(UnkStruct_02001AF4));
+    UIControlData * v0 = (UIControlData *)Heap_AllocFromHeap(param4, sizeof(UIControlData));
 
     v0->unk_00 = *param0;
     v0->unk_0C = sub_020149F0(param4);
@@ -69,20 +69,20 @@ UnkStruct_02001AF4 * sub_02001AF4 (const UnkStruct_02081CF4 * param0, u8 param1,
     return v0;
 }
 
-UnkStruct_02001AF4 * sub_02001B7C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5)
+UIControlData * sub_02001B7C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2, u8 param3, u8 param4, u32 param5)
 {
-    UnkStruct_02001AF4 * v0 = sub_02001AF4(param0, param1, param2, param3, param4, param5);
+    UIControlData * v0 = sub_02001AF4(param0, param1, param2, param3, param4, param5);
 
     sub_0201A954(v0->unk_00.unk_04);
     return v0;
 }
 
-UnkStruct_02001AF4 * sub_02001B9C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2)
+UIControlData * sub_02001B9C (const UnkStruct_02081CF4 * param0, u8 param1, u8 param2)
 {
     return sub_02001B7C(param0, sub_02002DF8(param0->unk_08, 0), 0, param1, param2, PAD_BUTTON_B);
 }
 
-void sub_02001BC4 (UnkStruct_02001AF4 * param0, u8 * param1)
+void sub_02001BC4 (UIControlData * param0, u8 * param1)
 {
     if (param1 != NULL) {
         *param1 = param0->unk_15;
@@ -92,7 +92,7 @@ void sub_02001BC4 (UnkStruct_02001AF4 * param0, u8 * param1)
     Heap_FreeToHeapExplicit(param0->unk_1C, param0);
 }
 
-u32 sub_02001BE0 (UnkStruct_02001AF4 * param0)
+u32 sub_02001BE0 (UIControlData * param0)
 {
     param0->unk_1B = 0;
 
@@ -141,7 +141,7 @@ u32 sub_02001BE0 (UnkStruct_02001AF4 * param0)
     return 0xffffffff;
 }
 
-u32 sub_02001C94 (UnkStruct_02001AF4 * param0, u16 param1)
+u32 sub_02001C94 (UIControlData * param0, u16 param1)
 {
     param0->unk_1B = 0;
 
@@ -190,7 +190,7 @@ u32 sub_02001C94 (UnkStruct_02001AF4 * param0, u16 param1)
     return 0xffffffff;
 }
 
-u32 sub_02001D44 (UnkStruct_02001AF4 * param0, u8 param1)
+u32 sub_02001D44 (UIControlData * param0, u8 param1)
 {
     switch (param1) {
     case 0:
@@ -216,17 +216,17 @@ u32 sub_02001D44 (UnkStruct_02001AF4 * param0, u8 param1)
     return 0xffffffff;
 }
 
-u8 sub_02001DC4 (UnkStruct_02001AF4 * param0)
+u8 sub_02001DC4 (UIControlData * param0)
 {
     return param0->unk_15;
 }
 
-u8 sub_02001DC8 (UnkStruct_02001AF4 * param0)
+u8 sub_02001DC8 (UIControlData * param0)
 {
     return param0->unk_1B;
 }
 
-static BOOL sub_02001DCC (UnkStruct_02001AF4 * param0, u8 param1, u16 param2)
+static BOOL sub_02001DCC (UIControlData * param0, u8 param1, u16 param2)
 {
     u8 v0 = param0->unk_15;
 
@@ -250,7 +250,7 @@ static BOOL sub_02001DCC (UnkStruct_02001AF4 * param0, u8 param1, u16 param2)
     return 1;
 }
 
-static u8 sub_02001E24 (UnkStruct_02001AF4 * param0, u8 param1)
+static u8 sub_02001E24 (UIControlData * param0, u8 param1)
 {
     s8 v0;
 
@@ -320,7 +320,7 @@ static u8 sub_02001E24 (UnkStruct_02001AF4 * param0, u8 param1)
     return 1;
 }
 
-static u8 sub_02001F1C (UnkStruct_02001AF4 * param0)
+static u8 sub_02001F1C (UIControlData * param0)
 {
     u8 v0 = 0;
     u8 v1, v2;
@@ -336,7 +336,7 @@ static u8 sub_02001F1C (UnkStruct_02001AF4 * param0)
     return v0;
 }
 
-static void sub_02001F5C (UnkStruct_02001AF4 * param0)
+static void sub_02001F5C (UIControlData * param0)
 {
     const void * v0;
     u8 v1, v2, v3;
@@ -359,7 +359,7 @@ static void sub_02001F5C (UnkStruct_02001AF4 * param0)
     }
 }
 
-static void sub_02001FE8 (UnkStruct_02001AF4 * param0)
+static void sub_02001FE8 (UIControlData * param0)
 {
     u8 v0, v1;
 
@@ -371,17 +371,17 @@ static void sub_02001FE8 (UnkStruct_02001AF4 * param0)
     sub_02014A58(param0->unk_0C, param0->unk_00.unk_04, v0, v1);
 }
 
-static void sub_02002018 (UnkStruct_02001AF4 * param0, u8 * param1, u8 * param2, u8 param3)
+static void sub_02002018 (UIControlData * param0, u8 * param1, u8 * param2, u8 param3)
 {
     *param1 = (param3 / param0->unk_00.unk_0A) * (param0->unk_16 + param0->unk_19 * 2);
     *param2 = (param3 % param0->unk_00.unk_0A) * (param0->unk_1A + param0->unk_00.unk_0B_0) + param0->unk_18;
 }
 
-UnkStruct_02001AF4 * sub_02002054 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5)
+UIControlData * sub_02002054 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u8 param4, u32 param5)
 {
     UnkStruct_02081CF4 v0;
     MessageLoader * v1;
-    UnkStruct_02013A04 * v2;
+    ResourceMetadata * v2;
 
     v1 = MessageLoader_Init(1, 26, 361, param5);
     v2 = sub_02013A04(2, param5);
@@ -405,12 +405,12 @@ UnkStruct_02001AF4 * sub_02002054 (BGL * param0, const UnkStruct_ov61_0222C884 *
     return sub_02001B7C(&v0, 8, 0, param4, param5, PAD_BUTTON_B);
 }
 
-UnkStruct_02001AF4 * sub_02002100 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4)
+UIControlData * sub_02002100 (BGL * param0, const UnkStruct_ov61_0222C884 * param1, u16 param2, u8 param3, u32 param4)
 {
     return sub_02002054(param0, param1, param2, param3, 0, param4);
 }
 
-u32 sub_02002114 (UnkStruct_02001AF4 * param0, u32 param1)
+u32 sub_02002114 (UIControlData * param0, u32 param1)
 {
     u32 v0 = sub_02001BE0(param0);
 
@@ -421,7 +421,7 @@ u32 sub_02002114 (UnkStruct_02001AF4 * param0, u32 param1)
     return v0;
 }
 
-u32 sub_02002134 (UnkStruct_02001AF4 * param0, u8 param1, u32 param2)
+u32 sub_02002134 (UIControlData * param0, u8 param1, u32 param2)
 {
     u32 v0 = sub_02001D44(param0, param1);
 
@@ -432,12 +432,12 @@ u32 sub_02002134 (UnkStruct_02001AF4 * param0, u8 param1, u32 param2)
     return v0;
 }
 
-void sub_02002154 (UnkStruct_02001AF4 * param0, u32 param1)
+void sub_02002154 (UIControlData * param0, u32 param1)
 {
     Window_Clear(param0->unk_00.unk_04, 0);
     BGL_DeleteWindow(param0->unk_00.unk_04);
     Heap_FreeToHeapExplicit(param1, param0->unk_00.unk_04);
-    sub_02013A3C((UnkStruct_02013A04 *)param0->unk_00.unk_00);
+    sub_02013A3C((ResourceMetadata *)param0->unk_00.unk_00);
     sub_02001BC4(param0, NULL);
 }
 
diff --git a/src/unk_02003B60.c b/src/unk_02003B60.c
index 6441feebd7..cac14c96b6 100644
--- a/src/unk_02003B60.c
+++ b/src/unk_02003B60.c
@@ -61,7 +61,7 @@ struct UnkStruct_02003D54_t {
     u8 unk_BCDD3;
 };
 
-void sub_02003B60(ChatotCry * param0, UnkStruct_020279FC * param1);
+void sub_02003B60(ChatotCry * param0, AnimationControlFlags * param1);
 void sub_02003BD8(void);
 void sub_02003D0C(int param0);
 UnkStruct_02003D54 * sub_02003D54(void);
@@ -87,7 +87,7 @@ static UnkStruct_02003D54 Unk_02101DF8;
 static int Unk_02101DF0;
 static NNSSndCaptureOutputEffectType Unk_02101DF4;
 
-void sub_02003B60 (ChatotCry * param0, UnkStruct_020279FC * param1)
+void sub_02003B60 (ChatotCry * param0, AnimationControlFlags * param1)
 {
     UnkStruct_02003D54 * v0 = sub_02003D54();
 
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index 220af818d9..e40e7cb977 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -137,7 +137,7 @@ void sub_020095A8 (UnkStruct_02009508 * param0)
     Heap_FreeToHeap(param0);
 }
 
-UnkStruct_020218BC * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2)
+GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2)
 {
     UnkStruct_020095C4 v0;
     NNSG2dViewRect v1;
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 4497d669b9..2694af9f0f 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -36,36 +36,36 @@
 #include "unk_0201F834.h"
 #include "unk_020218BC.h"
 
-typedef struct UnkStruct_0200C6E4_t {
+typedef struct CellTransferStateData_t {
     int unk_00;
     int unk_04;
     int unk_08;
     NNSG2dCellTransferState * unk_0C;
     UnkStruct_0200C738 unk_10;
-} UnkStruct_0200C6E4;
+} CellTransferStateData;
 
-typedef struct UnkStruct_0200C704_t {
-    UnkStruct_020218BC * unk_00;
+typedef struct AnimationResourceCollection_t {
+    GraphicElementManager * unk_00;
     UnkStruct_02009508 * unk_04;
     UnkStruct_02009F38 * unk_08;
     UnkStruct_02009714 * unk_0C[6];
     UnkStruct_02009CFC * unk_24[6];
     int unk_3C[6];
     int unk_54;
-} UnkStruct_0200C704;
+} AnimationResourceCollection;
 
-static BOOL sub_0200D11C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5, int param6);
-static BOOL sub_0200D18C(UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6);
+static BOOL sub_0200D11C(CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6);
+static BOOL sub_0200D18C(CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6);
 static BOOL sub_0200D1FC(UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1);
 static BOOL sub_0200D27C(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2);
 static BOOL sub_0200D2D0(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2);
 static BOOL sub_0200D230(UnkStruct_02009714 * param0, UnkStruct_02009CFC * param1, int param2);
 
-UnkStruct_0200C6E4 * sub_0200C6E4 (int param0)
+CellTransferStateData * sub_0200C6E4 (int param0)
 {
-    UnkStruct_0200C6E4 * v0 = NULL;
+    CellTransferStateData * v0 = NULL;
 
-    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0200C6E4));
+    v0 = Heap_AllocFromHeap(param0, sizeof(CellTransferStateData));
 
     if (v0 == NULL) {
         return NULL;
@@ -78,14 +78,14 @@ UnkStruct_0200C6E4 * sub_0200C6E4 (int param0)
     return v0;
 }
 
-UnkStruct_0200C704 * sub_0200C704 (UnkStruct_0200C6E4 * param0)
+AnimationResourceCollection * sub_0200C704 (CellTransferStateData * param0)
 {
     int v0;
-    UnkStruct_0200C704 * v1 = NULL;
+    AnimationResourceCollection * v1 = NULL;
 
     GF_ASSERT(param0 != NULL);
 
-    v1 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_0200C704));
+    v1 = Heap_AllocFromHeap(param0->unk_00, sizeof(AnimationResourceCollection));
 
     if (v1 == NULL) {
         return NULL;
@@ -100,12 +100,12 @@ UnkStruct_0200C704 * sub_0200C704 (UnkStruct_0200C6E4 * param0)
     return v1;
 }
 
-UnkStruct_0200C738 * sub_0200C738 (UnkStruct_0200C6E4 * param0)
+UnkStruct_0200C738 * sub_0200C738 (CellTransferStateData * param0)
 {
     return &param0->unk_10;
 }
 
-BOOL sub_0200C73C (UnkStruct_0200C6E4 * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3)
+BOOL sub_0200C73C (CellTransferStateData * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3)
 {
     GF_ASSERT(param0 != NULL);
 
@@ -139,7 +139,7 @@ BOOL sub_0200C73C (UnkStruct_0200C6E4 * param0, const UnkStruct_ov104_0224133C *
     return 1;
 }
 
-BOOL sub_0200C7C0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2)
+BOOL sub_0200C7C0 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2)
 {
     if ((param0 == NULL) || (param1 == NULL)) {
         return 0;
@@ -149,12 +149,12 @@ BOOL sub_0200C7C0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     return 1;
 }
 
-void sub_0200C7E4 (UnkStruct_02022550 * param0)
+void sub_0200C7E4 (GraphicElementData * param0)
 {
     sub_02021BD4(param0);
 }
 
-void sub_0200C7EC (UnkStruct_0200C704 * param0)
+void sub_0200C7EC (AnimationResourceCollection * param0)
 {
     GF_ASSERT(param0 != NULL);
     sub_020219F8(param0->unk_00);
@@ -170,12 +170,12 @@ void sub_0200C808 (void)
     sub_0201DCE8();
 }
 
-void sub_0200C810 (UnkStruct_0200C704 * param0)
+void sub_0200C810 (AnimationResourceCollection * param0)
 {
     sub_02021964(param0->unk_00);
 }
 
-void sub_0200C81C (UnkStruct_0200C704 * param0)
+void sub_0200C81C (AnimationResourceCollection * param0)
 {
     if (param0->unk_04 == NULL) {
         return;
@@ -184,7 +184,7 @@ void sub_0200C81C (UnkStruct_0200C704 * param0)
     sub_020095A8(param0->unk_04);
 }
 
-void sub_0200C82C (UnkStruct_0200C704 * param0)
+void sub_0200C82C (AnimationResourceCollection * param0)
 {
     int v0;
     UnkStruct_02009F38 * v1;
@@ -204,7 +204,7 @@ void sub_0200C82C (UnkStruct_0200C704 * param0)
     }
 }
 
-void sub_0200C880 (UnkStruct_0200C6E4 * param0)
+void sub_0200C880 (CellTransferStateData * param0)
 {
     sub_0201DCF0(param0->unk_0C);
     sub_0201E958();
@@ -215,13 +215,13 @@ void sub_0200C880 (UnkStruct_0200C6E4 * param0)
     }
 }
 
-void sub_0200C8A0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1)
+void sub_0200C8A0 (CellTransferStateData * param0, AnimationResourceCollection * param1)
 {
     param0->unk_04--;
     Heap_FreeToHeap(param1);
 }
 
-void sub_0200C8B0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1)
+void sub_0200C8B0 (CellTransferStateData * param0, AnimationResourceCollection * param1)
 {
     sub_0200C810(param1);
     sub_0200C81C(param1);
@@ -229,7 +229,7 @@ void sub_0200C8B0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1)
     sub_0200C8A0(param0, param1);
 }
 
-void sub_0200C8D4 (UnkStruct_0200C6E4 * param0)
+void sub_0200C8D4 (CellTransferStateData * param0)
 {
     GF_ASSERT(param0->unk_04 == 0);
 
@@ -237,7 +237,7 @@ void sub_0200C8D4 (UnkStruct_0200C6E4 * param0)
     Heap_FreeToHeap(param0);
 }
 
-BOOL sub_0200C8F0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov7_0224F2EC * param2)
+BOOL sub_0200C8F0 (CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F2EC * param2)
 {
     int v0;
     int v1 = 6;
@@ -290,17 +290,17 @@ BOOL sub_0200C8F0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, con
     return 1;
 }
 
-UnkStruct_02022550 * sub_0200CA08 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov7_0224F358 * param2)
+GraphicElementData * sub_0200CA08 (CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov7_0224F358 * param2)
 {
-    UnkStruct_02022550 * v0 = NULL;
+    GraphicElementData * v0 = NULL;
 
     v0 = sub_0200CA44(param0, param1, param2->unk_00, param2->unk_04, param2->unk_06, param2->unk_04, param2->unk_0A, param2->unk_0C, param2->unk_10, param2->unk_14, param2->unk_18, param2->unk_1C, param2->unk_20, param2->unk_24);
     return v0;
 }
 
-UnkStruct_02022550 * sub_0200CA44 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13)
+GraphicElementData * sub_0200CA44 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, s16 param3, s16 param4, s16 param5, u16 param6, int param7, int param8, int param9, int param10, int param11, int param12, int param13)
 {
-    UnkStruct_02022550 * v0 = NULL;
+    GraphicElementData * v0 = NULL;
     UnkStruct_ov115_02261520 v1;
 
     v1.unk_00 = param1->unk_00;
@@ -331,7 +331,7 @@ UnkStruct_02022550 * sub_0200CA44 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C7
     return v0;
 }
 
-BOOL sub_0200CB30 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov104_02241308 * param2)
+BOOL sub_0200CB30 (CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_02241308 * param2)
 {
     int v0;
     int v1;
@@ -371,7 +371,7 @@ BOOL sub_0200CB30 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, con
     return 1;
 }
 
-BOOL sub_0200CBDC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5, int param6)
+BOOL sub_0200CBDC (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -393,7 +393,7 @@ BOOL sub_0200CBDC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     return (v0 == NULL) ? 0 : 1;
 }
 
-BOOL sub_0200CC3C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6)
+BOOL sub_0200CC3C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -414,7 +414,7 @@ BOOL sub_0200CC3C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NAR
     return (v0 == NULL) ? 0 : 1;
 }
 
-s8 sub_0200CC9C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5, int param6, int param7)
+s8 sub_0200CC9C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6, int param7)
 {
     UnkStruct_02009DC8 * v0;
     int v1;
@@ -438,7 +438,7 @@ s8 sub_0200CC9C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int p
     return -1;
 }
 
-s8 sub_0200CD0C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7)
+s8 sub_0200CD0C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6, int param7)
 {
     UnkStruct_02009DC8 * v0;
     int v1;
@@ -461,7 +461,7 @@ s8 sub_0200CD0C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC
     return -1;
 }
 
-u8 sub_0200CD7C (PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, int param4, int param5, int param6, int param7, int param8, int param9)
+u8 sub_0200CD7C (PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, int param4, int param5, int param6, int param7, int param8, int param9)
 {
     int v0;
 
@@ -474,7 +474,7 @@ u8 sub_0200CD7C (PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, U
     return v0;
 }
 
-u8 sub_0200CDC4 (PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, NARC * param4, int param5, int param6, int param7, int param8, int param9)
+u8 sub_0200CDC4 (PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NARC * param4, int param5, int param6, int param7, int param8, int param9)
 {
     int v0;
 
@@ -487,27 +487,27 @@ u8 sub_0200CDC4 (PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, U
     return v0;
 }
 
-BOOL sub_0200CE0C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5)
+BOOL sub_0200CE0C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5)
 {
     return sub_0200D11C(param0, param1, param2, param3, param4, 2, param5);
 }
 
-BOOL sub_0200CE24 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5)
+BOOL sub_0200CE24 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5)
 {
     return sub_0200D18C(param0, param1, param2, param3, param4, 2, param5);
 }
 
-BOOL sub_0200CE3C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5)
+BOOL sub_0200CE3C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5)
 {
     return sub_0200D11C(param0, param1, param2, param3, param4, 3, param5);
 }
 
-BOOL sub_0200CE54 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5)
+BOOL sub_0200CE54 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5)
 {
     return sub_0200D18C(param0, param1, param2, param3, param4, 3, param5);
 }
 
-CellActorData * sub_0200CE6C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, const UnkStruct_ov104_0223F9E0 * param2)
+CellActorData * sub_0200CE6C (CellTransferStateData * param0, AnimationResourceCollection * param1, const UnkStruct_ov104_0223F9E0 * param2)
 {
     int v0;
     int v1;
@@ -589,39 +589,39 @@ CellActorData * sub_0200CE6C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 *
     return v2;
 }
 
-const NNSG2dImagePaletteProxy * sub_0200D04C (UnkStruct_0200C704 * param0, int param1)
+const NNSG2dImagePaletteProxy * sub_0200D04C (AnimationResourceCollection * param0, int param1)
 {
     UnkStruct_02009DC8 * v0 = sub_02009DC8(param0->unk_0C[1], param1);
     return sub_0200A72C(v0, NULL);
 }
 
-u32 sub_0200D05C (UnkStruct_0200C704 * param0, int param1, NNS_G2D_VRAM_TYPE param2)
+u32 sub_0200D05C (AnimationResourceCollection * param0, int param1, NNS_G2D_VRAM_TYPE param2)
 {
     UnkStruct_02009DC8 * v0 = sub_02009DC8(param0->unk_0C[1], param1);
     return sub_0200A760(v0, param2);
 }
 
-BOOL sub_0200D070 (UnkStruct_0200C704 * param0, int param1)
+BOOL sub_0200D070 (AnimationResourceCollection * param0, int param1)
 {
     return sub_0200D27C(param0->unk_0C[0], param0->unk_24[0], param1);
 }
 
-BOOL sub_0200D080 (UnkStruct_0200C704 * param0, int param1)
+BOOL sub_0200D080 (AnimationResourceCollection * param0, int param1)
 {
     return sub_0200D2D0(param0->unk_0C[1], param0->unk_24[1], param1);
 }
 
-BOOL sub_0200D090 (UnkStruct_0200C704 * param0, int param1)
+BOOL sub_0200D090 (AnimationResourceCollection * param0, int param1)
 {
     return sub_0200D230(param0->unk_0C[2], param0->unk_24[2], param1);
 }
 
-BOOL sub_0200D0A0 (UnkStruct_0200C704 * param0, int param1)
+BOOL sub_0200D0A0 (AnimationResourceCollection * param0, int param1)
 {
     return sub_0200D230(param0->unk_0C[3], param0->unk_24[3], param1);
 }
 
-void sub_0200D0B0 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1)
+void sub_0200D0B0 (CellTransferStateData * param0, AnimationResourceCollection * param1)
 {
     int v0;
 
@@ -648,7 +648,7 @@ void sub_0200D0F4 (CellActorData * param0)
     Heap_FreeToHeap(param0);
 }
 
-static BOOL sub_0200D11C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, int param4, int param5, int param6)
+static BOOL sub_0200D11C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
     int v1;
@@ -670,7 +670,7 @@ static BOOL sub_0200D11C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * para
     return (v0 == NULL) ? 0 : 1;
 }
 
-static BOOL sub_0200D18C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, int param4, int param5, int param6)
+static BOOL sub_0200D18C (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
     int v1;
@@ -788,7 +788,7 @@ static BOOL sub_0200D2D0 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para
     return 0;
 }
 
-void sub_0200D324 (UnkStruct_02022550 * param0)
+void sub_0200D324 (GraphicElementData * param0)
 {
     sub_02021E2C(param0, FX32_ONE);
 }
@@ -828,7 +828,7 @@ u32 sub_0200D37C (CellActorData * param0)
     return sub_02021E24(param0->unk_00);
 }
 
-void sub_0200D388 (UnkStruct_02022550 * param0, int param1)
+void sub_0200D388 (GraphicElementData * param0, int param1)
 {
     sub_02021CC8(param0, param1);
 }
@@ -838,7 +838,7 @@ void sub_0200D390 (CellActorData * param0, int param1)
     sub_0200D388(param0->unk_00, param1);
 }
 
-void sub_0200D39C (UnkStruct_02022550 * param0, fx32 param1)
+void sub_0200D39C (GraphicElementData * param0, fx32 param1)
 {
     sub_02021CE4(param0, param1);
 }
@@ -848,7 +848,7 @@ void sub_0200D3A4 (CellActorData * param0, fx32 param1)
     sub_0200D39C(param0->unk_00, param1);
 }
 
-BOOL sub_0200D3B0 (UnkStruct_02022550 * param0)
+BOOL sub_0200D3B0 (GraphicElementData * param0)
 {
     return sub_02021FD0(param0);
 }
@@ -858,7 +858,7 @@ BOOL sub_0200D3B8 (CellActorData * param0)
     return sub_0200D3B0(param0->unk_00);
 }
 
-void sub_0200D3C4 (UnkStruct_02022550 * param0, u16 param1)
+void sub_0200D3C4 (GraphicElementData * param0, u16 param1)
 {
     sub_02021E50(param0, param1);
 }
@@ -868,7 +868,7 @@ void sub_0200D3CC (CellActorData * param0, u16 param1)
     sub_0200D3C4(param0->unk_00, param1);
 }
 
-u16 sub_0200D3D8 (UnkStruct_02022550 * param0)
+u16 sub_0200D3D8 (GraphicElementData * param0)
 {
     return sub_02021E74(param0);
 }
@@ -878,7 +878,7 @@ u16 sub_0200D3E0 (CellActorData * param0)
     return sub_0200D3D8(param0->unk_00);
 }
 
-void sub_0200D3EC (UnkStruct_02022550 * param0, int param1)
+void sub_0200D3EC (GraphicElementData * param0, int param1)
 {
     sub_02021CAC(param0, param1);
 }
@@ -888,7 +888,7 @@ void sub_0200D3F4 (CellActorData * param0, int param1)
     sub_0200D3EC(param0->unk_00, param1);
 }
 
-int sub_0200D400 (UnkStruct_02022550 * param0)
+int sub_0200D400 (GraphicElementData * param0)
 {
     return sub_02021D34(param0);
 }
@@ -898,7 +898,7 @@ int sub_0200D408 (CellActorData * param0)
     return sub_0200D400(param0->unk_00);
 }
 
-void sub_0200D414 (UnkStruct_02022550 * param0, int param1)
+void sub_0200D414 (GraphicElementData * param0, int param1)
 {
     sub_02021E90(param0, param1);
 }
@@ -908,7 +908,7 @@ void sub_0200D41C (CellActorData * param0, int param1)
     sub_0200D414(param0->unk_00, param1);
 }
 
-void sub_0200D428 (UnkStruct_02022550 * param0, int param1)
+void sub_0200D428 (GraphicElementData * param0, int param1)
 {
     sub_02021EF0(param0, param1);
 }
@@ -923,7 +923,7 @@ int sub_0200D43C (CellActorData * param0)
     return sub_02021F48(param0->unk_00);
 }
 
-void sub_0200D448 (UnkStruct_02022550 * param0, int param1)
+void sub_0200D448 (GraphicElementData * param0, int param1)
 {
     sub_02021E80(param0, param1);
 }
@@ -938,7 +938,7 @@ void sub_0200D460 (CellActorData * param0, int param1)
     sub_0200D448(param0->unk_00, param1);
 }
 
-void sub_0200D46C (UnkStruct_02022550 * param0, int param1)
+void sub_0200D46C (GraphicElementData * param0, int param1)
 {
     sub_02021F58(param0, param1);
 }
@@ -948,7 +948,7 @@ void sub_0200D474 (CellActorData * param0, int param1)
     sub_0200D46C(param0->unk_00, param1);
 }
 
-u32 sub_0200D480 (UnkStruct_02022550 * param0)
+u32 sub_0200D480 (GraphicElementData * param0)
 {
     return sub_02021F74(param0);
 }
@@ -958,7 +958,7 @@ u32 sub_0200D488 (CellActorData * param0)
     return sub_0200D480(param0->unk_00);
 }
 
-void sub_0200D494 (UnkStruct_02022550 * param0, s16 param1, s16 param2)
+void sub_0200D494 (GraphicElementData * param0, s16 param1, s16 param2)
 {
     VecFx32 v0;
 
@@ -979,7 +979,7 @@ void sub_0200D4C4 (CellActorData * param0, s16 param1, s16 param2)
     sub_0200D494(param0->unk_00, param1, param2);
 }
 
-void sub_0200D4D0 (UnkStruct_02022550 * param0, s16 param1, s16 param2, fx32 param3)
+void sub_0200D4D0 (GraphicElementData * param0, s16 param1, s16 param2, fx32 param3)
 {
     VecFx32 v0;
 
@@ -1000,7 +1000,7 @@ void sub_0200D500 (CellActorData * param0, s16 param1, s16 param2, fx32 param3)
     sub_0200D4D0(param0->unk_00, param1, param2, param3);
 }
 
-void sub_0200D50C (UnkStruct_02022550 * param0, s16 * param1, s16 * param2)
+void sub_0200D50C (GraphicElementData * param0, s16 * param1, s16 * param2)
 {
     const VecFx32 * v0;
 
@@ -1019,7 +1019,7 @@ void sub_0200D550 (CellActorData * param0, s16 * param1, s16 * param2)
     sub_0200D50C(param0->unk_00, param1, param2);
 }
 
-void sub_0200D55C (UnkStruct_02022550 * param0, s16 * param1, s16 * param2, fx32 param3)
+void sub_0200D55C (GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3)
 {
     const VecFx32 * v0;
 
@@ -1038,7 +1038,7 @@ void sub_0200D5A0 (CellActorData * param0, s16 * param1, s16 * param2, fx32 para
     sub_0200D55C(param0->unk_00, param1, param2, param3);
 }
 
-void sub_0200D5AC (UnkStruct_02022550 * param0, s16 param1, s16 param2)
+void sub_0200D5AC (GraphicElementData * param0, s16 param1, s16 param2)
 {
     const VecFx32 * v0;
     VecFx32 v1;
@@ -1114,7 +1114,7 @@ void sub_0200D67C (CellActorData * param0, fx32 * param1, fx32 * param2, fx32 pa
     }
 }
 
-void sub_0200D69C (UnkStruct_02022550 * param0, int param1)
+void sub_0200D69C (GraphicElementData * param0, int param1)
 {
     sub_02021CF8(param0, param1);
 }
@@ -1124,7 +1124,7 @@ void sub_0200D6A4 (CellActorData * param0, int param1)
     sub_0200D69C(param0->unk_00, param1);
 }
 
-void sub_0200D6B0 (UnkStruct_02022550 * param0, f32 param1, f32 param2)
+void sub_0200D6B0 (GraphicElementData * param0, f32 param1, f32 param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
@@ -1143,7 +1143,7 @@ void sub_0200D6E8 (CellActorData * param0, f32 param1, f32 param2)
     sub_0200D6B0(param0->unk_00, param1, param2);
 }
 
-void sub_0200D6F4 (UnkStruct_02022550 * param0, f32 param1, f32 param2)
+void sub_0200D6F4 (GraphicElementData * param0, f32 param1, f32 param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
@@ -1162,7 +1162,7 @@ void sub_0200D74C (CellActorData * param0, f32 param1, f32 param2)
     sub_0200D6F4(param0->unk_00, param1, param2);
 }
 
-void sub_0200D758 (UnkStruct_02022550 * param0, f32 * param1, f32 * param2)
+void sub_0200D758 (GraphicElementData * param0, f32 * param1, f32 * param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
@@ -1178,7 +1178,7 @@ void sub_0200D788 (CellActorData * param0, f32 * param1, f32 * param2)
     sub_0200D758(param0->unk_00, param1, param2);
 }
 
-void sub_0200D794 (UnkStruct_02022550 * param0, u16 param1)
+void sub_0200D794 (GraphicElementData * param0, u16 param1)
 {
     sub_02021C94(param0, param1);
 }
@@ -1188,7 +1188,7 @@ void sub_0200D79C (CellActorData * param0, u16 param1)
     sub_0200D794(param0->unk_00, param1);
 }
 
-void sub_0200D7A8 (UnkStruct_02022550 * param0, s32 param1)
+void sub_0200D7A8 (GraphicElementData * param0, s32 param1)
 {
     u16 v0;
 
@@ -1203,7 +1203,7 @@ void sub_0200D7C0 (CellActorData * param0, s32 param1)
     sub_0200D7A8(param0->unk_00, param1);
 }
 
-void sub_0200D7CC (UnkStruct_02022550 * param0, int param1)
+void sub_0200D7CC (GraphicElementData * param0, int param1)
 {
     sub_02021D0C(param0, param1);
 }
@@ -1229,7 +1229,7 @@ void sub_0200D7FC (CellActorData * param0, BOOL param1)
     sub_02021FA0(param0->unk_00, param1);
 }
 
-void sub_0200D808 (UnkStruct_02022550 * param0, GXOamMode param1)
+void sub_0200D808 (GraphicElementData * param0, GXOamMode param1)
 {
     sub_02021FE0(param0, param1);
 }
@@ -1244,7 +1244,7 @@ u32 sub_0200D81C (CellActorData * param0)
     return sub_020220F4(param0->unk_00);
 }
 
-BOOL sub_0200D828 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5, int param6)
+BOOL sub_0200D828 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -1266,7 +1266,7 @@ BOOL sub_0200D828 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     return (v0 == NULL) ? 0 : 1;
 }
 
-BOOL sub_0200D888 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5, int param6)
+BOOL sub_0200D888 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -1288,7 +1288,7 @@ BOOL sub_0200D888 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     return (v0 == NULL) ? 0 : 1;
 }
 
-BOOL sub_0200D8E8 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, BOOL param4, int param5, int param6)
+BOOL sub_0200D8E8 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5, int param6)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -1310,7 +1310,7 @@ BOOL sub_0200D8E8 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NAR
     return (v0 == NULL) ? 0 : 1;
 }
 
-void sub_0200D948 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5)
+void sub_0200D948 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -1320,7 +1320,7 @@ void sub_0200D948 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     sub_0200A4C0(v0);
 }
 
-void sub_0200D97C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, int param3, BOOL param4, int param5)
+void sub_0200D97C (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, int param3, BOOL param4, int param5)
 {
     UnkStruct_02009DC8 * v0;
 
@@ -1330,12 +1330,12 @@ void sub_0200D97C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int
     sub_0200A6B8(v0);
 }
 
-UnkStruct_020218BC * sub_0200D9B0 (UnkStruct_0200C704 * param0)
+GraphicElementManager * sub_0200D9B0 (AnimationResourceCollection * param0)
 {
     return param0->unk_00;
 }
 
-void sub_0200D9B4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NARC * param2, int param3, BOOL param4, int param5)
+void sub_0200D9B4 (CellTransferStateData * param0, AnimationResourceCollection * param1, NARC * param2, int param3, BOOL param4, int param5)
 {
     UnkStruct_02009DC8 * v0;
 
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 37f906fdd7..ddf73f1fcb 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -15,7 +15,7 @@
 #include "unk_020218BC.h"
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_02012CE0_sub1;
@@ -23,7 +23,7 @@ typedef struct {
 typedef struct FontOAM {
     UnkStruct_02012CE0_sub1 * unk_00;
     int unk_04;
-    const UnkStruct_02022550 * unk_08;
+    const GraphicElementData * unk_08;
     int unk_0C;
     int unk_10;
 } FontOAM;
@@ -70,7 +70,7 @@ static void sub_02012E6C(const Window * param0, const UnkStruct_02013034 * param
 static int sub_02012EE0(const Window * param0, const UnkStruct_02013034 * param1, NNSG2dImageProxy * param2, int param3, int param4, int param5, int param6, int param7);
 static int sub_02013034(const UnkStruct_02013034 * param0, int param1);
 static void sub_02013088(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2, FontOAM * param3);
-static UnkStruct_02022550 * sub_02013100(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2);
+static GraphicElementData * sub_02013100(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2);
 static void sub_020130DC(FontOAM * param0);
 static UnkStruct_02013034 * sub_02013188(int param0);
 static void sub_020131A4(UnkStruct_02013034 * param0);
@@ -396,7 +396,7 @@ void sub_02012BE0 (FontOAM * param0, const UnkStruct_02012B20 * param1, const Wi
     int v0;
     char * v1;
     NNSG2dImageProxy * v2;
-    UnkStruct_02022550 * v3 = param0->unk_00[0].unk_00;
+    GraphicElementData * v3 = param0->unk_00[0].unk_00;
     int v4;
 
     v4 = sub_02021FC8(v3);
@@ -725,7 +725,7 @@ static void sub_020130DC (FontOAM * param0)
     }
 }
 
-static UnkStruct_02022550 * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
+static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
 {
     UnkStruct_ov83_0223D9A8 v0;
     UnkStruct_ov19_021DA864 v1;
@@ -803,7 +803,7 @@ static void sub_020131D0 (UnkStruct_02013034 * param0, UnkStruct_02013034 * para
     param1->unk_0C = param0;
 }
 
-void sub_020131E0 (FontOAM * param0, const UnkStruct_02022550 * param1)
+void sub_020131E0 (FontOAM * param0, const GraphicElementData * param1)
 {
     param0->unk_08 = param1;
     sub_02012938(param0);
diff --git a/src/unk_02013A04.c b/src/unk_02013A04.c
index 42b72e7061..333d447cd4 100644
--- a/src/unk_02013A04.c
+++ b/src/unk_02013A04.c
@@ -12,11 +12,11 @@
 #include "heap.h"
 #include "strbuf.h"
 
-static UnkStruct_02013A04 * sub_02013AAC(UnkStruct_02013A04 * param0, u32 * param1);
+static ResourceMetadata * sub_02013AAC(ResourceMetadata * param0, u32 * param1);
 
-UnkStruct_02013A04 * sub_02013A04 (u32 param0, u32 param1)
+ResourceMetadata * sub_02013A04 (u32 param0, u32 param1)
 {
-    UnkStruct_02013A04 * v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02013A04) * (param0 + 1));
+    ResourceMetadata * v0 = Heap_AllocFromHeap(param1, sizeof(ResourceMetadata) * (param0 + 1));
 
     if (v0) {
         u32 v1;
@@ -33,13 +33,13 @@ UnkStruct_02013A04 * sub_02013A04 (u32 param0, u32 param1)
     return v0;
 }
 
-void sub_02013A3C (UnkStruct_02013A04 * param0)
+void sub_02013A3C (ResourceMetadata * param0)
 {
     sub_02013AE8(param0);
     Heap_FreeToHeap(param0);
 }
 
-void sub_02013A4C (UnkStruct_02013A04 * param0, const MessageLoader * param1, u32 param2, u32 param3)
+void sub_02013A4C (ResourceMetadata * param0, const MessageLoader * param1, u32 param2, u32 param3)
 {
     u32 v0;
 
@@ -51,7 +51,7 @@ void sub_02013A4C (UnkStruct_02013A04 * param0, const MessageLoader * param1, u3
     }
 }
 
-void sub_02013A6C (UnkStruct_02013A04 * param0, const Strbuf *param1, u32 param2)
+void sub_02013A6C (ResourceMetadata * param0, const Strbuf *param1, u32 param2)
 {
     u32 v0;
 
@@ -63,7 +63,7 @@ void sub_02013A6C (UnkStruct_02013A04 * param0, const Strbuf *param1, u32 param2
     }
 }
 
-void sub_02013A90 (UnkStruct_02013A04 * param0, const UnkStruct_02013A04 * param1)
+void sub_02013A90 (ResourceMetadata * param0, const ResourceMetadata * param1)
 {
     u32 v0;
 
@@ -75,9 +75,9 @@ void sub_02013A90 (UnkStruct_02013A04 * param0, const UnkStruct_02013A04 * param
     }
 }
 
-static UnkStruct_02013A04 * sub_02013AAC (UnkStruct_02013A04 * param0, u32 * param1)
+static ResourceMetadata * sub_02013AAC (ResourceMetadata * param0, u32 * param1)
 {
-    UnkStruct_02013A04 * v0;
+    ResourceMetadata * v0;
 
     while (param0->unk_00 != NULL) {
         if (param0->unk_00 == ((const void *)0xffffffff)) {
@@ -99,9 +99,9 @@ static UnkStruct_02013A04 * sub_02013AAC (UnkStruct_02013A04 * param0, u32 * par
     return v0;
 }
 
-void sub_02013AE8 (UnkStruct_02013A04 * param0)
+void sub_02013AE8 (ResourceMetadata * param0)
 {
-    UnkStruct_02013A04 * v0 = param0;
+    ResourceMetadata * v0 = param0;
 
     while (v0->unk_00 != ((const void *)0xffffffff)) {
         if (v0->unk_00 == NULL) {
diff --git a/src/unk_0201C970.c b/src/unk_0201C970.c
index b49b77f634..99e409da8d 100644
--- a/src/unk_0201C970.c
+++ b/src/unk_0201C970.c
@@ -92,7 +92,7 @@ void sub_0201CAB0 (NNSG3dRenderObj * param0, const VecFx32 * param1, const MtxFx
     NNS_G3dGeFlushBuffer();
 }
 
-static UnkStruct_0207C690 * Unk_021BFB0C = NULL;
+static GenericPointerData * Unk_021BFB0C = NULL;
 
 void sub_0201CAF4 (const u8 param0)
 {
diff --git a/src/unk_0201E010.c b/src/unk_0201E010.c
index 97aabf87b8..8f68bcbaec 100644
--- a/src/unk_0201E010.c
+++ b/src/unk_0201E010.c
@@ -5,19 +5,19 @@
 
 #include "unk_0201E010.h"
 
-void sub_0201E010 (const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2)
+void sub_0201E010 (const ByteFlagSet * param0, u8 * param1, u8 * param2)
 {
     *param1 = param0->unk_00;
     *param2 = param0->unk_01;
 }
 
-void sub_0201E01C (const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2)
+void sub_0201E01C (const ByteFlagSet * param0, u8 * param1, u8 * param2)
 {
     *param1 = param0->unk_02;
     *param2 = param0->unk_03;
 }
 
-u8 sub_0201E028 (const UnkStruct_020F1DB8 * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6)
+u8 sub_0201E028 (const ByteFlagSet * param0, u8 * param1, u8 * param2, u8 * param3, u8 * param4, u8 param5, u8 param6)
 {
     u8 v0 = param5;
 
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 9384e9d2e8..e52f8e7041 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -14,14 +14,14 @@ typedef struct {
     const NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
     NNSG2dCellAnimation unk_08;
-} UnkStruct_02021D44;
+} CellAnimationData;
 
 typedef struct {
     NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
     NNSG2dCellAnimation unk_08;
     u32 unk_60;
-} UnkStruct_02021BD4;
+} CellDataAnimationWrapper;
 
 typedef struct {
     const NNSG2dCellDataBank * unk_00;
@@ -31,9 +31,9 @@ typedef struct {
     const NNSG2dMultiCellAnimBankData * unk_70;
     NNSG2dNode * unk_74;
     NNSG2dCellAnimation * unk_78;
-} UnkStruct_02021E2C;
+} MultiCellAnimationData;
 
-typedef struct UnkStruct_02022550_t {
+typedef struct GraphicElementData_t {
     VecFx32 unk_00;
     VecFx32 unk_0C;
     VecFx32 unk_18;
@@ -48,7 +48,7 @@ typedef struct UnkStruct_02022550_t {
     u8 unk_34;
     u8 unk_35;
     fx32 unk_38;
-    UnkStruct_020218BC * unk_3C;
+    GraphicElementManager * unk_3C;
     u32 unk_40[29];
     NNSG2dImageProxy unk_B4;
     NNSG2dImagePaletteProxy unk_D8;
@@ -57,64 +57,64 @@ typedef struct UnkStruct_02022550_t {
     u8 unk_F2;
     u16 unk_F4;
     NNS_G2D_VRAM_TYPE unk_F8;
-    struct UnkStruct_02022550_t * unk_FC;
-    struct UnkStruct_02022550_t * unk_100;
-} UnkStruct_02022550;
+    struct GraphicElementData_t * unk_FC;
+    struct GraphicElementData_t * unk_100;
+} GraphicElementData;
 
-typedef struct UnkStruct_020218BC_t {
-    UnkStruct_02022550 * unk_00;
+typedef struct GraphicElementManager_t {
+    GraphicElementData * unk_00;
     int unk_04;
-    UnkStruct_02022550 ** unk_08;
+    GraphicElementData ** unk_08;
     int unk_0C;
-    UnkStruct_02022550 unk_10;
+    GraphicElementData unk_10;
     NNSG2dRendererInstance * unk_110;
     void * unk_114;
     NNSG2dCellAnimBankData * unk_118;
     u32 unk_11C;
-} UnkStruct_020218BC;
+} GraphicElementManager;
 
-typedef void (* UnkFuncPtr_020219F8)(const UnkStruct_020218BC *, UnkStruct_02022550 *);
-typedef void (* UnkFuncPtr_020219F8_1)(UnkStruct_02022550 *);
+typedef void (* GraphicElementUpdateFunc)(const GraphicElementManager *, GraphicElementData *);
+typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
 
-static void sub_02021A50(UnkStruct_020218BC * param0);
+static void sub_02021A50(GraphicElementManager * param0);
 static u32 sub_020221B8(const UnkStruct_ov19_021DA864 * param0);
-static void sub_020221D0(const NNSG2dCellDataBank * param0, UnkStruct_02022550 * param1);
-static void sub_020221D4(const NNSG2dCellAnimBankData * param0, UnkStruct_02022550 * param1);
-static void sub_020221D8(const NNSG2dMultiCellDataBank * param0, UnkStruct_02022550 * param1);
-static void sub_020221E0(const NNSG2dMultiCellAnimBankData * param0, UnkStruct_02022550 * param1);
-static void sub_020221E8(UnkStruct_02022550 * param0, int param1);
-static void sub_02022208(const UnkStruct_ov19_021DA864 * param0, UnkStruct_02022550 * param1, int param2);
-static void sub_02022264(UnkStruct_02022550 * param0, int param1);
-static BOOL sub_02022110(const UnkStruct_020218BC * param0, const UnkStruct_ov19_021DA864 * param1, UnkStruct_02022550 * param2, int param3);
+static void sub_020221D0(const NNSG2dCellDataBank * param0, GraphicElementData * param1);
+static void sub_020221D4(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1);
+static void sub_020221D8(const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1);
+static void sub_020221E0(const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1);
+static void sub_020221E8(GraphicElementData * param0, int param1);
+static void sub_02022208(const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2);
+static void sub_02022264(GraphicElementData * param0, int param1);
+static BOOL sub_02022110(const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3);
 static u32 sub_020222C4(const NNSG2dImagePaletteProxy * param0, u32 param1);
-static void sub_020222F4(const UnkStruct_020218BC * param0, UnkStruct_02022550 * param1);
-static void sub_02022450(const UnkStruct_020218BC * param0, UnkStruct_02022550 * param1);
-static void sub_02022454(UnkStruct_02022550 * param0);
-static void sub_02022460(UnkStruct_02022550 * param0);
-static void sub_02022464(UnkStruct_020218BC * param0, UnkStruct_02022550 * param1);
-static void sub_020224FC(UnkStruct_02022550 * param0);
-static void sub_02022518(UnkStruct_020218BC * param0);
-static UnkStruct_02022550 * sub_02022550(UnkStruct_020218BC * param0);
-static BOOL sub_0202256C(UnkStruct_020218BC * param0, UnkStruct_02022550 * param1);
-
-UnkStruct_020218BC * sub_020218BC (const UnkStruct_020095C4 * param0)
-{
-    UnkStruct_020218BC * v0;
+static void sub_020222F4(const GraphicElementManager * param0, GraphicElementData * param1);
+static void sub_02022450(const GraphicElementManager * param0, GraphicElementData * param1);
+static void sub_02022454(GraphicElementData * param0);
+static void sub_02022460(GraphicElementData * param0);
+static void sub_02022464(GraphicElementManager * param0, GraphicElementData * param1);
+static void sub_020224FC(GraphicElementData * param0);
+static void sub_02022518(GraphicElementManager * param0);
+static GraphicElementData * sub_02022550(GraphicElementManager * param0);
+static BOOL sub_0202256C(GraphicElementManager * param0, GraphicElementData * param1);
+
+GraphicElementManager * sub_020218BC (const UnkStruct_020095C4 * param0)
+{
+    GraphicElementManager * v0;
     int v1;
 
     GF_ASSERT(param0);
     GF_ASSERT(param0->unk_04);
 
-    v0 = Heap_AllocFromHeap(param0->unk_08, sizeof(UnkStruct_020218BC));
+    v0 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementManager));
     GF_ASSERT(v0);
 
     sub_02021A50(v0);
 
-    v0->unk_00 = Heap_AllocFromHeap(param0->unk_08, sizeof(UnkStruct_02022550) * param0->unk_00);
+    v0->unk_00 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementData) * param0->unk_00);
     GF_ASSERT(v0->unk_00);
     v0->unk_04 = param0->unk_00;
 
-    v0->unk_08 = Heap_AllocFromHeap(param0->unk_08, sizeof(UnkStruct_02022550 *) * param0->unk_00);
+    v0->unk_08 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementData *) * param0->unk_00);
     GF_ASSERT(v0->unk_08);
 
     sub_02022518(v0);
@@ -131,7 +131,7 @@ UnkStruct_020218BC * sub_020218BC (const UnkStruct_020095C4 * param0)
     return v0;
 }
 
-BOOL sub_02021964 (UnkStruct_020218BC * param0)
+BOOL sub_02021964 (GraphicElementManager * param0)
 {
     if (param0 == NULL) {
         return 0;
@@ -155,7 +155,7 @@ BOOL sub_02021964 (UnkStruct_020218BC * param0)
     return 1;
 }
 
-BOOL sub_020219A4 (UnkStruct_020218BC * param0, u8 param1)
+BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1)
 {
     if (param0 == NULL) {
         return 0;
@@ -170,10 +170,10 @@ BOOL sub_020219A4 (UnkStruct_020218BC * param0, u8 param1)
     return 1;
 }
 
-BOOL sub_020219C0 (UnkStruct_020218BC * param0)
+BOOL sub_020219C0 (GraphicElementManager * param0)
 {
-    UnkStruct_02022550 * v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v0;
+    GraphicElementData * v1;
 
     if (param0 == NULL) {
         return 0;
@@ -194,14 +194,14 @@ BOOL sub_020219C0 (UnkStruct_020218BC * param0)
     return 1;
 }
 
-void sub_020219F8 (const UnkStruct_020218BC * param0)
+void sub_020219F8 (const GraphicElementManager * param0)
 {
-    UnkStruct_02022550 * v0;
-    static const UnkFuncPtr_020219F8 v1[] = {
+    GraphicElementData * v0;
+    static const GraphicElementUpdateFunc v1[] = {
         sub_02022450,
         sub_020222F4
     };
-    static const UnkFuncPtr_020219F8_1 v2[] = {
+    static const GraphicElementInitializeFunc v2[] = {
         sub_02022460,
         sub_02022454
     };
@@ -221,7 +221,7 @@ void sub_020219F8 (const UnkStruct_020218BC * param0)
     }
 }
 
-static void sub_02021A50 (UnkStruct_020218BC * param0)
+static void sub_02021A50 (GraphicElementManager * param0)
 {
     param0->unk_00 = NULL;
     param0->unk_04 = 0;
@@ -233,12 +233,12 @@ static void sub_02021A50 (UnkStruct_020218BC * param0)
     param0->unk_11C = 0;
 }
 
-void sub_02021A78 (UnkStruct_02022550 * param0)
+void sub_02021A78 (GraphicElementData * param0)
 {
     int v0;
 
     param0->unk_3C = NULL;
-    memset(param0, 0, sizeof(UnkStruct_02022550));
+    memset(param0, 0, sizeof(GraphicElementData));
 
     NNS_G2dInitImageProxy(&param0->unk_B4);
     NNS_G2dInitImagePaletteProxy(&param0->unk_D8);
@@ -246,9 +246,9 @@ void sub_02021A78 (UnkStruct_02022550 * param0)
     param0->unk_30 = GX_OAM_MODE_NORMAL;
 }
 
-UnkStruct_02022550 * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
+GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     v0 = sub_02022550(param0->unk_00);
 
@@ -289,7 +289,7 @@ UnkStruct_02022550 * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
     return v0;
 }
 
-UnkStruct_02022550 * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
+GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
 {
     UnkStruct_ov115_02261520 v0;
 
@@ -307,19 +307,19 @@ UnkStruct_02022550 * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
     return sub_02021AA0(&v0);
 }
 
-void sub_02021BD4 (UnkStruct_02022550 * param0)
+void sub_02021BD4 (GraphicElementData * param0)
 {
-    UnkStruct_020218BC * v0;
+    GraphicElementManager * v0;
 
     if (param0->unk_EC != 0) {
-        UnkStruct_02021D44 * v1 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
 
         if (param0->unk_FC != NULL) {
             sub_020224FC(param0);
         }
 
         if (param0->unk_EC == 3) {
-            UnkStruct_02021BD4 * v2 = (UnkStruct_02021BD4 *)&param0->unk_40;
+            CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)&param0->unk_40;
 
             if (NNS_G2dGetImageLocation(&param0->unk_B4, param0->unk_F8) != NNS_G2D_VRAM_ADDR_NONE) {
                 NNS_G2dFreeCellTransferStateHandle(v2->unk_60);
@@ -327,7 +327,7 @@ void sub_02021BD4 (UnkStruct_02022550 * param0)
         }
 
         if (param0->unk_EC == 2) {
-            UnkStruct_02021E2C * v3 = (UnkStruct_02021E2C *)&param0->unk_40;
+            MultiCellAnimationData * v3 = (MultiCellAnimationData *)&param0->unk_40;
 
             if (v3->unk_74 != NULL) {
                 Heap_FreeToHeap(v3->unk_74);
@@ -340,44 +340,44 @@ void sub_02021BD4 (UnkStruct_02022550 * param0)
 
         param0->unk_EC = 0;
 
-        v0 = (UnkStruct_020218BC *)param0->unk_3C;
+        v0 = (GraphicElementManager *)param0->unk_3C;
         sub_0202256C(v0, param0);
     }
 }
 
-void sub_02021C50 (UnkStruct_02022550 * param0, const VecFx32 * param1)
+void sub_02021C50 (GraphicElementData * param0, const VecFx32 * param1)
 {
     param0->unk_00 = *param1;
 }
 
-void sub_02021C60 (UnkStruct_02022550 * param0, const VecFx32 * param1)
+void sub_02021C60 (GraphicElementData * param0, const VecFx32 * param1)
 {
     param0->unk_0C = *param1;
 }
 
-void sub_02021C70 (UnkStruct_02022550 * param0, const VecFx32 * param1)
+void sub_02021C70 (GraphicElementData * param0, const VecFx32 * param1)
 {
     param0->unk_18 = *param1;
 }
 
-void sub_02021C80 (UnkStruct_02022550 * param0, const VecFx32 * param1, int param2)
+void sub_02021C80 (GraphicElementData * param0, const VecFx32 * param1, int param2)
 {
     sub_02021C70(param0, param1);
     sub_02021CF8(param0, param2);
 }
 
-void sub_02021C94 (UnkStruct_02022550 * param0, u16 param1)
+void sub_02021C94 (GraphicElementData * param0, u16 param1)
 {
     param0->unk_24 = param1;
 }
 
-void sub_02021C98 (UnkStruct_02022550 * param0, u16 param1, int param2)
+void sub_02021C98 (GraphicElementData * param0, u16 param1, int param2)
 {
     sub_02021C94(param0, param1);
     sub_02021CF8(param0, param2);
 }
 
-void sub_02021CAC (UnkStruct_02022550 * param0, int param1)
+void sub_02021CAC (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
     GF_ASSERT(param1 < 2);
@@ -385,7 +385,7 @@ void sub_02021CAC (UnkStruct_02022550 * param0, int param1)
     param0->unk_34 = param1;
 }
 
-void sub_02021CC8 (UnkStruct_02022550 * param0, int param1)
+void sub_02021CC8 (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
     GF_ASSERT(param1 < 2);
@@ -393,21 +393,21 @@ void sub_02021CC8 (UnkStruct_02022550 * param0, int param1)
     param0->unk_35 = param1;
 }
 
-void sub_02021CE4 (UnkStruct_02022550 * param0, fx32 param1)
+void sub_02021CE4 (GraphicElementData * param0, fx32 param1)
 {
     GF_ASSERT(param0);
 
     param0->unk_38 = param1;
 }
 
-void sub_02021CF8 (UnkStruct_02022550 * param0, int param1)
+void sub_02021CF8 (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
 
     param0->unk_26 = param1;
 }
 
-void sub_02021D0C (UnkStruct_02022550 * param0, int param1)
+void sub_02021D0C (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
 
@@ -415,49 +415,49 @@ void sub_02021D0C (UnkStruct_02022550 * param0, int param1)
     param0->unk_26 = 0;
 }
 
-const VecFx32 * sub_02021D28 (const UnkStruct_02022550 * param0)
+const VecFx32 * sub_02021D28 (const GraphicElementData * param0)
 {
     return &param0->unk_00;
 }
 
-const VecFx32 * sub_02021D2C (const UnkStruct_02022550 * param0)
+const VecFx32 * sub_02021D2C (const GraphicElementData * param0)
 {
     return &param0->unk_18;
 }
 
-u16 sub_02021D30 (const UnkStruct_02022550 * param0)
+u16 sub_02021D30 (const GraphicElementData * param0)
 {
     return param0->unk_24;
 }
 
-int sub_02021D34 (const UnkStruct_02022550 * param0)
+int sub_02021D34 (const GraphicElementData * param0)
 {
     return param0->unk_34;
 }
 
-int sub_02021D3C (const UnkStruct_02022550 * param0)
+int sub_02021D3C (const GraphicElementData * param0)
 {
     return param0->unk_35;
 }
 
-u32 sub_02021D44 (const UnkStruct_02022550 * param0)
+u32 sub_02021D44 (const GraphicElementData * param0)
 {
     u32 v0;
 
     GF_ASSERT(param0);
 
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v1 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
         v0 = v1->unk_04->numSequences;
     } else {
-        UnkStruct_02021E2C * v2 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
         v0 = v2->unk_70->numSequences;
     }
 
     return v0;
 }
 
-void sub_02021D6C (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021D6C (GraphicElementData * param0, u32 param1)
 {
     const NNSG2dAnimSequence * v0;
 
@@ -465,13 +465,13 @@ void sub_02021D6C (UnkStruct_02022550 * param0, u32 param1)
     param0->unk_F0 = param1;
 
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v1 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
 
         v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1);
         NNS_G2dSetCellAnimationSequence(&v1->unk_08, v0);
         NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl);
     } else {
-        UnkStruct_02021E2C * v2 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
 
         v0 = NNS_G2dGetAnimSequenceByIdx(v2->unk_70, param1);
         NNS_G2dSetAnimSequenceToMCAnimation(&v2->unk_08, v0);
@@ -479,23 +479,23 @@ void sub_02021D6C (UnkStruct_02022550 * param0, u32 param1)
     }
 }
 
-void sub_02021DCC (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021DCC (GraphicElementData * param0, u32 param1)
 {
     if (param0->unk_F0 != param1) {
         sub_02021D6C(param0, param1);
     }
 }
 
-void sub_02021DE0 (UnkStruct_02022550 * param0)
+void sub_02021DE0 (GraphicElementData * param0)
 {
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v0 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
 
         NNS_G2dResetAnimCtrlState(&v0->unk_08.animCtrl);
         NNS_G2dStartAnimCtrl(&v0->unk_08.animCtrl);
         sub_02021E50(param0, 0);
     } else {
-        UnkStruct_02021E2C * v1 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
 
         NNS_G2dResetAnimCtrlState(&v1->unk_08.animCtrl);
         NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl);
@@ -503,59 +503,59 @@ void sub_02021DE0 (UnkStruct_02022550 * param0)
     }
 }
 
-u32 sub_02021E24 (const UnkStruct_02022550 * param0)
+u32 sub_02021E24 (const GraphicElementData * param0)
 {
     return param0->unk_F0;
 }
 
-void sub_02021E2C (UnkStruct_02022550 * param0, fx32 param1)
+void sub_02021E2C (GraphicElementData * param0, fx32 param1)
 {
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v0 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         NNS_G2dTickCellAnimation(&v0->unk_08, param1);
     } else {
-        UnkStruct_02021E2C * v1 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
         NNS_G2dTickMCAnimation(&v1->unk_08, param1);
     }
 }
 
-void sub_02021E50 (UnkStruct_02022550 * param0, u16 param1)
+void sub_02021E50 (GraphicElementData * param0, u16 param1)
 {
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v0 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         NNS_G2dSetCellAnimationCurrentFrame(&v0->unk_08, param1);
     } else {
-        UnkStruct_02021E2C * v1 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
         NNS_G2dSetMCAnimationCurrentFrame(&v1->unk_08, param1);
     }
 }
 
-u16 sub_02021E74 (const UnkStruct_02022550 * param0)
+u16 sub_02021E74 (const GraphicElementData * param0)
 {
     NNSG2dAnimController * v0;
 
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v1 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
         v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->unk_08);
     } else {
-        UnkStruct_02021E2C * v2 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
         v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->unk_08);
     }
 
     return NNS_G2dGetAnimCtrlCurrentFrame(v0);
 }
 
-void sub_02021E80 (UnkStruct_02022550 * param0, u8 param1)
+void sub_02021E80 (GraphicElementData * param0, u8 param1)
 {
     param0->unk_F2 = param1;
 }
 
-u8 sub_02021E88 (const UnkStruct_02022550 * param0)
+u8 sub_02021E88 (const GraphicElementData * param0)
 {
     return param0->unk_F2;
 }
 
-void sub_02021E90 (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021E90 (GraphicElementData * param0, u32 param1)
 {
     GF_ASSERT(param0);
 
@@ -564,18 +564,18 @@ void sub_02021E90 (UnkStruct_02022550 * param0, u32 param1)
     param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
 }
 
-void sub_02021EC4 (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021EC4 (GraphicElementData * param0, u32 param1)
 {
     sub_02021E90(param0, param1);
     param0->unk_29 += sub_020222C4(&param0->unk_D8, param0->unk_F8);
 }
 
-u32 sub_02021EE8 (const UnkStruct_02022550 * param0)
+u32 sub_02021EE8 (const GraphicElementData * param0)
 {
     return param0->unk_29;
 }
 
-void sub_02021EF0 (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021EF0 (GraphicElementData * param0, u32 param1)
 {
     GF_ASSERT(param0);
 
@@ -584,21 +584,21 @@ void sub_02021EF0 (UnkStruct_02022550 * param0, u32 param1)
     param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
 }
 
-void sub_02021F24 (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021F24 (GraphicElementData * param0, u32 param1)
 {
     sub_02021EF0(param0, param1);
     param0->unk_2A += sub_020222C4(&param0->unk_D8, param0->unk_F8);
 }
 
-u32 sub_02021F48 (const UnkStruct_02022550 * param0)
+u32 sub_02021F48 (const GraphicElementData * param0)
 {
     GF_ASSERT(param0);
     return param0->unk_2A;
 }
 
-void sub_02021F58 (UnkStruct_02022550 * param0, u32 param1)
+void sub_02021F58 (GraphicElementData * param0, u32 param1)
 {
-    UnkStruct_020218BC * v0 = (UnkStruct_020218BC *)param0->unk_3C;
+    GraphicElementManager * v0 = (GraphicElementManager *)param0->unk_3C;
 
     param0->unk_F4 = param1;
 
@@ -606,27 +606,27 @@ void sub_02021F58 (UnkStruct_02022550 * param0, u32 param1)
     sub_02022464(v0, param0);
 }
 
-u32 sub_02021F74 (const UnkStruct_02022550 * param0)
+u32 sub_02021F74 (const GraphicElementData * param0)
 {
     return param0->unk_F4;
 }
 
-void sub_02021F7C (UnkStruct_02022550 * param0, const NNSG2dImageProxy * param1)
+void sub_02021F7C (GraphicElementData * param0, const NNSG2dImageProxy * param1)
 {
     param0->unk_B4 = *param1;
 }
 
-NNSG2dImageProxy * sub_02021F98 (UnkStruct_02022550 * param0)
+NNSG2dImageProxy * sub_02021F98 (GraphicElementData * param0)
 {
     return &param0->unk_B4;
 }
 
-NNSG2dImagePaletteProxy * sub_02021F9C (UnkStruct_02022550 * param0)
+NNSG2dImagePaletteProxy * sub_02021F9C (GraphicElementData * param0)
 {
     return &param0->unk_D8;
 }
 
-void sub_02021FA0 (UnkStruct_02022550 * param0, BOOL param1)
+void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
 {
     param0->unk_2C = param1;
 
@@ -637,25 +637,25 @@ void sub_02021FA0 (UnkStruct_02022550 * param0, BOOL param1)
     }
 }
 
-NNS_G2D_VRAM_TYPE sub_02021FC8 (const UnkStruct_02022550 * param0)
+NNS_G2D_VRAM_TYPE sub_02021FC8 (const GraphicElementData * param0)
 {
     return param0->unk_F8;
 }
 
-BOOL sub_02021FD0 (UnkStruct_02022550 * param0)
+BOOL sub_02021FD0 (GraphicElementData * param0)
 {
     GF_ASSERT(param0);
 
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v0 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         return NNS_G2dIsAnimCtrlActive(&v0->unk_08.animCtrl);
     } else {
-        UnkStruct_02021E2C * v1 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
         return NNS_G2dIsAnimCtrlActive(&v1->unk_08.animCtrl);
     }
 }
 
-void sub_02021FE0 (UnkStruct_02022550 * param0, GXOamMode param1)
+void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1)
 {
     GF_ASSERT(param0);
 
@@ -693,7 +693,7 @@ void sub_0202204C (int param0)
     Heap_FreeToHeap(v0);
 }
 
-u32 sub_0202207C (const UnkStruct_02022550 * param0, u32 param1, u32 param2)
+u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
 {
     const NNSG2dAnimBankData * v0;
     const NNSG2dUserExAnimAttrBank * v1;
@@ -701,10 +701,10 @@ u32 sub_0202207C (const UnkStruct_02022550 * param0, u32 param1, u32 param2)
     const NNSG2dUserExAnimFrameAttr * v3;
 
     if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
-        UnkStruct_02021D44 * v4 = (UnkStruct_02021D44 *)&param0->unk_40;
+        CellAnimationData * v4 = (CellAnimationData *)&param0->unk_40;
         v0 = v4->unk_04;
     } else {
-        UnkStruct_02021E2C * v5 = (UnkStruct_02021E2C *)&param0->unk_40;
+        MultiCellAnimationData * v5 = (MultiCellAnimationData *)&param0->unk_40;
         v0 = v5->unk_70;
     }
 
@@ -725,7 +725,7 @@ u32 sub_0202207C (const UnkStruct_02022550 * param0, u32 param1, u32 param2)
     return 0;
 }
 
-u32 sub_020220F4 (const UnkStruct_02022550 * param0)
+u32 sub_020220F4 (const GraphicElementData * param0)
 {
     u32 v0;
     u32 v1;
@@ -736,7 +736,7 @@ u32 sub_020220F4 (const UnkStruct_02022550 * param0)
     return sub_0202207C(param0, v0, v1);
 }
 
-static BOOL sub_02022110 (const UnkStruct_020218BC * param0, const UnkStruct_ov19_021DA864 * param1, UnkStruct_02022550 * param2, int param3)
+static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3)
 {
     param2->unk_EC = sub_020221B8(param1);
     param2->unk_B4 = *param1->unk_00;
@@ -756,7 +756,7 @@ static BOOL sub_02022110 (const UnkStruct_020218BC * param0, const UnkStruct_ov1
         sub_02022264(param2, param3);
     } else {
         if (param2->unk_EC == 3) {
-            UnkStruct_02021BD4 * v0 = (UnkStruct_02021BD4 *)&param2->unk_40;
+            CellDataAnimationWrapper * v0 = (CellDataAnimationWrapper *)&param2->unk_40;
             sub_02022208(param1, param2, param3);
         } else {
             sub_020221E8(param2, param3);
@@ -781,65 +781,65 @@ static u32 sub_020221B8 (const UnkStruct_ov19_021DA864 * param0)
     return 1;
 }
 
-static void sub_020221D0 (const NNSG2dCellDataBank * param0, UnkStruct_02022550 * param1)
+static void sub_020221D0 (const NNSG2dCellDataBank * param0, GraphicElementData * param1)
 {
-    UnkStruct_02021D44 * v0;
+    CellAnimationData * v0;
 
-    v0 = (UnkStruct_02021D44 *)&param1->unk_40;
+    v0 = (CellAnimationData *)&param1->unk_40;
     v0->unk_00 = param0;
 }
 
-static void sub_020221D4 (const NNSG2dCellAnimBankData * param0, UnkStruct_02022550 * param1)
+static void sub_020221D4 (const NNSG2dCellAnimBankData * param0, GraphicElementData * param1)
 {
-    UnkStruct_02021D44 * v0;
+    CellAnimationData * v0;
 
-    v0 = (UnkStruct_02021D44 *)&param1->unk_40;
+    v0 = (CellAnimationData *)&param1->unk_40;
     v0->unk_04 = param0;
 }
 
-static void sub_020221D8 (const NNSG2dMultiCellDataBank * param0, UnkStruct_02022550 * param1)
+static void sub_020221D8 (const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1)
 {
-    UnkStruct_02021E2C * v0;
+    MultiCellAnimationData * v0;
 
-    v0 = (UnkStruct_02021E2C *)&param1->unk_40;
+    v0 = (MultiCellAnimationData *)&param1->unk_40;
     v0->unk_6C = param0;
 }
 
-static void sub_020221E0 (const NNSG2dMultiCellAnimBankData * param0, UnkStruct_02022550 * param1)
+static void sub_020221E0 (const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1)
 {
-    UnkStruct_02021E2C * v0;
+    MultiCellAnimationData * v0;
 
-    v0 = (UnkStruct_02021E2C *)&param1->unk_40;
+    v0 = (MultiCellAnimationData *)&param1->unk_40;
     v0->unk_70 = param0;
 }
 
-static void sub_020221E8 (UnkStruct_02022550 * param0, int param1)
+static void sub_020221E8 (GraphicElementData * param0, int param1)
 {
-    UnkStruct_02021D44 * v0;
+    CellAnimationData * v0;
 
-    v0 = (UnkStruct_02021D44 *)&param0->unk_40;
+    v0 = (CellAnimationData *)&param0->unk_40;
     NNS_G2dInitCellAnimation((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00);
 }
 
-static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, UnkStruct_02022550 * param1, int param2)
+static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2)
 {
-    UnkStruct_02021BD4 * v0;
+    CellDataAnimationWrapper * v0;
     const NNSG2dCharacterData * v1;
 
-    v0 = (UnkStruct_02021BD4 *)&param1->unk_40;
+    v0 = (CellDataAnimationWrapper *)&param1->unk_40;
     v0->unk_60 = NNS_G2dGetNewCellTransferStateHandle();
     v1 = param0->unk_04;
 
     NNS_G2dInitCellAnimationVramTransfered((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00, v0->unk_60, NNS_G2D_VRAM_ADDR_NONE, NNS_G2dGetImageLocation(&param1->unk_B4, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->unk_B4, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
 }
 
-static void sub_02022264 (UnkStruct_02022550 * param0, int param1)
+static void sub_02022264 (GraphicElementData * param0, int param1)
 {
-    UnkStruct_02021E2C * v0;
+    MultiCellAnimationData * v0;
     const NNSG2dMultiCellAnimSequence * v1;
     u16 v2;
 
-    v0 = (UnkStruct_02021E2C *)&param0->unk_40;
+    v0 = (MultiCellAnimationData *)&param0->unk_40;
     v1 = NNS_G2dGetAnimSequenceByIdx(v0->unk_70, 0);
     v2 = NNS_G2dGetMCBankNumNodesRequired(v0->unk_6C);
 
@@ -875,7 +875,7 @@ static u32 sub_020222C4 (const NNSG2dImagePaletteProxy * param0, u32 param1)
     return v1;
 }
 
-static void sub_020222F4 (const UnkStruct_020218BC * param0, UnkStruct_02022550 * param1)
+static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementData * param1)
 {
     VecFx32 v0 = param1->unk_00;
 
@@ -910,10 +910,10 @@ static void sub_020222F4 (const UnkStruct_020218BC * param0, UnkStruct_02022550
         NNS_G2dSetRendererOverwritePriority(param0->unk_110, param1->unk_F2);
 
         if ((param1->unk_EC == 1) || (param1->unk_EC == 3)) {
-            UnkStruct_02021D44 * v1 = (UnkStruct_02021D44 *)&param1->unk_40;
+            CellAnimationData * v1 = (CellAnimationData *)&param1->unk_40;
             NNS_G2dDrawCellAnimation(&v1->unk_08);
         } else {
-            UnkStruct_02021E2C * v2 = (UnkStruct_02021E2C *)&param1->unk_40;
+            MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param1->unk_40;
             NNS_G2dDrawMultiCellAnimation(&v2->unk_08);
         }
     }
@@ -922,24 +922,24 @@ static void sub_020222F4 (const UnkStruct_020218BC * param0, UnkStruct_02022550
     NNS_G2dEndRendering();
 }
 
-static void sub_02022450 (const UnkStruct_020218BC * param0, UnkStruct_02022550 * param1)
+static void sub_02022450 (const GraphicElementManager * param0, GraphicElementData * param1)
 {
     return;
 }
 
-static void sub_02022454 (UnkStruct_02022550 * param0)
+static void sub_02022454 (GraphicElementData * param0)
 {
     sub_02021E2C(param0, param0->unk_38);
 }
 
-static void sub_02022460 (UnkStruct_02022550 * param0)
+static void sub_02022460 (GraphicElementData * param0)
 {
     return;
 }
 
-static void sub_02022464 (UnkStruct_020218BC * param0, UnkStruct_02022550 * param1)
+static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * param1)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     if (param0->unk_10.unk_100 == &param0->unk_10) {
         param0->unk_10.unk_100 = param1;
@@ -970,13 +970,13 @@ static void sub_02022464 (UnkStruct_020218BC * param0, UnkStruct_02022550 * para
     }
 }
 
-static void sub_020224FC (UnkStruct_02022550 * param0)
+static void sub_020224FC (GraphicElementData * param0)
 {
     param0->unk_FC->unk_100 = param0->unk_100;
     param0->unk_100->unk_FC = param0->unk_FC;
 }
 
-static void sub_02022518 (UnkStruct_020218BC * param0)
+static void sub_02022518 (GraphicElementManager * param0)
 {
     int v0;
 
@@ -988,9 +988,9 @@ static void sub_02022518 (UnkStruct_020218BC * param0)
     param0->unk_0C = 0;
 }
 
-static UnkStruct_02022550 * sub_02022550 (UnkStruct_020218BC * param0)
+static GraphicElementData * sub_02022550 (GraphicElementManager * param0)
 {
-    UnkStruct_02022550 * v0;
+    GraphicElementData * v0;
 
     if (param0->unk_0C >= param0->unk_04) {
         return NULL;
@@ -1002,7 +1002,7 @@ static UnkStruct_02022550 * sub_02022550 (UnkStruct_020218BC * param0)
     return v0;
 }
 
-static BOOL sub_0202256C (UnkStruct_020218BC * param0, UnkStruct_02022550 * param1)
+static BOOL sub_0202256C (GraphicElementManager * param0, GraphicElementData * param1)
 {
     if (param0->unk_0C <= 0) {
         return 0;
diff --git a/src/unk_02024220.c b/src/unk_02024220.c
index f6ec1c8d05..98090c7a9f 100644
--- a/src/unk_02024220.c
+++ b/src/unk_02024220.c
@@ -10,10 +10,10 @@
 
 static void sub_020242DC(void);
 
-UnkStruct_0207C690 * sub_02024220 (u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5)
+GenericPointerData * sub_02024220 (u32 param0, int param1, int param2, int param3, int param4, UnkFuncPtr_02024220 param5)
 {
     int v0, v1;
-    UnkStruct_0207C690 * v2 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0207C690));
+    GenericPointerData * v2 = Heap_AllocFromHeap(param0, sizeof(GenericPointerData));
 
     v2->unk_00 = param0;
 
@@ -47,7 +47,7 @@ UnkStruct_0207C690 * sub_02024220 (u32 param0, int param1, int param2, int param
     return v2;
 }
 
-void sub_020242C4 (UnkStruct_0207C690 * param0)
+void sub_020242C4 (GenericPointerData * param0)
 {
     Heap_FreeToHeap(param0->unk_04);
     Heap_FreeToHeap(param0->unk_08);
diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c
index b293abe879..cfb034d297 100644
--- a/src/unk_02025E08.c
+++ b/src/unk_02025E08.c
@@ -15,7 +15,7 @@
 #include "unk_0202CBE4.h"
 
 struct UnkStruct_02025E0C_t {
-    UnkStruct_020279FC unk_00;
+    AnimationControlFlags unk_00;
     TrainerInfo unk_04;
     u16 unk_24;
     UnkStruct_02025E5C unk_26;
@@ -44,7 +44,7 @@ TrainerInfo * sub_02025E38 (SaveData * param0)
     return &v0->unk_04;
 }
 
-UnkStruct_020279FC * sub_02025E44 (SaveData * param0)
+AnimationControlFlags * sub_02025E44 (SaveData * param0)
 {
     UnkStruct_02025E0C * v0;
 
diff --git a/src/unk_020279FC.c b/src/unk_020279FC.c
index 8449ac65f6..371856f3e0 100644
--- a/src/unk_020279FC.c
+++ b/src/unk_020279FC.c
@@ -11,24 +11,24 @@
 #include "unk_02025E08.h"
 #include "unk_020279FC.h"
 
-UnkStruct_020279FC * sub_020279FC (u32 param0)
+AnimationControlFlags * sub_020279FC (u32 param0)
 {
-    UnkStruct_020279FC * v0;
+    AnimationControlFlags * v0;
 
-    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_020279FC));
+    v0 = Heap_AllocFromHeap(param0, sizeof(AnimationControlFlags));
     sub_02027A1C(v0);
 
     return v0;
 }
 
-void sub_02027A10 (const UnkStruct_020279FC * param0, UnkStruct_020279FC * param1)
+void sub_02027A10 (const AnimationControlFlags * param0, AnimationControlFlags * param1)
 {
-    MI_CpuCopy8(param0, param1, sizeof(UnkStruct_020279FC));
+    MI_CpuCopy8(param0, param1, sizeof(AnimationControlFlags));
 }
 
-void sub_02027A1C (UnkStruct_020279FC * param0)
+void sub_02027A1C (AnimationControlFlags * param0)
 {
-    MI_CpuFill8(param0, 0, sizeof(UnkStruct_020279FC));
+    MI_CpuFill8(param0, 0, sizeof(AnimationControlFlags));
 
     param0->unk_00_0 = 1;
     param0->unk_00_4 = 0;
@@ -40,7 +40,7 @@ void sub_02027A1C (UnkStruct_020279FC * param0)
 
 void sub_02027A68 (SaveData * param0, int param1)
 {
-    UnkStruct_020279FC * v0;
+    AnimationControlFlags * v0;
 
     if (param0 != NULL) {
         param1 = sub_02027B30(sub_02025E44(param0));
@@ -60,17 +60,17 @@ void sub_02027A68 (SaveData * param0, int param1)
     }
 }
 
-int sub_02027AA4 (const UnkStruct_020279FC * param0)
+int sub_02027AA4 (const AnimationControlFlags * param0)
 {
     return param0->unk_00_0;
 }
 
-void sub_02027AAC (UnkStruct_020279FC * param0, int param1)
+void sub_02027AAC (AnimationControlFlags * param0, int param1)
 {
     param0->unk_00_0 = param1;
 }
 
-u8 sub_02027AC0 (const UnkStruct_020279FC * param0)
+u8 sub_02027AC0 (const AnimationControlFlags * param0)
 {
     int v0 = sub_02027AA4(param0);
 
@@ -83,52 +83,52 @@ u8 sub_02027AC0 (const UnkStruct_020279FC * param0)
     }
 }
 
-int sub_02027ADC (const UnkStruct_020279FC * param0)
+int sub_02027ADC (const AnimationControlFlags * param0)
 {
     return param0->unk_00_4;
 }
 
-void sub_02027AE4 (UnkStruct_020279FC * param0, int param1)
+void sub_02027AE4 (AnimationControlFlags * param0, int param1)
 {
     param0->unk_00_4 = param1;
 }
 
-int GameConfig_BattleAnimations (const UnkStruct_020279FC * param0)
+int GameConfig_BattleAnimations (const AnimationControlFlags * param0)
 {
     return param0->unk_00_7;
 }
 
-void sub_02027B00 (UnkStruct_020279FC * param0, int param1)
+void sub_02027B00 (AnimationControlFlags * param0, int param1)
 {
     param0->unk_00_7 = param1;
 }
 
-int sub_02027B14 (const UnkStruct_020279FC * param0)
+int sub_02027B14 (const AnimationControlFlags * param0)
 {
     return param0->unk_00_6;
 }
 
-void sub_02027B1C (UnkStruct_020279FC * param0, int param1)
+void sub_02027B1C (AnimationControlFlags * param0, int param1)
 {
     param0->unk_00_6 = param1;
 }
 
-int sub_02027B30 (const UnkStruct_020279FC * param0)
+int sub_02027B30 (const AnimationControlFlags * param0)
 {
     return param0->unk_02_0;
 }
 
-void sub_02027B38 (UnkStruct_020279FC * param0, int param1)
+void sub_02027B38 (AnimationControlFlags * param0, int param1)
 {
     param0->unk_02_0 = param1;
 }
 
-int sub_02027B50 (const UnkStruct_020279FC * param0)
+int sub_02027B50 (const AnimationControlFlags * param0)
 {
     return param0->unk_02_2;
 }
 
-void sub_02027B58 (UnkStruct_020279FC * param0, int param1)
+void sub_02027B58 (AnimationControlFlags * param0, int param1)
 {
     param0->unk_02_2 = param1;
 }
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index 767c34f2f7..883780df48 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -140,10 +140,10 @@ static u32 sub_0203AC3C(UnkStruct_0203CDB0 * param0);
 static void sub_0203B318(UnkStruct_020708E0 * param0, u8 * param1, u32 param2, u8 param3);
 static void sub_0203B4E8(UnkStruct_020708E0 * param0);
 static void sub_0203B520(UnkStruct_020708E0 * param0);
-static void sub_0203B558(UnkStruct_02022550 * param0, u32 param1);
-static void sub_0203B588(UnkStruct_02022550 * param0, u16 param1, u16 param2);
+static void sub_0203B558(GraphicElementData * param0, u32 param1);
+static void sub_0203B588(GraphicElementData * param0, u16 param1, u16 param2);
 static void sub_0203B5B4(UnkStruct_020708E0 * param0, u16 param1, u16 param2);
-static void sub_0203B5E8(UnkStruct_02022550 * param0);
+static void sub_0203B5E8(GraphicElementData * param0);
 static BOOL sub_0203AC44(UnkStruct_020508D4 * param0);
 static void sub_0203ADFC(UnkStruct_020508D4 * param0);
 static BOOL sub_0203B244(UnkStruct_020508D4 * param0);
@@ -840,7 +840,7 @@ static void sub_0203B520 (UnkStruct_020708E0 * param0)
     }
 }
 
-static void sub_0203B558 (UnkStruct_02022550 * param0, u32 param1)
+static void sub_0203B558 (GraphicElementData * param0, u32 param1)
 {
     VecFx32 v0;
 
@@ -850,7 +850,7 @@ static void sub_0203B558 (UnkStruct_02022550 * param0, u32 param1)
     sub_02021C50(param0, &v0);
 }
 
-static void sub_0203B588 (UnkStruct_02022550 * param0, u16 param1, u16 param2)
+static void sub_0203B588 (GraphicElementData * param0, u16 param1, u16 param2)
 {
     u32 v0 = sub_02021E24(param0);
 
@@ -864,7 +864,7 @@ static void sub_0203B5B4 (UnkStruct_020708E0 * param0, u16 param1, u16 param2)
     sub_0203B588(param0->unk_200[1 + param2]->unk_00, 1, 1);
 }
 
-static void sub_0203B5E8 (UnkStruct_02022550 * param0)
+static void sub_0203B5E8 (GraphicElementData * param0)
 {
     if ((sub_02021E24(param0) % 3) != 1) {
         return;
@@ -1014,13 +1014,13 @@ BOOL sub_0203B7C0 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02098C44 * v2;
+    PartyManagementData * v2;
 
     v0 = sub_02050A60(param0);
     v1 = sub_02050A64(param0);
-    v2 = (UnkStruct_02098C44 *)Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    v2 = (PartyManagementData *)Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    memcpy(v2, v1->unk_25C, sizeof(UnkStruct_02098C44));
+    memcpy(v2, v1->unk_25C, sizeof(PartyManagementData));
     Heap_FreeToHeap(v1->unk_25C);
 
     switch (v2->unk_23) {
@@ -1307,10 +1307,10 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
         break;
     case 2:
     {
-        UnkStruct_02098C44 * v6;
+        PartyManagementData * v6;
 
-        v6 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
-        memset(v6, 0, sizeof(UnkStruct_02098C44));
+        v6 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
+        memset(v6, 0, sizeof(PartyManagementData));
 
         v6->unk_00 = Party_GetFromSavedata(v0->unk_0C);
         v6->unk_04 = sub_0207D990(v0->unk_0C);
@@ -1350,10 +1350,10 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
             v1->unk_260 = sub_0203C540(v10, 0, (u8)v9);
             sub_0203B674(v1, sub_0203C558);
         } else {
-            UnkStruct_02098C44 * v13;
+            PartyManagementData * v13;
 
-            v13 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
-            memset(v13, 0, sizeof(UnkStruct_02098C44));
+            v13 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
+            memset(v13, 0, sizeof(PartyManagementData));
 
             v13->unk_00 = v7;
             v13->unk_04 = sub_0207D990(v0->unk_0C);
@@ -1636,13 +1636,13 @@ static BOOL sub_0203C1C8 (UnkStruct_020508D4 * param0)
     switch (v2->unk_12) {
     case 2:
     {
-        UnkStruct_02098C44 * v3;
+        PartyManagementData * v3;
         UnkStruct_0203C1C8 * v4;
 
-        v3 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+        v3 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
         v4 = (UnkStruct_0203C1C8 *)v1->unk_260;
 
-        memset(v3, 0, sizeof(UnkStruct_02098C44));
+        memset(v3, 0, sizeof(PartyManagementData));
 
         v3->unk_00 = Party_GetFromSavedata(v0->unk_0C);
         v3->unk_04 = sub_0207D990(v0->unk_0C);
@@ -1862,12 +1862,12 @@ BOOL sub_0203C558 (UnkStruct_020508D4 * param0)
 static void sub_0203C668 (UnkStruct_0203CDB0 * param0, UnkStruct_020708E0 * param1, u8 param2)
 {
     UnkStruct_0203C540 * v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
 
     v0 = param1->unk_260;
-    v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    memset(v1, 0, sizeof(UnkStruct_02098C44));
+    memset(v1, 0, sizeof(PartyManagementData));
     v1->unk_00 = Party_GetFromSavedata(param0->unk_0C);
     v1->unk_04 = sub_0207D990(param0->unk_0C);
     v1->unk_08 = sub_02028430(param0->unk_0C);
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index f98e101fbf..a87ac0f13e 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -197,7 +197,7 @@ FS_EXTERN_OVERLAY(overlay121);
 
 typedef struct {
     int unk_00;
-    UnkStruct_02098C44 * unk_04;
+    PartyManagementData * unk_04;
     UnkStruct_02098D38 * unk_08;
 } UnkStruct_0203D444;
 
@@ -392,11 +392,11 @@ void sub_0203D334 (UnkStruct_0203CDB0 * param0, void * param1)
     sub_0203CD84(param0, &Unk_020F410C, param1);
 }
 
-static UnkStruct_02098C44 * sub_0203D344 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3)
+static PartyManagementData * sub_0203D344 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3)
 {
-    UnkStruct_02098C44 * v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v0 = Heap_AllocFromHeap(param0, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v0, sizeof(UnkStruct_02098C44));
+    MI_CpuClearFast(v0, sizeof(PartyManagementData));
 
     v0->unk_00 = Party_GetFromSavedata(param1->unk_0C);
     v0->unk_04 = sub_0207D990(param1->unk_0C);
@@ -411,7 +411,7 @@ static UnkStruct_02098C44 * sub_0203D344 (int param0, UnkStruct_0203CDB0 * param
 
 void * sub_0203D390 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1, u8 param2)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param0, 0, 0);
+    PartyManagementData * v0 = sub_0203D344(11, param0, 0, 0);
 
     v0->unk_18 = param1;
     v0->unk_22 = param2;
@@ -423,7 +423,7 @@ void * sub_0203D390 (UnkStruct_0203CDB0 * param0, UnkStruct_02070950 * param1, u
 
 void * sub_0203D3C0 (int param0, UnkStruct_0203CDB0 * param1)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param1, 0, 3);
+    PartyManagementData * v0 = sub_0203D344(11, param1, 0, 3);
 
     sub_0203CD84(param1, &Unk_020F1E88, v0);
     return v0;
@@ -431,7 +431,7 @@ void * sub_0203D3C0 (int param0, UnkStruct_0203CDB0 * param1)
 
 void * sub_0203D3E4 (int param0, UnkStruct_0203CDB0 * param1)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param1, 0, 19);
+    PartyManagementData * v0 = sub_0203D344(11, param1, 0, 19);
 
     sub_0203CD84(param1, &Unk_020F1E88, v0);
     return v0;
@@ -439,13 +439,13 @@ void * sub_0203D3E4 (int param0, UnkStruct_0203CDB0 * param1)
 
 int sub_0203D408 (void * param0)
 {
-    UnkStruct_02098C44 * v0 = param0;
+    PartyManagementData * v0 = param0;
     return v0->unk_22;
 }
 
 void * sub_0203D410 (int param0, UnkStruct_0203CDB0 * param1, int param2)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param1, 0, 18);
+    PartyManagementData * v0 = sub_0203D344(11, param1, 0, 18);
 
     v0->unk_22 = param2;
     sub_0203CD84(param1, &Unk_020F1E88, v0);
@@ -455,7 +455,7 @@ void * sub_0203D410 (int param0, UnkStruct_0203CDB0 * param1, int param2)
 
 int sub_0203D438 (void * param0)
 {
-    UnkStruct_02098C44 * v0 = param0;
+    PartyManagementData * v0 = param0;
     return v0->unk_23;
 }
 
@@ -519,7 +519,7 @@ static BOOL sub_0203D444 (UnkStruct_020508D4 * param0)
 void * sub_0203D50C (UnkStruct_020508D4 * param0, int param1)
 {
     UnkStruct_0203D444 * v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
     UnkStruct_0203CDB0 * v2 = sub_02050A60(param0);
 
     v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_0203D444));
@@ -538,7 +538,7 @@ void * sub_0203D50C (UnkStruct_020508D4 * param0, int param1)
 
 void * sub_0203D578 (int param0, UnkStruct_0203CDB0 * param1, int param2, int param3, int param4, int param5)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param1, 0, 13);
+    PartyManagementData * v0 = sub_0203D344(11, param1, 0, 13);
 
     v0->unk_22 = param5;
     v0->unk_29 = 2;
@@ -580,7 +580,7 @@ void * sub_0203D5C8 (int param0, UnkStruct_0203CDB0 * param1, int param2)
 
 void * sub_0203D644 (UnkStruct_0203CDB0 * param0, int param1)
 {
-    UnkStruct_02098C44 * v0 = sub_0203D344(11, param0, 0, 21);
+    PartyManagementData * v0 = sub_0203D344(11, param0, 0, 21);
 
     v0->unk_22 = param1;
     sub_0203CD84(param0, &Unk_020F1E88, v0);
@@ -773,7 +773,7 @@ void * sub_0203D8AC (UnkStruct_0203CDB0 * param0)
     return v0;
 }
 
-static void sub_0203D8DC (UnkStruct_0203CDB0 * param0, UnkStruct_020279FC * param1)
+static void sub_0203D8DC (UnkStruct_0203CDB0 * param0, AnimationControlFlags * param1)
 {
     FS_EXTERN_OVERLAY(overlay74);
 
@@ -790,7 +790,7 @@ static void sub_0203D8DC (UnkStruct_0203CDB0 * param0, UnkStruct_020279FC * para
 void * sub_0203D8EC (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_0203D8EC * v0;
-    UnkStruct_020279FC * v1;
+    AnimationControlFlags * v1;
 
     v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203D8EC));
     v1 = sub_02025E44(sub_0203D174(param0));
@@ -1617,7 +1617,7 @@ static BOOL sub_0203E35C (UnkStruct_020508D4 * param0)
 void sub_0203E414 (UnkStruct_020508D4 * param0, int param1)
 {
     UnkStruct_0203CDB0 * v0 = sub_02050A60(param0);
-    UnkStruct_020279FC * v1 = sub_02025E44(v0->unk_0C);
+    AnimationControlFlags * v1 = sub_02025E44(v0->unk_0C);
     UnkStruct_0203E35C * v2 = Heap_AllocFromHeap(32, sizeof(UnkStruct_0203E35C));
 
     v2->unk_0C.unk_00 = &v2->unk_00;
@@ -1724,12 +1724,12 @@ void * sub_0203E564 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2, u16 para
     return v0;
 }
 
-UnkStruct_02098C44 * sub_0203E598 (UnkStruct_0203CDB0 * param0, int param1, int param2)
+PartyManagementData * sub_0203E598 (UnkStruct_0203CDB0 * param0, int param1, int param2)
 {
-    UnkStruct_02098C44 * v0;
+    PartyManagementData * v0;
 
-    v0 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02098C44));
-    memset(v0, 0, sizeof(UnkStruct_02098C44));
+    v0 = Heap_AllocFromHeap(param1, sizeof(PartyManagementData));
+    memset(v0, 0, sizeof(PartyManagementData));
 
     v0->unk_00 = Party_GetFromSavedata(param0->unk_0C);
     v0->unk_04 = sub_0207D990(param0->unk_0C);
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index 18ac713da3..bd4fd6c2e3 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -64,7 +64,7 @@ struct UnkStruct_0203EF60_t {
     BOOL unk_0C;
     UnkStruct_ov5_021DC1A4 * unk_10;
     Window unk_14;
-    UnkStruct_02001AF4 * unk_24;
+    UIControlData * unk_24;
     int unk_28;
     UnkStruct_02061AB4 * unk_2C;
     UnkStruct_02061AB4 * unk_30;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 0116cdee8a..cb097850f0 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -2733,7 +2733,7 @@ static BOOL sub_020407B4 (UnkStruct_0203E724 * param0)
 static BOOL sub_020407C4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
-    UnkStruct_02001AF4 ** v1 = sub_0203F098(v0, 2);
+    UIControlData ** v1 = sub_0203F098(v0, 2);
     u16 v2 = sub_0203E838(param0);
 
     sub_0200DAA4(v0->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
@@ -2750,7 +2750,7 @@ static BOOL sub_02040824 (UnkStruct_0203E724 * param0)
 {
     u32 v0;
     UnkStruct_0203CDB0 * v1 = param0->unk_34;
-    UnkStruct_02001AF4 ** v2 = sub_0203F098(v1, 2);
+    UIControlData ** v2 = sub_0203F098(v1, 2);
     u16 * v3 = sub_0203F118(v1, param0->unk_18[0]);
 
     v0 = sub_02002114(*v2, 4);
@@ -3697,7 +3697,7 @@ static BOOL sub_02041860 (UnkStruct_0203E724 * param0)
     void ** v2;
     u16 * v3;
     u16 * v4;
-    UnkStruct_02098C44 * v5;
+    PartyManagementData * v5;
 
     v3 = inline_0204FCAC(param0);
     v4 = inline_0204FCAC(param0);
@@ -3736,7 +3736,7 @@ static BOOL sub_020418E0 (UnkStruct_0203E724 * param0)
     u16 * v3;
     u16 * v4;
     u16 * v5;
-    UnkStruct_02098C44 * v6;
+    PartyManagementData * v6;
 
     v3 = inline_0204FCAC(param0);
     v4 = inline_0204FCAC(param0);
@@ -3778,7 +3778,7 @@ static BOOL sub_02041984 (UnkStruct_0203E724 * param0)
     u16 * v3;
     u16 * v4;
     u16 * v5;
-    UnkStruct_02098C44 * v6;
+    PartyManagementData * v6;
 
     v3 = inline_0204FCAC(param0);
     v4 = inline_0204FCAC(param0);
@@ -5038,7 +5038,7 @@ static BOOL sub_02043040 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204304C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02098C44 * v0;
+    PartyManagementData * v0;
     void ** v1;
 
     v1 = sub_0203F098(param0->unk_34, 19);
@@ -5453,7 +5453,7 @@ static BOOL sub_020437FC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043854 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02098C44 * v0;
+    PartyManagementData * v0;
     void ** v1;
     u16 * v2 = inline_0204FCAC(param0);
 
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index e854e79aa4..53bd8aaa7f 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -432,7 +432,7 @@ void sub_0204A358 (UnkStruct_0204AFC4 * param0, UnkStruct_020508D4 * param1, voi
 BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, SaveData * param2)
 {
     u16 v0 = 0;
-    UnkStruct_02098C44 * v1 = *param1;
+    PartyManagementData * v1 = *param1;
     Party * v2;
     Pokemon * v3;
 
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index 8704f85a3d..0e967b6582 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -339,8 +339,8 @@ static int sub_0204F50C (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param
 {
     u8 v0;
 
-    UnkStruct_02098C44 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
-    MI_CpuClearFast(v1, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
+    MI_CpuClearFast(v1, sizeof(PartyManagementData));
 
     v1->unk_00 = Party_GetFromSavedata(param1->unk_0C);
     v1->unk_04 = sub_0207D990(param1->unk_0C);
@@ -378,7 +378,7 @@ static int sub_0204F50C (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param
 static int sub_0204F5D8 (UnkStruct_0204F470 * param0, UnkStruct_0203CDB0 * param1)
 {
     int v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
 
     if (sub_020509B4(param1)) {
         return UnkEnum_0204F13C_2;
diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c
index 6337cd3420..c25baca816 100644
--- a/src/unk_0204FAB4.c
+++ b/src/unk_0204FAB4.c
@@ -257,9 +257,9 @@ static BOOL sub_0204FDE8 (UnkStruct_020508D4 * param0)
 static int sub_0204FE50 (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1, int param2)
 {
     u8 v0;
-    UnkStruct_02098C44 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v1, sizeof(UnkStruct_02098C44));
+    MI_CpuClearFast(v1, sizeof(PartyManagementData));
 
     v1->unk_00 = Party_GetFromSavedata(param1->unk_0C);
     v1->unk_04 = sub_0207D990(param1->unk_0C);
@@ -294,7 +294,7 @@ static int sub_0204FE50 (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param
 static int sub_0204FF1C (UnkStruct_0204FE50 * param0, UnkStruct_0203CDB0 * param1)
 {
     int v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
 
     if (sub_020509B4(param1)) {
         return 1;
diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c
index 139e44efe5..620c36e0a1 100644
--- a/src/unk_0205003C.c
+++ b/src/unk_0205003C.c
@@ -249,9 +249,9 @@ static BOOL sub_02050314 (UnkStruct_020508D4 * param0)
 static int sub_0205037C (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1, int param2)
 {
     u8 v0;
-    UnkStruct_02098C44 * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v1 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    MI_CpuClearFast(v1, sizeof(UnkStruct_02098C44));
+    MI_CpuClearFast(v1, sizeof(PartyManagementData));
 
     v1->unk_00 = Party_GetFromSavedata(param1->unk_0C);
     v1->unk_04 = sub_0207D990(param1->unk_0C);
@@ -284,7 +284,7 @@ static int sub_0205037C (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param
 static int sub_02050448 (UnkStruct_0205037C * param0, UnkStruct_0203CDB0 * param1)
 {
     int v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
 
     if (sub_020509B4(param1)) {
         return 1;
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index a032cc2445..b8840fe990 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -158,7 +158,7 @@ BattleParams * sub_02051F38 (int param0, int param1)
 BattleParams * sub_02051F4C (int param0, const UnkStruct_0203CDB0 * param1)
 {
     TrainerInfo * v0 = sub_02025E38(param1->unk_0C);
-    UnkStruct_020279FC * v1 = sub_02025E44(param1->unk_0C);
+    AnimationControlFlags * v1 = sub_02025E44(param1->unk_0C);
     MessageLoader * v2;
     Strbuf* v3;
     BattleParams * v4;
@@ -257,7 +257,7 @@ void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, Sav
     UnkStruct_0207D3C0 * v2 = sub_0207D990(param2);
     UnkStruct_02026324 * v3 = sub_02027560(param2);
     ChatotCry * v4 = GetChatotCryDataFromSave(param2);
-    UnkStruct_020279FC * v5 = sub_02025E44(param2);
+    AnimationControlFlags * v5 = sub_02025E44(param2);
     UnkStruct_0203A790 * v6 = sub_0203A790(param2);
 
     if (param1 != NULL) {
@@ -312,7 +312,7 @@ void sub_02052348 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, int
     UnkStruct_0207D3C0 * v4 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v5 = sub_02027560(param1->unk_0C);
     ChatotCry * v6 = GetChatotCryDataFromSave(param1->unk_0C);
-    UnkStruct_020279FC * v7 = sub_02025E44(param1->unk_0C);
+    AnimationControlFlags * v7 = sub_02025E44(param1->unk_0C);
     Pokemon * v8;
 
     param0->unk_128 = 6;
@@ -362,7 +362,7 @@ void sub_020524E4 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, con
     UnkStruct_0207D3C0 * v1 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v2 = sub_02027560(param1->unk_0C);
     ChatotCry * v3 = GetChatotCryDataFromSave(param1->unk_0C);
-    UnkStruct_020279FC * v4 = sub_02025E44(param1->unk_0C);
+    AnimationControlFlags * v4 = sub_02025E44(param1->unk_0C);
     const UnkStruct_0202610C * v5 = param1->unk_B0;
     int v6, v7, v8;
     Pokemon * v9;
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index 10313f1e46..c92f34472d 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -277,7 +277,7 @@ static void sub_02052F28 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * para
 
 static void sub_02052FA8 (UnkStruct_0203CDB0 * param0, UnkStruct_0205300C * param1)
 {
-    UnkStruct_020279FC * v0 = sub_02025E44(param0->unk_0C);
+    AnimationControlFlags * v0 = sub_02025E44(param0->unk_0C);
 
     param1->unk_2C = MessageBank_GetNewStrbufFromNARC(26, 213, 15, 32);
 
diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c
index dd57888036..16829e2bcd 100644
--- a/src/unk_020530C8.c
+++ b/src/unk_020530C8.c
@@ -128,7 +128,7 @@ typedef struct {
     Window unk_24;
     Strbuf* unk_34;
     u8 unk_38;
-    UnkStruct_02001AF4 * unk_3C;
+    UIControlData * unk_3C;
 } UnkStruct_02053FAC;
 
 typedef struct {
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 8a3a6de007..6e058edda2 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -59,7 +59,7 @@
 
 typedef struct {
     UnkStruct_02098D38 * unk_00;
-    UnkStruct_02098C44 * unk_04;
+    PartyManagementData * unk_04;
     UnkFuncPtr_0205AB10 * unk_08;
     Strbuf* unk_0C;
     Strbuf* unk_10;
@@ -158,9 +158,9 @@ static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * para
 static void sub_0205A164 (UnkStruct_0205A0D8 * param0, int param1)
 {
     int v0;
-    UnkStruct_02098C44 * v1 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v1 = Heap_AllocFromHeap(param1, sizeof(PartyManagementData));
 
-    MI_CpuClear8(v1, sizeof(UnkStruct_02098C44));
+    MI_CpuClear8(v1, sizeof(PartyManagementData));
 
     v1->unk_0C = sub_02025E44(param0->unk_24->unk_0C);
     v1->unk_14 = (void *)param0->unk_24->unk_B0;
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index c4a5134c04..549b066b70 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -34,7 +34,7 @@
 #include "unk_02061804.h"
 
 typedef struct {
-    UnkStruct_020218BC * unk_00;
+    GraphicElementManager * unk_00;
     UnkStruct_02009508 * unk_04;
     UnkStruct_02009714 * unk_08[4];
     UnkStruct_02009CFC * unk_18[2];
@@ -61,20 +61,20 @@ typedef struct {
 
 typedef struct {
     VecFx32 unk_00;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
     int unk_10;
 } UnkStruct_0205D3C4;
 
 typedef struct {
     VecFx32 unk_00;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
     int unk_10;
     int unk_14;
 } UnkStruct_0205D5E0;
 
 typedef struct {
     VecFx32 unk_00;
-    UnkStruct_02022550 * unk_0C;
+    GraphicElementData * unk_0C;
     int unk_10;
 } UnkStruct_0205D4A4;
 
@@ -87,7 +87,7 @@ static void sub_0205D080(SysTask * param0, UnkStruct_0205D274 * param1);
 void sub_0205D094(UnkStruct_0205D094 * param0, int param1, u32 param2);
 static void sub_0205D0AC(UnkStruct_0205D094 * param0);
 static void sub_0205D274(UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int param2);
-static UnkStruct_02022550 * sub_0205D344(UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4);
+static GraphicElementData * sub_0205D344(UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4);
 static void sub_0205D3AC(UnkStruct_0205D3AC * param0);
 static void sub_0205D0B4(UnkStruct_0205D094 * param0);
 static void sub_0205D0D8(UnkStruct_0205D094 * param0, int param1, u32 param2);
@@ -561,10 +561,10 @@ void sub_0205D274 (UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int
     param1->unk_04(&param0->unk_04, param1);
 }
 
-static UnkStruct_02022550 * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4)
+static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4)
 {
     UnkStruct_ov115_02261520 v0;
-    UnkStruct_02022550 * v1;
+    GraphicElementData * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
 
     memset(&v0, 0, sizeof(UnkStruct_ov115_02261520));
diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c
index 495bd761b7..d245d49be8 100644
--- a/src/unk_0205D8CC.c
+++ b/src/unk_0205D8CC.c
@@ -34,7 +34,7 @@ void sub_0205D8F4 (BGL * param0, Window * param1, u32 param2)
     }
 }
 
-void sub_0205D944 (Window * param0, const UnkStruct_020279FC * param1)
+void sub_0205D944 (Window * param0, const AnimationControlFlags * param1)
 {
     sub_0200DD0C(param0->unk_00, sub_0201C290(param0), 1024 - (18 + 12), 10, sub_02027B50(param1), 4);
     sub_0205D988(param0);
@@ -46,7 +46,7 @@ void sub_0205D988 (Window * param0)
     BGL_FillWindow(param0, 15);
 }
 
-u8 sub_0205D994 (Window * param0, Strbuf *param1, const UnkStruct_020279FC * param2, u8 param3)
+u8 sub_0205D994 (Window * param0, Strbuf *param1, const AnimationControlFlags * param2, u8 param3)
 {
     u8 v0;
 
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index 938f9f37f2..9fc9514334 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -334,13 +334,13 @@ static void sub_02068630 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 {
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02098C44 * v2;
+    PartyManagementData * v2;
 
     v0 = sub_02050A60(param0->unk_00);
     v1 = sub_02050A64(param0->unk_00);
-    v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    v2 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(UnkStruct_02098C44));
+    memset(v2, 0, sizeof(PartyManagementData));
 
     v2->unk_00 = Party_GetFromSavedata(v0->unk_0C);
     v2->unk_04 = sub_0207D990(v0->unk_0C);
@@ -587,13 +587,13 @@ static void sub_02068A34 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 {
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02098C44 * v2;
+    PartyManagementData * v2;
 
     v0 = sub_02050A60(param0->unk_00);
     v1 = sub_02050A64(param0->unk_00);
-    v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    v2 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(UnkStruct_02098C44));
+    memset(v2, 0, sizeof(PartyManagementData));
 
     v2->unk_00 = Party_GetFromSavedata(v0->unk_0C);
     v2->unk_04 = sub_0207D990(v0->unk_0C);
@@ -956,7 +956,7 @@ static BOOL sub_02068F48 (UnkStruct_020508D4 * param0)
         sub_0205D8F4(v0->unk_08, &v1->unk_00, 3);
 
         {
-            const UnkStruct_020279FC * v2 = sub_02025E44(v0->unk_0C);
+            const AnimationControlFlags * v2 = sub_02025E44(v0->unk_0C);
 
             sub_0205D944(&v1->unk_00, v2);
             v1->unk_14 = sub_0205D994(&v1->unk_00, v1->unk_10, v2, 1);
@@ -987,13 +987,13 @@ static void sub_02068FEC (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 {
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02098C44 * v2;
+    PartyManagementData * v2;
 
     v0 = sub_02050A60(param0->unk_00);
     v1 = sub_02050A64(param0->unk_00);
-    v2 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
+    v2 = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
 
-    memset(v2, 0, sizeof(UnkStruct_02098C44));
+    memset(v2, 0, sizeof(PartyManagementData));
 
     v2->unk_00 = Party_GetFromSavedata(v0->unk_0C);
     v2->unk_04 = sub_0207D990(v0->unk_0C);
@@ -1115,7 +1115,7 @@ static void sub_020691E0 (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 {
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02098C44 * v2;
+    PartyManagementData * v2;
 
     v0 = sub_02050A60(param0->unk_00);
     v1 = sub_02050A64(param0->unk_00);
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 10cba43b11..d0cbed2cda 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -69,10 +69,10 @@ static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
 {
     u8 v0;
     SaveData * v1;
-    UnkStruct_02098C44 * v2 = Heap_AllocFromHeapAtEnd(param2, sizeof(UnkStruct_02098C44));
+    PartyManagementData * v2 = Heap_AllocFromHeapAtEnd(param2, sizeof(PartyManagementData));
 
     v1 = param1->unk_0C;
-    MI_CpuClear8(v2, sizeof(UnkStruct_02098C44));
+    MI_CpuClear8(v2, sizeof(PartyManagementData));
 
     v2->unk_0C = sub_02025E44(v1);
     v2->unk_00 = Party_GetFromSavedata(v1);
@@ -97,7 +97,7 @@ static int sub_0206B9D8 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param
 static int sub_0206BA84 (UnkStruct_0206B9D8 * param0, UnkStruct_0203CDB0 * param1)
 {
     int v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
 
     if (sub_020509B4(param1)) {
         return 1;
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index 6c67702410..770a40dadf 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -105,8 +105,8 @@ typedef struct {
     UnkStruct_0206F7F8_sub1 unk_2C;
     UnkStruct_ov84_02240FA8 unk_A0;
     UnkStruct_0200112C * unk_C0;
-    UnkStruct_02013A04 * unk_C4;
-    UnkStruct_02001AF4 * unk_C8;
+    ResourceMetadata * unk_C4;
+    UIControlData * unk_C8;
     UnkStruct_0203CDB0 * unk_CC;
     BGL * unk_D0;
     Window unk_D4;
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 278a63b384..ac37aba3fb 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -113,8 +113,8 @@ typedef struct {
     u16 unk_13E;
     UnkStruct_ov84_02240FA8 unk_140;
     UnkStruct_0200112C * unk_160;
-    UnkStruct_02013A04 * unk_164;
-    UnkStruct_02001AF4 * unk_168;
+    ResourceMetadata * unk_164;
+    UIControlData * unk_168;
     UnkStruct_0203CDB0 * unk_16C;
     BGL * unk_170;
     Window unk_174;
@@ -124,7 +124,7 @@ typedef struct {
     UnkStruct_02097728 * unk_1A8;
     UnkStruct_02028430 * unk_1AC;
     UnkStruct_0207D3C0 * unk_1B0;
-    UnkStruct_02098C44 * unk_1B4;
+    PartyManagementData * unk_1B4;
 } UnkStruct_02072334;
 
 typedef struct {
@@ -522,7 +522,7 @@ static void sub_020726B4 (SysTask * param0, void * param1)
 static void sub_02072754 (SysTask * param0, void * param1)
 {
     u8 v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
     UnkStruct_02072334 * v2 = (UnkStruct_02072334 *)param1;
 
     switch (v2->unk_10) {
@@ -602,7 +602,7 @@ static void sub_02072878 (SysTask * param0, void * param1)
 {
     int v0;
     u8 v1, v2;
-    UnkStruct_02098C44 * v3;
+    PartyManagementData * v3;
     UnkStruct_02072334 * v4 = (UnkStruct_02072334 *)param1;
 
     switch (v4->unk_10) {
@@ -1218,12 +1218,12 @@ static int sub_020734F4 (UnkStruct_02072334 * param0, u8 param1)
 
 static int sub_02073524 (UnkStruct_02072334 * param0, int param1)
 {
-    UnkStruct_02098C44 * v0;
+    PartyManagementData * v0;
 
     switch (param0->unk_12) {
     case 0:
-        v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02098C44));
-        MI_CpuClear8(v0, sizeof(UnkStruct_02098C44));
+        v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(PartyManagementData));
+        MI_CpuClear8(v0, sizeof(PartyManagementData));
 
         v0->unk_00 = Party_GetFromSavedata(sub_0203D174(param0->unk_16C));
         v0->unk_04 = sub_0207D990(sub_0203D174(param0->unk_16C));
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index 3f567d1ed5..f711f5115d 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -68,7 +68,7 @@
 #include "unk_0207D3B8.h"
 #include "unk_0208C324.h"
 
-UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
+UnkStruct_0207AE68 * sub_0207AE68(Party * param0, Pokemon * param1, int param2, AnimationControlFlags * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
 static void sub_0207B0A0(SysTask * param0, void * param1);
 BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0);
 void sub_0207B0E0(UnkStruct_0207AE68 * param0);
@@ -98,7 +98,7 @@ static const u8 Unk_020F0A2C[] = {
     0x8
 };
 
-UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11)
+UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, Pokemon * param1, int param2, AnimationControlFlags * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11)
 {
     UnkStruct_0207AE68 * v0;
     ArchivedSprite v1;
diff --git a/src/unk_0207C63C.c b/src/unk_0207C63C.c
index 1f67c9494d..64e24b9b28 100644
--- a/src/unk_0207C63C.c
+++ b/src/unk_0207C63C.c
@@ -20,7 +20,7 @@
 
 void sub_0207C63C(void);
 void sub_0207C664(void);
-UnkStruct_0207C690 * sub_0207C690(int param0);
+GenericPointerData * sub_0207C690(int param0);
 void sub_0207C6AC(void);
 void sub_0207C730(void);
 void sub_0207C770(void);
@@ -49,9 +49,9 @@ void sub_0207C664 (void)
     G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, 7, 8);
 }
 
-UnkStruct_0207C690 * sub_0207C690 (int param0)
+GenericPointerData * sub_0207C690 (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 2, 0, 2, sub_0207C6AC);
     return v0;
diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c
index b1c2240f71..956378f925 100644
--- a/src/unk_0207C908.c
+++ b/src/unk_0207C908.c
@@ -107,44 +107,44 @@ u32 sub_0207C944 (void)
     return 27;
 }
 
-void sub_0207C948 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
+void sub_0207C948 (CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
 {
     sub_0200CBDC(param0, param1, sub_0207C944(), sub_0207C908(param3), 1, param2, param4);
 }
 
-void sub_0207C97C (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, u32 param3)
+void sub_0207C97C (CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, u32 param3)
 {
     sub_0200CC9C(param0, param1, sub_0207C944(), sub_0207C920(), 0, 3, param2, param3);
 }
 
-void sub_0207C9B0 (PaletteSys * param0, int param1, UnkStruct_0200C6E4 * param2, UnkStruct_0200C704 * param3, NNS_G2D_VRAM_TYPE param4, u32 param5)
+void sub_0207C9B0 (PaletteSys * param0, int param1, CellTransferStateData * param2, AnimationResourceCollection * param3, NNS_G2D_VRAM_TYPE param4, u32 param5)
 {
     sub_0200CD7C(param0, param1, param2, param3, sub_0207C944(), sub_0207C920(), 0, 3, param4, param5);
 }
 
-void sub_0207C9EC (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, u32 param2, u32 param3)
+void sub_0207C9EC (CellTransferStateData * param0, AnimationResourceCollection * param1, u32 param2, u32 param3)
 {
     sub_0200CE0C(param0, param1, sub_0207C944(), sub_0207C924(), 1, param2);
     sub_0200CE3C(param0, param1, sub_0207C944(), sub_0207C928(), 1, param3);
 }
 
-void sub_0207CA34 (UnkStruct_0200C704 * param0, u32 param1)
+void sub_0207CA34 (AnimationResourceCollection * param0, u32 param1)
 {
     sub_0200D070(param0, param1);
 }
 
-void sub_0207CA3C (UnkStruct_0200C704 * param0, u32 param1)
+void sub_0207CA3C (AnimationResourceCollection * param0, u32 param1)
 {
     sub_0200D080(param0, param1);
 }
 
-void sub_0207CA44 (UnkStruct_0200C704 * param0, u32 param1, u32 param2)
+void sub_0207CA44 (AnimationResourceCollection * param0, u32 param1, u32 param2)
 {
     sub_0200D090(param0, param1);
     sub_0200D0A0(param0, param2);
 }
 
-CellActorData * sub_0207CA58 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3)
+CellActorData * sub_0207CA58 (CellTransferStateData * param0, AnimationResourceCollection * param1, int param2, const UnkStruct_ov104_0223F9E0 * param3)
 {
     CellActorData * v0;
     UnkStruct_ov104_0223F9E0 v1;
@@ -178,12 +178,12 @@ u32 sub_0207CAC0 (void)
     return 27;
 }
 
-void sub_0207CAC4 (UnkStruct_0200C6E4 * param0, UnkStruct_0200C704 * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
+void sub_0207CAC4 (CellTransferStateData * param0, AnimationResourceCollection * param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4)
 {
     sub_0200CBDC(param0, param1, sub_0207CAC0(), sub_0207CA90(param3), 1, param2, param4);
 }
 
-void sub_0207CAF8 (UnkStruct_0200C704 * param0, u32 param1)
+void sub_0207CAF8 (AnimationResourceCollection * param0, u32 param1)
 {
     sub_0200D070(param0, param1);
 }
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index e956ba388c..05f72129c2 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -85,82 +85,82 @@ typedef struct {
 static int sub_0207E0B8(UnkStruct_020067E8 * param0, int * param1);
 static int sub_0207E2A8(UnkStruct_020067E8 * param0, int * param1);
 static int sub_0207E7E0(UnkStruct_020067E8 * param0, int * param1);
-static int sub_0207E490(UnkStruct_0207F248 * param0);
-static int sub_0207E518(UnkStruct_0207F248 * param0);
-static int sub_0207E5B4(UnkStruct_0207F248 * param0);
-static int sub_0207E5F4(UnkStruct_0207F248 * param0);
-static int sub_0207E6C0(UnkStruct_0207F248 * param0);
-static int sub_0207E6E4(UnkStruct_0207F248 * param0);
-static int sub_0207E708(UnkStruct_0207F248 * param0);
-static int sub_0207E714(UnkStruct_0207F248 * param0);
-static int sub_0207E750(UnkStruct_0207F248 * param0);
-static int sub_02080BF4(UnkStruct_0207F248 * param0);
+static int sub_0207E490(GameWindowLayout * param0);
+static int sub_0207E518(GameWindowLayout * param0);
+static int sub_0207E5B4(GameWindowLayout * param0);
+static int sub_0207E5F4(GameWindowLayout * param0);
+static int sub_0207E6C0(GameWindowLayout * param0);
+static int sub_0207E6E4(GameWindowLayout * param0);
+static int sub_0207E708(GameWindowLayout * param0);
+static int sub_0207E714(GameWindowLayout * param0);
+static int sub_0207E750(GameWindowLayout * param0);
+static int sub_02080BF4(GameWindowLayout * param0);
 static void sub_0207E898(void * param0);
 static void sub_0207E8C0(void);
 static void sub_0207E918(BGL * param0);
 static void sub_0207EA24(BGL * param0);
-static void sub_0207EB6C(UnkStruct_0207F248 * param0, NARC * param1);
-static UnkStruct_0207F248 * sub_0207ECC0(UnkStruct_020067E8 * param0);
-static void sub_0207EE14(UnkStruct_0207F248 * param0);
-static void sub_0207F308(UnkStruct_0207F248 * param0);
-static u8 sub_0207F984(UnkStruct_0207F248 * param0, u8 param1);
-static u8 sub_0207FE98(UnkStruct_0207F248 * param0);
-static void sub_02080500(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static void sub_0207F9A0(UnkStruct_0207F248 * param0);
-static void sub_0207EDC0(UnkStruct_0207F248 * param0);
-static int sub_02080670(UnkStruct_0207F248 * param0);
-static u8 sub_02080B34(UnkStruct_0207F248 * param0, int * param1);
-static u8 sub_020805E4(UnkStruct_0207F248 * param0);
-static void sub_02080A50(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static int sub_02080AD8(UnkStruct_0207F248 * param0);
-static u8 sub_02080FD0(UnkStruct_0207F248 * param0);
-static int sub_0208107C(UnkStruct_0207F248 * param0);
-static u8 sub_020811F4(UnkStruct_0207F248 * param0);
-static int sub_02081224(UnkStruct_0207F248 * param0);
-static int sub_02081408(UnkStruct_0207F248 * param0, Pokemon * param1, int * param2);
-static int sub_0208150C(UnkStruct_0207F248 * param0);
-static int sub_02081594(UnkStruct_0207F248 * param0);
-static int sub_020815B8(UnkStruct_0207F248 * param0);
-static int sub_0207E634(UnkStruct_0207F248 * param0);
-static int sub_0208170C(UnkStruct_0207F248 * param0);
-static int sub_02081760(UnkStruct_0207F248 * param0);
-static void sub_0207F094(UnkStruct_0207F248 * param0, Pokemon * param1, u8 param2);
+static void sub_0207EB6C(GameWindowLayout * param0, NARC * param1);
+static GameWindowLayout * sub_0207ECC0(UnkStruct_020067E8 * param0);
+static void sub_0207EE14(GameWindowLayout * param0);
+static void sub_0207F308(GameWindowLayout * param0);
+static u8 sub_0207F984(GameWindowLayout * param0, u8 param1);
+static u8 sub_0207FE98(GameWindowLayout * param0);
+static void sub_02080500(GameWindowLayout * param0, u8 param1, u8 param2);
+static void sub_0207F9A0(GameWindowLayout * param0);
+static void sub_0207EDC0(GameWindowLayout * param0);
+static int HandleGameWindowEvent(GameWindowLayout * param0);
+static u8 sub_02080B34(GameWindowLayout * param0, int * param1);
+static u8 sub_020805E4(GameWindowLayout * param0);
+static void sub_02080A50(GameWindowLayout * param0, u8 param1, u8 param2);
+static int sub_02080AD8(GameWindowLayout * param0);
+static u8 sub_02080FD0(GameWindowLayout * param0);
+static int sub_0208107C(GameWindowLayout * param0);
+static u8 sub_020811F4(GameWindowLayout * param0);
+static int sub_02081224(GameWindowLayout * param0);
+static int sub_02081408(GameWindowLayout * param0, Pokemon * param1, int * param2);
+static int sub_0208150C(GameWindowLayout * param0);
+static int sub_02081594(GameWindowLayout * param0);
+static int sub_020815B8(GameWindowLayout * param0);
+static int sub_0207E634(GameWindowLayout * param0);
+static int sub_0208170C(GameWindowLayout * param0);
+static int sub_02081760(GameWindowLayout * param0);
+static void sub_0207F094(GameWindowLayout * param0, Pokemon * param1, u8 param2);
 static u32 sub_0207F134(Pokemon * param0, u8 param1);
-static void sub_0207FE1C(UnkStruct_0207F248 * param0);
+static void sub_0207FE1C(GameWindowLayout * param0);
 static void sub_02080AB8(u8 param0, s16 * param1, s16 * param2);
-static int sub_0208188C(UnkStruct_0207F248 * param0);
-static u8 sub_020808CC(UnkStruct_0207F248 * param0);
-static u8 sub_02080968(UnkStruct_0207F248 * param0);
-static u8 sub_020809DC(UnkStruct_0207F248 * param0);
-static BOOL sub_020818F8(UnkStruct_0207F248 * param0);
-static UnkStruct_0207C690 * sub_0207EAD4(int param0);
+static int sub_0208188C(GameWindowLayout * param0);
+static u8 sub_020808CC(GameWindowLayout * param0);
+static u8 sub_02080968(GameWindowLayout * param0);
+static u8 sub_020809DC(GameWindowLayout * param0);
+static BOOL sub_020818F8(GameWindowLayout * param0);
+static GenericPointerData * sub_0207EAD4(int param0);
 static void sub_0207EAF4(void);
-static void sub_0207EB64(UnkStruct_0207C690 * param0);
-static int sub_0208153C(UnkStruct_0207F248 * param0);
-static int sub_02081578(UnkStruct_0207F248 * param0);
-static void sub_0207F388(UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1);
-static void sub_0207F4AC(UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1);
-static void sub_0207F5A0(UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1);
-static void sub_0207F694(UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1);
-static void sub_0207F788(UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1);
-static void sub_0207F884(UnkStruct_0207F248 * param0, u8 param1, s16 param2, s16 param3);
-static u8 sub_0207FA24(UnkStruct_0207F248 * param0);
-static u8 sub_0207FBE0(UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, u8 param3);
-static u8 sub_0207FC30(UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, const u8 * param3);
-static u8 sub_0207FC94(UnkStruct_0207F248 * param0);
-static void sub_0207FFC8(UnkStruct_0207F248 * param0);
-static u8 sub_020800B4(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_020801F0(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_0208022C(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_0208027C(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_020802CC(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_0208031C(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_020801AC(UnkStruct_0207F248 * param0, u8 * param1);
-static u8 sub_020801B8(UnkStruct_0207F248 * param0, u8 * param1);
-u8 sub_02080404(UnkStruct_0207F248 * param0, u8 param1);
-u8 sub_02080488(UnkStruct_0207F248 * param0, u8 param1);
-static u8 sub_02080ECC(UnkStruct_0207F248 * param0);
-static BOOL sub_02080F3C(UnkStruct_0207F248 * param0, u8 param1, s8 param2);
+static void sub_0207EB64(GenericPointerData * param0);
+static int sub_0208153C(GameWindowLayout * param0);
+static int sub_02081578(GameWindowLayout * param0);
+static void sub_0207F388(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
+static void sub_0207F4AC(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
+static void sub_0207F5A0(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
+static void sub_0207F694(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
+static void sub_0207F788(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
+static void sub_0207F884(GameWindowLayout * param0, u8 param1, s16 param2, s16 param3);
+static u8 sub_0207FA24(GameWindowLayout * param0);
+static u8 sub_0207FBE0(GameWindowLayout * param0, u8 * param1, u8 * param2, u8 param3);
+static u8 sub_0207FC30(GameWindowLayout * param0, u8 * param1, u8 * param2, const u8 * param3);
+static u8 sub_0207FC94(GameWindowLayout * param0);
+static void sub_0207FFC8(GameWindowLayout * param0);
+static u8 sub_020800B4(GameWindowLayout * param0, u8 * param1);
+static u8 sub_020801F0(GameWindowLayout * param0, u8 * param1);
+static u8 sub_0208022C(GameWindowLayout * param0, u8 * param1);
+static u8 sub_0208027C(GameWindowLayout * param0, u8 * param1);
+static u8 sub_020802CC(GameWindowLayout * param0, u8 * param1);
+static u8 sub_0208031C(GameWindowLayout * param0, u8 * param1);
+static u8 sub_020801AC(GameWindowLayout * param0, u8 * param1);
+static u8 sub_020801B8(GameWindowLayout * param0, u8 * param1);
+u8 sub_02080404(GameWindowLayout * param0, u8 param1);
+u8 sub_02080488(GameWindowLayout * param0, u8 param1);
+static u8 sub_02080ECC(GameWindowLayout * param0);
+static BOOL sub_02080F3C(GameWindowLayout * param0, u8 param1, s8 param2);
 
 const UnkStruct_0208BE5C Unk_020F1E88 = {
     sub_0207E0B8,
@@ -188,7 +188,7 @@ static const UnkStruct_020F1DF8 Unk_020F1DF8[2][6] = {
     }
 };
 
-static const UnkStruct_020F1DB8 Unk_020F1DB8[] = {
+static const ByteFlagSet Unk_020F1DB8[] = {
     {0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1},
     {0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2},
     {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3},
@@ -199,7 +199,7 @@ static const UnkStruct_020F1DB8 Unk_020F1DB8[] = {
     {0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0x5, 0x0}
 };
 
-static const UnkStruct_020F1DB8 Unk_020F1CF8[] = {
+static const ByteFlagSet Unk_020F1CF8[] = {
     {0x40, 0x19, 0x0, 0x0, 0x4, 0x2, 0x1, 0x1},
     {0xC0, 0x19, 0x0, 0x0, 0x7, 0x3, 0x0, 0x0},
     {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x3, 0x3},
@@ -210,7 +210,7 @@ static const UnkStruct_020F1DB8 Unk_020F1CF8[] = {
     {0xE0, 0xA8, 0x0, 0x0, 0x5, 0x1, 0xFF, 0xFF}
 };
 
-static const UnkStruct_020F1DB8 Unk_020F1D38[] = {
+static const ByteFlagSet Unk_020F1D38[] = {
     {0x40, 0x19, 0x0, 0x0, 0x7, 0x2, 0x7, 0x1},
     {0xC0, 0x21, 0x0, 0x0, 0x7, 0x3, 0x0, 0x2},
     {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3},
@@ -221,7 +221,7 @@ static const UnkStruct_020F1DB8 Unk_020F1D38[] = {
     {0xE0, 0xB8, 0x0, 0x0, 0x6, 0x1, 0x6, 0x0}
 };
 
-static const UnkStruct_020F1DB8 Unk_020F1D78[] = {
+static const ByteFlagSet Unk_020F1D78[] = {
     {0x40, 0x19, 0x0, 0x0, 0x5, 0x2, 0x5, 0x1},
     {0xC0, 0x21, 0x0, 0x0, 0x5, 0x3, 0x0, 0x2},
     {0x40, 0x49, 0x0, 0x0, 0x0, 0x4, 0x1, 0x3},
@@ -252,7 +252,7 @@ static const u16 Unk_020F1CB0[] = {
 
 static int sub_0207E0B8 (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     NARC * v1;
 
     sub_02017798(NULL, NULL);
@@ -328,7 +328,7 @@ static int sub_0207E0B8 (UnkStruct_020067E8 * param0, int * param1)
 
 static int sub_0207E2A8 (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0207F248 * v0 = sub_0200682C(param0);
+    GameWindowLayout * v0 = sub_0200682C(param0);
 
     switch (*param1) {
     case 0:
@@ -464,7 +464,7 @@ static int sub_0207E2A8 (UnkStruct_020067E8 * param0, int * param1)
     return 0;
 }
 
-static int sub_0207E490 (UnkStruct_0207F248 * param0)
+static int sub_0207E490 (GameWindowLayout * param0)
 {
     if (ScreenWipe_Done() == 1) {
         if ((param0->unk_5A4->unk_20 == 5) || (param0->unk_5A4->unk_20 == 16)) {
@@ -494,7 +494,7 @@ static int sub_0207E490 (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static int sub_0207E518 (UnkStruct_0207F248 * param0)
+static int sub_0207E518 (GameWindowLayout * param0)
 {
     u8 v0 = sub_0207FE98(param0);
 
@@ -511,7 +511,7 @@ static int sub_0207E518 (UnkStruct_0207F248 * param0)
             return 2;
         }
     } else if (v0 == 4) {
-        return sub_02080670(param0);
+        return HandleGameWindowEvent(param0);
     } else if (v0 == 3) {
         param0->unk_5A4->unk_23 = 0;
         return 32;
@@ -528,7 +528,7 @@ static int sub_0207E518 (UnkStruct_0207F248 * param0)
     return 1;
 }
 
-static int sub_0207E5B4 (UnkStruct_0207F248 * param0)
+static int sub_0207E5B4 (GameWindowLayout * param0)
 {
     u8 v0 = sub_02080FD0(param0);
 
@@ -543,7 +543,7 @@ static int sub_0207E5B4 (UnkStruct_0207F248 * param0)
     return 4;
 }
 
-static int sub_0207E5F4 (UnkStruct_0207F248 * param0)
+static int sub_0207E5F4 (GameWindowLayout * param0)
 {
     u8 v0 = sub_02080FD0(param0);
 
@@ -558,7 +558,7 @@ static int sub_0207E5F4 (UnkStruct_0207F248 * param0)
     return 8;
 }
 
-static int sub_0207E634 (UnkStruct_0207F248 * param0)
+static int sub_0207E634 (GameWindowLayout * param0)
 {
     u32 v0 = sub_02001BE0(param0->unk_700);
 
@@ -589,7 +589,7 @@ static int sub_0207E634 (UnkStruct_0207F248 * param0)
     return 15;
 }
 
-static int sub_0207E6C0 (UnkStruct_0207F248 * param0)
+static int sub_0207E6C0 (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         return param0->unk_B0E;
@@ -598,7 +598,7 @@ static int sub_0207E6C0 (UnkStruct_0207F248 * param0)
     return 24;
 }
 
-static int sub_0207E6E4 (UnkStruct_0207F248 * param0)
+static int sub_0207E6E4 (GameWindowLayout * param0)
 {
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         Sound_PlayEffect(1500);
@@ -608,13 +608,13 @@ static int sub_0207E6E4 (UnkStruct_0207F248 * param0)
     return 25;
 }
 
-static int sub_0207E708 (UnkStruct_0207F248 * param0)
+static int sub_0207E708 (GameWindowLayout * param0)
 {
     sub_020827EC(param0);
     return 27;
 }
 
-static int sub_0207E714 (UnkStruct_0207F248 * param0)
+static int sub_0207E714 (GameWindowLayout * param0)
 {
     switch (sub_02002114(param0->unk_700, 12)) {
     case 0:
@@ -626,7 +626,7 @@ static int sub_0207E714 (UnkStruct_0207F248 * param0)
     return 27;
 }
 
-static int sub_0207E750 (UnkStruct_0207F248 * param0)
+static int sub_0207E750 (GameWindowLayout * param0)
 {
     u8 v0 = sub_02080FD0(param0);
 
@@ -652,7 +652,7 @@ static int sub_0207E750 (UnkStruct_0207F248 * param0)
 
 static int sub_0207E7E0 (UnkStruct_020067E8 * param0, int * param1)
 {
-    UnkStruct_0207F248 * v0 = sub_0200682C(param0);
+    GameWindowLayout * v0 = sub_0200682C(param0);
     u32 v1;
 
     sub_02017798(NULL, NULL);
@@ -689,7 +689,7 @@ static int sub_0207E7E0 (UnkStruct_020067E8 * param0, int * param1)
 
 static void sub_0207E898 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
 
     sub_0201C2B8(v0->unk_00);
     sub_0201DCAC();
@@ -875,7 +875,7 @@ static void sub_0207EA24 (BGL * param0)
     Heap_FreeToHeapExplicit(12, param0);
 }
 
-void sub_0207EA74 (UnkStruct_0207F248 * param0, int param1)
+void sub_0207EA74 (GameWindowLayout * param0, int param1)
 {
     if (param1 == 0) {
         sub_02019120(0, 0);
@@ -894,9 +894,9 @@ void sub_0207EA74 (UnkStruct_0207F248 * param0, int param1)
     }
 }
 
-static UnkStruct_0207C690 * sub_0207EAD4 (int param0)
+static GenericPointerData * sub_0207EAD4 (int param0)
 {
-    UnkStruct_0207C690 * v0;
+    GenericPointerData * v0;
 
     v0 = sub_02024220(param0, 0, 1, 0, 2, sub_0207EAF4);
     return v0;
@@ -914,12 +914,12 @@ static void sub_0207EAF4 (void)
     G3_ViewPort(0, 0, 255, 191);
 }
 
-static void sub_0207EB64 (UnkStruct_0207C690 * param0)
+static void sub_0207EB64 (GenericPointerData * param0)
 {
     sub_020242C4(param0);
 }
 
-static void sub_0207EB6C (UnkStruct_0207F248 * param0, NARC * param1)
+static void sub_0207EB6C (GameWindowLayout * param0, NARC * param1)
 {
     sub_020070E8(param1, 15, param0->unk_00, 3, 0, 0, 0, 12);
     sub_0200710C(param1, 17, param0->unk_00, 3, 0, 0, 0, 12);
@@ -951,13 +951,13 @@ static void sub_0207EB6C (UnkStruct_0207F248 * param0, NARC * param1)
     sub_0201975C(4, 0);
 }
 
-static UnkStruct_0207F248 * sub_0207ECC0 (UnkStruct_020067E8 * param0)
+static GameWindowLayout * sub_0207ECC0 (UnkStruct_020067E8 * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     u32 v1;
 
-    v0 = sub_0200681C(param0, sizeof(UnkStruct_0207F248), 12);
-    memset(v0, 0, sizeof(UnkStruct_0207F248));
+    v0 = sub_0200681C(param0, sizeof(GameWindowLayout), 12);
+    memset(v0, 0, sizeof(GameWindowLayout));
 
     v0->unk_5A4 = sub_02006840(param0);
     v0->unk_00 = sub_02018340(12);
@@ -989,7 +989,7 @@ static UnkStruct_0207F248 * sub_0207ECC0 (UnkStruct_020067E8 * param0)
     return v0;
 }
 
-static void sub_0207EDC0 (UnkStruct_0207F248 * param0)
+static void sub_0207EDC0 (GameWindowLayout * param0)
 {
     if ((param0->unk_5A4->unk_20 & 0x80) != 0) {
         param0->unk_B0F_7 = 1;
@@ -1001,7 +1001,7 @@ static void sub_0207EDC0 (UnkStruct_0207F248 * param0)
     }
 }
 
-static void sub_0207EE14 (UnkStruct_0207F248 * param0)
+static void sub_0207EE14 (GameWindowLayout * param0)
 {
     u8 v0 = 3;
 
@@ -1037,12 +1037,12 @@ static void sub_0207EE14 (UnkStruct_0207F248 * param0)
     sub_020825B4(param0, v0);
 }
 
-u8 sub_0207EF04 (UnkStruct_0207F248 * param0, u8 param1)
+u8 sub_0207EF04 (GameWindowLayout * param0, u8 param1)
 {
     return param0->unk_704[param1].unk_29;
 }
 
-u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1)
+u8 sub_0207EF14 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     u32 v1;
@@ -1087,7 +1087,7 @@ u8 sub_0207EF14 (UnkStruct_0207F248 * param0, u8 param1)
     return 1;
 }
 
-static void sub_0207F094 (UnkStruct_0207F248 * param0, Pokemon * param1, u8 param2)
+static void sub_0207F094 (GameWindowLayout * param0, Pokemon * param1, u8 param2)
 {
     u32 v0;
     u32 v1;
@@ -1155,12 +1155,12 @@ static u32 sub_0207F134 (Pokemon * param0, u8 param1)
     return v0;
 }
 
-const u16 * sub_0207F248 (UnkStruct_0207F248 * param0)
+const u16 * sub_0207F248 (GameWindowLayout * param0)
 {
     return &param0->unk_324[3 * 16 + 6];
 }
 
-static void sub_0207F250 (UnkStruct_0207F248 * param0, u8 param1, u8 param2, u8 param3, u8 param4)
+static void sub_0207F250 (GameWindowLayout * param0, u8 param1, u8 param2, u8 param3, u8 param4)
 {
     const u16 * v0;
 
@@ -1184,7 +1184,7 @@ static void sub_0207F250 (UnkStruct_0207F248 * param0, u8 param1, u8 param2, u8
     sub_0207F8F8(param0, param1);
 }
 
-static void sub_0207F308 (UnkStruct_0207F248 * param0)
+static void sub_0207F308 (GameWindowLayout * param0)
 {
     const UnkStruct_020F1DF8 * v0;
 
@@ -1210,7 +1210,7 @@ static void sub_0207F308 (UnkStruct_0207F248 * param0)
     sub_0201C3C0(param0->unk_00, 4);
 }
 
-static void sub_0207F388 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1)
+static void sub_0207F388 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1)
 {
     u8 v0;
     NARC * v1;
@@ -1242,7 +1242,7 @@ static void sub_0207F388 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8
     NARC_dtor(v1);
 }
 
-static void sub_0207F4AC (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1)
+static void sub_0207F4AC (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1)
 {
     u8 v0;
     NARC * v1;
@@ -1269,7 +1269,7 @@ static void sub_0207F4AC (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8
     NARC_dtor(v1);
 }
 
-static void sub_0207F5A0 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1)
+static void sub_0207F5A0 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1)
 {
     u8 v0;
     NARC * v1;
@@ -1296,7 +1296,7 @@ static void sub_0207F5A0 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8
     NARC_dtor(v1);
 }
 
-static void sub_0207F694 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1)
+static void sub_0207F694 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1)
 {
     u8 v0;
     NARC * v1;
@@ -1323,7 +1323,7 @@ static void sub_0207F694 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8
     NARC_dtor(v1);
 }
 
-static void sub_0207F788 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8 * param1)
+static void sub_0207F788 (GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1)
 {
     u8 v0;
     NARC * v1;
@@ -1351,7 +1351,7 @@ static void sub_0207F788 (UnkStruct_0207F248 * param0, const UnkStruct_020F1DF8
     NARC_dtor(v1);
 }
 
-static void sub_0207F884 (UnkStruct_0207F248 * param0, u8 param1, s16 param2, s16 param3)
+static void sub_0207F884 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3)
 {
     sub_020198E8(param0->unk_00, 2, param2, param3, 16, 6, (const void *)param0->unk_3E4, 0, 0, 16, 6);
     sub_02019E2C(param0->unk_00, 2, param2, param3, 16, 6, 1);
@@ -1360,7 +1360,7 @@ static void sub_0207F884 (UnkStruct_0207F248 * param0, u8 param1, s16 param2, s1
     sub_02083104(param0, param1);
 }
 
-void sub_0207F8F8 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_0207F8F8 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     u8 v1;
@@ -1388,7 +1388,7 @@ void sub_0207F8F8 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201972C(2, &param0->unk_4A4[v1 * 16], 8 * 2, (3 + param1) * 32);
 }
 
-static u8 sub_0207F984 (UnkStruct_0207F248 * param0, u8 param1)
+static u8 sub_0207F984 (GameWindowLayout * param0, u8 param1)
 {
     if ((param0->unk_5A4->unk_21 == 2) && ((param1 & 1) != 0)) {
         return 1;
@@ -1397,7 +1397,7 @@ static u8 sub_0207F984 (UnkStruct_0207F248 * param0, u8 param1)
     return 0;
 }
 
-static void sub_0207F9A0 (UnkStruct_0207F248 * param0)
+static void sub_0207F9A0 (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -1413,7 +1413,7 @@ static const u8 Unk_020F1BD4[][6] = {
     {0x5, 0x3, 0x1, 0x4, 0x2, 0x0}
 };
 
-static u8 sub_0207FA00 (UnkStruct_0207F248 * param0)
+static u8 sub_0207FA00 (GameWindowLayout * param0)
 {
     if (sub_0207FA24(param0) == 1) {
         return 1;
@@ -1426,7 +1426,7 @@ static u8 sub_0207FA00 (UnkStruct_0207F248 * param0)
     return 5;
 }
 
-static u8 sub_0207FA24 (UnkStruct_0207F248 * param0)
+static u8 sub_0207FA24 (GameWindowLayout * param0)
 {
     u8 v0;
     u8 v1;
@@ -1501,7 +1501,7 @@ static u8 sub_0207FA24 (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static u8 sub_0207FBE0 (UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, u8 param3)
+static u8 sub_0207FBE0 (GameWindowLayout * param0, u8 * param1, u8 * param2, u8 param3)
 {
     u8 v0 = param0->unk_B11;
 
@@ -1520,7 +1520,7 @@ static u8 sub_0207FBE0 (UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, u
     return v0;
 }
 
-static u8 sub_0207FC30 (UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, const u8 * param3)
+static u8 sub_0207FC30 (GameWindowLayout * param0, u8 * param1, u8 * param2, const u8 * param3)
 {
     u8 v0 = 0;
 
@@ -1541,7 +1541,7 @@ static u8 sub_0207FC30 (UnkStruct_0207F248 * param0, u8 * param1, u8 * param2, c
     return 0;
 }
 
-static u8 sub_0207FC94 (UnkStruct_0207F248 * param0)
+static u8 sub_0207FC94 (GameWindowLayout * param0)
 {
     int v0 = sub_02080AD8(param0);
 
@@ -1579,7 +1579,7 @@ static u8 sub_0207FC94 (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-void sub_0207FD68 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_0207FD68 (GameWindowLayout * param0, u8 param1)
 {
     if ((param1 == 6) || (param1 == 7)) {
         sub_02021CAC(param0->unk_5B0[6], 0);
@@ -1606,7 +1606,7 @@ void sub_0207FD68 (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-static void sub_0207FE1C (UnkStruct_0207F248 * param0)
+static void sub_0207FE1C (GameWindowLayout * param0)
 {
     switch (param0->unk_B0C) {
     case 0:
@@ -1631,7 +1631,7 @@ static void sub_0207FE1C (UnkStruct_0207F248 * param0)
     }
 }
 
-static u8 sub_0207FE98 (UnkStruct_0207F248 * param0)
+static u8 sub_0207FE98 (GameWindowLayout * param0)
 {
     u8 v0;
 
@@ -1697,7 +1697,7 @@ static u8 sub_0207FE98 (UnkStruct_0207F248 * param0)
     return v0;
 }
 
-static void sub_0207FFC8 (UnkStruct_0207F248 * param0)
+static void sub_0207FFC8 (GameWindowLayout * param0)
 {
     u8 * v0;
     u8 v1;
@@ -1740,7 +1740,7 @@ static void sub_0207FFC8 (UnkStruct_0207F248 * param0)
     sub_0200D414(param0->unk_5B0[6], 1);
 }
 
-static u8 sub_020800B4 (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_020800B4 (GameWindowLayout * param0, u8 * param1)
 {
     Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
     u16 v1;
@@ -1790,7 +1790,7 @@ static u8 sub_020800B4 (UnkStruct_0207F248 * param0, u8 * param1)
     return v4;
 }
 
-static u8 sub_020801AC (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_020801AC (GameWindowLayout * param0, u8 * param1)
 {
     param1[0] = 14;
     param1[1] = 9;
@@ -1798,7 +1798,7 @@ static u8 sub_020801AC (UnkStruct_0207F248 * param0, u8 * param1)
     return 2;
 }
 
-static u8 sub_020801B8 (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_020801B8 (GameWindowLayout * param0, u8 * param1)
 {
     if (param0->unk_704[param0->unk_B11].unk_10 == 0) {
         param1[0] = 8;
@@ -1814,7 +1814,7 @@ static u8 sub_020801B8 (UnkStruct_0207F248 * param0, u8 * param1)
     return 2;
 }
 
-static u8 sub_020801F0 (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_020801F0 (GameWindowLayout * param0, u8 * param1)
 {
     if (param0->unk_704[param0->unk_B11].unk_0E_15 == 1) {
         param1[0] = 13;
@@ -1830,7 +1830,7 @@ static u8 sub_020801F0 (UnkStruct_0207F248 * param0, u8 * param1)
     return 2;
 }
 
-static u8 sub_0208022C (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_0208022C (GameWindowLayout * param0, u8 * param1)
 {
     switch (sub_02080354(param0, param0->unk_B11)) {
     case 0:
@@ -1852,7 +1852,7 @@ static u8 sub_0208022C (UnkStruct_0207F248 * param0, u8 * param1)
     return 0;
 }
 
-static u8 sub_0208027C (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_0208027C (GameWindowLayout * param0, u8 * param1)
 {
     switch (sub_02080404(param0, param0->unk_B11)) {
     case 0:
@@ -1874,7 +1874,7 @@ static u8 sub_0208027C (UnkStruct_0207F248 * param0, u8 * param1)
     return 0;
 }
 
-static u8 sub_020802CC (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_020802CC (GameWindowLayout * param0, u8 * param1)
 {
     switch (sub_02080488(param0, param0->unk_B11)) {
     case 0:
@@ -1896,7 +1896,7 @@ static u8 sub_020802CC (UnkStruct_0207F248 * param0, u8 * param1)
     return 0;
 }
 
-static u8 sub_0208031C (UnkStruct_0207F248 * param0, u8 * param1)
+static u8 sub_0208031C (GameWindowLayout * param0, u8 * param1)
 {
     if (param0->unk_704[param0->unk_B11].unk_10 == 1) {
         param1[0] = 1;
@@ -1911,7 +1911,7 @@ static u8 sub_0208031C (UnkStruct_0207F248 * param0, u8 * param1)
     return 2;
 }
 
-u8 sub_02080354 (UnkStruct_0207F248 * param0, u8 param1)
+u8 sub_02080354 (GameWindowLayout * param0, u8 param1)
 {
     u8 v0;
 
@@ -1942,7 +1942,7 @@ u8 sub_02080354 (UnkStruct_0207F248 * param0, u8 param1)
     return 1;
 }
 
-u8 sub_02080404 (UnkStruct_0207F248 * param0, u8 param1)
+u8 sub_02080404 (GameWindowLayout * param0, u8 param1)
 {
     u8 v0;
 
@@ -1965,7 +1965,7 @@ u8 sub_02080404 (UnkStruct_0207F248 * param0, u8 param1)
     return 1;
 }
 
-u8 sub_02080488 (UnkStruct_0207F248 * param0, u8 param1)
+u8 sub_02080488 (GameWindowLayout * param0, u8 param1)
 {
     u8 v0;
 
@@ -1988,7 +1988,7 @@ u8 sub_02080488 (UnkStruct_0207F248 * param0, u8 param1)
     return 1;
 }
 
-static void sub_02080500 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     if (param1 == 6) {
         u8 v0 = sub_02021E24(param0->unk_5B0[8]);
@@ -2040,7 +2040,7 @@ u8 sub_020805D0 (u8 param0, u8 param1)
     return 0;
 }
 
-static u8 sub_020805E4 (UnkStruct_0207F248 * param0)
+static u8 sub_020805E4 (GameWindowLayout * param0)
 {
     u8 v0;
 
@@ -2077,7 +2077,7 @@ static u8 sub_020805E4 (UnkStruct_0207F248 * param0)
     return v0;
 }
 
-static int sub_02080670 (UnkStruct_0207F248 * param0)
+static int HandleGameWindowEvent (GameWindowLayout * param0)
 {
     u8 v0;
 
@@ -2190,7 +2190,7 @@ static int sub_02080670 (UnkStruct_0207F248 * param0)
     return 32;
 }
 
-static u8 sub_020808CC (UnkStruct_0207F248 * param0)
+static u8 sub_020808CC (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2217,7 +2217,7 @@ static u8 sub_020808CC (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static u8 sub_02080968 (UnkStruct_0207F248 * param0)
+static u8 sub_02080968 (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2240,7 +2240,7 @@ static u8 sub_02080968 (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static u8 sub_020809DC (UnkStruct_0207F248 * param0)
+static u8 sub_020809DC (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2282,7 +2282,7 @@ static const UnkUnion_02022594 Unk_020F1C94[] = {
     {0xFF, 0x0, 0x0, 0x0}
 };
 
-static void sub_02080A50 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02080A50 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     u16 * v0;
     u16 v1;
@@ -2307,7 +2307,7 @@ static void sub_02080AB8 (u8 param0, s16 * param1, s16 * param2)
     *param2 = Unk_020F1BB8[param0][1] * 8 + ((5 * 8) >> 1);
 }
 
-static int sub_02080AD8 (UnkStruct_0207F248 * param0)
+static int sub_02080AD8 (GameWindowLayout * param0)
 {
     int v0;
 
@@ -2328,7 +2328,7 @@ static int sub_02080AD8 (UnkStruct_0207F248 * param0)
     return v0;
 }
 
-static u8 sub_02080B34 (UnkStruct_0207F248 * param0, int * param1)
+static u8 sub_02080B34 (GameWindowLayout * param0, int * param1)
 {
     u32 v0 = sub_02001BE0(param0->unk_700);
 
@@ -2372,7 +2372,7 @@ u8 sub_02080BCC (u16 param0)
     return 0xff;
 }
 
-static int sub_02080BF4 (UnkStruct_0207F248 * param0)
+static int sub_02080BF4 (GameWindowLayout * param0)
 {
     switch (param0->unk_B14[1]) {
     case 0:
@@ -2492,7 +2492,7 @@ static int sub_02080BF4 (UnkStruct_0207F248 * param0)
     return 30;
 }
 
-static u8 sub_02080ECC (UnkStruct_0207F248 * param0)
+static u8 sub_02080ECC (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_10 != 0) {
         return 2;
@@ -2511,7 +2511,7 @@ static u8 sub_02080ECC (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static BOOL sub_02080F3C (UnkStruct_0207F248 * param0, u8 param1, s8 param2)
+static BOOL sub_02080F3C (GameWindowLayout * param0, u8 param1, s8 param2)
 {
     param0->unk_704[param1].unk_06 += param2;
     param0->unk_B14[2]++;
@@ -2534,7 +2534,7 @@ static BOOL sub_02080F3C (UnkStruct_0207F248 * param0, u8 param1, s8 param2)
     return 0;
 }
 
-static u8 sub_02080FD0 (UnkStruct_0207F248 * param0)
+static u8 sub_02080FD0 (GameWindowLayout * param0)
 {
     u8 v0;
 
@@ -2578,7 +2578,7 @@ static u8 sub_02080FD0 (UnkStruct_0207F248 * param0)
     return v0;
 }
 
-static int sub_0208107C (UnkStruct_0207F248 * param0)
+static int sub_0208107C (GameWindowLayout * param0)
 {
     ItemData * v0;
 
@@ -2631,7 +2631,7 @@ static int sub_0208107C (UnkStruct_0207F248 * param0)
     return 5;
 }
 
-static u8 sub_020811F4 (UnkStruct_0207F248 * param0)
+static u8 sub_020811F4 (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_0C == 0) {
         return 0;
@@ -2642,7 +2642,7 @@ static u8 sub_020811F4 (UnkStruct_0207F248 * param0)
     return 1;
 }
 
-static int sub_02081224 (UnkStruct_0207F248 * param0)
+static int sub_02081224 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Window * v1;
@@ -2706,7 +2706,7 @@ static int sub_02081224 (UnkStruct_0207F248 * param0)
     return v2;
 }
 
-static int sub_02081408 (UnkStruct_0207F248 * param0, Pokemon * param1, int * param2)
+static int sub_02081408 (GameWindowLayout * param0, Pokemon * param1, int * param2)
 {
     u32 v0 = param0->unk_5A4->unk_24;
     UnkStruct_0203CDB0 * v1;
@@ -2733,7 +2733,7 @@ static int sub_02081408 (UnkStruct_0207F248 * param0, Pokemon * param1, int * pa
     return 11;
 }
 
-static void sub_020814A8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2, u32 param3)
+static void sub_020814A8 (GameWindowLayout * param0, Pokemon * param1, u32 param2, u32 param3)
 {
     sub_0207D570(param0->unk_5A4->unk_04, (u16)param2, 1, 12);
     Pokemon_SetValue(param1, 6, &param3);
@@ -2743,7 +2743,7 @@ static void sub_020814A8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 par
     sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C);
 }
 
-static int sub_0208150C (UnkStruct_0207F248 * param0)
+static int sub_0208150C (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
@@ -2754,7 +2754,7 @@ static int sub_0208150C (UnkStruct_0207F248 * param0)
     return 11;
 }
 
-static int sub_0208153C (UnkStruct_0207F248 * param0)
+static int sub_0208153C (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
@@ -2767,7 +2767,7 @@ static int sub_0208153C (UnkStruct_0207F248 * param0)
     return 12;
 }
 
-static int sub_02081578 (UnkStruct_0207F248 * param0)
+static int sub_02081578 (GameWindowLayout * param0)
 {
     if (ov118_021D0DBC(param0) == 1) {
         sub_020819CC(param0);
@@ -2778,7 +2778,7 @@ static int sub_02081578 (UnkStruct_0207F248 * param0)
     return 13;
 }
 
-static int sub_02081594 (UnkStruct_0207F248 * param0)
+static int sub_02081594 (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         sub_020827EC(param0);
@@ -2788,7 +2788,7 @@ static int sub_02081594 (UnkStruct_0207F248 * param0)
     return 9;
 }
 
-static int sub_020815B8 (UnkStruct_0207F248 * param0)
+static int sub_020815B8 (GameWindowLayout * param0)
 {
     int v0, v1;
 
@@ -2841,7 +2841,7 @@ static int sub_020815B8 (UnkStruct_0207F248 * param0)
     return 10;
 }
 
-static int sub_0208170C (UnkStruct_0207F248 * param0)
+static int sub_0208170C (GameWindowLayout * param0)
 {
     if (param0->unk_5A4->unk_20 == 10) {
         sub_0200E084(&param0->unk_04[34], 1);
@@ -2855,7 +2855,7 @@ static int sub_0208170C (UnkStruct_0207F248 * param0)
     return 32;
 }
 
-static int sub_02081760 (UnkStruct_0207F248 * param0)
+static int sub_02081760 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Window * v1;
@@ -2897,7 +2897,7 @@ static int sub_02081760 (UnkStruct_0207F248 * param0)
     return v4;
 }
 
-static int sub_0208188C (UnkStruct_0207F248 * param0)
+static int sub_0208188C (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
         param0->unk_5A4->unk_23 = 0;
@@ -2912,7 +2912,7 @@ static int sub_0208188C (UnkStruct_0207F248 * param0)
     return 24;
 }
 
-static BOOL sub_020818F8 (UnkStruct_0207F248 * param0)
+static BOOL sub_020818F8 (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)) {
         return 0;
@@ -2961,13 +2961,13 @@ void sub_02081940 (u32 param0, u16 * param1, u16 * param2, u16 * param3)
     Heap_FreeToHeap(v1);
 }
 
-void sub_020819B4 (UnkStruct_0207F248 * param0)
+void sub_020819B4 (GameWindowLayout * param0)
 {
     Overlay_LoadByID(FS_OVERLAY_ID(overlay118), 2);
     ov118_021D0D80(param0);
 }
 
-void sub_020819CC (UnkStruct_0207F248 * param0)
+void sub_020819CC (GameWindowLayout * param0)
 {
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay118));
 }
diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c
index 972c251847..a973722e6c 100644
--- a/src/unk_020819DC.c
+++ b/src/unk_020819DC.c
@@ -32,10 +32,10 @@
 #include "unk_02084B70.h"
 #include "unk_0208C098.h"
 
-static void sub_02082810(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static void sub_02082880(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static void sub_02082900(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static void sub_02082964(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
+static void sub_02082810(GameWindowLayout * param0, u8 param1, u8 param2);
+static void sub_02082880(GameWindowLayout * param0, u8 param1, u8 param2);
+static void sub_02082900(GameWindowLayout * param0, u8 param1, u8 param2);
+static void sub_02082964(GameWindowLayout * param0, u8 param1, u8 param2);
 static BOOL sub_0208279C(UnkStruct_0201D738 * param0, u16 param1);
 
 static const UnkStruct_ov61_0222C884 Unk_020F1F08[] = {
@@ -115,7 +115,7 @@ static void sub_020819DC (BGL * param0, Window * param1, const UnkStruct_ov61_02
     sub_0201A8D4(param0, &param1[4], &param2[4]);
 }
 
-void sub_02081A24 (UnkStruct_0207F248 * param0)
+void sub_02081A24 (GameWindowLayout * param0)
 {
     const UnkStruct_ov61_0222C884 * v0 = Unk_020F1F08;
     u16 v1;
@@ -152,7 +152,7 @@ void sub_02081A24 (UnkStruct_0207F248 * param0)
     sub_0201A8D4(param0->unk_00, &param0->unk_04[36], &Unk_020F1ED0[6]);
 }
 
-void sub_02081B90 (UnkStruct_0207F248 * param0)
+void sub_02081B90 (GameWindowLayout * param0)
 {
     u16 v0;
 
@@ -167,7 +167,7 @@ void sub_02081B90 (UnkStruct_0207F248 * param0)
     }
 }
 
-void sub_02081BC0 (UnkStruct_0207F248 * 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]);
@@ -187,7 +187,7 @@ void sub_02081BC0 (UnkStruct_0207F248 * param0)
     MessageLoader_GetStrbuf(param0->unk_69C, 200, param0->unk_6AC[15]);
 }
 
-void sub_02081CAC (UnkStruct_0207F248 * param0, u16 param1, u8 param2)
+void sub_02081CAC (GameWindowLayout * param0, u16 param1, u8 param2)
 {
     Strbuf* v0;
 
@@ -199,7 +199,7 @@ void sub_02081CAC (UnkStruct_0207F248 * param0, u16 param1, u8 param2)
     Strbuf_Free(v0);
 }
 
-void sub_02081CF4 (UnkStruct_0207F248 * param0, const u8 * param1, u8 param2)
+void sub_02081CF4 (GameWindowLayout * param0, const u8 * param1, u8 param2)
 {
     UnkStruct_02081CF4 v0;
     u16 v1, v2;
@@ -236,7 +236,7 @@ void sub_02081CF4 (UnkStruct_0207F248 * param0, const u8 * param1, u8 param2)
     param0->unk_700 = sub_02001B7C(&v0, 8, 0, 0, 12, PAD_BUTTON_B);
 }
 
-void sub_02081E08 (UnkStruct_0207F248 * param0)
+void sub_02081E08 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -264,12 +264,12 @@ static const u16 Unk_020F1EA0[6][4] = {
     {0xD, 0x7, 0x19, 0x13}
 };
 
-static void sub_02081EAC (UnkStruct_0207F248 * param0, u8 param1)
+static void sub_02081EAC (GameWindowLayout * param0, u8 param1)
 {
     sub_0200C578(param0->unk_698, 0, &param0->unk_04[2 + param1 * 5], 28, 2);
 }
 
-void sub_02081ED8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2)
+void sub_02081ED8 (GameWindowLayout * param0, Pokemon * param1, u32 param2)
 {
     Strbuf* v0;
 
@@ -280,7 +280,7 @@ void sub_02081ED8 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2)
     Strbuf_Free(v0);
 }
 
-void sub_02081F2C (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02081F2C (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     Pokemon * v1;
@@ -309,7 +309,7 @@ void sub_02081F2C (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-void sub_02081FFC (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02081FFC (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     Strbuf* v1;
@@ -325,7 +325,7 @@ void sub_02081FFC (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-void sub_02082058 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02082058 (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     Strbuf* v1;
@@ -337,7 +337,7 @@ void sub_02082058 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-void sub_02082098 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02082098 (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     Strbuf* v1;
@@ -349,7 +349,7 @@ void sub_02082098 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-static void sub_020820C4 (UnkStruct_0207F248 * param0, u8 param1)
+static void sub_020820C4 (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     Strbuf* v1;
@@ -360,7 +360,7 @@ static void sub_020820C4 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-void sub_02082104 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02082104 (GameWindowLayout * param0, u8 param1)
 {
     Window * v0;
     u8 v1;
@@ -391,7 +391,7 @@ void sub_02082104 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201A9A4(v0);
 }
 
-void sub_020821F8 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020821F8 (GameWindowLayout * param0, u8 param1)
 {
     BGL_FillWindow(&param0->unk_04[0 + param1 * 5], 0);
     BGL_FillWindow(&param0->unk_04[1 + param1 * 5], 0);
@@ -414,7 +414,7 @@ void sub_020821F8 (UnkStruct_0207F248 * param0, u8 param1)
     sub_02082104(param0, param1);
 }
 
-void sub_020822BC (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020822BC (GameWindowLayout * param0, u8 param1)
 {
     sub_0201ACCC(&param0->unk_04[0 + param1 * 5]);
     sub_0201ACCC(&param0->unk_04[1 + param1 * 5]);
@@ -422,7 +422,7 @@ void sub_020822BC (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201ACCC(&param0->unk_04[3 + param1 * 5]);
 }
 
-void sub_020822F4 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020822F4 (GameWindowLayout * param0, u8 param1)
 {
     sub_0201AD10(&param0->unk_04[0 + param1 * 5]);
     sub_0201AD10(&param0->unk_04[1 + param1 * 5]);
@@ -430,7 +430,7 @@ void sub_020822F4 (UnkStruct_0207F248 * param0, u8 param1)
     sub_0201AD10(&param0->unk_04[3 + param1 * 5]);
 }
 
-void sub_0208232C (UnkStruct_0207F248 * param0, u8 param1)
+void sub_0208232C (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
 
@@ -454,7 +454,7 @@ void sub_0208232C (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-void sub_020823C4 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020823C4 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     u8 v1;
@@ -482,7 +482,7 @@ void sub_020823C4 (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-void sub_0208245C (UnkStruct_0207F248 * param0, u8 param1)
+void sub_0208245C (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     u8 v1;
@@ -498,7 +498,7 @@ void sub_0208245C (UnkStruct_0207F248 * param0, u8 param1)
     sub_02082900(param0, param1, (u8)param0->unk_704[param1].unk_0E_15);
 }
 
-void sub_020824C0 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020824C0 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     u8 v1;
@@ -512,7 +512,7 @@ void sub_020824C0 (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-void sub_02082508 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02082508 (GameWindowLayout * param0, u8 param1)
 {
     u8 v0;
 
@@ -550,7 +550,7 @@ static u32 sub_020825A4 (int param0, const Strbuf *param1, u32 param2)
     return (param2 - v0) >> 1;
 }
 
-void sub_020825B4 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020825B4 (GameWindowLayout * param0, u8 param1)
 {
     u32 v0;
 
@@ -572,7 +572,7 @@ void sub_020825B4 (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-static void sub_02082680 (UnkStruct_0207F248 * param0, Window * param1, u32 param2, u8 param3)
+static void sub_02082680 (GameWindowLayout * param0, Window * param1, u32 param2, u8 param3)
 {
     if (param3 == 1) {
         sub_0200E060(param1, 1, (1 + 9), 15);
@@ -588,17 +588,17 @@ static void sub_02082680 (UnkStruct_0207F248 * param0, Window * param1, u32 para
     sub_0201A9A4(param1);
 }
 
-void sub_020826E0 (UnkStruct_0207F248 * param0, u32 param1, u8 param2)
+void sub_020826E0 (GameWindowLayout * param0, u32 param1, u8 param2)
 {
     sub_02082680(param0, &param0->unk_04[32], param1, param2);
 }
 
-void sub_020826F4 (UnkStruct_0207F248 * param0, u32 param1, u8 param2)
+void sub_020826F4 (GameWindowLayout * param0, u32 param1, u8 param2)
 {
     sub_02082680(param0, &param0->unk_04[33], param1, param2);
 }
 
-void sub_02082708 (UnkStruct_0207F248 * param0, u32 param1, u8 param2)
+void sub_02082708 (GameWindowLayout * param0, u32 param1, u8 param2)
 {
     Window * v0 = &param0->unk_04[34];
 
@@ -615,7 +615,7 @@ void sub_02082708 (UnkStruct_0207F248 * param0, u32 param1, u8 param2)
     sub_0208274C(param0);
 }
 
-void sub_0208274C (UnkStruct_0207F248 * param0)
+void sub_0208274C (GameWindowLayout * param0)
 {
     sub_02002AC8(1);
     sub_02002AE4(0);
@@ -643,13 +643,13 @@ static BOOL sub_0208279C (UnkStruct_0201D738 * param0, u16 param1)
     return 0;
 }
 
-void sub_020827EC (UnkStruct_0207F248 * param0)
+void sub_020827EC (GameWindowLayout * param0)
 {
     param0->unk_700 = sub_02002100(
         param0->unk_00, &Unk_020F1E98, 1, 14, 12);
 }
 
-static void sub_02082810 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02082810 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     Window * v0;
     Strbuf* v1;
@@ -672,7 +672,7 @@ static void sub_02082810 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0201A9A4(v0);
 }
 
-static void sub_02082880 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02082880 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     Window * v0;
     Strbuf* v1;
@@ -698,7 +698,7 @@ static void sub_02082880 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0201A9A4(v0);
 }
 
-static void sub_02082900 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02082900 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     Window * v0;
     Strbuf* v1;
@@ -718,7 +718,7 @@ static void sub_02082900 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0201A9A4(v0);
 }
 
-static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02082964 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     Window * v0;
     Strbuf* v1;
@@ -740,7 +740,7 @@ static void sub_02082964 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0201A9A4(v0);
 }
 
-void sub_020829DC (UnkStruct_0207F248 * param0)
+void sub_020829DC (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -782,7 +782,7 @@ void sub_020829DC (UnkStruct_0207F248 * param0)
     sub_0201A9A4(&param0->unk_254[0]);
 }
 
-void sub_02082B58 (UnkStruct_0207F248 * param0)
+void sub_02082B58 (GameWindowLayout * param0)
 {
     Strbuf* v0;
     u32 v1;
@@ -804,7 +804,7 @@ void sub_02082B58 (UnkStruct_0207F248 * param0)
     sub_0201A9A4(&param0->unk_254[0]);
 }
 
-void sub_02082C10 (UnkStruct_0207F248 * param0)
+void sub_02082C10 (GameWindowLayout * param0)
 {
     Window_Clear(&param0->unk_254[0], 0);
     BGL_DeleteWindow(&param0->unk_254[0]);
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index ebed69e88d..1598025be4 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -30,7 +30,7 @@
 #include "unk_02082C2C.h"
 #include "unk_0208C098.h"
 
-void sub_02082C2C (UnkStruct_0207F248 * param0)
+void sub_02082C2C (GameWindowLayout * param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -71,7 +71,7 @@ void sub_02082C2C (UnkStruct_0207F248 * param0)
     }
 }
 
-void sub_02082CEC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param3, NARC * param4)
+void sub_02082CEC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3, NARC * param4)
 {
     Pokemon * v0;
     UnkStruct_ov7_0224F358 v1;
@@ -102,7 +102,7 @@ void sub_02082CEC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param
     param0->unk_704[param1].unk_24 = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &v1);
 }
 
-void sub_02082DA8 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02082DA8 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     NARC * v1;
@@ -156,7 +156,7 @@ static const UnkStruct_ov7_0224F358 Unk_020F20C0[] = {
     {0xB, 0xA4, 0x94, 0x0, 0x0, 0x0, 0x0, NNS_G2D_VRAM_TYPE_2DSUB, 0x0, 0x0, 0x0, 0x0}
 };
 
-void sub_02082E58 (UnkStruct_0207F248 * param0)
+void sub_02082E58 (GameWindowLayout * param0)
 {
     u32 v0;
 
@@ -179,7 +179,7 @@ void sub_02082E58 (UnkStruct_0207F248 * param0)
     sub_02021CAC(param0->unk_5B0[28], 0);
 }
 
-void sub_02082FAC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param3)
+void sub_02082FAC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3)
 {
     UnkStruct_ov7_0224F358 v0;
 
@@ -199,15 +199,15 @@ void sub_02082FAC (UnkStruct_0207F248 * param0, u8 param1, u16 param2, u16 param
     param0->unk_5B0[0 + param1] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &v0);
 }
 
-void sub_02082FF4 (UnkStruct_0207F248 * param0)
+void sub_02082FF4 (GameWindowLayout * param0)
 {
     sub_0200C8B0(param0->unk_5A8, param0->unk_5AC);
     sub_0200C8D4(param0->unk_5A8);
 }
 
-void sub_02083014 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
-    UnkStruct_02022550 ** v0 = &param0->unk_5B0[10 + param1];
+    GraphicElementData ** v0 = &param0->unk_5B0[10 + param1];
 
     if (param2 == 7) {
         sub_02021CAC(*v0, 0);
@@ -218,9 +218,9 @@ void sub_02083014 (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_02021CAC(*v0, 1);
 }
 
-void sub_02083040 (UnkStruct_0207F248 * param0, u8 param1, u16 param2)
+void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
 {
-    UnkStruct_02022550 ** v0 = &param0->unk_5B0[16 + param1];
+    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
     if (param2 == 0) {
         sub_02021CAC(*v0, 0);
@@ -236,17 +236,17 @@ void sub_02083040 (UnkStruct_0207F248 * param0, u8 param1, u16 param2)
     sub_02021CAC(*v0, 1);
 }
 
-void sub_02083080 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02083080 (GameWindowLayout * param0, u8 param1)
 {
-    UnkStruct_02022550 ** v0 = &param0->unk_5B0[16 + param1];
+    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
     sub_02021D6C(*v0, 1);
     sub_02021CAC(*v0, 1);
 }
 
-void sub_020830A0 (UnkStruct_0207F248 * param0, u8 param1, s16 param2, s16 param3)
+void sub_020830A0 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3)
 {
-    UnkStruct_02022550 ** v0 = &param0->unk_5B0[16 + param1];
+    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
     param0->unk_704[param1].unk_1E = param2 + 8;
     param0->unk_704[param1].unk_20 = param3 + 8;
@@ -254,14 +254,14 @@ void sub_020830A0 (UnkStruct_0207F248 * param0, u8 param1, s16 param2, s16 param
     sub_0200D494(*v0, param0->unk_704[param1].unk_1E, param0->unk_704[param1].unk_20);
 }
 
-void sub_020830D4 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020830D4 (GameWindowLayout * param0, u8 param1)
 {
     sub_0200D494(param0->unk_5B0[22 + param1], param0->unk_704[param1].unk_1E + 8, param0->unk_704[param1].unk_20);
 }
 
-void sub_02083104 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_02083104 (GameWindowLayout * param0, u8 param1)
 {
-    UnkStruct_02022550 ** v0 = &param0->unk_5B0[22 + param1];
+    GraphicElementData ** v0 = &param0->unk_5B0[22 + param1];
 
     if (param0->unk_704[param1].unk_12 == 0) {
         sub_02021CAC(*v0, 0);
@@ -271,7 +271,7 @@ void sub_02083104 (UnkStruct_0207F248 * param0, u8 param1)
     sub_02021CAC(*v0, 1);
 }
 
-static void sub_02083138 (UnkStruct_02022550 * param0, u8 param1)
+static void sub_02083138 (GraphicElementData * param0, u8 param1)
 {
     if (sub_02021E24(param0) == param1) {
         return;
@@ -281,7 +281,7 @@ static void sub_02083138 (UnkStruct_02022550 * param0, u8 param1)
     sub_02021D6C(param0, param1);
 }
 
-static u8 sub_02083158 (UnkStruct_020831B4 * param0)
+static u8 sub_02083158 (StrBufWrapper * param0)
 {
     if (param0->unk_06 == 0) {
         return 0;
@@ -305,9 +305,9 @@ static u8 sub_02083158 (UnkStruct_020831B4 * param0)
     return 0;
 }
 
-void sub_020831B4 (UnkStruct_0207F248 * param0)
+void sub_020831B4 (GameWindowLayout * param0)
 {
-    UnkStruct_020831B4 * v0;
+    StrBufWrapper * v0;
     u16 v1;
     u16 v2;
 
@@ -341,7 +341,7 @@ void sub_020831B4 (UnkStruct_0207F248 * param0)
     }
 }
 
-void sub_0208327C (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     u8 v0, v1;
 
@@ -352,7 +352,7 @@ void sub_0208327C (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0200D414(param0->unk_5B0[6], param2);
 }
 
-void sub_020832E4 (UnkStruct_0207F248 * param0, s16 param1, s16 param2)
+void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2)
 {
     VecFx32 v0;
 
@@ -367,7 +367,7 @@ void sub_020832E4 (UnkStruct_0207F248 * param0, s16 param1, s16 param2)
     sub_02021D6C(param0->unk_5B0[28], 0);
 }
 
-void sub_02083334 (UnkStruct_0207F248 * param0)
+void sub_02083334 (GameWindowLayout * param0)
 {
     if (sub_02021D34(param0->unk_5B0[28]) == 1) {
         sub_02021E2C(param0->unk_5B0[28], FX32_ONE);
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 82182ee865..c3f329dc41 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -35,45 +35,45 @@
 #include "unk_02097624.h"
 #include "overlay118/ov118_021D0D80.h"
 
-static void sub_02083AD0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_0208472C(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084808(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02083E8C(UnkStruct_0207F248 * param0, u8 param1);
-static void sub_02083FDC(UnkStruct_0207F248 * param0, u8 param1, u8 param2);
-static void sub_02084134(UnkStruct_0207F248 * param0);
-static void sub_02084420(UnkStruct_0207F248 * param0, u8 param1);
-static void sub_020848A8(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020848C0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020848D8(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020848F0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084908(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084920(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084938(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084950(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084968(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084980(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02084998(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020849B0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020849C8(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020849E0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020849FC(UnkStruct_0207F248 * param0, int * param1);
-static int sub_02084A18(UnkStruct_0207F248 * param0);
-static void sub_02084760(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020833BC(UnkStruct_0207F248 * param0, int * param1);
-static void sub_0208347C(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020834B0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_02083700(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020837C0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020837F4(UnkStruct_0207F248 * param0, int * param1);
+static void sub_02083AD0(GameWindowLayout * param0, int * param1);
+static void sub_0208472C(GameWindowLayout * param0, int * param1);
+static void sub_02084808(GameWindowLayout * param0, int * param1);
+static void sub_02083E8C(GameWindowLayout * param0, u8 param1);
+static void sub_02083FDC(GameWindowLayout * param0, u8 param1, u8 param2);
+static void sub_02084134(GameWindowLayout * param0);
+static void sub_02084420(GameWindowLayout * param0, u8 param1);
+static void sub_020848A8(GameWindowLayout * param0, int * param1);
+static void sub_020848C0(GameWindowLayout * param0, int * param1);
+static void sub_020848D8(GameWindowLayout * param0, int * param1);
+static void sub_020848F0(GameWindowLayout * param0, int * param1);
+static void sub_02084908(GameWindowLayout * param0, int * param1);
+static void sub_02084920(GameWindowLayout * param0, int * param1);
+static void sub_02084938(GameWindowLayout * param0, int * param1);
+static void sub_02084950(GameWindowLayout * param0, int * param1);
+static void sub_02084968(GameWindowLayout * param0, int * param1);
+static void sub_02084980(GameWindowLayout * param0, int * param1);
+static void sub_02084998(GameWindowLayout * param0, int * param1);
+static void sub_020849B0(GameWindowLayout * param0, int * param1);
+static void sub_020849C8(GameWindowLayout * param0, int * param1);
+static void sub_020849E0(GameWindowLayout * param0, int * param1);
+static void sub_020849FC(GameWindowLayout * param0, int * param1);
+static int sub_02084A18(GameWindowLayout * param0);
+static void sub_02084760(GameWindowLayout * param0, int * param1);
+static void sub_020833BC(GameWindowLayout * param0, int * param1);
+static void sub_0208347C(GameWindowLayout * param0, int * param1);
+static void sub_020834B0(GameWindowLayout * param0, int * param1);
+static void sub_02083700(GameWindowLayout * param0, int * param1);
+static void sub_020837C0(GameWindowLayout * param0, int * param1);
+static void sub_020837F4(GameWindowLayout * param0, int * param1);
 static int sub_0208384C(void * param0);
 static int sub_020838C4(void * param0);
 static int sub_020838F4(void * param0);
 static int sub_02083990(void * param0);
-static void sub_020846CC(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020844B0(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020845E8(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020846FC(UnkStruct_0207F248 * param0, int * param1);
-static void sub_020839FC(UnkStruct_0207F248 * param0, int * param1);
+static void sub_020846CC(GameWindowLayout * param0, int * param1);
+static void sub_020844B0(GameWindowLayout * param0, int * param1);
+static void sub_020845E8(GameWindowLayout * param0, int * param1);
+static void sub_020846FC(GameWindowLayout * param0, int * param1);
+static void sub_020839FC(GameWindowLayout * param0, int * param1);
 
 static const u32 Unk_020F2458[] = {
     (const u32)sub_02083AD0,
@@ -115,7 +115,7 @@ u32 sub_02083370 (u8 param0)
     return Unk_020F2458[param0];
 }
 
-void sub_0208337C (UnkStruct_0207F248 * param0)
+void sub_0208337C (GameWindowLayout * param0)
 {
     Window_Clear(&param0->unk_254[0], 1);
     sub_0201AD10(&param0->unk_254[0]);
@@ -124,7 +124,7 @@ void sub_0208337C (UnkStruct_0207F248 * param0)
     BGL_DeleteWindow(&param0->unk_254[0]);
 }
 
-static void sub_020833BC (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020833BC (GameWindowLayout * param0, int * param1)
 {
     UnkStruct_02081CF4 v0;
 
@@ -152,7 +152,7 @@ static void sub_020833BC (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 15;
 }
 
-static void sub_0208347C (UnkStruct_0207F248 * param0, int * param1)
+static void sub_0208347C (GameWindowLayout * param0, int * param1)
 {
     sub_02001BC4(param0->unk_700, NULL);
     sub_02013A3C(param0->unk_6FC);
@@ -161,7 +161,7 @@ static void sub_0208347C (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 32;
 }
 
-static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020834B0 (GameWindowLayout * param0, int * param1)
 {
     Pokemon * v0;
     int v1;
@@ -215,7 +215,7 @@ static void sub_020834B0 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = v2;
 }
 
-int sub_02083658 (UnkStruct_0207F248 * param0)
+int sub_02083658 (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
@@ -229,7 +229,7 @@ int sub_02083658 (UnkStruct_0207F248 * param0)
     return 17;
 }
 
-int sub_020836A8 (UnkStruct_0207F248 * param0)
+int sub_020836A8 (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
@@ -242,7 +242,7 @@ int sub_020836A8 (UnkStruct_0207F248 * param0)
     return 18;
 }
 
-int sub_020836E4 (UnkStruct_0207F248 * param0)
+int sub_020836E4 (GameWindowLayout * param0)
 {
     if (ov118_021D0DBC(param0) == 1) {
         sub_020819CC(param0);
@@ -252,7 +252,7 @@ int sub_020836E4 (UnkStruct_0207F248 * param0)
     return 19;
 }
 
-static void sub_02083700 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02083700 (GameWindowLayout * param0, int * param1)
 {
     UnkStruct_02081CF4 v0;
 
@@ -280,7 +280,7 @@ static void sub_02083700 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 15;
 }
 
-static void sub_020837C0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020837C0 (GameWindowLayout * param0, int * param1)
 {
     sub_02001BC4(param0->unk_700, NULL);
     sub_02013A3C(param0->unk_6FC);
@@ -289,7 +289,7 @@ static void sub_020837C0 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 32;
 }
 
-static void sub_020837F4 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020837F4 (GameWindowLayout * param0, int * param1)
 {
     Window_Clear(&param0->unk_04[35], 1);
     sub_02001BC4(param0->unk_700, NULL);
@@ -304,7 +304,7 @@ static void sub_020837F4 (UnkStruct_0207F248 * param0, int * param1)
 
 static int sub_0208384C (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
     Pokemon * v1;
 
     v0 = param0;
@@ -325,7 +325,7 @@ static int sub_0208384C (void * param0)
 
 static int sub_020838C4 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
 
     sub_02082708(v0, 47, 0);
 
@@ -338,7 +338,7 @@ static int sub_020838C4 (void * param0)
 
 static int sub_020838F4 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
 
     if (sub_0207D570(v0->unk_5A4->unk_04, v0->unk_704[v0->unk_B11].unk_0C, 1, 12) == 1) {
         Pokemon * v1;
@@ -366,7 +366,7 @@ static int sub_020838F4 (void * param0)
 
 static int sub_02083990 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
 
     sub_0200E084(&v0->unk_04[34], 1);
     sub_020826E0(v0, 29, 1);
@@ -375,7 +375,7 @@ static int sub_02083990 (void * param0)
     return 1;
 }
 
-int sub_020839BC (UnkStruct_0207F248 * param0)
+int sub_020839BC (GameWindowLayout * param0)
 {
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         sub_0200E084(&param0->unk_04[34], 1);
@@ -387,7 +387,7 @@ int sub_020839BC (UnkStruct_0207F248 * param0)
     return 20;
 }
 
-static void sub_020839FC (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020839FC (GameWindowLayout * param0, int * param1)
 {
     if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
         sub_02001BC4(param0->unk_700, NULL);
@@ -408,7 +408,7 @@ static void sub_020839FC (UnkStruct_0207F248 * param0, int * param1)
 
 int sub_02083A78 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Pokemon * v1;
 
     v0 = param0;
@@ -422,7 +422,7 @@ int sub_02083A78 (void * param0)
 
 int sub_02083AA4 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = param0;
+    GameWindowLayout * v0 = param0;
 
     sub_0200E084(&v0->unk_04[34], 1);
     sub_020826E0(v0, 29, 1);
@@ -431,7 +431,7 @@ int sub_02083AA4 (void * param0)
     return 1;
 }
 
-static void sub_02083AD0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
 {
     s16 v0, v1;
 
@@ -451,7 +451,7 @@ static void sub_02083AD0 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 28;
 }
 
-void sub_02083B88 (UnkStruct_0207F248 * param0)
+void sub_02083B88 (GameWindowLayout * param0)
 {
     param0->unk_B0F_6 = 0;
     sub_02021CAC(param0->unk_5B0[7], 0);
@@ -464,7 +464,7 @@ void sub_02083B88 (UnkStruct_0207F248 * param0)
     sub_020826E0(param0, 29, 1);
 }
 
-void sub_02083BD4 (UnkStruct_0207F248 * param0)
+void sub_02083BD4 (GameWindowLayout * param0)
 {
     u16 * v0;
     u16 * v1;
@@ -508,9 +508,9 @@ void sub_02083BD4 (UnkStruct_0207F248 * param0)
     sub_02021CAC(param0->unk_5B0[7], 0);
 }
 
-BOOL sub_02083D1C (UnkStruct_0207F248 * param0)
+BOOL sub_02083D1C (GameWindowLayout * param0)
 {
-    UnkStruct_02083D1C * v0 = &param0->unk_7F8;
+    DualArrayShortData * v0 = &param0->unk_7F8;
 
     switch (v0->unk_305) {
     case 0:
@@ -569,9 +569,9 @@ BOOL sub_02083D1C (UnkStruct_0207F248 * param0)
     return 0;
 }
 
-static void sub_02083E8C (UnkStruct_0207F248 * param0, u8 param1)
+static void sub_02083E8C (GameWindowLayout * param0, u8 param1)
 {
-    UnkStruct_02083D1C * v0;
+    DualArrayShortData * v0;
     s8 v1, v2;
     u8 v3;
 
@@ -591,9 +591,9 @@ static void sub_02083E8C (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-static void sub_02083FDC (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
+static void sub_02083FDC (GameWindowLayout * param0, u8 param1, u8 param2)
 {
-    UnkStruct_02083D1C * v0;
+    DualArrayShortData * v0;
     s16 v1, v2;
 
     v0 = &param0->unk_7F8;
@@ -619,16 +619,16 @@ static void sub_02083FDC (UnkStruct_0207F248 * param0, u8 param1, u8 param2)
     sub_0200D494(param0->unk_5B0[0 + v0->unk_300[param1]], v1, v2);
 }
 
-static void sub_02084134 (UnkStruct_0207F248 * param0)
+static void sub_02084134 (GameWindowLayout * param0)
 {
-    UnkStruct_020831B4 * v0;
-    UnkStruct_02083D1C * v1;
+    StrBufWrapper * v0;
+    DualArrayShortData * v1;
     CellActorData * v2;
     s16 v3;
 
     v1 = &param0->unk_7F8;
 
-    v0 = Heap_AllocFromHeap(12, sizeof(UnkStruct_020831B4));
+    v0 = Heap_AllocFromHeap(12, sizeof(StrBufWrapper));
     *v0 = param0->unk_704[v1->unk_300[0]];
 
     param0->unk_704[v1->unk_300[0]] = param0->unk_704[v1->unk_300[1]];
@@ -686,9 +686,9 @@ static void sub_02084134 (UnkStruct_0207F248 * param0)
     sub_02083104(param0, v1->unk_300[1]);
 }
 
-static void sub_02084420 (UnkStruct_0207F248 * param0, u8 param1)
+static void sub_02084420 (GameWindowLayout * param0, u8 param1)
 {
-    UnkStruct_02083D1C * v0;
+    DualArrayShortData * v0;
     const u16 * v1;
     u16 * v2;
     u16 v3;
@@ -711,7 +711,7 @@ static void sub_02084420 (UnkStruct_0207F248 * param0, u8 param1)
     }
 }
 
-static void sub_020844B0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020844B0 (GameWindowLayout * param0, int * param1)
 {
     u8 v0;
 
@@ -759,7 +759,7 @@ static void sub_020844B0 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 24;
 }
 
-int sub_020845A8 (UnkStruct_0207F248 * param0)
+int sub_020845A8 (GameWindowLayout * param0)
 {
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         sub_0200E084(&param0->unk_04[34], 1);
@@ -771,7 +771,7 @@ int sub_020845A8 (UnkStruct_0207F248 * param0)
     return 23;
 }
 
-static void sub_020845E8 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020845E8 (GameWindowLayout * param0, int * param1)
 {
     u8 v0;
 
@@ -803,7 +803,7 @@ static void sub_020845E8 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 1;
 }
 
-static void sub_020846CC (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020846CC (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 0;
 
@@ -813,7 +813,7 @@ static void sub_020846CC (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 32;
 }
 
-static void sub_020846FC (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020846FC (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 0;
 
@@ -823,7 +823,7 @@ static void sub_020846FC (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 32;
 }
 
-static void sub_0208472C (UnkStruct_0207F248 * param0, int * param1)
+static void sub_0208472C (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 1;
 
@@ -833,7 +833,7 @@ static void sub_0208472C (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 32;
 }
 
-static void sub_02084760 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084760 (GameWindowLayout * param0, int * param1)
 {
     sub_0208337C(param0);
     sub_0200E084(&param0->unk_04[33], 1);
@@ -841,7 +841,7 @@ static void sub_02084760 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = sub_02084780(param0);
 }
 
-int sub_02084780 (UnkStruct_0207F248 * param0)
+int sub_02084780 (GameWindowLayout * param0)
 {
     Pokemon * v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11);
 
@@ -861,7 +861,7 @@ int sub_02084780 (UnkStruct_0207F248 * param0)
     return 24;
 }
 
-static void sub_02084808 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084808 (GameWindowLayout * param0, int * param1)
 {
     UnkFuncPtr_02084808 v0;
     u32 v1;
@@ -904,85 +904,85 @@ static void sub_02084808 (UnkStruct_0207F248 * param0, int * param1)
     *param1 = 24;
 }
 
-static void sub_020848A8 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020848A8 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 11;
     sub_02084808(param0, param1);
 }
 
-static void sub_020848C0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020848C0 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 16;
     sub_02084808(param0, param1);
 }
 
-static void sub_020848D8 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020848D8 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 14;
     sub_02084808(param0, param1);
 }
 
-static void sub_020848F0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020848F0 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 13;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084908 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084908 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 15;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084920 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084920 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 18;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084938 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084938 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 12;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084950 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084950 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 17;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084968 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084968 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 19;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084980 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084980 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 20;
     sub_02084808(param0, param1);
 }
 
-static void sub_02084998 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_02084998 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 21;
     sub_02084808(param0, param1);
 }
 
-static void sub_020849B0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020849B0 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 22;
     sub_02084808(param0, param1);
 }
 
-static void sub_020849C8 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020849C8 (GameWindowLayout * param0, int * param1)
 {
     param0->unk_5A4->unk_23 = 23;
     sub_02084808(param0, param1);
 }
 
-static void sub_020849E0 (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020849E0 (GameWindowLayout * param0, int * param1)
 {
     *param1 = sub_02084A18(param0);
 
@@ -991,7 +991,7 @@ static void sub_020849E0 (UnkStruct_0207F248 * param0, int * param1)
     }
 }
 
-static void sub_020849FC (UnkStruct_0207F248 * param0, int * param1)
+static void sub_020849FC (GameWindowLayout * param0, int * param1)
 {
     *param1 = sub_02084A18(param0);
 
@@ -1000,7 +1000,7 @@ static void sub_020849FC (UnkStruct_0207F248 * param0, int * param1)
     }
 }
 
-static int sub_02084A18 (UnkStruct_0207F248 * param0)
+static int sub_02084A18 (GameWindowLayout * param0)
 {
     sub_0200E084(&param0->unk_04[33], 1);
     sub_0208337C(param0);
@@ -1030,7 +1030,7 @@ static int sub_02084A18 (UnkStruct_0207F248 * param0)
     }
 }
 
-int sub_02084B34 (UnkStruct_0207F248 * param0)
+int sub_02084B34 (GameWindowLayout * param0)
 {
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         sub_0200E084(&param0->unk_04[34], 1);
diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c
index a469d58cae..a810c9bc40 100644
--- a/src/unk_02084B70.c
+++ b/src/unk_02084B70.c
@@ -39,12 +39,12 @@ 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(UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2);
+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(UnkStruct_0207F248 * 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);
@@ -219,7 +219,7 @@ static u8 sub_02084B70 (u16 param0)
     return 28;
 }
 
-static void sub_02084E58 (UnkStruct_0207F248 * param0, u16 param1, u32 param2)
+static void sub_02084E58 (GameWindowLayout * param0, u16 param1, u32 param2)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -355,7 +355,7 @@ static void sub_02084E58 (UnkStruct_0207F248 * param0, u16 param1, u32 param2)
     }
 }
 
-void sub_020852B8 (UnkStruct_0207F248 * param0)
+void sub_020852B8 (GameWindowLayout * param0)
 {
     switch (sub_02084B70(param0->unk_5A4->unk_24)) {
     case 0:
@@ -401,7 +401,7 @@ void sub_020852B8 (UnkStruct_0207F248 * param0)
 
 int sub_02085348 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = (UnkStruct_0207F248 *)param0;
+    GameWindowLayout * v0 = (GameWindowLayout *)param0;
 
     if (Message_Printing(v0->unk_B10) != 0) {
         return 5;
@@ -417,7 +417,7 @@ int sub_02085348 (void * param0)
 
 static int sub_02085384 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = (UnkStruct_0207F248 *)param0;
+    GameWindowLayout * v0 = (GameWindowLayout *)param0;
 
     sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
     sub_0207EF14(v0, v0->unk_B11);
@@ -435,11 +435,11 @@ static int sub_02085384 (void * param0)
 
 static int sub_02085424 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Pokemon * v1;
     u8 v2[7];
 
-    v0 = (UnkStruct_0207F248 *)param0;
+    v0 = (GameWindowLayout *)param0;
     v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
 
     v2[0] = Pokemon_GetValue(v1, MON_DATA_HP_EV, NULL);
@@ -474,13 +474,13 @@ static int sub_02085424 (void * param0)
 
 static int sub_020855C4 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Pokemon * v1;
     Strbuf* v2;
     u32 v3;
     u32 v4;
 
-    v0 = (UnkStruct_0207F248 *)param0;
+    v0 = (GameWindowLayout *)param0;
 
     sub_02096F14(v0->unk_5A4->unk_00, v0->unk_5A4->unk_24, v0->unk_B11, 0, sub_02086930(v0), 12);
 
@@ -517,7 +517,7 @@ static int sub_020855C4 (void * param0)
 
 static int sub_02085704 (void * param0)
 {
-    UnkStruct_0207F248 * v0 = (UnkStruct_0207F248 *)param0;
+    GameWindowLayout * v0 = (GameWindowLayout *)param0;
     Pokemon * v1;
     u32 v2;
 
@@ -550,7 +550,7 @@ BOOL sub_020857A8 (u16 param0)
     return 0;
 }
 
-static u8 sub_020857C0 (UnkStruct_0207F248 * param0, u8 param1)
+static u8 sub_020857C0 (GameWindowLayout * param0, u8 param1)
 {
     u8 v0;
 
@@ -567,7 +567,7 @@ static u8 sub_020857C0 (UnkStruct_0207F248 * param0, u8 param1)
     return 0xff;
 }
 
-int sub_02085804 (UnkStruct_0207F248 * param0)
+int sub_02085804 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -658,13 +658,13 @@ int sub_02085804 (UnkStruct_0207F248 * param0)
 
 static int sub_02085A70 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Pokemon * v1;
     Strbuf* v2;
     u32 v3;
     u32 v4;
 
-    v0 = (UnkStruct_0207F248 *)param0;
+    v0 = (GameWindowLayout *)param0;
     v1 = Party_GetPokemonBySlotIndex(v0->unk_5A4->unk_00, v0->unk_B11);
 
     v0->unk_B14[0] = (u16)Pokemon_GetValue(v1, MON_DATA_MAX_HP, NULL);
@@ -711,7 +711,7 @@ static int sub_02085A70 (void * param0)
 
 static int sub_02085C50 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Pokemon * v1;
     Strbuf* v2;
 
@@ -824,7 +824,7 @@ static int sub_02085C50 (void * param0)
     return 5;
 }
 
-int sub_02085EF4 (UnkStruct_0207F248 * param0)
+int sub_02085EF4 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -854,7 +854,7 @@ int sub_02085EF4 (UnkStruct_0207F248 * param0)
 
 static int sub_02085FB4 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -872,7 +872,7 @@ static int sub_02085FB4 (void * param0)
 
 static int sub_02086008 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -891,7 +891,7 @@ static int sub_02086008 (void * param0)
 
 static int sub_02086060 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -909,7 +909,7 @@ static int sub_02086060 (void * param0)
 
 static int sub_020860AC (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -926,7 +926,7 @@ static int sub_020860AC (void * param0)
     return 24;
 }
 
-u8 sub_02086104 (UnkStruct_0207F248 * param0, Pokemon * param1)
+u8 sub_02086104 (GameWindowLayout * param0, Pokemon * param1)
 {
     u16 v0;
     u8 v1;
@@ -954,7 +954,7 @@ u8 sub_02086104 (UnkStruct_0207F248 * param0, Pokemon * param1)
     return v1;
 }
 
-int sub_0208615C (UnkStruct_0207F248 * param0)
+int sub_0208615C (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -1011,7 +1011,7 @@ int sub_0208615C (UnkStruct_0207F248 * param0)
     return 24;
 }
 
-int sub_020862F8 (UnkStruct_0207F248 * param0)
+int sub_020862F8 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -1034,7 +1034,7 @@ int sub_020862F8 (UnkStruct_0207F248 * param0)
     return 24;
 }
 
-int sub_020863A0 (UnkStruct_0207F248 * param0)
+int sub_020863A0 (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -1060,7 +1060,7 @@ int sub_020863A0 (UnkStruct_0207F248 * param0)
 
 static int sub_02086438 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -1078,7 +1078,7 @@ static int sub_02086438 (void * param0)
 
 static int sub_0208648C (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -1097,7 +1097,7 @@ static int sub_0208648C (void * param0)
 
 static int sub_020864E4 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -1115,7 +1115,7 @@ static int sub_020864E4 (void * param0)
 
 static int sub_02086538 (void * param0)
 {
-    UnkStruct_0207F248 * v0;
+    GameWindowLayout * v0;
     Strbuf* v1;
 
     v0 = param0;
@@ -1132,7 +1132,7 @@ static int sub_02086538 (void * param0)
     return 24;
 }
 
-static void sub_02086590 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 param2)
+static void sub_02086590 (GameWindowLayout * param0, Pokemon * param1, u32 param2)
 {
     u32 v0;
 
@@ -1154,7 +1154,7 @@ static void sub_02086590 (UnkStruct_0207F248 * param0, Pokemon * param1, u32 par
     }
 }
 
-static u8 sub_02086614 (UnkStruct_0207F248 * param0, u8 param1)
+static u8 sub_02086614 (GameWindowLayout * param0, u8 param1)
 {
     Pokemon * v0;
     Strbuf* v1;
@@ -1177,7 +1177,7 @@ static u8 sub_02086614 (UnkStruct_0207F248 * param0, u8 param1)
     return 1;
 }
 
-void sub_020866A0 (UnkStruct_0207F248 * param0, u8 param1)
+void sub_020866A0 (GameWindowLayout * param0, u8 param1)
 {
     UnkStruct_02081CF4 v0;
     u8 v1;
@@ -1213,7 +1213,7 @@ void sub_020866A0 (UnkStruct_0207F248 * param0, u8 param1)
     param0->unk_700 = sub_02001B7C(&v0, 8, 0, 0, 12, PAD_BUTTON_B);
 }
 
-int sub_02086774 (UnkStruct_0207F248 * param0)
+int sub_02086774 (GameWindowLayout * param0)
 {
     u32 v0 = sub_02001BE0(param0->unk_700);
 
@@ -1253,7 +1253,7 @@ int sub_02086774 (UnkStruct_0207F248 * param0)
     return 6;
 }
 
-void sub_020868B0 (UnkStruct_0207F248 * param0)
+void sub_020868B0 (GameWindowLayout * param0)
 {
     sub_0200E084(&param0->unk_04[32], 1);
 
@@ -1271,7 +1271,7 @@ void sub_020868B0 (UnkStruct_0207F248 * param0)
     param0->unk_B0E = 25;
 }
 
-static u16 sub_02086930 (UnkStruct_0207F248 * param0)
+static u16 sub_02086930 (GameWindowLayout * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_5A4->unk_1C;
     return (u16)sub_0203A138(v0->unk_1C->unk_00);
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 48a74a4d60..712495eaa2 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -85,7 +85,7 @@ struct UnkStruct_02087A10_t {
     int unk_0C;
     int unk_10;
     int unk_14;
-    UnkStruct_020279FC * unk_18;
+    AnimationControlFlags * unk_18;
     UnkStruct_02087A10_sub1 unk_1C;
     u16 unk_38;
     u16 unk_3A[6][13];
@@ -104,15 +104,15 @@ struct UnkStruct_02087A10_t {
     Strbuf* unk_17C;
     Strbuf* unk_180;
     Strbuf* unk_184;
-    UnkStruct_020218BC * unk_188;
+    GraphicElementManager * unk_188;
     UnkStruct_0200C738 unk_18C;
     UnkStruct_02009714 * unk_318[4];
     UnkStruct_02009DC8 * unk_328[2][4];
     UnkStruct_ov19_021DA864 unk_348;
     UnkStruct_ov19_021DA864 unk_36C;
-    UnkStruct_02022550 * unk_390[14];
-    UnkStruct_02022550 * unk_3C8[12];
-    UnkStruct_02022550 * unk_3F8[2];
+    GraphicElementData * unk_390[14];
+    GraphicElementData * unk_3C8[12];
+    GraphicElementData * unk_3F8[2];
     SysTask * unk_400[7];
     Window unk_41C[10];
     int unk_4BC;
@@ -138,14 +138,14 @@ struct UnkStruct_02087A10_t {
 };
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
-    UnkStruct_02022550 * unk_04;
+    GraphicElementData * unk_00;
+    GraphicElementData * unk_04;
     int unk_08;
     int unk_0C;
 } UnkStruct_020879DC;
 
 typedef struct {
-    UnkStruct_02022550 * unk_00;
+    GraphicElementData * unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;
@@ -170,7 +170,7 @@ static void sub_020871CC(void);
 static void sub_020871EC(BGL * param0);
 static void sub_0208765C(BGL * param0, Window * param1);
 static void sub_0208769C(UnkStruct_02087A10 * param0, NARC * param1);
-static void sub_02087D64(BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], UnkStruct_02022550 ** param6, void * param7);
+static void sub_02087D64(BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], GraphicElementData ** param6, void * param7);
 static void sub_0208737C(UnkStruct_02087A10 * param0, UnkStruct_020067E8 * param1);
 static void sub_02088240(BGL * param0, int param1, VecFx32 param2[]);
 static void sub_02088260(VecFx32 param0[], int param1);
@@ -187,11 +187,11 @@ static void sub_02088754(Window * param0, u16 * param1, int param2, u16 * param3
 static int sub_02088898(UnkStruct_02087A10 * param0, u16 param1, int param2);
 static int sub_02088D08(int param0, int param1, int param2, int param3, u16 * param4, int param5);
 static int sub_02088C9C(int param0, int param1, u16 * param2, int param3);
-static void sub_02088E1C(UnkStruct_02022550 ** param0, int param1, int param2);
+static void sub_02088E1C(GraphicElementData ** param0, int param1, int param2);
 static void sub_020871B0(UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1);
 static void sub_02088E58(Window * param0, u16 param1, int param2, u32 param3, u8 * param4);
 static void sub_02088454(UnkStruct_02087A10 * param0, int param1);
-static void sub_02088F40(int param0[], UnkStruct_02022550 ** param1, int param2);
+static void sub_02088F40(int param0[], GraphicElementData ** param1, int param2);
 static void sub_020879DC(SysTask * param0, void * param1);
 static void sub_02087CDC(SysTask * param0, void * param1);
 static void sub_02086B30(NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3);
@@ -1210,7 +1210,7 @@ static int sub_02086F3C (UnkStruct_020067E8 * param0, int * param1)
     return 1;
 }
 
-UnkStruct_0208737C * sub_0208712C (int param0, int param1, int param2, int param3, UnkStruct_020279FC * param4)
+UnkStruct_0208737C * sub_0208712C (int param0, int param1, int param2, int param3, AnimationControlFlags * param4)
 {
     UnkStruct_0208737C * v0;
 
@@ -1752,7 +1752,7 @@ static void sub_02087CDC (SysTask * param0, void * param1)
     v0->unk_04++;
 }
 
-static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], UnkStruct_02022550 ** param6, void * param7)
+static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], GraphicElementData ** param6, void * param7)
 {
     int v0 = *param4;
     int v1 = v0 ^ 1;
@@ -2443,7 +2443,7 @@ static int sub_02088D08 (int param0, int param1, int param2, int param3, u16 * p
     return 0;
 }
 
-static void sub_02088E1C (UnkStruct_02022550 ** param0, int param1, int param2)
+static void sub_02088E1C (GraphicElementData ** param0, int param1, int param2)
 {
     int v0;
 
@@ -2488,7 +2488,7 @@ static void sub_02088E58 (Window * param0, u16 param1, int param2, u32 param3, u
     sub_0201A954(param0);
 }
 
-static void sub_02088F40 (int param0[], UnkStruct_02022550 ** param1, int param2)
+static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2)
 {
     int v0, v1;
 
diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c
index 6774131b99..5c74a9970d 100644
--- a/src/unk_020890F4.c
+++ b/src/unk_020890F4.c
@@ -159,7 +159,7 @@ static int sub_0208927C (UnkStruct_020067E8 * param0, int * param1)
     return 1;
 }
 
-UnkStruct_02089438 * sub_020893B4 (int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5)
+UnkStruct_02089438 * sub_020893B4 (int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5)
 {
     int v0;
     UnkStruct_02089438 * v1 = NULL;
@@ -181,7 +181,7 @@ UnkStruct_02089438 * sub_020893B4 (int param0, int param1, int param2[], UnkStru
     return v1;
 }
 
-UnkStruct_02089438 * sub_02089400 (int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5)
+UnkStruct_02089438 * sub_02089400 (int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5)
 {
     UnkStruct_02089438 * v0 = sub_020893B4(param0, param1, param2, param3, param4, param5);
 
@@ -190,7 +190,7 @@ UnkStruct_02089438 * sub_02089400 (int param0, int param1, int param2[], UnkStru
     return v0;
 }
 
-UnkStruct_02089438 * sub_0208941C (int param0, int param1, int param2[], UnkStruct_020279FC * param3, u32 param4, u32 param5, u32 param6, u32 param7)
+UnkStruct_02089438 * sub_0208941C (int param0, int param1, int param2[], AnimationControlFlags * param3, u32 param4, u32 param5, u32 param6, u32 param7)
 {
     UnkStruct_02089438 * v0 = sub_020893B4(param0, param1, param2, param3, param4, param5);
 
diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c
index ded4b85c98..1209f3aa1c 100644
--- a/src/unk_0208A3F4.c
+++ b/src/unk_0208A3F4.c
@@ -70,8 +70,8 @@ void sub_0208A490 (UnkStruct_02089688 * param0)
 {
     NARC * v0;
     BGL * v1;
-    UnkStruct_0200C6E4 * v2;
-    UnkStruct_0200C704 * v3;
+    CellTransferStateData * v2;
+    AnimationResourceCollection * v3;
     PaletteSys * v4;
 
     v2 = param0->unk_2C0.unk_04;
@@ -303,8 +303,8 @@ asm void sub_0208A758 (UnkStruct_02089688 * param0)
 void sub_0208A8A0 (UnkStruct_02089688 * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
 
     v1 = param0->unk_2C0.unk_04;
@@ -359,8 +359,8 @@ void sub_0208A8A0 (UnkStruct_02089688 * param0)
 void sub_0208A9BC (UnkStruct_02089688 * param0)
 {
     UnkStruct_ov104_0223F9E0 v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
 
     v1 = param0->unk_2C0.unk_04;
diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c
index 4d220a08e2..c9382c89a6 100644
--- a/src/unk_0208B284.c
+++ b/src/unk_0208B284.c
@@ -25,7 +25,7 @@ typedef struct {
 
 static BOOL sub_0208B2DC(s16 param0, s16 param1, f32 param2, f32 param3, f32 * param4, f32 * param5, f32 param6, s16 param7);
 static void sub_0208B3D4(SysTask * param0, void * param1);
-UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, PaletteSys * param3);
+UnkStruct_0208B878 * sub_0208B284(UnkStruct_0208B284 param0, CellTransferStateData * param1, AnimationResourceCollection * param2, PaletteSys * param3);
 void sub_0208B6B0(UnkStruct_0208B878 * param0, int param1);
 void sub_0208B7B4(UnkStruct_0208B878 * param0);
 void sub_0208B830(UnkStruct_0208B878 * param0);
@@ -41,7 +41,7 @@ static const int Unk_020F2FB0[] = {
     97, 98, 99, 100, 101, 128, 133,
 };
 
-UnkStruct_0208B878 * sub_0208B284 (UnkStruct_0208B284 param0, UnkStruct_0200C6E4 * param1, UnkStruct_0200C704 * param2, PaletteSys * param3)
+UnkStruct_0208B878 * sub_0208B284 (UnkStruct_0208B284 param0, CellTransferStateData * param1, AnimationResourceCollection * param2, PaletteSys * param3)
 {
     UnkStruct_0208B878 * v0;
 
@@ -174,8 +174,8 @@ static void sub_0208B3D4 (SysTask * param0, void * param1)
 void sub_0208B63C (UnkStruct_0208B878 * param0, int param1)
 {
     NARC * v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
 
     v1 = param0->unk_00.unk_04;
@@ -192,8 +192,8 @@ void sub_0208B63C (UnkStruct_0208B878 * param0, int param1)
 void sub_0208B6B0 (UnkStruct_0208B878 * param0, int param1)
 {
     NARC * v0;
-    UnkStruct_0200C6E4 * v1;
-    UnkStruct_0200C704 * v2;
+    CellTransferStateData * v1;
+    AnimationResourceCollection * v2;
     PaletteSys * v3;
     int v4 = 22222 + param0->unk_10.unk_08;
 
@@ -228,8 +228,8 @@ void sub_0208B7B4 (UnkStruct_0208B878 * param0)
 {
     int v0;
     UnkStruct_ov104_0223F9E0 v1;
-    UnkStruct_0200C6E4 * v2;
-    UnkStruct_0200C704 * v3;
+    CellTransferStateData * v2;
+    AnimationResourceCollection * v3;
     PaletteSys * v4;
 
     v2 = param0->unk_00.unk_04;
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index 702dab59d1..67cbb12908 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -26,7 +26,7 @@
 
 static void sub_0208F194(UnkStruct_0208D7BC * param0, u8 param1, u8 param2, u8 param3);
 static void sub_0208EF0C(UnkStruct_0208D7BC * param0);
-static void sub_0208FC30(UnkStruct_02022550 * param0, u32 param1, u32 param2, const s16 * param3);
+static void sub_0208FC30(GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3);
 
 static const UnkStruct_ov7_0224F358 Unk_020F41A8[] = {
     {0x1, 0x80, 0x18, 0x0, 0x0, 0x1, 0x1, NNS_G2D_VRAM_TYPE_2DMAIN, 0x0, 0x0, 0x0, 0x0},
@@ -242,7 +242,7 @@ static u8 sub_0208ECB8 (UnkStruct_0208D7BC * param0)
 
 void sub_0208ECF4 (UnkStruct_0208D7BC * param0)
 {
-    UnkStruct_02022550 ** v0;
+    GraphicElementData ** v0;
     s16 v1, v2;
     s16 v3;
     u16 v4;
@@ -831,7 +831,7 @@ void sub_0208FB54 (UnkStruct_0208D7BC * param0, u8 param1)
     }
 }
 
-static void sub_0208FC30 (UnkStruct_02022550 * param0, u32 param1, u32 param2, const s16 * param3)
+static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3)
 {
     s32 v0, v1;
 
diff --git a/src/unk_02097B18.c b/src/unk_02097B18.c
index c694b06323..7328da6306 100644
--- a/src/unk_02097B18.c
+++ b/src/unk_02097B18.c
@@ -62,7 +62,7 @@ typedef struct {
     UnkStruct_ov76_0223DE00 * unk_00;
     UnkStruct_02097F38_sub1 * unk_04;
     UnkStruct_02097F18 * unk_08;
-    UnkStruct_02098C44 * unk_0C;
+    PartyManagementData * unk_0C;
     SaveData * unk_10;
     int unk_14;
 } UnkStruct_02097F38;
@@ -369,7 +369,7 @@ static BOOL sub_02097F38 (UnkStruct_020508D4 * param0)
     break;
     case 3:
     {
-        UnkStruct_02098C44 * v6 = v0->unk_0C;
+        PartyManagementData * v6 = v0->unk_0C;
 
         v6->unk_00 = v1->unk_1C;
         v6->unk_04 = sub_0207D990(v0->unk_10);
@@ -385,7 +385,7 @@ static BOOL sub_02097F38 (UnkStruct_020508D4 * param0)
     break;
     case 4:
     {
-        UnkStruct_02098C44 * v7 = v0->unk_0C;
+        PartyManagementData * v7 = v0->unk_0C;
         Pokemon * v8;
         UnkStruct_0202CA28 * v9;
         UnkStruct_0202CA64 * v10;
@@ -436,8 +436,8 @@ void sub_020980DC (UnkStruct_020508D4 * param0, SaveData * param1)
     memset(v0->unk_08, 0, sizeof(UnkStruct_02097F18));
     v0->unk_08->unk_24 = sub_02025E44(param1);
     v0->unk_08->unk_28 = param1;
-    v0->unk_0C = Heap_AllocFromHeap(11, sizeof(UnkStruct_02098C44));
-    memset(v0->unk_0C, 0, sizeof(UnkStruct_02098C44));
+    v0->unk_0C = Heap_AllocFromHeap(11, sizeof(PartyManagementData));
+    memset(v0->unk_0C, 0, sizeof(PartyManagementData));
 
     sub_02050944(param0, sub_02097F38, v0);
 }
diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c
index c3e8589465..bf4c331796 100644
--- a/src/unk_020989DC.c
+++ b/src/unk_020989DC.c
@@ -277,7 +277,7 @@ static int sub_02098C2C (UnkStruct_02098BE4 * param0)
 
 static int sub_02098C44 (UnkStruct_02098BE4 * param0)
 {
-    UnkStruct_02098C44 * v0;
+    PartyManagementData * v0;
 
     if (!sub_02098AF8(&param0->unk_14)) {
         return 1;
@@ -289,8 +289,8 @@ static int sub_02098C44 (UnkStruct_02098BE4 * param0)
 
     param0->unk_0C->unk_02 = 0;
 
-    v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02098C44));
-    MI_CpuClear8(v0, sizeof(UnkStruct_02098C44));
+    v0 = Heap_AllocFromHeap(param0->unk_00, 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;
@@ -306,7 +306,7 @@ static int sub_02098C44 (UnkStruct_02098BE4 * param0)
 static int sub_02098CB0 (UnkStruct_02098BE4 * param0)
 {
     u8 v0;
-    UnkStruct_02098C44 * v1;
+    PartyManagementData * v1;
     UnkStruct_02098D38 * v2;
     static const u8 v3[] = {
         4, 7, 8
@@ -316,7 +316,7 @@ static int sub_02098CB0 (UnkStruct_02098BE4 * param0)
         return 2;
     }
 
-    v1 = (UnkStruct_02098C44 *)param0->unk_10;
+    v1 = (PartyManagementData *)param0->unk_10;
     v0 = v1->unk_22;
     param0->unk_08 = v0;
     Heap_FreeToHeap(param0->unk_10);
diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c
index c6e165d250..b68ce8c3b5 100644
--- a/src/unk_02099DFC.c
+++ b/src/unk_02099DFC.c
@@ -46,7 +46,7 @@ typedef struct {
     BGL * unk_14;
     MessageLoader * unk_18;
     Window unk_1C;
-    UnkStruct_02001AF4 * unk_2C;
+    UIControlData * unk_2C;
     SaveData * unk_30;
     void * unk_34;
 } UnkStruct_02099DFC;
diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c
index 88f6214e7f..42e8c3077f 100644
--- a/src/unk_0209A2C4.c
+++ b/src/unk_0209A2C4.c
@@ -44,7 +44,7 @@ typedef struct {
     BGL * unk_18;
     MessageLoader * unk_1C;
     Window unk_20;
-    UnkStruct_02001AF4 * unk_30;
+    UIControlData * unk_30;
     SaveData * unk_34;
     void * unk_38;
     u32 unk_3C;
diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c
index 40837b1ae3..b104e91aaa 100644
--- a/src/unk_0209C194.c
+++ b/src/unk_0209C194.c
@@ -30,7 +30,7 @@ typedef struct {
     UnkStruct_0209C194_1 unk_08;
     UnkStruct_0209C194 * unk_28;
     UnkStruct_0203CDB0 * unk_2C;
-    UnkStruct_02098C44 * unk_30;
+    PartyManagementData * unk_30;
     UnkStruct_02098D38 * unk_34;
 } UnkStruct_0209C1EC;
 

From 549e023dee42d7a0f80d30f7dc533e783354c28a Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 15:51:34 -0500
Subject: [PATCH 08/12] more functions with human names

---
 include/unk_0207E0B8.h         |   8 +-
 src/overlay010/ov10_0221F800.c |   2 +-
 src/unk_0207E0B8.c             | 228 ++++++++++++++++-----------------
 src/unk_02083370.c             |   4 +-
 4 files changed, 121 insertions(+), 121 deletions(-)

diff --git a/include/unk_0207E0B8.h b/include/unk_0207E0B8.h
index 64562d4ff3..8fe21eb467 100644
--- a/include/unk_0207E0B8.h
+++ b/include/unk_0207E0B8.h
@@ -13,13 +13,13 @@ u8 sub_02080354(GameWindowLayout * param0, u8 param1);
 u8 sub_02080404(GameWindowLayout * param0, u8 param1);
 u8 sub_02080488(GameWindowLayout * param0, u8 param1);
 u8 sub_020805D0(u8 param0, u8 param1);
-u8 sub_02080BCC(u16 param0);
+u8 GetElementIndex(u16 param0);
 u32 sub_02081930(void);
 u32 sub_02081934(void);
 u32 sub_02081938(void);
 u32 sub_0208193C(void);
-void sub_02081940(u32 param0, u16 * param1, u16 * param2, u16 * param3);
-void sub_020819B4(GameWindowLayout * param0);
-void sub_020819CC(GameWindowLayout * param0);
+void LoadScreenDataFromNARC(u32 param0, u16 * param1, u16 * param2, u16 * param3);
+void LoadOverlay118(GameWindowLayout * param0);
+void UnloadOverlay118(GameWindowLayout * param0);
 
 #endif // POKEPLATINUM_UNK_0207E0B8_H
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index f90b99bfbc..4aac029483 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -1944,7 +1944,7 @@ static void ov10_02221A3C (UnkStruct_ov10_0221FB28 * param0)
         Heap_FreeToHeap(v2);
     }
 
-    sub_02081940(param0->unk_00->unk_24, param0->unk_298, param0->unk_358, param0->unk_418);
+    LoadScreenDataFromNARC(param0->unk_00->unk_24, param0->unk_298, param0->unk_358, param0->unk_418);
     NARC_dtor(v0);
 }
 
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 05f72129c2..344ea2b149 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -94,7 +94,7 @@ static int sub_0207E6E4(GameWindowLayout * param0);
 static int sub_0207E708(GameWindowLayout * param0);
 static int sub_0207E714(GameWindowLayout * param0);
 static int sub_0207E750(GameWindowLayout * param0);
-static int sub_02080BF4(GameWindowLayout * param0);
+static int ProcessWindowInput(GameWindowLayout * param0);
 static void sub_0207E898(void * param0);
 static void sub_0207E8C0(void);
 static void sub_0207E918(BGL * param0);
@@ -109,35 +109,35 @@ static void sub_02080500(GameWindowLayout * param0, u8 param1, u8 param2);
 static void sub_0207F9A0(GameWindowLayout * param0);
 static void sub_0207EDC0(GameWindowLayout * param0);
 static int HandleGameWindowEvent(GameWindowLayout * param0);
-static u8 sub_02080B34(GameWindowLayout * param0, int * param1);
+static u8 HandleWindowInputEvent(GameWindowLayout * param0, int * param1);
 static u8 sub_020805E4(GameWindowLayout * param0);
-static void sub_02080A50(GameWindowLayout * param0, u8 param1, u8 param2);
-static int sub_02080AD8(GameWindowLayout * param0);
-static u8 sub_02080FD0(GameWindowLayout * param0);
-static int sub_0208107C(GameWindowLayout * param0);
-static u8 sub_020811F4(GameWindowLayout * param0);
-static int sub_02081224(GameWindowLayout * param0);
-static int sub_02081408(GameWindowLayout * param0, Pokemon * param1, int * param2);
-static int sub_0208150C(GameWindowLayout * param0);
-static int sub_02081594(GameWindowLayout * param0);
-static int sub_020815B8(GameWindowLayout * param0);
+static void UpdateWindowLayout(GameWindowLayout * param0, u8 param1, u8 param2);
+static int GetValidWindowLayout(GameWindowLayout * param0);
+static u8 HandleSpecialInput(GameWindowLayout * param0);
+static int ApplyItemEffectOnPokemon(GameWindowLayout * param0);
+static u8 CheckItemUsageValidity(GameWindowLayout * param0);
+static int ProcessItemApplication(GameWindowLayout * param0);
+static int UpdatePokemonWithItem(GameWindowLayout * param0, Pokemon * param1, int * param2);
+static int HandleMessageCompletion(GameWindowLayout * param0);
+static int FinalizeMessageProcessing(GameWindowLayout * param0);
+static int ProcessPokemonItemSwap(GameWindowLayout * param0);
 static int sub_0207E634(GameWindowLayout * param0);
-static int sub_0208170C(GameWindowLayout * param0);
-static int sub_02081760(GameWindowLayout * param0);
+static int ResetWindowOnInput(GameWindowLayout * param0);
+static int UpdatePokemonFormWithItem(GameWindowLayout * param0);
 static void sub_0207F094(GameWindowLayout * param0, Pokemon * param1, u8 param2);
 static u32 sub_0207F134(Pokemon * param0, u8 param1);
 static void sub_0207FE1C(GameWindowLayout * param0);
-static void sub_02080AB8(u8 param0, s16 * param1, s16 * param2);
-static int sub_0208188C(GameWindowLayout * param0);
-static u8 sub_020808CC(GameWindowLayout * param0);
-static u8 sub_02080968(GameWindowLayout * param0);
-static u8 sub_020809DC(GameWindowLayout * param0);
-static BOOL sub_020818F8(GameWindowLayout * param0);
+static void CalculateWindowPosition(u8 param0, s16 * param1, s16 * param2);
+static int CheckForItemApplication(GameWindowLayout * param0);
+static u8 CheckDuplicateValues(GameWindowLayout * param0);
+static u8 CheckUniqueValues(GameWindowLayout * param0);
+static u8 CheckEqualityInArray(GameWindowLayout * param0);
+static BOOL ValidateGameWindowState(GameWindowLayout * param0);
 static GenericPointerData * sub_0207EAD4(int param0);
 static void sub_0207EAF4(void);
 static void sub_0207EB64(GenericPointerData * param0);
-static int sub_0208153C(GameWindowLayout * param0);
-static int sub_02081578(GameWindowLayout * param0);
+static int ProcessMessageResult(GameWindowLayout * param0);
+static int HandleOverlayCompletion(GameWindowLayout * param0);
 static void sub_0207F388(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
 static void sub_0207F4AC(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
 static void sub_0207F5A0(GameWindowLayout * param0, const UnkStruct_020F1DF8 * param1);
@@ -159,8 +159,8 @@ static u8 sub_020801AC(GameWindowLayout * param0, u8 * param1);
 static u8 sub_020801B8(GameWindowLayout * param0, u8 * param1);
 u8 sub_02080404(GameWindowLayout * param0, u8 param1);
 u8 sub_02080488(GameWindowLayout * param0, u8 param1);
-static u8 sub_02080ECC(GameWindowLayout * param0);
-static BOOL sub_02080F3C(GameWindowLayout * param0, u8 param1, s8 param2);
+static u8 CheckPokemonCondition(GameWindowLayout * param0);
+static BOOL UpdatePokemonStatus(GameWindowLayout * param0, u8 param1, s8 param2);
 
 const UnkStruct_0208BE5C Unk_020F1E88 = {
     sub_0207E0B8,
@@ -315,7 +315,7 @@ static int sub_0207E0B8 (UnkStruct_020067E8 * param0, int * param1)
     sub_02081BC0(v0);
     sub_0207F9A0(v0);
 
-    if (sub_020818F8(v0) == 0) {
+    if (ValidateGameWindowState(v0) == 0) {
         GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0, 0);
     }
 
@@ -338,7 +338,7 @@ static int sub_0207E2A8 (UnkStruct_020067E8 * param0, int * param1)
         *param1 = sub_0207E518(v0);
         break;
     case 2:
-        if (sub_02080B34(v0, param1) == 1) {
+        if (HandleWindowInputEvent(v0, param1) == 1) {
             *param1 = 1;
         }
         break;
@@ -361,28 +361,28 @@ static int sub_0207E2A8 (UnkStruct_020067E8 * param0, int * param1)
         *param1 = sub_0207E5F4(v0);
         break;
     case 9:
-        *param1 = sub_02081594(v0);
+        *param1 = FinalizeMessageProcessing(v0);
         break;
     case 10:
-        *param1 = sub_020815B8(v0);
+        *param1 = ProcessPokemonItemSwap(v0);
         break;
     case 11:
-        *param1 = sub_0208150C(v0);
+        *param1 = HandleMessageCompletion(v0);
         break;
     case 12:
-        *param1 = sub_0208153C(v0);
+        *param1 = ProcessMessageResult(v0);
         break;
     case 13:
-        *param1 = sub_02081578(v0);
+        *param1 = HandleOverlayCompletion(v0);
         break;
     case 14:
-        *param1 = sub_02081760(v0);
+        *param1 = UpdatePokemonFormWithItem(v0);
         break;
     case 15:
         *param1 = sub_0207E634(v0);
         break;
     case 16:
-        *param1 = sub_02081224(v0);
+        *param1 = ProcessItemApplication(v0);
         break;
     case 17:
         *param1 = sub_02083658(v0);
@@ -434,11 +434,11 @@ static int sub_0207E2A8 (UnkStruct_020067E8 * param0, int * param1)
         }
         break;
     case 30:
-        *param1 = sub_02080BF4(v0);
+        *param1 = ProcessWindowInput(v0);
         break;
     case 31:
         if (ov118_021D0DBC(v0) == 1) {
-            sub_020819CC(v0);
+            UnloadOverlay118(v0);
             *param1 = 25;
         } else {
             *param1 = 31;
@@ -506,7 +506,7 @@ static int sub_0207E518 (GameWindowLayout * param0)
             sub_020868B0(param0);
             return 24;
         } else if (param0->unk_5A4->unk_20 == 19) {
-            return sub_0208188C(param0);
+            return CheckForItemApplication(param0);
         } else {
             return 2;
         }
@@ -530,11 +530,11 @@ static int sub_0207E518 (GameWindowLayout * param0)
 
 static int sub_0207E5B4 (GameWindowLayout * param0)
 {
-    u8 v0 = sub_02080FD0(param0);
+    u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
         sub_0200D414(param0->unk_5B0[6], 1);
-        return sub_0208107C(param0);
+        return ApplyItemEffectOnPokemon(param0);
     } else if (v0 == 3) {
         param0->unk_5A4->unk_23 = 0;
         return 32;
@@ -545,11 +545,11 @@ static int sub_0207E5B4 (GameWindowLayout * param0)
 
 static int sub_0207E5F4 (GameWindowLayout * param0)
 {
-    u8 v0 = sub_02080FD0(param0);
+    u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
         sub_0200D414(param0->unk_5B0[6], 1);
-        return sub_02081224(param0);
+        return ProcessItemApplication(param0);
     } else if (v0 == 3) {
         param0->unk_5A4->unk_23 = 0;
         return 32;
@@ -628,7 +628,7 @@ static int sub_0207E714 (GameWindowLayout * param0)
 
 static int sub_0207E750 (GameWindowLayout * param0)
 {
-    u8 v0 = sub_02080FD0(param0);
+    u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
         sub_0200D414(param0->unk_5B0[6], 1);
@@ -946,7 +946,7 @@ static void sub_0207EB6C (GameWindowLayout * param0, NARC * param1)
     sub_020070E8(param1, 12, param0->unk_00, 5, 0, 0, 0, 12);
     sub_0200710C(param1, 14, param0->unk_00, 5, 0, 0, 0, 12);
     sub_02007130(param1, 13, 4, 0, 0x20, 12);
-    sub_02081940(12, param0->unk_264, param0->unk_324, param0->unk_3E4);
+    LoadScreenDataFromNARC(12, param0->unk_264, param0->unk_324, param0->unk_3E4);
     sub_0201975C(0, 0);
     sub_0201975C(4, 0);
 }
@@ -1233,7 +1233,7 @@ static void sub_0207F388 (GameWindowLayout * param0, const UnkStruct_020F1DF8 *
             sub_02083104(param0, v0);
             sub_020830D4(param0, v0);
             sub_02083014(param0, v0, param0->unk_704[v0].unk_0E_0);
-            sub_02080A50(param0, v0, 0);
+            UpdateWindowLayout(param0, v0, 0);
         } else {
             sub_0207F884(param0, v0, param1[v0].unk_00, param1[v0].unk_02);
         }
@@ -1260,7 +1260,7 @@ static void sub_0207F4AC (GameWindowLayout * param0, const UnkStruct_020F1DF8 *
             sub_02083104(param0, v0);
             sub_020830D4(param0, v0);
             sub_02083014(param0, v0, param0->unk_704[v0].unk_0E_0);
-            sub_02080A50(param0, v0, 0);
+            UpdateWindowLayout(param0, v0, 0);
         } else {
             sub_0207F884(param0, v0, param1[v0].unk_00, param1[v0].unk_02);
         }
@@ -1287,7 +1287,7 @@ static void sub_0207F5A0 (GameWindowLayout * param0, const UnkStruct_020F1DF8 *
             sub_02083104(param0, v0);
             sub_020830D4(param0, v0);
             sub_02083014(param0, v0, param0->unk_704[v0].unk_0E_0);
-            sub_02080A50(param0, v0, 0);
+            UpdateWindowLayout(param0, v0, 0);
         } else {
             sub_0207F884(param0, v0, param1[v0].unk_00, param1[v0].unk_02);
         }
@@ -1314,7 +1314,7 @@ static void sub_0207F694 (GameWindowLayout * param0, const UnkStruct_020F1DF8 *
             sub_02083104(param0, v0);
             sub_020830D4(param0, v0);
             sub_02083014(param0, v0, param0->unk_704[v0].unk_0E_0);
-            sub_02080A50(param0, v0, 0);
+            UpdateWindowLayout(param0, v0, 0);
         } else {
             sub_0207F884(param0, v0, param1[v0].unk_00, param1[v0].unk_02);
         }
@@ -1342,7 +1342,7 @@ static void sub_0207F788 (GameWindowLayout * param0, const UnkStruct_020F1DF8 *
             sub_02083104(param0, v0);
             sub_020830D4(param0, v0);
             sub_02083014(param0, v0, param0->unk_704[v0].unk_0E_0);
-            sub_02080A50(param0, v0, 0);
+            UpdateWindowLayout(param0, v0, 0);
         } else {
             sub_0207F884(param0, v0, param1[v0].unk_00, param1[v0].unk_02);
         }
@@ -1486,7 +1486,7 @@ static u8 sub_0207FA24 (GameWindowLayout * param0)
             Sound_PlayEffect(1500);
 
             if (v4 < 6) {
-                sub_02080A50(param0, v4, 0);
+                UpdateWindowLayout(param0, v4, 0);
                 sub_0201C3C0(param0->unk_00, 4);
             }
 
@@ -1543,7 +1543,7 @@ static u8 sub_0207FC30 (GameWindowLayout * param0, u8 * param1, u8 * param2, con
 
 static u8 sub_0207FC94 (GameWindowLayout * param0)
 {
-    int v0 = sub_02080AD8(param0);
+    int v0 = GetValidWindowLayout(param0);
 
     if (v0 != 0xffffffff) {
         u8 v1, v2;
@@ -1556,7 +1556,7 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
         sub_02080500(param0, param0->unk_B11, 1);
 
         if (v3 < 6) {
-            sub_02080A50(param0, v3, 0);
+            UpdateWindowLayout(param0, v3, 0);
         }
 
         sub_0201E028(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, 4);
@@ -1600,7 +1600,7 @@ void sub_0207FD68 (GameWindowLayout * param0, u8 param1)
         sub_02080500(param0, param0->unk_B11, 1);
 
         if (v2 < 6) {
-            sub_02080A50(param0, v2, 0);
+            UpdateWindowLayout(param0, v2, 0);
             sub_0201C3C0(param0->unk_00, 4);
         }
     }
@@ -1616,15 +1616,15 @@ static void sub_0207FE1C (GameWindowLayout * param0)
     {
         s16 v0, v1;
 
-        sub_02080AB8(param0->unk_B0D, &v0, &v1);
+        CalculateWindowPosition(param0->unk_B0D, &v0, &v1);
         sub_020832E4(param0, v0, v1);
     }
-        sub_02080A50(param0, param0->unk_B0D, 2);
+        UpdateWindowLayout(param0, param0->unk_B0D, 2);
         sub_0201C3C0(param0->unk_00, 4);
         param0->unk_B0C++;
         break;
     case 2:
-        sub_02080A50(param0, param0->unk_B0D, 1);
+        UpdateWindowLayout(param0, param0->unk_B0D, 1);
         sub_0201C3C0(param0->unk_00, 4);
         param0->unk_B0C = 0;
         break;
@@ -1758,7 +1758,7 @@ static u8 sub_020800B4 (GameWindowLayout * param0, u8 * param1)
                     break;
                 }
 
-                v5 = sub_02080BCC(v1);
+                v5 = GetElementIndex(v1);
 
                 if (v5 != 0xff) {
                     param1[v4] = v5;
@@ -2145,7 +2145,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0)
     }
 
     if (param0->unk_5A4->unk_20 == 17) {
-        switch (sub_020808CC(param0)) {
+        switch (CheckDuplicateValues(param0)) {
         case 0:
             break;
         case 1:
@@ -2162,7 +2162,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0)
     }
 
     if (param0->unk_5A4->unk_20 == 22) {
-        switch (sub_02080968(param0)) {
+        switch (CheckUniqueValues(param0)) {
         case 0:
             break;
         case 1:
@@ -2174,7 +2174,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0)
     }
 
     if (param0->unk_5A4->unk_20 == 23) {
-        switch (sub_020809DC(param0)) {
+        switch (CheckEqualityInArray(param0)) {
         case 0:
             break;
         case 1:
@@ -2190,7 +2190,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0)
     return 32;
 }
 
-static u8 sub_020808CC (GameWindowLayout * param0)
+static u8 CheckDuplicateValues (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2217,7 +2217,7 @@ static u8 sub_020808CC (GameWindowLayout * param0)
     return 0;
 }
 
-static u8 sub_02080968 (GameWindowLayout * param0)
+static u8 CheckUniqueValues (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2240,7 +2240,7 @@ static u8 sub_02080968 (GameWindowLayout * param0)
     return 0;
 }
 
-static u8 sub_020809DC (GameWindowLayout * param0)
+static u8 CheckEqualityInArray (GameWindowLayout * param0)
 {
     u8 v0, v1;
 
@@ -2282,7 +2282,7 @@ static const UnkUnion_02022594 Unk_020F1C94[] = {
     {0xFF, 0x0, 0x0, 0x0}
 };
 
-static void sub_02080A50 (GameWindowLayout * param0, u8 param1, u8 param2)
+static void UpdateWindowLayout (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     u16 * v0;
     u16 v1;
@@ -2301,17 +2301,17 @@ static void sub_02080A50 (GameWindowLayout * param0, u8 param1, u8 param2)
     }
 }
 
-static void sub_02080AB8 (u8 param0, s16 * param1, s16 * param2)
+static void CalculateWindowPosition (u8 param0, s16 * param1, s16 * param2)
 {
     *param1 = Unk_020F1BB8[param0][0] * 8 + ((5 * 8) >> 1);
     *param2 = Unk_020F1BB8[param0][1] * 8 + ((5 * 8) >> 1);
 }
 
-static int sub_02080AD8 (GameWindowLayout * param0)
+static int GetValidWindowLayout (GameWindowLayout * param0)
 {
     int v0;
 
-    if (sub_020818F8(param0) == 0) {
+    if (ValidateGameWindowState(param0) == 0) {
         return 0xffffffff;
     }
 
@@ -2328,7 +2328,7 @@ static int sub_02080AD8 (GameWindowLayout * param0)
     return v0;
 }
 
-static u8 sub_02080B34 (GameWindowLayout * param0, int * param1)
+static u8 HandleWindowInputEvent (GameWindowLayout * param0, int * param1)
 {
     u32 v0 = sub_02001BE0(param0->unk_700);
 
@@ -2359,7 +2359,7 @@ static u8 sub_02080B34 (GameWindowLayout * param0, int * param1)
     return 0;
 }
 
-u8 sub_02080BCC (u16 param0)
+u8 GetElementIndex (u16 param0)
 {
     u8 v0;
 
@@ -2372,7 +2372,7 @@ u8 sub_02080BCC (u16 param0)
     return 0xff;
 }
 
-static int sub_02080BF4 (GameWindowLayout * param0)
+static int ProcessWindowInput (GameWindowLayout * param0)
 {
     switch (param0->unk_B14[1]) {
     case 0:
@@ -2382,7 +2382,7 @@ static int sub_02080BF4 (GameWindowLayout * param0)
                 sub_02083B88(param0);
                 return 1;
             } else {
-                switch (sub_02080ECC(param0)) {
+                switch (CheckPokemonCondition(param0)) {
                 case 0:
                     Sound_PlayEffect(1516);
                     sub_0200D414(param0->unk_5B0[6], 1);
@@ -2416,7 +2416,7 @@ static int sub_02080BF4 (GameWindowLayout * param0)
                 sub_02083B88(param0);
                 return 1;
             } else {
-                switch (sub_02080ECC(param0)) {
+                switch (CheckPokemonCondition(param0)) {
                 case 0:
                     Sound_PlayEffect(1516);
                     sub_0200D414(param0->unk_5B0[6], 1);
@@ -2448,14 +2448,14 @@ static int sub_02080BF4 (GameWindowLayout * param0)
         }
         break;
     case 2:
-        if (sub_02080F3C(param0, param0->unk_B0F_0, -1) == 1) {
+        if (UpdatePokemonStatus(param0, param0->unk_B0F_0, -1) == 1) {
             Sound_PlayEffect(1516);
             param0->unk_B14[1] = 3;
             param0->unk_B14[2] = 0;
         }
         break;
     case 3:
-        if (sub_02080F3C(param0, param0->unk_B11, 1) == 1) {
+        if (UpdatePokemonStatus(param0, param0->unk_B11, 1) == 1) {
             Pokemon * v0;
             Strbuf* v1;
             void * v2;
@@ -2492,7 +2492,7 @@ static int sub_02080BF4 (GameWindowLayout * param0)
     return 30;
 }
 
-static u8 sub_02080ECC (GameWindowLayout * param0)
+static u8 CheckPokemonCondition (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_10 != 0) {
         return 2;
@@ -2511,30 +2511,30 @@ static u8 sub_02080ECC (GameWindowLayout * param0)
     return 0;
 }
 
-static BOOL sub_02080F3C (GameWindowLayout * param0, u8 param1, s8 param2)
+static BOOL UpdatePokemonStatus (GameWindowLayout * param0, u8 slot, s8 param2)
 {
-    param0->unk_704[param1].unk_06 += param2;
+    param0->unk_704[slot].unk_06 += param2;
     param0->unk_B14[2]++;
 
-    sub_02082098(param0, param1);
-    BGL_FillWindow(&param0->unk_04[3 + param1 * 5], 0);
-    sub_02082058(param0, param1);
-    sub_02082104(param0, param1);
+    sub_02082098(param0, slot);
+    BGL_FillWindow(&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[param1].unk_06 == param0->unk_704[param1].unk_08)) {
-        Pokemon * v0;
-        u32 v1;
+    if ((param0->unk_B14[0] == param0->unk_B14[2]) || (param0->unk_704[slot].unk_06 == param0->unk_704[slot].unk_08)) {
+        Pokemon * mon;
+        u32 v1; 
 
-        v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param1);
-        v1 = param0->unk_704[param1].unk_06;
-        Pokemon_SetValue(v0, 163, &v1); //hm
+        mon = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, slot);
+        v1 = param0->unk_704[slot].unk_06;
+        Pokemon_SetValue(mon, 163, &v1);
         return 1;
     }
 
     return 0;
 }
 
-static u8 sub_02080FD0 (GameWindowLayout * param0)
+static u8 HandleSpecialInput (GameWindowLayout * param0)
 {
     u8 v0;
 
@@ -2578,7 +2578,7 @@ static u8 sub_02080FD0 (GameWindowLayout * param0)
     return v0;
 }
 
-static int sub_0208107C (GameWindowLayout * param0)
+static int ApplyItemEffectOnPokemon (GameWindowLayout * param0)
 {
     ItemData * v0;
 
@@ -2587,7 +2587,7 @@ static int sub_0208107C (GameWindowLayout * param0)
     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;
         Heap_FreeToHeap(v0);
-        sub_020819B4(param0);
+        LoadOverlay118(param0);
         return 31;
     }
 
@@ -2631,7 +2631,7 @@ static int sub_0208107C (GameWindowLayout * param0)
     return 5;
 }
 
-static u8 sub_020811F4 (GameWindowLayout * param0)
+static u8 CheckItemUsageValidity (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_0C == 0) {
         return 0;
@@ -2642,7 +2642,7 @@ static u8 sub_020811F4 (GameWindowLayout * param0)
     return 1;
 }
 
-static int sub_02081224 (GameWindowLayout * param0)
+static int ProcessItemApplication (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Window * v1;
@@ -2671,14 +2671,14 @@ static int sub_02081224 (GameWindowLayout * param0)
     }
 
     if (v2 == -1) {
-        switch (sub_020811F4(param0)) {
+        switch (CheckItemUsageValidity(param0)) {
         case 0:
             if (Item_IsMail(param0->unk_5A4->unk_24) == 1) {
                 param0->unk_5A4->unk_23 = 6;
                 return 32;
             }
 
-            v2 = sub_02081408(param0, v0, &v3);
+            v2 = UpdatePokemonWithItem(param0, v0, &v3);
 
             MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8);
             sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0));
@@ -2706,7 +2706,7 @@ static int sub_02081224 (GameWindowLayout * param0)
     return v2;
 }
 
-static int sub_02081408 (GameWindowLayout * param0, Pokemon * param1, int * param2)
+static int UpdatePokemonWithItem (GameWindowLayout * param0, Pokemon * param1, int * param2)
 {
     u32 v0 = param0->unk_5A4->unk_24;
     UnkStruct_0203CDB0 * v1;
@@ -2733,7 +2733,7 @@ static int sub_02081408 (GameWindowLayout * param0, Pokemon * param1, int * para
     return 11;
 }
 
-static void sub_020814A8 (GameWindowLayout * param0, Pokemon * param1, u32 param2, u32 param3)
+static void SwapPokemonItem (GameWindowLayout * param0, Pokemon * param1, u32 param2, u32 param3)
 {
     sub_0207D570(param0->unk_5A4->unk_04, (u16)param2, 1, 12);
     Pokemon_SetValue(param1, 6, &param3);
@@ -2743,23 +2743,23 @@ static void sub_020814A8 (GameWindowLayout * param0, Pokemon * param1, u32 param
     sub_02083040(param0, param0->unk_B11, param0->unk_704[param0->unk_B11].unk_0C);
 }
 
-static int sub_0208150C (GameWindowLayout * param0)
+static int HandleMessageCompletion (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-            return sub_0208170C(param0);
+            return ResetWindowOnInput(param0);
         }
     }
 
     return 11;
 }
 
-static int sub_0208153C (GameWindowLayout * param0)
+static int ProcessMessageResult (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             sub_0200E084(&param0->unk_04[34], 1);
-            sub_020819B4(param0);
+            LoadOverlay118(param0);
             return 13;
         }
     }
@@ -2767,10 +2767,10 @@ static int sub_0208153C (GameWindowLayout * param0)
     return 12;
 }
 
-static int sub_02081578 (GameWindowLayout * param0)
+static int HandleOverlayCompletion (GameWindowLayout * param0)
 {
     if (ov118_021D0DBC(param0) == 1) {
-        sub_020819CC(param0);
+        UnloadOverlay118(param0);
 
         return 11;
     }
@@ -2778,7 +2778,7 @@ static int sub_02081578 (GameWindowLayout * param0)
     return 13;
 }
 
-static int sub_02081594 (GameWindowLayout * param0)
+static int FinalizeMessageProcessing (GameWindowLayout * param0)
 {
     if (Message_Printing(param0->unk_B10) == 0) {
         sub_020827EC(param0);
@@ -2788,7 +2788,7 @@ static int sub_02081594 (GameWindowLayout * param0)
     return 9;
 }
 
-static int sub_020815B8 (GameWindowLayout * param0)
+static int ProcessPokemonItemSwap (GameWindowLayout * param0)
 {
     int v0, v1;
 
@@ -2804,16 +2804,16 @@ static int sub_020815B8 (GameWindowLayout * param0)
         v3 = &param0->unk_04[34];
         v4 = param0->unk_5A4->unk_24;
         v5 = param0->unk_704[param0->unk_B11].unk_0C;
-        v0 = sub_02081408(param0, v2, &v1);
+        v0 = UpdatePokemonWithItem(param0, v2, &v1);
 
         if (sub_0207D570(param0->unk_5A4->unk_04, (u16)v5, 1, 12) == 0) {
-            sub_020814A8(param0, v2, v4, v5);
+            SwapPokemonItem(param0, v2, v4, v5);
             MessageLoader_GetStrbuf(param0->unk_69C, 83, param0->unk_6A4);
             v0 = 11;
         } else {
             if (Item_IsMail(param0->unk_5A4->unk_24) == 1) {
                 Bag_SubtractItem(param0->unk_5A4->unk_04, (u16)v5, 1, 12);
-                sub_020814A8(param0, v2, v4, v5);
+                SwapPokemonItem(param0, v2, v4, v5);
                 param0->unk_5A4->unk_23 = 6;
                 return 32;
             }
@@ -2835,13 +2835,13 @@ static int sub_020815B8 (GameWindowLayout * param0)
     }
         return v0;
     case 0xfffffffe:
-        return sub_0208170C(param0);
+        return ResetWindowOnInput(param0);
     }
 
     return 10;
 }
 
-static int sub_0208170C (GameWindowLayout * param0)
+static int ResetWindowOnInput (GameWindowLayout * param0)
 {
     if (param0->unk_5A4->unk_20 == 10) {
         sub_0200E084(&param0->unk_04[34], 1);
@@ -2855,7 +2855,7 @@ static int sub_0208170C (GameWindowLayout * param0)
     return 32;
 }
 
-static int sub_02081760 (GameWindowLayout * param0)
+static int UpdatePokemonFormWithItem (GameWindowLayout * param0)
 {
     Pokemon * v0;
     Window * v1;
@@ -2867,7 +2867,7 @@ static int sub_02081760 (GameWindowLayout * param0)
     v1 = &param0->unk_04[34];
     v2 = param0->unk_5A4->unk_24;
     v3 = param0->unk_704[param0->unk_B11].unk_0C;
-    v4 = sub_02081408(param0, v0, &v5);
+    v4 = UpdatePokemonWithItem(param0, v0, &v5);
 
     if ((v3 == 112) && (v4 == 11) && (v5 == 0)) {
         v4 = 12;
@@ -2897,7 +2897,7 @@ static int sub_02081760 (GameWindowLayout * param0)
     return v4;
 }
 
-static int sub_0208188C (GameWindowLayout * param0)
+static int CheckForItemApplication (GameWindowLayout * param0)
 {
     if (param0->unk_704[param0->unk_B11].unk_12 == 0) {
         param0->unk_5A4->unk_23 = 0;
@@ -2912,7 +2912,7 @@ static int sub_0208188C (GameWindowLayout * param0)
     return 24;
 }
 
-static BOOL sub_020818F8 (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)) {
         return 0;
@@ -2941,7 +2941,7 @@ u32 sub_0208193C (void)
     return 18;
 }
 
-void sub_02081940 (u32 param0, u16 * param1, u16 * param2, u16 * param3)
+void LoadScreenDataFromNARC (u32 param0, u16 * param1, u16 * param2, u16 * param3)
 {
     NNSG2dScreenData * v0;
     void * v1;
@@ -2961,13 +2961,13 @@ void sub_02081940 (u32 param0, u16 * param1, u16 * param2, u16 * param3)
     Heap_FreeToHeap(v1);
 }
 
-void sub_020819B4 (GameWindowLayout * param0)
+void LoadOverlay118 (GameWindowLayout * param0)
 {
     Overlay_LoadByID(FS_OVERLAY_ID(overlay118), 2);
     ov118_021D0D80(param0);
 }
 
-void sub_020819CC (GameWindowLayout * param0)
+void UnloadOverlay118 (GameWindowLayout * param0)
 {
     Overlay_UnloadByID(FS_OVERLAY_ID(overlay118));
 }
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index c3f329dc41..b64597bc72 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -234,7 +234,7 @@ int sub_020836A8 (GameWindowLayout * param0)
     if (Message_Printing(param0->unk_B10) == 0) {
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             sub_0200E084(&param0->unk_04[34], 1);
-            sub_020819B4(param0);
+            LoadOverlay118(param0);
             return 19;
         }
     }
@@ -245,7 +245,7 @@ int sub_020836A8 (GameWindowLayout * param0)
 int sub_020836E4 (GameWindowLayout * param0)
 {
     if (ov118_021D0DBC(param0) == 1) {
-        sub_020819CC(param0);
+        UnloadOverlay118(param0);
         return 17;
     }
 

From 947fa0f9f238c9eeccb82114ba36fa2a67130c3a Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 15:59:56 -0500
Subject: [PATCH 09/12] rename chatotcrydata

---
 src/main.c                     | 2 +-
 src/overlay019/ov19_021D0D80.c | 2 +-
 src/overlay088/ov88_0223B140.c | 2 +-
 src/pokemon.c                  | 1 +
 src/unk_02006224.c             | 6 +++---
 src/unk_0202440C.c             | 4 ++--
 src/unk_02046C7C.c             | 2 +-
 src/unk_020482D4.c             | 4 ++--
 src/unk_02051D8C.c             | 4 ++--
 src/unk_020933F8.c             | 4 ++--
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main.c b/src/main.c
index 2060ec0fe7..162cbfb659 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ void NitroMain (void)
     Unk_02101D28.unk_10.unk_00 = -1;
     Unk_02101D28.unk_10.unk_08 = sub_020244AC();
 
-    sub_02003B60(GetChatotCryDataFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
+    sub_02003B60(GetChatotCryFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
     sub_02022844();
 
     if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 05f99c8437..111edd29db 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -332,7 +332,7 @@ int ov19_021D0E58 (UnkStruct_020067E8 * param0, int * param1)
     if (Party_HasSpecies(v0->unk_124, 441) == 0) {
         ChatotCry * v1 = GetChatotCryDataFromSave(v0->unk_11C);
 
-        ResetChatotCryDataStatus(v1);
+        ResetChatotCryStatus(v1);
     }
 
     ov19_021D64A0(v0->unk_114);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 0674c65ae0..aaa5802ce6 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -700,7 +700,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
         }
         break;
     case 14:
-        ov88_0223D140(GetChatotCryDataFromSave(param0->unk_04));
+        ov88_0223D140(GetChatotCryFromSave(param0->unk_04));
         param0->unk_4C++;
         break;
     case 15:
diff --git a/src/pokemon.c b/src/pokemon.c
index fc73eeb6df..cb13265380 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -5,6 +5,7 @@
 
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/narc.h"
 #include "constants/pokemon.h"
 #include "constants/sound.h"
 #include "constants/species.h"
diff --git a/src/unk_02006224.c b/src/unk_02006224.c
index 5d5ce66689..8bb70b8b07 100644
--- a/src/unk_02006224.c
+++ b/src/unk_02006224.c
@@ -49,7 +49,7 @@ BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry)
     u8 * v0 = sub_02003D5C(31);
     u8 * v1 = sub_02003D5C(54);
 
-    if (IsChatotCryDataValid(cry) == 0) {
+    if (IsChatotCryValid(cry) == 0) {
         return 0;
     }
 
@@ -153,7 +153,7 @@ MICResult StopMicSampling (void)
 
 void StoreMicDataInChatotCryStruct (ChatotCry * param0)
 {
-    StoreProcessedAudioInChatotCryData(param0, (const s8 *)sub_02005014());
+    StoreProcessedAudioInChatotCry(param0, (const s8 *)sub_02005014());
     return;
 }
 
@@ -209,7 +209,7 @@ int Sound_Chatter (ChatotCry * param0)
     const s8 * v0;
     s8 v1;
 
-    if (IsChatotCryDataValid(param0) == 0) {
+    if (IsChatotCryValid(param0) == 0) {
         return 0;
     }
 
diff --git a/src/unk_0202440C.c b/src/unk_0202440C.c
index a14501debf..e95464c879 100644
--- a/src/unk_0202440C.c
+++ b/src/unk_0202440C.c
@@ -76,7 +76,7 @@ const SaveTableEntry gSaveTable[] = {
     { SAVE_TABLE_ENTRY_RANDOM_GROUP,          SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)RandomGroup_SaveSize,       (SaveEntryInitFunc)RandomGroup_Init       },
     { SAVE_TABLE_ENTRY_JOURNAL,               SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Journal_SaveSize,           (SaveEntryInitFunc)Journal_Init           },
     { SAVE_TABLE_ENTRY_TRAINER_CARD,          SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)TrainerCard_SaveSize,       (SaveEntryInitFunc)TrainerCard_Init       },
-    { SAVE_TABLE_ENTRY_GAME_RECORDS,          SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GameRecord_SaveSize,        (SaveEntryInitFunc)GameRecord_Init         },
+    { SAVE_TABLE_ENTRY_GAME_RECORDS,          SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)GameRecord_SaveSize,        (SaveEntryInitFunc)GameRecord_Init        },
     { SAVE_TABLE_ENTRY_BALL_SEALS,            SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)BallSeal_SaveSize,          (SaveEntryInitFunc)BallSeal_Init          },
     { SAVE_TABLE_ENTRY_CHATOT,                SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)ChatotCry_SaveSize,         (SaveEntryInitFunc)ChatotCry_Init         },
     { SAVE_TABLE_ENTRY_FRONTIER,              SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Frontier_SaveSize,          (SaveEntryInitFunc)Frontier_Init          },
@@ -93,7 +93,7 @@ const SaveTableEntry gSaveTable[] = {
     { SAVE_TABLE_ENTRY_SENTENCE,              SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Sentence_SaveSize,          (SaveEntryInitFunc)Sentence_Init          },
     { SAVE_TABLE_ENTRY_EMAIL,                 SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)Email_SaveSize,             (SaveEntryInitFunc)Email_Init             },
     { SAVE_TABLE_ENTRY_WIFI_QUESTIONS,        SAVE_BLOCK_ID_NORMAL, (SaveEntrySizeFunc)WiFiQuestion_SaveSize,      (SaveEntryInitFunc)WiFiQuestion_Init      },
-    { SAVE_TABLE_ENTRY_PC_BOXES,              SAVE_BLOCK_ID_BOXES,  (SaveEntrySizeFunc)PCBoxes_SaveSize,          (SaveEntryInitFunc)PCBoxes_Init          },
+    { SAVE_TABLE_ENTRY_PC_BOXES,              SAVE_BLOCK_ID_BOXES,  (SaveEntrySizeFunc)PCBoxes_SaveSize,          (SaveEntryInitFunc)PCBoxes_Init            },
 };
 
 const int gSaveTableSize = NELEMS(gSaveTable);
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index d8a271781a..508d55d300 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -121,7 +121,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0)
     v8.unk_14 = sub_0202A750(param0->unk_34->unk_0C);
     v8.unk_18 = sub_02025E44(param0->unk_34->unk_0C);
     v8.unk_1C = param0->unk_34->unk_0C;
-    v8.unk_20 = GetChatotCryDataFromSave(param0->unk_34->unk_0C);
+    v8.unk_20 = GetChatotCryFromSave(param0->unk_34->unk_0C);
 
     *v2 = sub_02093800(&v8);
 
diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c
index f072e57dde..7ae5992235 100644
--- a/src/unk_020482D4.c
+++ b/src/unk_020482D4.c
@@ -223,7 +223,7 @@ BOOL sub_020484F8 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->unk_34->unk_0C)) == 1) {
+    if (IsChatotCryStructReadyForProcessing(GetChatotCryFromSave(param0->unk_34->unk_0C)) == 1) {
         *v0 = 1;
         return 0;
     }
@@ -253,7 +253,7 @@ BOOL sub_0204855C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048568 (UnkStruct_0203E724 * param0)
 {
-    StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->unk_34->unk_0C));
+    StoreMicDataInChatotCryStruct(GetChatotCryFromSave(param0->unk_34->unk_0C));
     return 1;
 }
 
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index b8840fe990..8d13f25264 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -100,7 +100,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        v1->unk_F0[v0] = AllocateAndInitializeChatotCryData(param0);
+        v1->unk_F0[v0] = AllocateAndInitializeChatotCry(param0);
     }
 
     v1->unk_E0 = sub_0207D3C0(param0);
@@ -247,7 +247,7 @@ void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2
 
 void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2)
 {
-    CopyChatotCryData(param0->unk_F0[param2], param1);
+    CopyChatotCry(param0->unk_F0[param2], param1);
 }
 
 void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index 052f74bd24..b14f954c5a 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -445,10 +445,10 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0)
     }
 
     for (v2 = 0; v2 < 4; v2++) {
-        v0->unk_14C[v2] = AllocateAndInitializeChatotCryData(20);
+        v0->unk_14C[v2] = AllocateAndInitializeChatotCry(20);
     }
 
-    CopyChatotCryData(v0->unk_14C[0], param0->unk_20);
+    CopyChatotCry(v0->unk_14C[0], param0->unk_20);
 
     {
         Pokemon_Copy(param0->unk_08, v0->unk_00.unk_00[0]);

From 00c6525c462e1b70ec419e303d83df4ec3db9d6a Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 16:03:50 -0500
Subject: [PATCH 10/12] doxygen documentation

---
 include/pokemon.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/pokemon.h b/include/pokemon.h
index 1d273a554c..d93616f07a 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -182,16 +182,16 @@ typedef struct BoxPokemon {
  *  Rather than recalculating stats after each battle, they're stored here.
  */
 typedef struct PartyPokemon {
-    u32 status;
-    u8 level;
-    u8 mail;
-    u16 hp;
-    u16 maxHP;
-    u16 attack;
-    u16 defense;
-    u16 speed;
-    u16 spAtk;
-    u16 spDef;
+    u32 status; //!< The pokemons status
+    u8 level; //!< The pokemons level
+    u8 mail; //!< The ID of the mail the pokemon is holding
+    u16 hp; //!< The pokemons current HP
+    u16 maxHP; //!< The pokemons maximum HP
+    u16 attack; //!< The pokemons Attack stat
+    u16 defense; //!< The pokemons Defense stat
+    u16 speed; //!< The pokemons Speed stat
+    u16 spAtk; //!< The pokemons Special Attack stat
+    u16 spDef; //!< The pokemons Special Defense stat
     UnkStruct_0202818C unk_14;
     UnkStruct_0202CA28 unk_4C;
 } PartyPokemon;
@@ -200,8 +200,8 @@ typedef struct PartyPokemon {
  * @brief The main Pokemon data structure
  */
 typedef struct Pokemon {
-    BoxPokemon box; // Contains the pokemons boxed data
-    PartyPokemon party; // Contains the pokemons extra data while it is in the players party
+    BoxPokemon box; //!< Contains the pokemons boxed data
+    PartyPokemon party; //!< Contains the pokemons extra data while it is in the players party
 } Pokemon;
 
 /**

From 98d93b3a5fcb4528af9d0106b31bd7fca3eeecf0 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 16:18:17 -0500
Subject: [PATCH 11/12] update box mon function

ProcessBoxPokemonWithTrainerInfo is now UpdateBoxMonStatusAndTrainerInfo and all params are labeled
---
 include/unk_02092494.h |   2 +-
 src/pokemon.c          |   2 +-
 src/unk_02092494.c     | 121 +++++++++++++++++++++--------------------
 3 files changed, 63 insertions(+), 62 deletions(-)

diff --git a/include/unk_02092494.h b/include/unk_02092494.h
index b6a288d67b..9c2625f2ec 100644
--- a/include/unk_02092494.h
+++ b/include/unk_02092494.h
@@ -8,6 +8,6 @@
 PokemonInfoDisplayStruct * sub_02092494(Pokemon * param0, BOOL param1, int param2);
 void sub_0209282C(PokemonInfoDisplayStruct * param0);
 void sub_0209304C(Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
-void ProcessBoxPokemonWithTrainerInfo(BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4);
+void UpdateBoxMonStatusAndTrainerInfo(BoxPokemon * boxMon, TrainerInfo * trainerInfo, int sel, int metLocation, int heapID);
 
 #endif // POKEPLATINUM_UNK_02092494_H
diff --git a/src/pokemon.c b/src/pokemon.c
index cb13265380..4e867e1ae4 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -4238,7 +4238,7 @@ void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, in
 
 static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
-    ProcessBoxPokemonWithTrainerInfo(boxMon, param1, 0, param3, param5);
+    UpdateBoxMonStatusAndTrainerInfo(boxMon, param1, 0, param3, param5);
     BoxPokemon_SetValue(boxMon, MON_DATA_MET_GAME, &Unk_020E4C40);
     BoxPokemon_SetValue(boxMon, MON_DATA_POKEBALL, &monPokeball);
     BoxPokemon_SetValue(boxMon, MON_DATA_158, &param4);
diff --git a/src/unk_02092494.c b/src/unk_02092494.c
index 615ef63bf7..80f5cff74e 100644
--- a/src/unk_02092494.c
+++ b/src/unk_02092494.c
@@ -718,116 +718,117 @@ static int DeterminePokemonStatus (Pokemon * param0, BOOL param1, int param2)
 
 void sub_0209304C (Pokemon * param0, TrainerInfo * param1, int param2, int param3, int param4)
 {
-    ProcessBoxPokemonWithTrainerInfo(&param0->box, param1, param2, param3, param4);
+    UpdateBoxMonStatusAndTrainerInfo(&param0->box, param1, param2, param3, param4);
 }
 
-void ProcessBoxPokemonWithTrainerInfo (BoxPokemon * param0, TrainerInfo * param1, int param2, int param3, int param4)
+void UpdateBoxMonStatusAndTrainerInfo (BoxPokemon * boxMon, TrainerInfo * trainerInfo, int sel, int metLocation, int heapID)
 {
-    switch (param2) {
+    switch (sel) {
     case 0:
-        if (param3 > (sub_02017070(1, 0))) {
-            param3 = (sub_02017070(2, 2));
+        if (metLocation > (sub_02017070(1, 0))) {
+            metLocation = (sub_02017070(2, 2));
         }
 
-        if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-            ResetBoxPokemonEggStatus(param0, 0);
-            SetMetLocationForBoxPokemon(param0, param3, 1);
-            FinalizeBoxPokemonData(param0);
+        if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) {
+            ResetBoxPokemonEggStatus(boxMon, 0);
+            SetMetLocationForBoxPokemon(boxMon, metLocation, 1);
+            FinalizeBoxPokemonData(boxMon);
         } else {
-            SetMetLocationForBoxPokemon(param0, param3, 0);
-            ResetBoxPokemonEggStatus(param0, 1);
+            SetMetLocationForBoxPokemon(boxMon, metLocation, 0);
+            ResetBoxPokemonEggStatus(boxMon, 1);
         }
 
-        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
+        AssignTrainerInfoToBoxPokemon(boxMon, trainerInfo, heapID);
         break;
     case 1:
-        if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-            ResetBoxPokemonEggStatus(param0, 0);
-            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 1)), 1);
-            FinalizeBoxPokemonData(param0);
+        if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) {
+            ResetBoxPokemonEggStatus(boxMon, 0);
+            SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 1)), 1);
+            FinalizeBoxPokemonData(boxMon);
         } else {
-            ResetBoxPokemonEggStatus(param0, 0);
-            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 1)), 1);
+            ResetBoxPokemonEggStatus(boxMon, 0);
+            SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 1)), 1);
         }
         break;
     case 2:
-        ResetBoxPokemonEggStatus(param0, 0);
-        SetMetLocationForBoxPokemon(param0, (sub_02017070(0, 55)), 1);
-        FinalizeBoxPokemonData(param0);
+        ResetBoxPokemonEggStatus(boxMon, 0);
+        SetMetLocationForBoxPokemon(boxMon, (sub_02017070(0, 55)), 1);
+        FinalizeBoxPokemonData(boxMon);
         break;
     case 3:
-        SetMetLocationForBoxPokemon(param0, param3, 0);
-        ResetBoxPokemonEggStatus(param0, 1);
-        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
+        SetMetLocationForBoxPokemon(boxMon, metLocation, 0);
+        ResetBoxPokemonEggStatus(boxMon, 1);
+        AssignTrainerInfoToBoxPokemon(boxMon, trainerInfo, heapID);
         break;
     case 4:
-        if (sub_0207884C(param0, param1, param4) == 1) {
-            if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-                ResetBoxPokemonEggStatus(param0, 0);
-                SetMetLocationForBoxPokemon(param0, param3, 1);
-                FinalizeBoxPokemonData(param0);
+        if (sub_0207884C(boxMon, trainerInfo, heapID) == 1) {
+            if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) {
+                ResetBoxPokemonEggStatus(boxMon, 0);
+                SetMetLocationForBoxPokemon(boxMon, metLocation, 1);
+                FinalizeBoxPokemonData(boxMon);
             } else {
-                SetMetLocationForBoxPokemon(param0, param3, 0);
-                ResetBoxPokemonEggStatus(param0, 1);
+                SetMetLocationForBoxPokemon(boxMon, metLocation, 0);
+                ResetBoxPokemonEggStatus(boxMon, 1);
             }
         } else {
-            if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
-                ResetBoxPokemonEggStatus(param0, 0);
-                SetMetLocationForBoxPokemon(param0, param3, 1);
-                FinalizeBoxPokemonData(param0);
+            if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) {
+                ResetBoxPokemonEggStatus(boxMon, 0);
+                SetMetLocationForBoxPokemon(boxMon, metLocation, 1);
+                FinalizeBoxPokemonData(boxMon);
             } else {
-                ResetBoxPokemonEggStatus(param0, 0);
-                SetMetLocationForBoxPokemon(param0, param3, 1);
+                ResetBoxPokemonEggStatus(boxMon, 0);
+                SetMetLocationForBoxPokemon(boxMon, metLocation, 1);
             }
         }
 
-        UpdateBoxPokemonAfterCheck(param0);
+        UpdateBoxPokemonAfterCheck(boxMon);
         break;
     case 5:
-        if (BoxPokemon_GetValue(param0, MON_DATA_IS_EGG, NULL) == 0) {
+        if (BoxPokemon_GetValue(boxMon, MON_DATA_IS_EGG, NULL) == 0) {
             (void)0;
         } else {
-            SetMetLocationForBoxPokemon(param0, (sub_02017070(1, 2)), 1);
+            SetMetLocationForBoxPokemon(boxMon, (sub_02017070(1, 2)), 1);
         }
         break;
     case 6:
-        if (param3 > (sub_02017070(1, 0))) {
-            param3 = (sub_02017070(2, 2));
+        if (metLocation > (sub_02017070(1, 0))) {
+            metLocation = (sub_02017070(2, 2));
         }
 
-        if (sub_0207884C(param0, param1, param4) == 0) {
+        if (sub_0207884C(boxMon, trainerInfo, heapID) == 0) {
             {
                 int v0;
 
-                v0 = BoxPokemon_GetValue(param0, MON_DATA_153, NULL);
-                BoxPokemon_SetValue(param0, 152, &v0);
+                v0 = BoxPokemon_GetValue(boxMon, MON_DATA_153, NULL);
+                BoxPokemon_SetValue(boxMon, 152, &v0);
 
-                v0 = BoxPokemon_GetValue(param0, MON_DATA_149, NULL);
-                BoxPokemon_SetValue(param0, 146, &v0);
+                v0 = BoxPokemon_GetValue(boxMon, MON_DATA_149, NULL);
+                BoxPokemon_SetValue(boxMon, 146, &v0);
 
-                v0 = BoxPokemon_GetValue(param0, MON_DATA_150, NULL);
-                BoxPokemon_SetValue(param0, 147, &v0);
+                v0 = BoxPokemon_GetValue(boxMon, MON_DATA_150, NULL);
+                BoxPokemon_SetValue(boxMon, 147, &v0);
 
-                v0 = BoxPokemon_GetValue(param0, MON_DATA_151, NULL);
-                BoxPokemon_SetValue(param0, 148, &v0);
+                v0 = BoxPokemon_GetValue(boxMon, MON_DATA_151, NULL);
+                BoxPokemon_SetValue(boxMon, 148, &v0);
             }
         }
 
-        SetMetLocationForBoxPokemon(param0, param3, 1);
-        AssignTrainerInfoToBoxPokemon(param0, param1, param4);
+        SetMetLocationForBoxPokemon(boxMon, metLocation, 1);
+        AssignTrainerInfoToBoxPokemon(boxMon, trainerInfo, heapID);
         break;
     }
 }
 
-static void AssignTrainerInfoToBoxPokemon (BoxPokemon * param0, TrainerInfo * param1, int param2)
+
+static void AssignTrainerInfoToBoxPokemon (BoxPokemon * boxMon, TrainerInfo * trainerInfo, int heapID)
 {
-    int v0 = TrainerInfo_ID(param1);
-    int v1 = TrainerInfo_Gender(param1);
-    Strbuf* v2 = TrainerInfo_NameNewStrbuf(param1, param2);
+    int v0 = TrainerInfo_ID(trainerInfo);
+    int v1 = TrainerInfo_Gender(trainerInfo);
+    Strbuf* v2 = TrainerInfo_NameNewStrbuf(trainerInfo, heapID);
 
-    BoxPokemon_SetValue(param0, 7, &v0);
-    BoxPokemon_SetValue(param0, 157, &v1);
-    BoxPokemon_SetValue(param0, 145, v2);
+    BoxPokemon_SetValue(boxMon, 7, &v0);
+    BoxPokemon_SetValue(boxMon, 157, &v1);
+    BoxPokemon_SetValue(boxMon, 145, v2);
     Strbuf_Free(v2);
 }
 

From 4ab62fb391e6d79732e38c6cd3f221e9052943e8 Mon Sep 17 00:00:00 2001
From: Jack <schoenjack98@gmail.com>
Date: Fri, 17 Nov 2023 16:32:06 -0500
Subject: [PATCH 12/12] fixing formatting

---
 include/constants/pokemon.h     |  8 ++++----
 include/pokemon.h               | 12 ++++++------
 src/main.c                      |  2 +-
 src/overlay006/ov6_02240C9C.c   |  2 +-
 src/overlay006/ov6_02243258.c   |  2 +-
 src/overlay019/ov19_021D0D80.c  |  2 +-
 src/overlay088/ov88_0223B140.c  |  2 +-
 src/overlay104/ov104_0222DCE0.c |  2 +-
 src/overlay104/ov104_0223B6F4.c |  2 +-
 src/overlay104/ov104_0223BCBC.c |  2 +-
 src/overlay118/ov118_021D0D80.c |  2 +-
 src/pokemon.c                   | 12 ++++++------
 src/unk_02006224.c              |  6 +++---
 src/unk_02046C7C.c              |  2 +-
 src/unk_020482D4.c              |  4 ++--
 src/unk_02051D8C.c              |  4 ++--
 src/unk_020559DC.c              |  2 +-
 src/unk_0208C324.c              |  4 ++--
 src/unk_020933F8.c              |  4 ++--
 19 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 90c256e25a..66b43011b6 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -38,7 +38,7 @@ enum PokemonDataParam {
     MON_DATA_3,
     MON_DATA_4,
     MON_DATA_SPECIES,
-    MON_DATA_HELD_ITEM, // 6
+    MON_DATA_HELD_ITEM,
     MON_DATA_OT_ID,
     MON_DATA_EXP,
     MON_DATA_FRIENDSHIP,
@@ -192,10 +192,10 @@ enum PokemonDataParam {
     MON_DATA_OT_GENDER,
     MON_DATA_158,
     MON_DATA_159,
-    MON_DATA_STATUS_CONDITION, // 160
+    MON_DATA_STATUS_CONDITION,
     MON_DATA_LEVEL,
     MON_DATA_162,
-    MON_DATA_CURRENT_HP, //163
+    MON_DATA_CURRENT_HP,
     MON_DATA_MAX_HP,
     MON_DATA_ATK,
     MON_DATA_DEF,
@@ -204,7 +204,7 @@ enum PokemonDataParam {
     MON_DATA_SP_DEF,
     MON_DATA_170,
     MON_DATA_171,
-    MON_DATA_172, // data sanity?
+    MON_DATA_172, //!< possible data sanity check
     MON_DATA_173,
     MON_DATA_SPECIES_EGG,
     MON_DATA_COMBINED_IVS,
diff --git a/include/pokemon.h b/include/pokemon.h
index d93616f07a..e986719b4b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -801,10 +801,10 @@ int Pokemon_LoadLevelUpMoveIdsOf(int monSpecies, int monForm, u16 *monLevelUpMov
 
 void Pokemon_ApplyPokerus(Party *party);
 u8 Pokemon_HasPokerus(Party *party, u8 param1);
-void UpdatePokerusStatusInParty(Party *party, s32 param1);
+void Party_UpdatePokerusStatus(Party *party, s32 param1);
 void Pokemon_ValidatePokerus(Party *party);
-BOOL IsPokemonInfectedWithPokerus(Pokemon *mon);
-BOOL CanPokemonSpreadPokerus(Pokemon *mon);
+BOOL Pokemon_InfectedWithPokerus(Pokemon *mon);
+BOOL Pokemon_CanSpreadPokerus(Pokemon *mon);
 
 /**
  * @brief Sets Arceus' form based on its held item. Has no effect if the given Pokemon is not an Arceus
@@ -953,10 +953,10 @@ void Pokemon_PlayCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 specie
  * @param delay                 Number of frames until playback will begin.
  */
 void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16 species, int form, int pan, int volume, int forceDefaultChatot, int heapID, u8 delay);
-BOOL IsPokemonEligibleForAction(Pokemon *mon);
+BOOL Pokemon_IsEligibleForAction(Pokemon *mon);
 void Pokemon_SetCatchData(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
-void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2);
+void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5);
+void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2);
 BOOL Pokemon_CanLearnTM(Pokemon *mon, u8 tmID);
 BOOL CanPokemonFormLearnTM(u16 monSpecies, int monForm, u8 tmID);
 
diff --git a/src/main.c b/src/main.c
index 162cbfb659..2060ec0fe7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ void NitroMain (void)
     Unk_02101D28.unk_10.unk_00 = -1;
     Unk_02101D28.unk_10.unk_08 = sub_020244AC();
 
-    sub_02003B60(GetChatotCryFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
+    sub_02003B60(GetChatotCryDataFromSave(Unk_02101D28.unk_10.unk_08), sub_02025E44(Unk_02101D28.unk_10.unk_08));
     sub_02022844();
 
     if (sub_02038FFC(3) == DWC_INIT_RESULT_DESTROY_OTHER_SETTING) {
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 5bba0a6bb0..6b9688fbcf 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -1686,7 +1686,7 @@ static BOOL ov6_02242514 (const int param0, const UnkStruct_ov6_022422D0 * param
         }
     }
 
-    AssignHeldItemToPokemon(param2, param3->battleType, v0);
+    Pokemon_GiveHeldItem(param2, param3->battleType, v0);
 
     {
         u8 v1;
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index ad86992a13..928c0ed0f1 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -1233,7 +1233,7 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
         param0->unk_00++;
 
         {
-            IsPokemonEligibleForAction(param0->unk_5C);
+            Pokemon_IsEligibleForAction(param0->unk_5C);
         }
     }
 
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 111edd29db..05f99c8437 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -332,7 +332,7 @@ int ov19_021D0E58 (UnkStruct_020067E8 * param0, int * param1)
     if (Party_HasSpecies(v0->unk_124, 441) == 0) {
         ChatotCry * v1 = GetChatotCryDataFromSave(v0->unk_11C);
 
-        ResetChatotCryStatus(v1);
+        ResetChatotCryDataStatus(v1);
     }
 
     ov19_021D64A0(v0->unk_114);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index aaa5802ce6..0674c65ae0 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -700,7 +700,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
         }
         break;
     case 14:
-        ov88_0223D140(GetChatotCryFromSave(param0->unk_04));
+        ov88_0223D140(GetChatotCryDataFromSave(param0->unk_04));
         param0->unk_4C++;
         break;
     case 15:
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index d5ad4bd710..3b76c9edca 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -361,7 +361,7 @@ void ov104_0222E134 (SaveData * param0, Pokemon * param1)
     TrainerInfo * v5 = sub_02025E38(param0);
 
     v0 = Pokemon_GetValue(param1, MON_DATA_OT_ID, NULL);
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0), 4, 0, 0, 11);
 
     v3 = sub_0203A138(562);
     sub_0209304C(param1, v5, v4, v3, 11);
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index ad57c097fb..e07a178fd1 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -308,7 +308,7 @@ void ov104_0223BA24 (Party * param0)
 
 void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, Pokemon * param1)
 {
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 49002359bc..0fa7ae462e 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -294,7 +294,7 @@ BOOL ov104_0223C000 (u8 param0)
 
 void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, Pokemon * param1)
 {
-    PostCapturePokemonProcessing(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
+    Pokemon_UpdateAfterCatch(param1, sub_02025E38(param0->unk_04), 4, 0, 0, 11);
     return;
 }
 
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index c5e1f7729a..69e4aa9b18 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -132,7 +132,7 @@ int ov118_021D0DBC (GameWindowLayout * param0)
         v0->unk_00++;
         break;
     case 7:
-        IsPokemonEligibleForAction(v1);
+        Pokemon_IsEligibleForAction(v1);
         v0->unk_00++;
         break;
     case 8:
diff --git a/src/pokemon.c b/src/pokemon.c
index 4e867e1ae4..166544ac21 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3785,7 +3785,7 @@ u8 Pokemon_HasPokerus(Party *party, u8 param1)
     return result;
 }
 
-void UpdatePokerusStatusInParty(Party *party, s32 param1)
+void Party_UpdatePokerusStatus(Party *party, s32 param1)
 {
     int currentPartyCount = Party_GetCurrentCount(party);
 
@@ -3846,7 +3846,7 @@ void Pokemon_ValidatePokerus(Party *party)
     }
 }
 
-BOOL IsPokemonInfectedWithPokerus(Pokemon *mon)
+BOOL Pokemon_InfectedWithPokerus(Pokemon *mon)
 {
     return IsBoxPokemonInfectedWithPokerus(&mon->box);
 }
@@ -3856,7 +3856,7 @@ static BOOL IsBoxPokemonInfectedWithPokerus(BoxPokemon *boxMon)
     return (BoxPokemon_GetValue(boxMon, MON_DATA_POKERUS, NULL) & 0xf) != 0;
 }
 
-BOOL CanPokemonSpreadPokerus(Pokemon *mon)
+BOOL Pokemon_CanSpreadPokerus(Pokemon *mon)
 {
     return CanBoxPokemonSpreadPokerus(&mon->box);
 }
@@ -4215,7 +4215,7 @@ void Pokemon_PlayDelayedCry(ChatotCry *chatotCry, enum PokemonCryMod crymod, u16
     Sound_PlayDelayedPokemonCry(crymod, species, pan, volume, heapID, delay, form);
 }
 
-BOOL IsPokemonEligibleForAction(Pokemon *mon)
+BOOL Pokemon_IsEligibleForAction(Pokemon *mon)
 {
     int monSpecies = Pokemon_GetValue(mon, MON_DATA_SPECIES, NULL);
     int monForm = Pokemon_GetValue(mon, MON_DATA_FORM, NULL);
@@ -4244,7 +4244,7 @@ static void InitializeBoxPokemonAfterCapture(BoxPokemon *boxMon, TrainerInfo *pa
     BoxPokemon_SetValue(boxMon, MON_DATA_158, &param4);
 }
 
-void PostCapturePokemonProcessing(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
+void Pokemon_UpdateAfterCatch(Pokemon *mon, TrainerInfo *param1, int monPokeball, int param3, int param4, int param5)
 {
     PostCaptureBoxPokemonProcessing(&mon->box, param1, monPokeball, param3, param4, param5);
 }
@@ -4259,7 +4259,7 @@ static const u16 sHeldItemChance[][2] = {
     {20, 80}
 };
 
-void AssignHeldItemToPokemon(Pokemon *mon, u32 param1, int param2)
+void Pokemon_GiveHeldItem(Pokemon *mon, u32 param1, int param2)
 {
     if (param1 & (0x1 | 0x80)) {
         return;
diff --git a/src/unk_02006224.c b/src/unk_02006224.c
index 8bb70b8b07..5d5ce66689 100644
--- a/src/unk_02006224.c
+++ b/src/unk_02006224.c
@@ -49,7 +49,7 @@ BOOL IsChatotCryStructReadyForProcessing (const ChatotCry * cry)
     u8 * v0 = sub_02003D5C(31);
     u8 * v1 = sub_02003D5C(54);
 
-    if (IsChatotCryValid(cry) == 0) {
+    if (IsChatotCryDataValid(cry) == 0) {
         return 0;
     }
 
@@ -153,7 +153,7 @@ MICResult StopMicSampling (void)
 
 void StoreMicDataInChatotCryStruct (ChatotCry * param0)
 {
-    StoreProcessedAudioInChatotCry(param0, (const s8 *)sub_02005014());
+    StoreProcessedAudioInChatotCryData(param0, (const s8 *)sub_02005014());
     return;
 }
 
@@ -209,7 +209,7 @@ int Sound_Chatter (ChatotCry * param0)
     const s8 * v0;
     s8 v1;
 
-    if (IsChatotCryValid(param0) == 0) {
+    if (IsChatotCryDataValid(param0) == 0) {
         return 0;
     }
 
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index 508d55d300..d8a271781a 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -121,7 +121,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0)
     v8.unk_14 = sub_0202A750(param0->unk_34->unk_0C);
     v8.unk_18 = sub_02025E44(param0->unk_34->unk_0C);
     v8.unk_1C = param0->unk_34->unk_0C;
-    v8.unk_20 = GetChatotCryFromSave(param0->unk_34->unk_0C);
+    v8.unk_20 = GetChatotCryDataFromSave(param0->unk_34->unk_0C);
 
     *v2 = sub_02093800(&v8);
 
diff --git a/src/unk_020482D4.c b/src/unk_020482D4.c
index 7ae5992235..f072e57dde 100644
--- a/src/unk_020482D4.c
+++ b/src/unk_020482D4.c
@@ -223,7 +223,7 @@ BOOL sub_020484F8 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (IsChatotCryStructReadyForProcessing(GetChatotCryFromSave(param0->unk_34->unk_0C)) == 1) {
+    if (IsChatotCryStructReadyForProcessing(GetChatotCryDataFromSave(param0->unk_34->unk_0C)) == 1) {
         *v0 = 1;
         return 0;
     }
@@ -253,7 +253,7 @@ BOOL sub_0204855C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048568 (UnkStruct_0203E724 * param0)
 {
-    StoreMicDataInChatotCryStruct(GetChatotCryFromSave(param0->unk_34->unk_0C));
+    StoreMicDataInChatotCryStruct(GetChatotCryDataFromSave(param0->unk_34->unk_0C));
     return 1;
 }
 
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index 8d13f25264..b8840fe990 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -100,7 +100,7 @@ BattleParams * sub_02051D8C (int param0, u32 param1)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        v1->unk_F0[v0] = AllocateAndInitializeChatotCry(param0);
+        v1->unk_F0[v0] = AllocateAndInitializeChatotCryData(param0);
     }
 
     v1->unk_E0 = sub_0207D3C0(param0);
@@ -247,7 +247,7 @@ void sub_02052184 (BattleParams * param0, const TrainerInfo * param1, int param2
 
 void sub_020521A4 (BattleParams * param0, const ChatotCry * param1, int param2)
 {
-    CopyChatotCry(param0->unk_F0[param2], param1);
+    CopyChatotCryData(param0->unk_F0[param2], param1);
 }
 
 void sub_020521B8 (BattleParams * param0, const UnkStruct_0203CDB0 * param1, SaveData * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index c36df1b541..27ec35e21f 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -101,7 +101,7 @@ static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
         Party * v0;
 
         v0 = Party_GetFromSavedata(param0->unk_0C);
-        UpdatePokerusStatusInParty(v0, param1);
+        Party_UpdatePokerusStatus(v0, param1);
     }
 
     {
diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c
index cc799b86ab..c33593cd2b 100644
--- a/src/unk_0208C324.c
+++ b/src/unk_0208C324.c
@@ -1102,9 +1102,9 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStru
     param2->unk_4E = Pokemon_GetValue(param1, MON_DATA_FORM, NULL);
     param2->unk_50_0 = sub_0208E9F0(param1);
 
-    if (CanPokemonSpreadPokerus(param1) == 1) {
+    if (Pokemon_CanSpreadPokerus(param1) == 1) {
         param2->unk_50_30 = 2;
-    } else if (IsPokemonInfectedWithPokerus(param1) == 1) {
+    } else if (Pokemon_InfectedWithPokerus(param1) == 1) {
         param2->unk_50_30 = 1;
 
         if (param2->unk_50_0 == 7) {
diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c
index b14f954c5a..052f74bd24 100644
--- a/src/unk_020933F8.c
+++ b/src/unk_020933F8.c
@@ -445,10 +445,10 @@ UnkStruct_02095C48 * sub_02093800 (const UnkStruct_02093800 * param0)
     }
 
     for (v2 = 0; v2 < 4; v2++) {
-        v0->unk_14C[v2] = AllocateAndInitializeChatotCry(20);
+        v0->unk_14C[v2] = AllocateAndInitializeChatotCryData(20);
     }
 
-    CopyChatotCry(v0->unk_14C[0], param0->unk_20);
+    CopyChatotCryData(v0->unk_14C[0], param0->unk_20);
 
     {
         Pokemon_Copy(param0->unk_08, v0->unk_00.unk_00[0]);