From 291ddf2c3b2f38813c5268020b8ed15662fc2e58 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Fri, 21 Jun 2024 16:25:35 +0200
Subject: [PATCH 01/19] Start documenting cell actor stuff

---
 include/struct_defs/struct_020095C4.h |   4 +-
 include/unk_020218BC.h                |   4 +-
 src/overlay005/ov5_021D5EB8.c         |   4 +-
 src/unk_020093B4.c                    |   4 +-
 src/unk_020218BC.c                    | 188 +++++++++++++-------------
 5 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/include/struct_defs/struct_020095C4.h b/include/struct_defs/struct_020095C4.h
index 08b8ab4740..749a37ba2f 100644
--- a/include/struct_defs/struct_020095C4.h
+++ b/include/struct_defs/struct_020095C4.h
@@ -6,8 +6,8 @@
 
 typedef struct {
     int unk_00;
-    NNSG2dRendererInstance * unk_04;
+    NNSG2dRendererInstance * renderer;
     int unk_08;
-} UnkStruct_020095C4;
+} GraphicElementManagerParams;
 
 #endif // POKEPLATINUM_STRUCT_020095C4_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 28464d49cb..2041a4c7e0 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -11,12 +11,12 @@
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
 
-GraphicElementManager * sub_020218BC(const UnkStruct_020095C4 * param0);
+GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerParams * 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);
+void GraphicElementData_Reset(GraphicElementData * param0);
 GraphicElementData * sub_02021AA0(const UnkStruct_ov115_02261520 * param0);
 GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
 void sub_02021BD4(GraphicElementData * param0);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 0e8b2494a7..9d55e8d6b6 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -800,13 +800,13 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
     ov5_021D6290(param0->unk_10, 3, 62);
 
     {
-        UnkStruct_020095C4 v3;
+        GraphicElementManagerParams v3;
 
         v3.unk_00 = 96;
         v3.unk_04 = &param0->unk_14;
         v3.unk_08 = 4;
 
-        param0->unk_130 = sub_020218BC(&v3);
+        param0->unk_130 = GraphicElementManager_New(&v3);
         param0->unk_134 = SysTask_Start(ov5_021D6284, param0, 10);
     }
 }
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index e40e7cb977..e39ef6805f 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -139,7 +139,7 @@ void sub_020095A8 (UnkStruct_02009508 * param0)
 
 GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2)
 {
-    UnkStruct_020095C4 v0;
+    GraphicElementManagerParams v0;
     NNSG2dViewRect v1;
 
     sub_0202309C(&param1->unk_00, -FX32_ONE);
@@ -162,7 +162,7 @@ GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, i
     v0.unk_04 = &param1->unk_00;
     v0.unk_08 = param2;
 
-    return sub_020218BC(&v0);
+    return GraphicElementManager_New(&v0);
 }
 
 void sub_0200962C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2)
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 3145780903..db7bf06869 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -44,14 +44,14 @@ typedef struct GraphicElementData_t {
     u8 unk_29;
     u8 unk_2A;
     BOOL unk_2C;
-    GXOamMode unk_30;
+    GXOamMode oamMode;
     u8 unk_34;
     u8 unk_35;
     fx32 unk_38;
-    GraphicElementManager * unk_3C;
+    GraphicElementManager * manager;
     u32 unk_40[29];
-    NNSG2dImageProxy unk_B4;
-    NNSG2dImagePaletteProxy unk_D8;
+    NNSG2dImageProxy imageProxy;
+    NNSG2dImagePaletteProxy paletteProxy;
     u32 unk_EC;
     u16 unk_F0;
     u8 unk_F2;
@@ -66,17 +66,17 @@ typedef struct GraphicElementManager_t {
     int unk_04;
     GraphicElementData ** unk_08;
     int unk_0C;
-    GraphicElementData unk_10;
-    NNSG2dRendererInstance * unk_110;
-    void * unk_114;
-    NNSG2dCellAnimBankData * unk_118;
+    GraphicElementData sentinelData;
+    NNSG2dRendererInstance * renderer;
+    void * rawAnimData;
+    NNSG2dCellAnimBankData * animData;
     u32 unk_11C;
 } GraphicElementManager;
 
 typedef void (* GraphicElementUpdateFunc)(const GraphicElementManager *, GraphicElementData *);
 typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
 
-static void sub_02021A50(GraphicElementManager * param0);
+static void GraphicElementManager_Reset(GraphicElementManager * param0);
 static u32 sub_020221B8(const UnkStruct_ov19_021DA864 * param0);
 static void sub_020221D0(const NNSG2dCellDataBank * param0, GraphicElementData * param1);
 static void sub_020221D4(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1);
@@ -97,38 +97,38 @@ 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 *GraphicElementManager_New(const GraphicElementManagerParams *params)
 {
-    GraphicElementManager * v0;
+    GraphicElementManager *gfxElemMgr;
     int v1;
 
-    GF_ASSERT(param0);
-    GF_ASSERT(param0->unk_04);
+    GF_ASSERT(params);
+    GF_ASSERT(params->renderer);
 
-    v0 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementManager));
-    GF_ASSERT(v0);
+    gfxElemMgr = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementManager));
+    GF_ASSERT(gfxElemMgr);
 
-    sub_02021A50(v0);
+    GraphicElementManager_Reset(gfxElemMgr);
 
-    v0->unk_00 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementData) * param0->unk_00);
-    GF_ASSERT(v0->unk_00);
-    v0->unk_04 = param0->unk_00;
+    gfxElemMgr->unk_00 = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementData) * params->unk_00);
+    GF_ASSERT(gfxElemMgr->unk_00);
+    gfxElemMgr->unk_04 = params->unk_00;
 
-    v0->unk_08 = Heap_AllocFromHeap(param0->unk_08, sizeof(GraphicElementData *) * param0->unk_00);
-    GF_ASSERT(v0->unk_08);
+    gfxElemMgr->unk_08 = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementData *) * params->unk_00);
+    GF_ASSERT(gfxElemMgr->unk_08);
 
-    sub_02022518(v0);
-    sub_02021A78(&v0->unk_10);
+    sub_02022518(gfxElemMgr);
+    GraphicElementData_Reset(&gfxElemMgr->sentinelData);
 
-    v0->unk_10.unk_FC = &v0->unk_10;
-    v0->unk_10.unk_100 = &v0->unk_10;
-    v0->unk_110 = param0->unk_04;
-    v0->unk_114 = ReadFileToHeap(param0->unk_08, "data/clact_default.NANR");
+    gfxElemMgr->sentinelData.unk_FC = &gfxElemMgr->sentinelData;
+    gfxElemMgr->sentinelData.unk_100 = &gfxElemMgr->sentinelData;
+    gfxElemMgr->renderer = params->renderer;
+    gfxElemMgr->rawAnimData = ReadFileToHeap(params->unk_08, "data/clact_default.NANR");
 
-    NNS_G2dGetUnpackedAnimBank(v0->unk_114, &v0->unk_118);
-    v0->unk_11C = 1;
+    NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->animData);
+    gfxElemMgr->unk_11C = 1;
 
-    return v0;
+    return gfxElemMgr;
 }
 
 BOOL sub_02021964 (GraphicElementManager * param0)
@@ -143,11 +143,11 @@ BOOL sub_02021964 (GraphicElementManager * param0)
 
     sub_020219C0(param0);
 
-    Heap_FreeToHeap(param0->unk_114);
+    Heap_FreeToHeap(param0->rawAnimData);
     Heap_FreeToHeap(param0->unk_08);
     Heap_FreeToHeap(param0->unk_00);
 
-    sub_02021A50(param0);
+    GraphicElementManager_Reset(param0);
     Heap_FreeToHeap(param0);
 
     param0 = NULL;
@@ -183,9 +183,9 @@ BOOL sub_020219C0 (GraphicElementManager * param0)
         return 1;
     }
 
-    v0 = param0->unk_10.unk_100;
+    v0 = param0->sentinelData.unk_100;
 
-    while (v0 != &param0->unk_10) {
+    while (v0 != &param0->sentinelData) {
         v1 = v0->unk_100;
         sub_02021BD4(v0);
         v0 = v1;
@@ -212,38 +212,38 @@ void sub_020219F8 (const GraphicElementManager * param0)
         return;
     }
 
-    v0 = param0->unk_10.unk_100;
+    v0 = param0->sentinelData.unk_100;
 
-    while (v0 != &param0->unk_10) {
+    while (v0 != &param0->sentinelData) {
         v1[v0->unk_34](param0, v0);
         v2[v0->unk_35](v0);
         v0 = v0->unk_100;
     }
 }
 
-static void sub_02021A50 (GraphicElementManager * param0)
+static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
 {
-    param0->unk_00 = NULL;
-    param0->unk_04 = 0;
-    param0->unk_08 = NULL;
-    param0->unk_0C = 0;
-    param0->unk_110 = NULL;
+    gfxElemMgr->unk_00 = NULL;
+    gfxElemMgr->unk_04 = 0;
+    gfxElemMgr->unk_08 = NULL;
+    gfxElemMgr->unk_0C = 0;
+    gfxElemMgr->renderer = NULL;
 
-    sub_02021A78(&param0->unk_10);
-    param0->unk_11C = 0;
+    GraphicElementData_Reset(&gfxElemMgr->sentinelData);
+    gfxElemMgr->unk_11C = 0;
 }
 
-void sub_02021A78 (GraphicElementData * param0)
+void GraphicElementData_Reset(GraphicElementData *elem)
 {
     int v0;
 
-    param0->unk_3C = NULL;
-    memset(param0, 0, sizeof(GraphicElementData));
+    elem->manager = NULL;
+    memset(elem, 0, sizeof(GraphicElementData));
 
-    NNS_G2dInitImageProxy(&param0->unk_B4);
-    NNS_G2dInitImagePaletteProxy(&param0->unk_D8);
+    NNS_G2dInitImageProxy(&elem->imageProxy);
+    NNS_G2dInitImagePaletteProxy(&elem->paletteProxy);
 
-    param0->unk_30 = GX_OAM_MODE_NORMAL;
+    elem->oamMode = GX_OAM_MODE_NORMAL;
 }
 
 GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
@@ -256,7 +256,7 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
         return NULL;
     }
 
-    v0->unk_3C = param0->unk_00;
+    v0->manager = param0->unk_00;
     v0->unk_F0 = 0;
     v0->unk_00 = param0->unk_08;
     v0->unk_18 = param0->unk_14;
@@ -266,11 +266,11 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
     v0->unk_26 = 0;
     v0->unk_27 = 0;
     v0->unk_2C = 0;
-    v0->unk_30 = GX_OAM_MODE_NORMAL;
+    v0->oamMode = GX_OAM_MODE_NORMAL;
     v0->unk_28 = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
-    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->unk_110->rendererCore), v0->unk_26);
-    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->unk_110->rendererCore), v0->unk_27 & 1, v0->unk_27 & 2);
+    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), v0->unk_26);
+    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), v0->unk_27 & 1, v0->unk_27 & 2);
 
     v0->unk_34 = 1;
     v0->unk_35 = 0;
@@ -281,7 +281,7 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
         return NULL;
     }
 
-    v0->unk_2A = sub_020222C4(&v0->unk_D8, v0->unk_F8);
+    v0->unk_2A = sub_020222C4(&v0->paletteProxy, v0->unk_F8);
     v0->unk_29 = v0->unk_2A;
 
     sub_02022464(param0->unk_00, v0);
@@ -321,7 +321,7 @@ void sub_02021BD4 (GraphicElementData * param0)
         if (param0->unk_EC == 3) {
             CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)&param0->unk_40;
 
-            if (NNS_G2dGetImageLocation(&param0->unk_B4, param0->unk_F8) != NNS_G2D_VRAM_ADDR_NONE) {
+            if (NNS_G2dGetImageLocation(&param0->imageProxy, param0->unk_F8) != NNS_G2D_VRAM_ADDR_NONE) {
                 NNS_G2dFreeCellTransferStateHandle(v2->unk_60);
             }
         }
@@ -340,7 +340,7 @@ void sub_02021BD4 (GraphicElementData * param0)
 
         param0->unk_EC = 0;
 
-        v0 = (GraphicElementManager *)param0->unk_3C;
+        v0 = (GraphicElementManager *)param0->manager;
         sub_0202256C(v0, param0);
     }
 }
@@ -567,7 +567,7 @@ void sub_02021E90 (GraphicElementData * 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);
+    param0->unk_29 += sub_020222C4(&param0->paletteProxy, param0->unk_F8);
 }
 
 u32 sub_02021EE8 (const GraphicElementData * param0)
@@ -587,7 +587,7 @@ void sub_02021EF0 (GraphicElementData * 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);
+    param0->unk_2A += sub_020222C4(&param0->paletteProxy, param0->unk_F8);
 }
 
 u32 sub_02021F48 (const GraphicElementData * param0)
@@ -598,7 +598,7 @@ u32 sub_02021F48 (const GraphicElementData * param0)
 
 void sub_02021F58 (GraphicElementData * param0, u32 param1)
 {
-    GraphicElementManager * v0 = (GraphicElementManager *)param0->unk_3C;
+    GraphicElementManager * v0 = (GraphicElementManager *)param0->manager;
 
     param0->unk_F4 = param1;
 
@@ -613,17 +613,17 @@ u32 sub_02021F74 (const GraphicElementData * param0)
 
 void sub_02021F7C (GraphicElementData * param0, const NNSG2dImageProxy * param1)
 {
-    param0->unk_B4 = *param1;
+    param0->imageProxy = *param1;
 }
 
 NNSG2dImageProxy * SpriteActor_ImageProxy (GraphicElementData * param0)
 {
-    return &param0->unk_B4;
+    return &param0->imageProxy;
 }
 
 NNSG2dImagePaletteProxy * sub_02021F9C (GraphicElementData * param0)
 {
-    return &param0->unk_D8;
+    return &param0->paletteProxy;
 }
 
 void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
@@ -659,7 +659,7 @@ void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_30 = param1;
+    param0->oamMode = param1;
 
     if (param1 == GX_OAM_MODE_NORMAL) {
         param0->unk_28 ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
@@ -739,15 +739,15 @@ u32 sub_020220F4 (const GraphicElementData * param0)
 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;
-    param2->unk_D8 = *param1->unk_08;
+    param2->imageProxy = *param1->unk_00;
+    param2->paletteProxy = *param1->unk_08;
 
     sub_020221D0(param1->unk_0C, param2);
 
     if (param1->unk_10) {
         sub_020221D4(param1->unk_10, param2);
     } else {
-        sub_020221D4(param0->unk_118, param2);
+        sub_020221D4(param0->animData, param2);
     }
 
     if (param2->unk_EC == 2) {
@@ -830,7 +830,7 @@ static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElement
     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);
+    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->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
 }
 
 static void sub_02022264 (GraphicElementData * param0, int param1)
@@ -879,17 +879,17 @@ static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementDa
 {
     VecFx32 v0 = param1->unk_00;
 
-    NNS_G2dSetRendererImageProxy(param0->unk_110, &param1->unk_B4, &param1->unk_D8);
-    NNS_G2dBeginRendering(param0->unk_110);
+    NNS_G2dSetRendererImageProxy(param0->renderer, &param1->imageProxy, &param1->paletteProxy);
+    NNS_G2dBeginRendering(param0->renderer);
     NNS_G2dPushMtx();
 
     {
-        NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_110->rendererCore), param1->unk_26);
+        NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->renderer->rendererCore), param1->unk_26);
 
         if (param1->unk_26 == 0) {
-            NNS_G2dSetRndCoreFlipMode(&(param0->unk_110->rendererCore), param1->unk_27 & 1, param1->unk_27 & 2);
+            NNS_G2dSetRndCoreFlipMode(&(param0->renderer->rendererCore), param1->unk_27 & 1, param1->unk_27 & 2);
         } else {
-            NNS_G2dSetRndCoreFlipMode(&(param0->unk_110->rendererCore), 0, 0);
+            NNS_G2dSetRndCoreFlipMode(&(param0->renderer->rendererCore), 0, 0);
         }
 
         NNS_G2dTranslate(v0.x, v0.y, v0.z);
@@ -901,13 +901,13 @@ static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementDa
             NNS_G2dTranslate(-param1->unk_0C.x, -param1->unk_0C.y, -param1->unk_0C.z);
         }
 
-        NNS_G2dSetRendererOverwriteEnable(param0->unk_110, param1->unk_28);
-        NNS_G2dSetRendererOverwriteDisable(param0->unk_110, ~param1->unk_28);
-        NNS_G2dSetRendererOverwritePlttNo(param0->unk_110, param1->unk_29);
-        NNS_G2dSetRendererOverwritePlttNoOffset(param0->unk_110, param1->unk_2A);
-        NNS_G2dSetRendererOverwriteMosaicFlag(param0->unk_110, param1->unk_2C);
-        NNS_G2dSetRendererOverwriteOBJMode(param0->unk_110, param1->unk_30);
-        NNS_G2dSetRendererOverwritePriority(param0->unk_110, param1->unk_F2);
+        NNS_G2dSetRendererOverwriteEnable(param0->renderer, param1->unk_28);
+        NNS_G2dSetRendererOverwriteDisable(param0->renderer, ~param1->unk_28);
+        NNS_G2dSetRendererOverwritePlttNo(param0->renderer, param1->unk_29);
+        NNS_G2dSetRendererOverwritePlttNoOffset(param0->renderer, param1->unk_2A);
+        NNS_G2dSetRendererOverwriteMosaicFlag(param0->renderer, param1->unk_2C);
+        NNS_G2dSetRendererOverwriteOBJMode(param0->renderer, param1->oamMode);
+        NNS_G2dSetRendererOverwritePriority(param0->renderer, param1->unk_F2);
 
         if ((param1->unk_EC == 1) || (param1->unk_EC == 3)) {
             CellAnimationData * v1 = (CellAnimationData *)&param1->unk_40;
@@ -941,21 +941,21 @@ static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * p
 {
     GraphicElementData * v0;
 
-    if (param0->unk_10.unk_100 == &param0->unk_10) {
-        param0->unk_10.unk_100 = param1;
-        param0->unk_10.unk_FC = param1;
-        param1->unk_FC = &param0->unk_10;
-        param1->unk_100 = &param0->unk_10;
+    if (param0->sentinelData.unk_100 == &param0->sentinelData) {
+        param0->sentinelData.unk_100 = param1;
+        param0->sentinelData.unk_FC = param1;
+        param1->unk_FC = &param0->sentinelData;
+        param1->unk_100 = &param0->sentinelData;
     } else {
-        if (param0->unk_10.unk_FC->unk_F4 <= param1->unk_F4) {
-            param1->unk_FC = param0->unk_10.unk_FC;
-            param0->unk_10.unk_FC->unk_100 = param1;
-            param1->unk_100 = &param0->unk_10;
-            param0->unk_10.unk_FC = param1;
+        if (param0->sentinelData.unk_FC->unk_F4 <= param1->unk_F4) {
+            param1->unk_FC = param0->sentinelData.unk_FC;
+            param0->sentinelData.unk_FC->unk_100 = param1;
+            param1->unk_100 = &param0->sentinelData;
+            param0->sentinelData.unk_FC = param1;
         } else {
-            v0 = param0->unk_10.unk_100;
+            v0 = param0->sentinelData.unk_100;
 
-            while (v0 != &param0->unk_10) {
+            while (v0 != &param0->sentinelData) {
                 if (v0->unk_F4 > param1->unk_F4) {
                     v0->unk_FC->unk_100 = param1;
                     param1->unk_FC = v0->unk_FC;
@@ -981,7 +981,7 @@ static void sub_02022518 (GraphicElementManager * param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021A78(&param0->unk_00[v0]);
+        GraphicElementData_Reset(&param0->unk_00[v0]);
         param0->unk_08[v0] = param0->unk_00 + v0;
     }
 
@@ -1008,7 +1008,7 @@ static BOOL sub_0202256C (GraphicElementManager * param0, GraphicElementData * p
         return 0;
     }
 
-    sub_02021A78(param1);
+    GraphicElementData_Reset(param1);
 
     param0->unk_0C--;
     param0->unk_08[param0->unk_0C] = param1;

From 3727cdf5451e7a8e16fd0188904f7121f33a52af Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 12:42:46 +0200
Subject: [PATCH 02/19] Label some GraphicElementManager init stuff

---
 include/struct_defs/struct_020095C4.h   |   4 +-
 include/unk_020218BC.h                  |   2 +-
 src/choose_starter/choose_starter_app.c |   2 +-
 src/overlay005/encounter_effect.c       |   2 +-
 src/overlay005/ov5_021D2F14.c           |   4 +-
 src/overlay005/ov5_021D5EB8.c           |   8 +-
 src/overlay006/ov6_022426AC.c           |   2 +-
 src/overlay006/ov6_02243258.c           |   4 +-
 src/overlay007/ov7_0224BE9C.c           |   2 +-
 src/overlay009/ov9_02249960.c           |   2 +-
 src/overlay019/ov19_021D61B0.c          |   2 +-
 src/overlay020/ov20_021D2098.c          |   2 +-
 src/overlay021/ov21_021D1FA4.c          |   2 +-
 src/overlay021/ov21_021E8D48.c          |   2 +-
 src/overlay022/ov22_02255094.c          |   2 +-
 src/overlay023/ov23_0223E140.c          |   2 +-
 src/overlay023/ov23_0224340C.c          |   4 +-
 src/overlay023/ov23_02248F1C.c          |   2 +-
 src/overlay056/ov56_022561C0.c          |   2 +-
 src/overlay058/ov58_021D0D80.c          |   2 +-
 src/overlay059/ov59_021D0D80.c          |   2 +-
 src/overlay064/ov64_0222DCE0.c          |   2 +-
 src/overlay065/ov65_0222DCE0.c          |   2 +-
 src/overlay065/ov65_02235060.c          |   2 +-
 src/overlay065/ov65_0223648C.c          |   2 +-
 src/overlay068/ov68_0225C700.c          |   2 +-
 src/overlay069/ov69_0225C700.c          |   2 +-
 src/overlay070/ov70_0225D9A4.c          |   2 +-
 src/overlay071/ov71_0223CF0C.c          |   2 +-
 src/overlay072/ov72_0223D7A0.c          |   2 +-
 src/overlay077/ov77_021D54B0.c          |   2 +-
 src/overlay077/ov77_021D6670.c          |   2 +-
 src/overlay083/ov83_0223D6A8.c          |   2 +-
 src/overlay086/ov86_0223B140.c          |   2 +-
 src/overlay087/ov87_021D106C.c          |   2 +-
 src/overlay088/ov88_0223B140.c          |   2 +-
 src/overlay094/ov94_0223BCB0.c          |   2 +-
 src/overlay095/ov95_02246C20.c          |   2 +-
 src/overlay096/ov96_0223B6A0.c          |   2 +-
 src/overlay097/ov97_02233B18.c          |   2 +-
 src/overlay097/ov97_02237694.c          |   2 +-
 src/overlay101/ov101_021D7E48.c         |   2 +-
 src/overlay105/ov105_02245AAC.c         |   2 +-
 src/overlay106/ov106_02243310.c         |   2 +-
 src/overlay107/ov107_02249604.c         |   2 +-
 src/overlay108/ov108_02243030.c         |   2 +-
 src/overlay109/ov109_021D3D50.c         |   2 +-
 src/overlay111/ov111_021D2F80.c         |   2 +-
 src/overlay112/ov112_0225C700.c         |   2 +-
 src/overlay114/ov114_0225C700.c         |   2 +-
 src/overlay115/ov115_02260CEC.c         |   2 +-
 src/unk_020093B4.c                      |   6 +-
 src/unk_0200C6E4.c                      |   2 +-
 src/unk_020218BC.c                      | 181 ++++++++++++------------
 src/unk_0205CA94.c                      |   2 +-
 src/unk_0208694C.c                      |   2 +-
 src/unk_02098FFC.c                      |   2 +-
 57 files changed, 154 insertions(+), 157 deletions(-)

diff --git a/include/struct_defs/struct_020095C4.h b/include/struct_defs/struct_020095C4.h
index 749a37ba2f..634c546d90 100644
--- a/include/struct_defs/struct_020095C4.h
+++ b/include/struct_defs/struct_020095C4.h
@@ -5,9 +5,9 @@
 #include <nnsys.h>
 
 typedef struct {
-    int unk_00;
+    int maxElements;
     NNSG2dRendererInstance * renderer;
-    int unk_08;
+    int heapID;
 } GraphicElementManagerParams;
 
 #endif // POKEPLATINUM_STRUCT_020095C4_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 2041a4c7e0..61fc02b39b 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -12,7 +12,7 @@
 #include <nitro/fx/fx.h>
 
 GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerParams * param0);
-BOOL sub_02021964(GraphicElementManager * param0);
+BOOL GraphicElementManager_Delete(GraphicElementManager * param0);
 BOOL sub_020219A4(GraphicElementManager * param0, u8 param1);
 BOOL sub_020219C0(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 775da125ce..59ab4d5d44 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -781,7 +781,7 @@ static void MakeCellActors (ChooseStarterApp * param0, int param1)
 
 static void ov78_021D1594 (ChooseStarterApp * param0)
 {
-    sub_02021964(param0->unk_248);
+    GraphicElementManager_Delete(param0->unk_248);
     sub_02009754(param0->unk_24C[0]);
     sub_02009754(param0->unk_24C[1]);
     sub_02009754(param0->unk_24C[2]);
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index a9531654ce..9db618d76a 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -749,7 +749,7 @@ void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_190[v0]);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 5fffef0a87..ccc1679236 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -88,7 +88,7 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
 {
     u32 v0;
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_020095A8(param0->unk_190);
     sub_0200A508(param0->unk_1AC[0]);
     sub_0200A700(param0->unk_1AC[1]);
@@ -402,7 +402,7 @@ void ov5_021D375C (UnkStruct_ov5_021D30A8 * param0)
 {
     u32 v0;
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A508(param0->unk_1AC[0]);
     sub_0200A700(param0->unk_1AC[1]);
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 9d55e8d6b6..bf1af2aff3 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -802,9 +802,9 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
     {
         GraphicElementManagerParams v3;
 
-        v3.unk_00 = 96;
-        v3.unk_04 = &param0->unk_14;
-        v3.unk_08 = 4;
+        v3.maxElements = 96;
+        v3.renderer = &param0->unk_14;
+        v3.heapID = 4;
 
         param0->unk_130 = GraphicElementManager_New(&v3);
         param0->unk_134 = SysTask_Start(ov5_021D6284, param0, 10);
@@ -844,7 +844,7 @@ static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0)
     Heap_FreeToHeap(param0->unk_10);
     param0->unk_10 = NULL;
 
-    sub_02021964(param0->unk_130);
+    GraphicElementManager_Delete(param0->unk_130);
     param0->unk_130 = NULL;
 
     SysTask_Done(param0->unk_134);
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 75bc490977..39cd1e7588 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -148,7 +148,7 @@ void ov6_02242828 (UnkStruct_ov6_022426B8 * param0)
         sub_02009754(param0->unk_00[v0]);
     }
 
-    sub_02021964(param0->unk_38);
+    GraphicElementManager_Delete(param0->unk_38);
     Heap_FreeToHeap(param0->unk_20);
     Heap_FreeToHeap(param0->unk_24);
 }
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 861d7b19b8..84b2a56fc1 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -412,7 +412,7 @@ static void ov6_0224339C (UnkStruct_ov6_02243258 * param0)
     Heap_FreeToHeap(param0->unk_1B0);
     Heap_FreeToHeap(param0->unk_1B4);
     sub_020219C0(param0->unk_08);
-    sub_02021964(param0->unk_08);
+    GraphicElementManager_Delete(param0->unk_08);
 }
 
 static void ov6_022434B0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3)
@@ -1829,7 +1829,7 @@ static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0)
     sub_02009754(param0->unk_208);
     sub_02009754(param0->unk_20C);
     sub_020219C0(param0->unk_70);
-    sub_02021964(param0->unk_70);
+    GraphicElementManager_Delete(param0->unk_70);
 }
 
 static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 94ad03970a..a067e84676 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -397,7 +397,7 @@ static void ov7_0224C3CC (UnkStruct_ov7_0224BEFC * param0)
 
 static void ov7_0224C3E0 (UnkStruct_ov7_0224BEFC * param0)
 {
-    sub_02021964(param0->unk_1C);
+    GraphicElementManager_Delete(param0->unk_1C);
 }
 
 static void ov7_0224C3EC (UnkStruct_ov7_0224C3EC * param0, BGL * param1, u32 param2, u32 param3)
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 6d4962c3aa..e30c3f3e93 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2745,7 +2745,7 @@ static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0)
     sub_02009754(param0->unk_19C);
 
     sub_020219C0(param0->unk_00);
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
 }
 
 static void ov9_0224B124 (SysTask * param0, void * param1)
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index bccf756400..6b7f4b1121 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -259,7 +259,7 @@ void ov19_021D64A0 (UnkStruct_ov19_021D61B0 * param0)
     ov19_021D7A74(&(param0->unk_494));
     ov19_021DA384(&(param0->unk_1C8));
 
-    sub_02021964(param0->unk_18);
+    GraphicElementManager_Delete(param0->unk_18);
     sub_02019044(param0->unk_1C0, 3);
     sub_02019044(param0->unk_1C0, 2);
     sub_02019044(param0->unk_1C0, 1);
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index d639395ac3..fe1eaec33a 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -152,7 +152,7 @@ void ov20_021D2128 (UnkStruct_ov20_021D2128 * param0)
         SysTask_Done(param0->unk_04);
 
         sub_0200A878();
-        sub_02021964(param0->unk_24);
+        GraphicElementManager_Delete(param0->unk_24);
 
         Heap_FreeToHeap(param0->unk_20);
         Heap_FreeToHeap(param0);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index ec73875abf..68d33cf1a2 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -120,7 +120,7 @@ void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0)
     ov21_021D299C(param0->unk_00);
 
     Heap_FreeToHeap(param0->unk_00);
-    sub_02021964(param0->unk_138);
+    GraphicElementManager_Delete(param0->unk_138);
     sub_02009754(param0->unk_13C[0]);
     sub_02009754(param0->unk_13C[1]);
     sub_02009754(param0->unk_13C[2]);
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 976f7c9b7d..d553017855 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -277,7 +277,7 @@ static void ov21_021E900C (UnkStruct_ov21_021E8D48 * param0)
     ov21_021D2C58(&param0->unk_1B4, param0->unk_1A0);
     ov21_021E9228(param0->unk_1A0);
 
-    sub_02021964(param0->unk_19C);
+    GraphicElementManager_Delete(param0->unk_19C);
 
     ov21_021E91F0(param0->unk_04);
     ov21_021E9194(param0->unk_00);
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 5d6070354c..66b5bf9f6b 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -726,7 +726,7 @@ static void ov22_022559F8 (UnkStruct_ov22_0225A0E4 * param0)
 
 static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0)
 {
-    sub_02021964(param0->unk_44);
+    GraphicElementManager_Delete(param0->unk_44);
 
     {
         int v0;
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index f97533070f..14938cd6e7 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -1398,7 +1398,7 @@ static void ov23_0223F020 (UnkStruct_ov23_0223EE80 * param0)
         }
     }
 
-    sub_02021964(Unk_ov23_02257740->unk_20);
+    GraphicElementManager_Delete(Unk_ov23_02257740->unk_20);
     sub_0200A878();
 
     sub_0201E958();
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 2e106a820d..713436809d 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3303,7 +3303,7 @@ static void ov23_02246370 (int param0)
     }
 
     if (Unk_ov23_02257764->unk_44) {
-        sub_02021964(Unk_ov23_02257764->unk_44);
+        GraphicElementManager_Delete(Unk_ov23_02257764->unk_44);
     }
 
     Unk_ov23_02257764->unk_44 = NULL;
@@ -4856,7 +4856,7 @@ static void ov23_02248884 (SysTask * param0, void * param1)
             Unk_ov23_02257764->unk_25C[v1] = NULL;
         }
 
-        sub_02021964(Unk_ov23_02257764->unk_44);
+        GraphicElementManager_Delete(Unk_ov23_02257764->unk_44);
         SysTask_Done(param0);
         Heap_FreeToHeap(v0);
 
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 0826090ba4..5927a37551 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -181,7 +181,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             sub_02009754(v0->unk_34C[v2]);
         }
 
-        sub_02021964(v0->unk_1BC);
+        GraphicElementManager_Delete(v0->unk_1BC);
         sub_0200E084(&v0->unk_3F4, 0);
         BGL_DeleteWindow(&v0->unk_3F4);
         sub_02019044(v1, 7);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 11bfe4becb..dc90b6e37d 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -267,7 +267,7 @@ void ov56_02256468 (UnkStruct_ov56_02256468 * param0)
             sub_02009754(param0->unk_1B8[v1]);
         }
 
-        sub_02021964(param0->unk_28);
+        GraphicElementManager_Delete(param0->unk_28);
         MessageLoader_Free(param0->unk_1C);
         StringTemplate_Free(param0->unk_18);
 
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 9fd2783e5e..ca28598a86 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -327,7 +327,7 @@ int ov58_021D1018 (OverlayManager * param0, int * param1)
             sub_02009754(v0->unk_1C4[v2]);
         }
 
-        sub_02021964(v0->unk_34);
+        GraphicElementManager_Delete(v0->unk_34);
         sub_0200A878();
         sub_0201E958();
         sub_0201F8B4();
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 4f101edd32..e35fa6780e 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -310,7 +310,7 @@ int ov59_021D0FF4 (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_1E0[v1]);
     }
 
-    sub_02021964(v0->unk_50);
+    GraphicElementManager_Delete(v0->unk_50);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 6a0f4407e0..6a726d587a 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1052,7 +1052,7 @@ static void ov64_0222E570 (UnkStruct_ov64_0222E21C * param0)
         sub_02009754(param0->unk_204[v0]);
     }
 
-    sub_02021964(param0->unk_04);
+    GraphicElementManager_Delete(param0->unk_04);
     sub_0201E958();
     sub_0201F8B4();
     sub_0200A878();
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 1b0a064764..bc857a6bae 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -879,7 +879,7 @@ static void ov65_0222E47C (UnkStruct_ov65_0222EBE0 * param0)
         sub_02009754(param0->unk_31C[v0]);
     }
 
-    sub_02021964(param0->unk_18C);
+    GraphicElementManager_Delete(param0->unk_18C);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 6e808a620b..784de5acd6 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -605,7 +605,7 @@ static void ov65_022358CC (UnkStruct_ov65_022358CC * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
 }
 
 static void ov65_022358F8 (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2)
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index c8cbfaf22b..bb07664acf 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -882,7 +882,7 @@ static void ov65_02236E04 (UnkStruct_ov65_02236840 * param0)
     ov63_0222CD9C(param0->unk_1BC);
     ov63_0222BE58(param0->unk_1B8);
 
-    sub_02021964(param0->unk_18);
+    GraphicElementManager_Delete(param0->unk_18);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_1A8[v0]);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 6313270502..3bd7baf82e 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -559,7 +559,7 @@ static void ov68_0225CB44 (UnkStruct_ov68_0225C91C * param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_04);
+    GraphicElementManager_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index fe5ed9c815..b5817e8c60 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -1511,7 +1511,7 @@ static void ov69_0225D5D8 (UnkStruct_ov69_0225D35C * param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_04);
+    GraphicElementManager_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 459bb55de3..3a860b1f23 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1391,7 +1391,7 @@ static void ov70_0225E6D0 (UnkStruct_ov70_0225E4EC * param0)
             sub_02009754(param0->unk_194[v1]);
         }
 
-        sub_02021964(param0->unk_04);
+        GraphicElementManager_Delete(param0->unk_04);
         sub_0201E958();
         sub_0201F8B4();
         sub_0200A878();
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index ec930c7ed4..dd6730ded8 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -192,7 +192,7 @@ void ov71_0223D238 (UnkStruct_ov71_0223D238 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index afe36536f0..61786ae903 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -226,7 +226,7 @@ int ov72_0223D984 (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_1CC[v1]);
     }
 
-    sub_02021964(v0->unk_3C);
+    GraphicElementManager_Delete(v0->unk_3C);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index dcb18eb126..d950dcb778 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -223,7 +223,7 @@ void ov77_021D5BAC (UnkStruct_ov77_021D5564 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 3; v0++) {
         sub_020094F0(&param0->unk_294[v0]);
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 229ab50585..a17c60f2b9 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -232,7 +232,7 @@ static void ov77_021D691C (UnkStruct_ov77_021D6800 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index a9c6644cdb..a21c739a2e 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -200,7 +200,7 @@ void ov83_0223D784 (UnkStruct_ov83_0223D784 * param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     for (v0 = 0; v0 < 4; v0++) {
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index fccc8c1ad5..25afe0042e 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -900,7 +900,7 @@ static void ov86_0223BD68 (UnkStruct_ov86_0223B3C8 * param0)
 
     Heap_FreeToHeap(param0->unk_1D4);
     Heap_FreeToHeap(param0->unk_1D0);
-    sub_02021964(param0->unk_24);
+    GraphicElementManager_Delete(param0->unk_24);
     sub_0200A878();
 }
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index ae79028000..526fdda1ef 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -132,7 +132,7 @@ void ov87_021D1140 (UnkStruct_ov87_021D106C * param0)
         MessageLoader_Free(param0->unk_1EC);
         MessageLoader_Free(param0->unk_1E8);
         MessageLoader_Free(param0->unk_1E4);
-        sub_02021964(param0->unk_34);
+        GraphicElementManager_Delete(param0->unk_34);
         sub_0200A878();
         Heap_FreeToHeap(param0->unk_10);
         Heap_FreeToHeap(param0);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index bff9d7385b..e960773465 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -862,7 +862,7 @@ static void ov88_0223BF7C (UnkStruct_02095E80 * param0)
         sub_02009754(param0->unk_324[v0]);
     }
 
-    sub_02021964(param0->unk_194);
+    GraphicElementManager_Delete(param0->unk_194);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 6e5cbbebc3..b9fcce22d5 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -520,7 +520,7 @@ static void ov94_0223C508 (UnkStruct_ov94_0223FD4C * param0)
         sub_02009754(param0->unk_D74[v0]);
     }
 
-    sub_02021964(param0->unk_BE4);
+    GraphicElementManager_Delete(param0->unk_BE4);
     param0->unk_BE4 = NULL;
 
     sub_0200A878();
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 28cb14e033..4af00073b4 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -220,7 +220,7 @@ int ov95_02246E1C (OverlayManager * param0, int * param1)
     MessageLoader_Free(v1->unk_10);
     Strbuf_Free(v1->unk_14);
     Heap_FreeToHeap(v1->unk_08);
-    sub_02021964(v1->unk_18);
+    GraphicElementManager_Delete(v1->unk_18);
     sub_0200A878();
     OverlayManager_FreeData(param0);
     Heap_Destroy(57);
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index d9b85fd6d7..3123c4cfd5 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -416,7 +416,7 @@ static void ov96_0223BC8C (UnkStruct_ov96_0223BF40 * param0)
         sub_02009754(param0->unk_D84[v0]);
     }
 
-    sub_02021964(param0->unk_BF4);
+    GraphicElementManager_Delete(param0->unk_BF4);
 
     param0->unk_BF4 = NULL;
 
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 1bf89d863d..d80ab16296 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -1583,7 +1583,7 @@ static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0)
         sub_02009754(param0->unk_1B8[v0]);
     }
 
-    sub_02021964(param0->unk_28);
+    GraphicElementManager_Delete(param0->unk_28);
     param0->unk_28 = NULL;
 
     sub_0200A878();
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 7d3a6f71f2..78eb540faa 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -505,7 +505,7 @@ void ov97_02237DA0 (void)
         v1->unk_190[v2] = NULL;
     }
 
-    sub_02021964(v1->unk_00);
+    GraphicElementManager_Delete(v1->unk_00);
     v1->unk_00 = NULL;
 
     sub_0200A878();
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 21b7458dca..e2fd8a7840 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -140,7 +140,7 @@ void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0)
     sub_0201DC3C();
     sub_0201DCF0(param0->unk_19C);
     sub_020219C0(param0->unk_0C);
-    sub_02021964(param0->unk_0C);
+    GraphicElementManager_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 }
 
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 0bffd0ba0b..4c532a9162 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -116,7 +116,7 @@ void ov105_02245C50 (UnkStruct_ov105_02245AAC * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index cec7d74064..05735a706c 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -131,7 +131,7 @@ void ov106_02243570 (UnkStruct_ov106_02243310 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 756cd87bc2..fc49cd785b 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -172,7 +172,7 @@ void ov107_02249954 (UnkStruct_ov107_02249954 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 8d7ea7a0cc..0ea504eb43 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -130,7 +130,7 @@ void ov108_02243194 (UnkStruct_ov108_02243030 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 9193fa7ab7..577ece911b 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -309,7 +309,7 @@ int ov109_021D3F9C (OverlayManager * param0, int * param1)
         sub_02009754(v1->unk_1F0[v0]);
     }
 
-    sub_02021964(v1->unk_60);
+    GraphicElementManager_Delete(v1->unk_60);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 8fed14176e..83d214378f 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -165,7 +165,7 @@ void ov111_021D3320 (UnkStruct_ov111_021D2F80 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index 4f97b40b44..a281b3ca75 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -587,7 +587,7 @@ static void ov112_0225CC38 (UnkStruct_ov112_0225C9BC * param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_04);
+    GraphicElementManager_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 8f1f71bbaf..78ca9bd9c0 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1413,7 +1413,7 @@ static void ov114_0225CFCC (UnkStruct_ov114_0225CFCC * param0, u32 param1, u32 p
 
 static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0)
 {
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     sub_0201E958();
     sub_0201F8B4();
     sub_0200A878();
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 49226a84b3..fb4dafc0b0 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -3212,7 +3212,7 @@ static void ov115_02263A3C (UnkStruct_ov115_02261ADC * param0)
     int v0;
 
     sub_020127BC(param0->unk_1F0);
-    sub_02021964(param0->unk_1C);
+    GraphicElementManager_Delete(param0->unk_1C);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_1AC[v0]);
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index e39ef6805f..3cf22cb30c 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -158,9 +158,9 @@ GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, i
 
     sub_0200A8B0(&param1->unk_94[1], &v1, NNS_G2D_SURFACETYPE_SUB2D, &param1->unk_00);
 
-    v0.unk_00 = param0;
-    v0.unk_04 = &param1->unk_00;
-    v0.unk_08 = param2;
+    v0.maxElements = param0;
+    v0.renderer = &param1->unk_00;
+    v0.heapID = param2;
 
     return GraphicElementManager_New(&v0);
 }
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 17fe201036..b46e355af1 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -172,7 +172,7 @@ void sub_0200C808 (void)
 
 void sub_0200C810 (SpriteGfxHandler * param0)
 {
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
 }
 
 void sub_0200C81C (SpriteGfxHandler * param0)
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index db7bf06869..c69811a1d0 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -56,14 +56,14 @@ typedef struct GraphicElementData_t {
     u16 unk_F0;
     u8 unk_F2;
     u16 unk_F4;
-    NNS_G2D_VRAM_TYPE unk_F8;
-    struct GraphicElementData_t * unk_FC;
-    struct GraphicElementData_t * unk_100;
+    NNS_G2D_VRAM_TYPE type;
+    struct GraphicElementData_t *prev;
+    struct GraphicElementData_t *next;
 } GraphicElementData;
 
 typedef struct GraphicElementManager_t {
-    GraphicElementData * unk_00;
-    int unk_04;
+    GraphicElementData * elements;
+    int maxElements;
     GraphicElementData ** unk_08;
     int unk_0C;
     GraphicElementData sentinelData;
@@ -93,7 +93,7 @@ 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 void GraphicElementManager_InitElements(GraphicElementManager * param0);
 static GraphicElementData * sub_02022550(GraphicElementManager * param0);
 static BOOL sub_0202256C(GraphicElementManager * param0, GraphicElementData * param1);
 
@@ -105,25 +105,25 @@ GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerPara
     GF_ASSERT(params);
     GF_ASSERT(params->renderer);
 
-    gfxElemMgr = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementManager));
+    gfxElemMgr = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementManager));
     GF_ASSERT(gfxElemMgr);
 
     GraphicElementManager_Reset(gfxElemMgr);
 
-    gfxElemMgr->unk_00 = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementData) * params->unk_00);
-    GF_ASSERT(gfxElemMgr->unk_00);
-    gfxElemMgr->unk_04 = params->unk_00;
+    gfxElemMgr->elements = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData) * params->maxElements);
+    GF_ASSERT(gfxElemMgr->elements);
+    gfxElemMgr->maxElements = params->maxElements;
 
-    gfxElemMgr->unk_08 = Heap_AllocFromHeap(params->unk_08, sizeof(GraphicElementData *) * params->unk_00);
+    gfxElemMgr->unk_08 = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData *) * params->maxElements);
     GF_ASSERT(gfxElemMgr->unk_08);
 
-    sub_02022518(gfxElemMgr);
+    GraphicElementManager_InitElements(gfxElemMgr);
     GraphicElementData_Reset(&gfxElemMgr->sentinelData);
 
-    gfxElemMgr->sentinelData.unk_FC = &gfxElemMgr->sentinelData;
-    gfxElemMgr->sentinelData.unk_100 = &gfxElemMgr->sentinelData;
+    gfxElemMgr->sentinelData.prev = &gfxElemMgr->sentinelData;
+    gfxElemMgr->sentinelData.next = &gfxElemMgr->sentinelData;
     gfxElemMgr->renderer = params->renderer;
-    gfxElemMgr->rawAnimData = ReadFileToHeap(params->unk_08, "data/clact_default.NANR");
+    gfxElemMgr->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
 
     NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->animData);
     gfxElemMgr->unk_11C = 1;
@@ -131,28 +131,28 @@ GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerPara
     return gfxElemMgr;
 }
 
-BOOL sub_02021964 (GraphicElementManager * param0)
+BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr)
 {
-    if (param0 == NULL) {
-        return 0;
+    if (gfxElemMgr == NULL) {
+        return FALSE;
     }
 
-    if (param0->unk_00 == NULL) {
-        return 1;
+    if (gfxElemMgr->elements == NULL) {
+        return TRUE;
     }
 
-    sub_020219C0(param0);
+    sub_020219C0(gfxElemMgr);
 
-    Heap_FreeToHeap(param0->rawAnimData);
-    Heap_FreeToHeap(param0->unk_08);
-    Heap_FreeToHeap(param0->unk_00);
+    Heap_FreeToHeap(gfxElemMgr->rawAnimData);
+    Heap_FreeToHeap(gfxElemMgr->unk_08);
+    Heap_FreeToHeap(gfxElemMgr->elements);
 
-    GraphicElementManager_Reset(param0);
-    Heap_FreeToHeap(param0);
+    GraphicElementManager_Reset(gfxElemMgr);
+    Heap_FreeToHeap(gfxElemMgr);
 
-    param0 = NULL;
+    gfxElemMgr = NULL;
 
-    return 1;
+    return TRUE;
 }
 
 BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1)
@@ -161,7 +161,7 @@ BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1)
         return 0;
     }
 
-    if (param0->unk_00 == NULL) {
+    if (param0->elements == NULL) {
         return 0;
     }
 
@@ -170,28 +170,27 @@ BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1)
     return 1;
 }
 
-BOOL sub_020219C0 (GraphicElementManager * param0)
+BOOL sub_020219C0(GraphicElementManager *gfxElemMgr)
 {
-    GraphicElementData * v0;
-    GraphicElementData * v1;
+    GraphicElementData *elem;
+    GraphicElementData *next;
 
-    if (param0 == NULL) {
-        return 0;
+    if (gfxElemMgr == NULL) {
+        return FALSE;
     }
 
-    if (param0->unk_00 == NULL) {
-        return 1;
+    if (gfxElemMgr->elements == NULL) {
+        return TRUE;
     }
 
-    v0 = param0->sentinelData.unk_100;
-
-    while (v0 != &param0->sentinelData) {
-        v1 = v0->unk_100;
-        sub_02021BD4(v0);
-        v0 = v1;
+    elem = gfxElemMgr->sentinelData.next;
+    while (elem != &gfxElemMgr->sentinelData) {
+        next = elem->next;
+        sub_02021BD4(elem);
+        elem = next;
     }
 
-    return 1;
+    return TRUE;
 }
 
 void sub_020219F8 (const GraphicElementManager * param0)
@@ -212,19 +211,19 @@ void sub_020219F8 (const GraphicElementManager * param0)
         return;
     }
 
-    v0 = param0->sentinelData.unk_100;
+    v0 = param0->sentinelData.next;
 
     while (v0 != &param0->sentinelData) {
         v1[v0->unk_34](param0, v0);
         v2[v0->unk_35](v0);
-        v0 = v0->unk_100;
+        v0 = v0->next;
     }
 }
 
 static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
 {
-    gfxElemMgr->unk_00 = NULL;
-    gfxElemMgr->unk_04 = 0;
+    gfxElemMgr->elements = NULL;
+    gfxElemMgr->maxElements = 0;
     gfxElemMgr->unk_08 = NULL;
     gfxElemMgr->unk_0C = 0;
     gfxElemMgr->renderer = NULL;
@@ -261,7 +260,7 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
     v0->unk_00 = param0->unk_08;
     v0->unk_18 = param0->unk_14;
     v0->unk_24 = param0->unk_20;
-    v0->unk_F8 = param0->unk_28;
+    v0->type = param0->unk_28;
     v0->unk_F4 = param0->unk_24;
     v0->unk_26 = 0;
     v0->unk_27 = 0;
@@ -281,7 +280,7 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
         return NULL;
     }
 
-    v0->unk_2A = sub_020222C4(&v0->paletteProxy, v0->unk_F8);
+    v0->unk_2A = sub_020222C4(&v0->paletteProxy, v0->type);
     v0->unk_29 = v0->unk_2A;
 
     sub_02022464(param0->unk_00, v0);
@@ -307,27 +306,27 @@ GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
     return sub_02021AA0(&v0);
 }
 
-void sub_02021BD4 (GraphicElementData * param0)
+void sub_02021BD4 (GraphicElementData *gfxElem)
 {
-    GraphicElementManager * v0;
+    GraphicElementManager *gfxElemMgr;
 
-    if (param0->unk_EC != 0) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
+    if (gfxElem->unk_EC != 0) {
+        CellAnimationData *v1 = (CellAnimationData *)&gfxElem->unk_40;
 
-        if (param0->unk_FC != NULL) {
-            sub_020224FC(param0);
+        if (gfxElem->prev != NULL) {
+            sub_020224FC(gfxElem);
         }
 
-        if (param0->unk_EC == 3) {
-            CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)&param0->unk_40;
+        if (gfxElem->unk_EC == 3) {
+            CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)&gfxElem->unk_40;
 
-            if (NNS_G2dGetImageLocation(&param0->imageProxy, param0->unk_F8) != NNS_G2D_VRAM_ADDR_NONE) {
+            if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->type) != NNS_G2D_VRAM_ADDR_NONE) {
                 NNS_G2dFreeCellTransferStateHandle(v2->unk_60);
             }
         }
 
-        if (param0->unk_EC == 2) {
-            MultiCellAnimationData * v3 = (MultiCellAnimationData *)&param0->unk_40;
+        if (gfxElem->unk_EC == 2) {
+            MultiCellAnimationData * v3 = (MultiCellAnimationData *)&gfxElem->unk_40;
 
             if (v3->unk_74 != NULL) {
                 Heap_FreeToHeap(v3->unk_74);
@@ -338,10 +337,10 @@ void sub_02021BD4 (GraphicElementData * param0)
             }
         }
 
-        param0->unk_EC = 0;
+        gfxElem->unk_EC = 0;
 
-        v0 = (GraphicElementManager *)param0->manager;
-        sub_0202256C(v0, param0);
+        gfxElemMgr = (GraphicElementManager *)gfxElem->manager;
+        sub_0202256C(gfxElemMgr, gfxElem);
     }
 }
 
@@ -567,7 +566,7 @@ void sub_02021E90 (GraphicElementData * param0, u32 param1)
 void sub_02021EC4 (GraphicElementData * param0, u32 param1)
 {
     sub_02021E90(param0, param1);
-    param0->unk_29 += sub_020222C4(&param0->paletteProxy, param0->unk_F8);
+    param0->unk_29 += sub_020222C4(&param0->paletteProxy, param0->type);
 }
 
 u32 sub_02021EE8 (const GraphicElementData * param0)
@@ -587,7 +586,7 @@ void sub_02021EF0 (GraphicElementData * param0, u32 param1)
 void sub_02021F24 (GraphicElementData * param0, u32 param1)
 {
     sub_02021EF0(param0, param1);
-    param0->unk_2A += sub_020222C4(&param0->paletteProxy, param0->unk_F8);
+    param0->unk_2A += sub_020222C4(&param0->paletteProxy, param0->type);
 }
 
 u32 sub_02021F48 (const GraphicElementData * param0)
@@ -639,7 +638,7 @@ void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
 
 NNS_G2D_VRAM_TYPE sub_02021FC8 (const GraphicElementData * param0)
 {
-    return param0->unk_F8;
+    return param0->type;
 }
 
 BOOL sub_02021FD0 (GraphicElementData * param0)
@@ -941,30 +940,30 @@ static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * p
 {
     GraphicElementData * v0;
 
-    if (param0->sentinelData.unk_100 == &param0->sentinelData) {
-        param0->sentinelData.unk_100 = param1;
-        param0->sentinelData.unk_FC = param1;
-        param1->unk_FC = &param0->sentinelData;
-        param1->unk_100 = &param0->sentinelData;
+    if (param0->sentinelData.next == &param0->sentinelData) {
+        param0->sentinelData.next = param1;
+        param0->sentinelData.prev = param1;
+        param1->prev = &param0->sentinelData;
+        param1->next = &param0->sentinelData;
     } else {
-        if (param0->sentinelData.unk_FC->unk_F4 <= param1->unk_F4) {
-            param1->unk_FC = param0->sentinelData.unk_FC;
-            param0->sentinelData.unk_FC->unk_100 = param1;
-            param1->unk_100 = &param0->sentinelData;
-            param0->sentinelData.unk_FC = param1;
+        if (param0->sentinelData.prev->unk_F4 <= param1->unk_F4) {
+            param1->prev = param0->sentinelData.prev;
+            param0->sentinelData.prev->next = param1;
+            param1->next = &param0->sentinelData;
+            param0->sentinelData.prev = param1;
         } else {
-            v0 = param0->sentinelData.unk_100;
+            v0 = param0->sentinelData.next;
 
             while (v0 != &param0->sentinelData) {
                 if (v0->unk_F4 > param1->unk_F4) {
-                    v0->unk_FC->unk_100 = param1;
-                    param1->unk_FC = v0->unk_FC;
-                    v0->unk_FC = param1;
-                    param1->unk_100 = v0;
+                    v0->prev->next = param1;
+                    param1->prev = v0->prev;
+                    v0->prev = param1;
+                    param1->next = v0;
                     break;
                 }
 
-                v0 = v0->unk_100;
+                v0 = v0->next;
             }
         }
     }
@@ -972,27 +971,25 @@ static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * p
 
 static void sub_020224FC (GraphicElementData * param0)
 {
-    param0->unk_FC->unk_100 = param0->unk_100;
-    param0->unk_100->unk_FC = param0->unk_FC;
+    param0->prev->next = param0->next;
+    param0->next->prev = param0->prev;
 }
 
-static void sub_02022518 (GraphicElementManager * param0)
+static void GraphicElementManager_InitElements(GraphicElementManager *gfxElemMgr)
 {
-    int v0;
-
-    for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_Reset(&param0->unk_00[v0]);
-        param0->unk_08[v0] = param0->unk_00 + v0;
+    for (int i = 0; i < gfxElemMgr->maxElements; i++) {
+        GraphicElementData_Reset(&gfxElemMgr->elements[i]);
+        gfxElemMgr->unk_08[i] = gfxElemMgr->elements + i;
     }
 
-    param0->unk_0C = 0;
+    gfxElemMgr->unk_0C = 0;
 }
 
 static GraphicElementData * sub_02022550 (GraphicElementManager * param0)
 {
     GraphicElementData * v0;
 
-    if (param0->unk_0C >= param0->unk_04) {
+    if (param0->unk_0C >= param0->maxElements) {
         return NULL;
     }
 
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index a437ab2f76..f1f59d1bcb 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -501,7 +501,7 @@ static void sub_0205D22C (UnkStruct_0205D094 * param0)
 {
     int v0;
 
-    sub_02021964(param0->unk_00);
+    GraphicElementManager_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     sub_020095A8(param0->unk_04);
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 6665877750..9efd1f7d1f 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1164,7 +1164,7 @@ static int sub_02086F3C (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_318[v2]);
     }
 
-    sub_02021964(v0->unk_188);
+    GraphicElementManager_Delete(v0->unk_188);
     sub_0200A878();
     Heap_FreeToHeapExplicit(18, v0->unk_510);
 
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 2782e37df8..84786b1248 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -87,7 +87,7 @@ static void sub_02099118 (UnkStruct_0209903C * param0)
     u32 v0;
 
     Heap_FreeToHeap(param0->unk_1C4);
-    sub_02021964(param0->unk_10);
+    GraphicElementManager_Delete(param0->unk_10);
     sub_0200A508(param0->unk_1B4[0]);
     sub_0200A700(param0->unk_1B4[1]);
 

From 586b7cc335628eb03497626b43f47f8031ff3f0e Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 13:12:28 +0200
Subject: [PATCH 03/19] Label various GraphicElementData fields

---
 src/unk_020218BC.c | 192 ++++++++++++++++++++++++---------------------
 1 file changed, 103 insertions(+), 89 deletions(-)

diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index c69811a1d0..4e32c423a3 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -1,6 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "nnsys/g2d/g2d_RendererCore.h"
 #include "struct_defs/struct_020095C4.h"
 #include "overlay019/struct_ov19_021DA864.h"
 #include "overlay083/struct_ov83_0223D9A8.h"
@@ -10,6 +11,10 @@
 #include "heap.h"
 #include "unk_020218BC.h"
 
+#define GRAPHIC_ELEMENT_DATA_FLIP_NONE 0
+#define GRAPHIC_ELEMENT_DATA_FLIP_H 1
+#define GRAPHIC_ELEMENT_DATA_FLIP_V 2
+
 typedef struct {
     const NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
@@ -34,17 +39,17 @@ typedef struct {
 } MultiCellAnimationData;
 
 typedef struct GraphicElementData_t {
-    VecFx32 unk_00;
-    VecFx32 unk_0C;
-    VecFx32 unk_18;
-    u16 unk_24;
-    u8 unk_26;
-    u8 unk_27;
-    u8 unk_28;
-    u8 unk_29;
-    u8 unk_2A;
-    BOOL unk_2C;
-    GXOamMode oamMode;
+    VecFx32 position;
+    VecFx32 affineTranslation;
+    VecFx32 affineScale;
+    u16 affineZRotation;
+    u8 affineOverwriteMode;
+    u8 flip;
+    u8 overwriteFlags;
+    u8 explicitPalette;
+    u8 explicitPaletteOffset;
+    BOOL explicitMosaic;
+    GXOamMode explicitOamMode;
     u8 unk_34;
     u8 unk_35;
     fx32 unk_38;
@@ -54,7 +59,7 @@ typedef struct GraphicElementData_t {
     NNSG2dImagePaletteProxy paletteProxy;
     u32 unk_EC;
     u16 unk_F0;
-    u8 unk_F2;
+    u8 explicitPriority;
     u16 unk_F4;
     NNS_G2D_VRAM_TYPE type;
     struct GraphicElementData_t *prev;
@@ -87,7 +92,7 @@ static void sub_02022208(const UnkStruct_ov19_021DA864 * param0, GraphicElementD
 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 GraphicElementManager * param0, GraphicElementData * param1);
+static void GraphicElementManager_DrawElement(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);
@@ -198,7 +203,7 @@ void sub_020219F8 (const GraphicElementManager * param0)
     GraphicElementData * v0;
     static const GraphicElementUpdateFunc v1[] = {
         sub_02022450,
-        sub_020222F4
+        GraphicElementManager_DrawElement
     };
     static const GraphicElementInitializeFunc v2[] = {
         sub_02022460,
@@ -242,7 +247,7 @@ void GraphicElementData_Reset(GraphicElementData *elem)
     NNS_G2dInitImageProxy(&elem->imageProxy);
     NNS_G2dInitImagePaletteProxy(&elem->paletteProxy);
 
-    elem->oamMode = GX_OAM_MODE_NORMAL;
+    elem->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
 GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
@@ -257,19 +262,19 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
 
     v0->manager = param0->unk_00;
     v0->unk_F0 = 0;
-    v0->unk_00 = param0->unk_08;
-    v0->unk_18 = param0->unk_14;
-    v0->unk_24 = param0->unk_20;
+    v0->position = param0->unk_08;
+    v0->affineScale = param0->unk_14;
+    v0->affineZRotation = param0->unk_20;
     v0->type = param0->unk_28;
     v0->unk_F4 = param0->unk_24;
-    v0->unk_26 = 0;
-    v0->unk_27 = 0;
-    v0->unk_2C = 0;
-    v0->oamMode = GX_OAM_MODE_NORMAL;
-    v0->unk_28 = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
+    v0->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+    v0->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
+    v0->explicitMosaic = FALSE;
+    v0->explicitOamMode = GX_OAM_MODE_NORMAL;
+    v0->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
-    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), v0->unk_26);
-    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), v0->unk_27 & 1, v0->unk_27 & 2);
+    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), v0->affineOverwriteMode);
+    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), v0->flip & 1, v0->flip & 2);
 
     v0->unk_34 = 1;
     v0->unk_35 = 0;
@@ -280,8 +285,8 @@ GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
         return NULL;
     }
 
-    v0->unk_2A = sub_020222C4(&v0->paletteProxy, v0->type);
-    v0->unk_29 = v0->unk_2A;
+    v0->explicitPaletteOffset = sub_020222C4(&v0->paletteProxy, v0->type);
+    v0->explicitPalette = v0->explicitPaletteOffset;
 
     sub_02022464(param0->unk_00, v0);
 
@@ -346,17 +351,17 @@ void sub_02021BD4 (GraphicElementData *gfxElem)
 
 void sub_02021C50 (GraphicElementData * param0, const VecFx32 * param1)
 {
-    param0->unk_00 = *param1;
+    param0->position = *param1;
 }
 
 void sub_02021C60 (GraphicElementData * param0, const VecFx32 * param1)
 {
-    param0->unk_0C = *param1;
+    param0->affineTranslation = *param1;
 }
 
 void sub_02021C70 (GraphicElementData * param0, const VecFx32 * param1)
 {
-    param0->unk_18 = *param1;
+    param0->affineScale = *param1;
 }
 
 void sub_02021C80 (GraphicElementData * param0, const VecFx32 * param1, int param2)
@@ -367,7 +372,7 @@ void sub_02021C80 (GraphicElementData * param0, const VecFx32 * param1, int para
 
 void sub_02021C94 (GraphicElementData * param0, u16 param1)
 {
-    param0->unk_24 = param1;
+    param0->affineZRotation = param1;
 }
 
 void sub_02021C98 (GraphicElementData * param0, u16 param1, int param2)
@@ -403,30 +408,30 @@ void sub_02021CF8 (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_26 = param1;
+    param0->affineOverwriteMode = param1;
 }
 
 void sub_02021D0C (GraphicElementData * param0, int param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_27 = param1;
-    param0->unk_26 = 0;
+    param0->flip = param1;
+    param0->affineOverwriteMode = 0;
 }
 
 const VecFx32 * sub_02021D28 (const GraphicElementData * param0)
 {
-    return &param0->unk_00;
+    return &param0->position;
 }
 
 const VecFx32 * sub_02021D2C (const GraphicElementData * param0)
 {
-    return &param0->unk_18;
+    return &param0->affineScale;
 }
 
 u16 sub_02021D30 (const GraphicElementData * param0)
 {
-    return param0->unk_24;
+    return param0->affineZRotation;
 }
 
 int sub_02021D34 (const GraphicElementData * param0)
@@ -546,53 +551,53 @@ u16 sub_02021E74 (const GraphicElementData * param0)
 
 void sub_02021E80 (GraphicElementData * param0, u8 param1)
 {
-    param0->unk_F2 = param1;
+    param0->explicitPriority = param1;
 }
 
 u8 sub_02021E88 (const GraphicElementData * param0)
 {
-    return param0->unk_F2;
+    return param0->explicitPriority;
 }
 
 void sub_02021E90 (GraphicElementData * param0, u32 param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_29 = param1;
-    param0->unk_28 |= NNS_G2D_RND_OVERWRITE_PLTTNO;
-    param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    param0->explicitPalette = param1;
+    param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
+    param0->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
 }
 
 void sub_02021EC4 (GraphicElementData * param0, u32 param1)
 {
     sub_02021E90(param0, param1);
-    param0->unk_29 += sub_020222C4(&param0->paletteProxy, param0->type);
+    param0->explicitPalette += sub_020222C4(&param0->paletteProxy, param0->type);
 }
 
 u32 sub_02021EE8 (const GraphicElementData * param0)
 {
-    return param0->unk_29;
+    return param0->explicitPalette;
 }
 
 void sub_02021EF0 (GraphicElementData * param0, u32 param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_2A = param1;
-    param0->unk_28 |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
-    param0->unk_28 &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
+    param0->explicitPaletteOffset = param1;
+    param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    param0->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
 }
 
 void sub_02021F24 (GraphicElementData * param0, u32 param1)
 {
     sub_02021EF0(param0, param1);
-    param0->unk_2A += sub_020222C4(&param0->paletteProxy, param0->type);
+    param0->explicitPaletteOffset += sub_020222C4(&param0->paletteProxy, param0->type);
 }
 
 u32 sub_02021F48 (const GraphicElementData * param0)
 {
     GF_ASSERT(param0);
-    return param0->unk_2A;
+    return param0->explicitPaletteOffset;
 }
 
 void sub_02021F58 (GraphicElementData * param0, u32 param1)
@@ -627,12 +632,12 @@ NNSG2dImagePaletteProxy * sub_02021F9C (GraphicElementData * param0)
 
 void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
 {
-    param0->unk_2C = param1;
+    param0->explicitMosaic = param1;
 
     if (param1 == 1) {
-        param0->unk_28 |= NNS_G2D_RND_OVERWRITE_MOSAIC;
+        param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
     } else {
-        param0->unk_28 ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
+        param0->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
     }
 }
 
@@ -658,12 +663,12 @@ void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1)
 {
     GF_ASSERT(param0);
 
-    param0->oamMode = param1;
+    param0->explicitOamMode = param1;
 
     if (param1 == GX_OAM_MODE_NORMAL) {
-        param0->unk_28 ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
+        param0->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
     } else {
-        param0->unk_28 |= NNS_G2D_RND_OVERWRITE_OBJMODE;
+        param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
     }
 }
 
@@ -762,7 +767,7 @@ static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_
         }
     }
 
-    param2->unk_F2 = param1->unk_20;
+    param2->explicitPriority = param1->unk_20;
 
     return 1;
 }
@@ -874,47 +879,56 @@ static u32 sub_020222C4 (const NNSG2dImagePaletteProxy * param0, u32 param1)
     return v1;
 }
 
-static void sub_020222F4 (const GraphicElementManager * param0, GraphicElementData * param1)
+static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
 {
-    VecFx32 v0 = param1->unk_00;
+    VecFx32 pos = elem->position;
 
-    NNS_G2dSetRendererImageProxy(param0->renderer, &param1->imageProxy, &param1->paletteProxy);
-    NNS_G2dBeginRendering(param0->renderer);
+    NNS_G2dSetRendererImageProxy(gfxElemMgr->renderer, &elem->imageProxy, &elem->paletteProxy);
+    NNS_G2dBeginRendering(gfxElemMgr->renderer);
     NNS_G2dPushMtx();
 
-    {
-        NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->renderer->rendererCore), param1->unk_26);
+    NNS_G2dSetRndCoreAffineOverwriteMode(&gfxElemMgr->renderer->rendererCore, elem->affineOverwriteMode);
 
-        if (param1->unk_26 == 0) {
-            NNS_G2dSetRndCoreFlipMode(&(param0->renderer->rendererCore), param1->unk_27 & 1, param1->unk_27 & 2);
-        } else {
-            NNS_G2dSetRndCoreFlipMode(&(param0->renderer->rendererCore), 0, 0);
-        }
+    if (elem->affineOverwriteMode == NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+        NNS_G2dSetRndCoreFlipMode(
+            &gfxElemMgr->renderer->rendererCore, 
+            elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_H, 
+            elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_V
+        );
+    } else {
+        NNS_G2dSetRndCoreFlipMode(&gfxElemMgr->renderer->rendererCore, FALSE, FALSE);
+    }
 
-        NNS_G2dTranslate(v0.x, v0.y, v0.z);
+    NNS_G2dTranslate(pos.x, pos.y, pos.z);
 
-        if (param1->unk_26 != 0) {
-            NNS_G2dTranslate(param1->unk_0C.x, param1->unk_0C.y, param1->unk_0C.z);
-            NNS_G2dScale(param1->unk_18.x, param1->unk_18.y, param1->unk_18.z);
-            NNS_G2dRotZ(FX_SinIdx(param1->unk_24), FX_CosIdx(param1->unk_24));
-            NNS_G2dTranslate(-param1->unk_0C.x, -param1->unk_0C.y, -param1->unk_0C.z);
-        }
+    if (elem->affineOverwriteMode != NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+        NNS_G2dTranslate(elem->affineTranslation.x, elem->affineTranslation.y, elem->affineTranslation.z);
+        NNS_G2dScale(elem->affineScale.x, elem->affineScale.y, elem->affineScale.z);
+        NNS_G2dRotZ(FX_SinIdx(elem->affineZRotation), FX_CosIdx(elem->affineZRotation));
 
-        NNS_G2dSetRendererOverwriteEnable(param0->renderer, param1->unk_28);
-        NNS_G2dSetRendererOverwriteDisable(param0->renderer, ~param1->unk_28);
-        NNS_G2dSetRendererOverwritePlttNo(param0->renderer, param1->unk_29);
-        NNS_G2dSetRendererOverwritePlttNoOffset(param0->renderer, param1->unk_2A);
-        NNS_G2dSetRendererOverwriteMosaicFlag(param0->renderer, param1->unk_2C);
-        NNS_G2dSetRendererOverwriteOBJMode(param0->renderer, param1->oamMode);
-        NNS_G2dSetRendererOverwritePriority(param0->renderer, param1->unk_F2);
-
-        if ((param1->unk_EC == 1) || (param1->unk_EC == 3)) {
-            CellAnimationData * v1 = (CellAnimationData *)&param1->unk_40;
-            NNS_G2dDrawCellAnimation(&v1->unk_08);
-        } else {
-            MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param1->unk_40;
-            NNS_G2dDrawMultiCellAnimation(&v2->unk_08);
-        }
+        // affineTranslation only serves as a pivot point for rotation and scaling
+        // so we undo this translation after applying these transformations.
+        NNS_G2dTranslate(-elem->affineTranslation.x, -elem->affineTranslation.y, -elem->affineTranslation.z);
+    }
+
+    // Set the overwrite parameters
+    // We always want the actual overwrite flags to be equal to overwriteParam
+    // so we set the flags that are not in overwriteParam to 0 with the second call
+    NNS_G2dSetRendererOverwriteEnable(gfxElemMgr->renderer, elem->overwriteFlags);
+    NNS_G2dSetRendererOverwriteDisable(gfxElemMgr->renderer, ~elem->overwriteFlags);
+
+    NNS_G2dSetRendererOverwritePlttNo(gfxElemMgr->renderer, elem->explicitPalette);
+    NNS_G2dSetRendererOverwritePlttNoOffset(gfxElemMgr->renderer, elem->explicitPaletteOffset);
+    NNS_G2dSetRendererOverwriteMosaicFlag(gfxElemMgr->renderer, elem->explicitMosaic);
+    NNS_G2dSetRendererOverwriteOBJMode(gfxElemMgr->renderer, elem->explicitOamMode);
+    NNS_G2dSetRendererOverwritePriority(gfxElemMgr->renderer, elem->explicitPriority);
+
+    if (elem->unk_EC == 1 || elem->unk_EC == 3) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->unk_40;
+        NNS_G2dDrawCellAnimation(&cellAnim->unk_08);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->unk_40;
+        NNS_G2dDrawMultiCellAnimation(&multiCellAnim->unk_08);
     }
 
     NNS_G2dPopMtx();

From 526a6f6d5e00c9c0f93e5a2df45acd46149cea5f Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 13:37:11 +0200
Subject: [PATCH 04/19] Document GraphicElementManager stack management
 functions

---
 include/unk_020218BC.h          |   2 +-
 src/overlay005/ov5_021D2F14.c   |   4 +-
 src/overlay005/ov5_021D5EB8.c   |   2 +-
 src/overlay006/ov6_022426AC.c   |   2 +-
 src/overlay022/ov22_02259C58.c  |   2 +-
 src/overlay023/ov23_0223E140.c  |   4 +-
 src/overlay023/ov23_0224340C.c  |  10 +-
 src/overlay023/ov23_02248F1C.c  |   4 +-
 src/overlay056/ov56_022561C0.c  |   2 +-
 src/overlay058/ov58_021D0D80.c  |   6 +-
 src/overlay059/ov59_021D0D80.c  |   4 +-
 src/overlay063/ov63_0222AE60.c  |   4 +-
 src/overlay064/ov64_0222DCE0.c  |   4 +-
 src/overlay065/ov65_0222DCE0.c  |   2 +-
 src/overlay065/ov65_02235060.c  |   4 +-
 src/overlay071/ov71_0223CF0C.c  |   8 +-
 src/overlay072/ov72_0223D7A0.c  |   2 +-
 src/overlay077/ov77_021D54B0.c  |  26 ++---
 src/overlay077/ov77_021D6670.c  |   2 +-
 src/overlay088/ov88_0223B140.c  |  12 +-
 src/overlay094/ov94_0223C610.c  |   2 +-
 src/overlay094/ov94_0223D0C4.c  |   2 +-
 src/overlay094/ov94_0223DC04.c  |   2 +-
 src/overlay094/ov94_0223E46C.c  |   2 +-
 src/overlay094/ov94_0223FB48.c  |  10 +-
 src/overlay094/ov94_02243EF8.c  |   4 +-
 src/overlay096/ov96_0223B6A0.c  |   2 +-
 src/overlay097/ov97_0222D30C.c  |   2 +-
 src/overlay097/ov97_02233B18.c  |   8 +-
 src/overlay097/ov97_02237694.c  |   2 +-
 src/overlay105/ov105_02245AAC.c |   2 +-
 src/overlay106/ov106_02243310.c |   2 +-
 src/overlay107/ov107_02249604.c |   2 +-
 src/overlay108/ov108_02243030.c |   2 +-
 src/overlay109/ov109_021D3D50.c |   2 +-
 src/overlay111/ov111_021D2F80.c |   2 +-
 src/overlay115/ov115_02260CEC.c |   8 +-
 src/unk_0200C6E4.c              |   4 +-
 src/unk_020218BC.c              | 190 ++++++++++++++++----------------
 src/unk_0205CA94.c              |   2 +-
 src/unk_0208694C.c              |   8 +-
 src/unk_02098FFC.c              |   2 +-
 42 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 61fc02b39b..d469e9bc3c 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -17,7 +17,7 @@ BOOL sub_020219A4(GraphicElementManager * param0, u8 param1);
 BOOL sub_020219C0(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
-GraphicElementData * sub_02021AA0(const UnkStruct_ov115_02261520 * param0);
+GraphicElementData * GraphicElementManager_AddElement(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);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index ccc1679236..6bf3c59f45 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -119,7 +119,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v0.unk_28 = param1->unk_14;
     v0.unk_2C = param0->unk_1C6;
 
-    v1 = sub_02021AA0(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
 
     SpriteActor_SetSpriteAnimActive(v1, param1->unk_0A);
@@ -385,7 +385,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     v3.unk_28 = param1->vramType;
     v3.unk_2C = param0->unk_1C6;
 
-    v2->unk_00 = sub_02021AA0(&v3);
+    v2->unk_00 = GraphicElementManager_AddElement(&v3);
 
     if (v2->unk_00 != NULL) {
         v1 = sub_02021EE8(v2->unk_00);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index bf1af2aff3..a9080f8366 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -1477,7 +1477,7 @@ static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 48; v0++) {
-        param0->unk_48[v0].unk_04 = sub_02021AA0(&param0->unk_08->unk_10);
+        param0->unk_48[v0].unk_04 = GraphicElementManager_AddElement(&param0->unk_08->unk_10);
         sub_02021CAC(param0->unk_48[v0].unk_04, 0);
         GF_ASSERT(param0->unk_48[v0].unk_04);
     }
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 39cd1e7588..badd865830 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -220,7 +220,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         v2.unk_08.x = FX32_ONE * (256 / 2);
         v2.unk_08.y = FX32_ONE * (192 / 2);
 
-        param0->unk_1C8 = sub_02021AA0(&v2);
+        param0->unk_1C8 = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_1C8, 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C8, 0);
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index 41fc0237cd..65b52bf75e 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -58,7 +58,7 @@ void ov22_02259C58 (UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1
     GF_ASSERT(param0);
     GF_ASSERT(param1);
 
-    param0->unk_00 = sub_02021AA0(param1->unk_00);
+    param0->unk_00 = GraphicElementManager_AddElement(param1->unk_00);
     GF_ASSERT(param0->unk_00);
 
     param0->unk_04 = param1->unk_0C;
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 14938cd6e7..f3da43ff99 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -2838,12 +2838,12 @@ static void ov23_0224108C (void)
 
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
-                Unk_ov23_02257740->unk_24C[v1] = sub_02021AA0(&v2);
+                Unk_ov23_02257740->unk_24C[v1] = GraphicElementManager_AddElement(&v2);
                 sub_02021CC8(Unk_ov23_02257740->unk_24C[v1], 1);
             }
         }
 
-        Unk_ov23_02257740->unk_24C[v0] = sub_02021AA0(&v2);
+        Unk_ov23_02257740->unk_24C[v0] = GraphicElementManager_AddElement(&v2);
         sub_02021CC8(Unk_ov23_02257740->unk_24C[v0], 1);
     }
 
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 713436809d..a83f166def 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3334,7 +3334,7 @@ static void ov23_0224644C (int param0)
             v0.unk_08.x = FX32_ONE * 300;
             v0.unk_08.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = sub_02021AA0(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
             sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 0);
@@ -3684,7 +3684,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
             v0.unk_08.x = FX32_ONE * 300;
             v0.unk_08.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = sub_02021AA0(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
             sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
@@ -3862,7 +3862,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
             v0.unk_08.x = FX32_ONE * 100;
             v0.unk_08.y = FX32_ONE * 100;
 
-            Unk_ov23_02257764->unk_25C[v1] = sub_02021AA0(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
             sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
@@ -4331,7 +4331,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
             v0.unk_08.x = FX32_ONE * 128;
             v0.unk_08.y = FX32_ONE * 84;
 
-            Unk_ov23_02257764->unk_25C[v1] = sub_02021AA0(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
             sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
@@ -4791,7 +4791,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
             v0.unk_08.x = FX32_ONE * 300;
             v0.unk_08.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = sub_02021AA0(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
             if (v1 == 0) {
                 sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 5927a37551..b6f75c3a16 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -126,7 +126,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             v3.unk_2C = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
-                v0->unk_390[v2] = sub_02021AA0(&v3);
+                v0->unk_390[v2] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(v0->unk_390[v2], 1);
                 sub_02021CAC(v0->unk_390[v2], 0);
 
@@ -136,7 +136,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             }
 
             for (v2 = 0; v2 < 16 + 1; v2++) {
-                v0->unk_3B0[v2] = sub_02021AA0(&v3);
+                v0->unk_3B0[v2] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(v0->unk_3B0[v2], 1);
                 sub_02021CAC(v0->unk_3B0[v2], 0);
                 SpriteActor_SetSpriteAnimActive(v0->unk_3B0[v2], 2);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index dc90b6e37d..b8a3c56ebe 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -435,7 +435,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
             v1.unk_08.x = FX32_CONST((256 - 24));
             v1.unk_08.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT);
 
-            param0->unk_1FC[v0] = sub_02021AA0(&v1);
+            param0->unk_1FC[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_1FC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_1FC[v0], v0);
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index ca28598a86..863cc8b58d 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -694,7 +694,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.unk_08.y = FX32_ONE * (32 + 32);
             v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
 
-            param0->unk_23C[v0] = sub_02021AA0(&v1);
+            param0->unk_23C[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_23C[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_23C[v0], v0);
@@ -706,7 +706,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.unk_08.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
             v1.unk_08.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
 
-            param0->unk_2AC[v0] = sub_02021AA0(&v1);
+            param0->unk_2AC[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_2AC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
@@ -722,7 +722,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.unk_08.x = FX32_ONE * 24;
             v1.unk_08.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
 
-            param0->unk_274[v0] = sub_02021AA0(&v1);
+            param0->unk_274[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_274[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_274[v0], v0);
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index e35fa6780e..7bd22fcc88 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -660,7 +660,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         v1.unk_08.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
         v1.unk_08.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
 
-        param0->unk_28C[0] = sub_02021AA0(&v1);
+        param0->unk_28C[0] = GraphicElementManager_AddElement(&v1);
 
         sub_02021CC8(param0->unk_28C[0], 1);
         sub_02021CAC(param0->unk_28C[0], 1);
@@ -669,7 +669,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
             v1.unk_08.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
             v1.unk_08.y = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][1];
 
-            param0->unk_28C[v0 + 1] = sub_02021AA0(&v1);
+            param0->unk_28C[v0 + 1] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_28C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index ce0ba0b9d8..c6d8c936cb 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -468,7 +468,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
         v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
     }
 
-    v0->unk_04 = sub_02021AA0(&v1);
+    v0->unk_04 = GraphicElementManager_AddElement(&v1);
     sub_02021E80(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
@@ -501,7 +501,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
             v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v0->unk_08 = sub_02021AA0(&v1);
+        v0->unk_08 = GraphicElementManager_AddElement(&v1);
 
         sub_02021E80(v0->unk_08, param1->unk_06);
     } else {
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 6a726d587a..c7ca6bc762 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1240,7 +1240,7 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
         v0[v1].unk_04 = &param0->unk_23C;
         v0[v1].unk_2C = param1;
 
-        param0->unk_270[v1] = sub_02021AA0(&v0[v1]);
+        param0->unk_270[v1] = GraphicElementManager_AddElement(&v0[v1]);
 
         sub_02021CC8(param0->unk_270[v1], 1);
         sub_02021CAC(param0->unk_270[v1], 0);
@@ -2171,7 +2171,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     ldr r0, [sp, #0x18]
     str r0, [sp, #0x54]
     add r0, sp, #0x28
-    bl sub_02021AA0
+    bl GraphicElementManager_AddElement
     mov r2, #0x42
     ldr r1, [sp, #0x14]
     lsl r2, r2, #2
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index bc857a6bae..d72953c1ad 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6706,7 +6706,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
         v9[v1].unk_04 = &v2;
         v9[v1].unk_2C = param2;
 
-        param0->unk_BE0.unk_21C[v1] = sub_02021AA0(&v9[v1]);
+        param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElement(&v9[v1]);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
     }
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 784de5acd6..ae0668f9c7 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -691,8 +691,8 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     v0.unk_24 = 0;
     v0.unk_2C = param1;
 
-    param0->unk_1A0.unk_34 = sub_02021AA0(&v0);
-    param0->unk_1A0.unk_38 = sub_02021AA0(&v0);
+    param0->unk_1A0.unk_34 = GraphicElementManager_AddElement(&v0);
+    param0->unk_1A0.unk_38 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CAC(param0->unk_1A0.unk_34, 0);
     sub_02021CAC(param0->unk_1A0.unk_38, 0);
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index dd6730ded8..5f57539c03 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -128,7 +128,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         for (v0 = 0; v0 < 8; v0++) {
             v3.unk_08.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
             v3.unk_08.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
-            param0->unk_1C0[v0] = sub_02021AA0(&v3);
+            param0->unk_1C0[v0] = GraphicElementManager_AddElement(&v3);
             sub_02021CC8(param0->unk_1C0[v0], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v0], v0);
 
@@ -144,7 +144,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.unk_08.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.unk_08.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.unk_24 = 1;
-                param0->unk_1C0[v2 + v0] = sub_02021AA0(&v3);
+                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 8);
                 sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
@@ -156,7 +156,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.unk_08.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.unk_08.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.unk_24 = 1;
-                param0->unk_1C0[v2 + v0] = sub_02021AA0(&v3);
+                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 9);
                 sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
@@ -169,7 +169,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.unk_08.x = FX32_ONE * (12 * 8);
             v3.unk_08.y = FX32_ONE * (17 * 8);
             v3.unk_24 = 0;
-            param0->unk_1C0[v2] = sub_02021AA0(&v3);
+            param0->unk_1C0[v2] = GraphicElementManager_AddElement(&v3);
             sub_02021CC8(param0->unk_1C0[v2], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2], 10);
             sub_02021CAC(param0->unk_1C0[v2], 0);
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 61786ae903..aec20d6e16 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -537,7 +537,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
             v1.unk_08.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
             v1.unk_08.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
 
-            param0->unk_2B4[v0] = sub_02021AA0(&v1);
+            param0->unk_2B4[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_2B4[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index d950dcb778..c7600d9fe7 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -270,7 +270,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * (128 - 48);
         v2.unk_08.y = FX32_ONE * (14 * 8);
-        param0->unk_250[0] = sub_02021AA0(&v2);
+        param0->unk_250[0] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[0], 0);
         sub_02021CAC(param0->unk_250[0], 0);
@@ -279,7 +279,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * (128 - 48);
         v2.unk_08.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[1] = sub_02021AA0(&v2);
+        param0->unk_250[1] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[1], 0);
         sub_02021CAC(param0->unk_250[1], 0);
@@ -288,7 +288,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * (128 + 48);
         v2.unk_08.y = FX32_ONE * (14 * 8);
-        param0->unk_250[2] = sub_02021AA0(&v2);
+        param0->unk_250[2] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[2], 0);
         sub_02021CAC(param0->unk_250[2], 0);
@@ -297,7 +297,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * -64;
         v2.unk_08.y = FX32_ONE * (14 * 8);
-        param0->unk_250[3] = sub_02021AA0(&v2);
+        param0->unk_250[3] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[3], 1);
         sub_02021CAC(param0->unk_250[3], 0);
@@ -306,7 +306,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * (256 + 64);
         v2.unk_08.y = FX32_ONE * (14 * 8);
-        param0->unk_250[10] = sub_02021AA0(&v2);
+        param0->unk_250[10] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[10], 1);
         sub_02021CAC(param0->unk_250[10], 0);
@@ -315,7 +315,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * 128;
         v2.unk_08.y = FX32_ONE * (12 * 8);
-        param0->unk_250[11] = sub_02021AA0(&v2);
+        param0->unk_250[11] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[11], 1);
         sub_02021CAC(param0->unk_250[11], 0);
@@ -325,7 +325,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * 128;
         v2.unk_08.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[12] = sub_02021AA0(&v2);
+        param0->unk_250[12] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[12], 1);
         sub_02021CAC(param0->unk_250[12], 0);
@@ -335,12 +335,12 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * 128;
         v2.unk_08.y = FX32_ONE * (0xd * 8);
-        param0->unk_250[13] = sub_02021AA0(&v2);
+        param0->unk_250[13] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[13], 1);
         sub_02021CAC(param0->unk_250[13], 0);
 
-        param0->unk_250[14] = sub_02021AA0(&v2);
+        param0->unk_250[14] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[14], 1);
         sub_02021CAC(param0->unk_250[14], 0);
@@ -349,12 +349,12 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.unk_08.x = FX32_ONE * 128;
         v2.unk_08.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[15] = sub_02021AA0(&v2);
+        param0->unk_250[15] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[15], 1);
         sub_02021CAC(param0->unk_250[15], 0);
 
-        param0->unk_250[16] = sub_02021AA0(&v2);
+        param0->unk_250[16] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[16], 1);
         sub_02021CAC(param0->unk_250[16], 0);
@@ -364,7 +364,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
             v2.unk_08.x = FX32_ONE * v4[v0];
             v2.unk_08.y = FX32_ONE * v5[v0];
-            param0->unk_250[v3[v0]] = sub_02021AA0(&v2);
+            param0->unk_250[v3[v0]] = GraphicElementManager_AddElement(&v2);
 
             sub_02021CC8(param0->unk_250[v3[v0]], 1);
             sub_02021CAC(param0->unk_250[v3[v0]], 0);
@@ -384,7 +384,7 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 
         for (v0 = 0; v0 < 16; v0++) {
             v3 = ov77_021D6794(param1, v0);
-            (*v3) = sub_02021AA0(&v2);
+            (*v3) = GraphicElementManager_AddElement(&v2);
             sub_02021CC8(*v3, 0);
             sub_02021CAC(*v3, 0);
         }
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index a17c60f2b9..318e631d3b 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -249,7 +249,7 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
         v2.unk_08.x = FX32_ONE * v0 * 2;
         v2.unk_08.y = FX32_ONE * v0 * 2;
 
-        param0->unk_1B0[v0].unk_04 = sub_02021AA0(&v2);
+        param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_1B0[v0].unk_04, 0);
         sub_02021CAC(param0->unk_1B0[v0].unk_04, 0);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index e960773465..cb17fa9ab5 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1427,7 +1427,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         for (v1 = 0; v1 < 2; v1++) {
             v0.unk_08.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
             v0.unk_08.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
-            param0->unk_39C[v1] = sub_02021AA0(&v0);
+            param0->unk_39C[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CC8(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
             sub_02021F58(param0->unk_39C[v1], 100);
@@ -1437,7 +1437,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         for (v1 = 0; v1 < 12; v1++) {
             v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
             v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
-            param0->unk_3D4[v1] = sub_02021AA0(&v0);
+            param0->unk_3D4[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CC8(param0->unk_3D4[v1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3D4[v1], 5 + v1);
             sub_02021F58(param0->unk_3D4[v1], 5);
@@ -1448,7 +1448,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20);
             v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.unk_24 = 0;
-            param0->unk_404[v1] = sub_02021AA0(&v0);
+            param0->unk_404[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021F58(param0->unk_404[v1], 3);
             sub_02021CAC(param0->unk_404[v1], 0);
         }
@@ -1457,14 +1457,14 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20 + 9);
             v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.unk_24 = 0;
-            param0->unk_434[v1] = sub_02021AA0(&v0);
+            param0->unk_434[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021F58(param0->unk_434[v1], 3);
             sub_02021CAC(param0->unk_434[v1], 0);
         }
 
         v0.unk_08.x = FX32_ONE * (128 - 4 * 8);
         v0.unk_08.y = FX32_ONE * (8 * 8 + 2);
-        param0->unk_47C = sub_02021AA0(&v0);
+        param0->unk_47C = GraphicElementManager_AddElement(&v0);
         sub_02021CC8(param0->unk_47C, 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_47C, 20);
         sub_02021CAC(param0->unk_47C, 0);
@@ -1474,7 +1474,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.unk_08.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
             v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
             v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
-            param0->unk_464[v1] = sub_02021AA0(&v0);
+            param0->unk_464[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CAC(param0->unk_464[v1], 0);
             sub_02021CC8(param0->unk_464[v1], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index c8601c83ad..dccedf59d0 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -313,7 +313,7 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
     v0.unk_08.x = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][0];
     v0.unk_08.y = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][1];
 
-    param0->unk_E20 = sub_02021AA0(&v0);
+    param0->unk_E20 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 1);
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 7795999562..59f62f12d9 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -267,7 +267,7 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
     v0.unk_08.x = FX32_ONE * 208;
     v0.unk_08.y = FX32_ONE * 58;
 
-    param0->unk_F30 = sub_02021AA0(&v0);
+    param0->unk_F30 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index b027817996..6bf0bd728f 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -230,7 +230,7 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
     v0.unk_08.x = FX32_ONE * 208;
     v0.unk_08.y = FX32_ONE * 58;
 
-    param0->unk_F30 = sub_02021AA0(&v0);
+    param0->unk_F30 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index cd8b365e75..78a13e0150 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -301,7 +301,7 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
     v0.unk_08.x = FX32_ONE;
     v0.unk_08.y = FX32_ONE;
 
-    param0->unk_E20 = sub_02021AA0(&v0);
+    param0->unk_E20 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 0);
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 1d2feacbbe..195acade9e 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -365,7 +365,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     v1.unk_08.x = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][0];
     v1.unk_08.y = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][1];
 
-    param0->unk_E20 = sub_02021AA0(&v1);
+    param0->unk_E20 = GraphicElementManager_AddElement(&v1);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 4);
@@ -381,7 +381,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.unk_08.y = FX32_ONE * Unk_ov94_02245ED4[v0][1];
         v1.unk_24 = 20;
 
-        param0->unk_E28[v0] = sub_02021AA0(&v1);
+        param0->unk_E28[v0] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_E28[v0], 6 + v0);
         sub_02021E80(param0->unk_E28[v0], 1);
@@ -392,7 +392,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.unk_08.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.unk_24 = 10;
 
-        param0->unk_EA0[v0] = sub_02021AA0(&v1);
+        param0->unk_EA0[v0] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_EA0[v0], 40);
         sub_02021E80(param0->unk_EA0[v0], 1);
@@ -403,7 +403,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.unk_08.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.unk_24 = 10;
 
-        param0->unk_F18[v0] = sub_02021AA0(&v1);
+        param0->unk_F18[v0] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_F18[v0], 42);
         sub_02021E80(param0->unk_F18[v0], 1);
@@ -413,7 +413,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.unk_08.x = FX32_ONE * Unk_ov94_02245E1C[v0][0];
         v1.unk_08.y = FX32_ONE * Unk_ov94_02245E1C[v0][1];
 
-        param0->unk_F54[v0] = sub_02021AA0(&v1);
+        param0->unk_F54[v0] = GraphicElementManager_AddElement(&v1);
 
         sub_02021CC8(param0->unk_F54[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F54[v0], 38 + v0);
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index c0d178ae71..edbfc5091f 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -55,14 +55,14 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
     v0.unk_08.x = FX32_ONE * 128;
     v0.unk_08.y = FX32_ONE * 130 + (256 * FX32_ONE);
 
-    param0->unk_F34[0] = sub_02021AA0(&v0);
+    param0->unk_F34[0] = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(param0->unk_F34[0], 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F34[0], 3 + param1 * 7);
     sub_02021CAC(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
-        param0->unk_F34[v1 + 1] = sub_02021AA0(&v0);
+        param0->unk_F34[v1 + 1] = GraphicElementManager_AddElement(&v0);
 
         sub_02021CC8(param0->unk_F34[v1 + 1], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F34[v1 + 1], 14 + v1 * 4);
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 3123c4cfd5..2bbf1397c4 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -313,7 +313,7 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
         for (v0 = 0; v0 < 2; v0++) {
             v1.unk_08.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
             v1.unk_08.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
-            param0->unk_E30[v0] = sub_02021AA0(&v1);
+            param0->unk_E30[v0] = GraphicElementManager_AddElement(&v1);
             sub_02021CC8(param0->unk_E30[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_E30[v0], v0);
             sub_02021CAC(param0->unk_E30[v0], 0);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 0fa6ac6707..7228a2410c 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1199,7 +1199,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
             v1.unk_08.y += FX32_CONST(256);
         }
 
-        v0 = sub_02021AA0(&v1);
+        v0 = GraphicElementManager_AddElement(&v1);
     }
 
     if (v0) {
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index d80ab16296..c8f32975a1 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -763,7 +763,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             v3.unk_08.y = FX32_ONE * (v2 * 24 + 40);
 
             if (param0->unk_20C[v0].unk_00 == NULL) {
-                param0->unk_20C[v0].unk_00 = sub_02021AA0(&v3);
+                param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElement(&v3);
             }
 
             sub_02021CC8(param0->unk_20C[v0].unk_00, 1);
@@ -776,7 +776,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             v3.unk_08.y += FX32_ONE * 12;
 
             if (param0->unk_20C[v0].unk_04 == NULL) {
-                param0->unk_20C[v0].unk_04 = sub_02021AA0(&v3);
+                param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElement(&v3);
             }
 
             sub_02021CC8(param0->unk_20C[v0].unk_04, 1);
@@ -805,7 +805,7 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int
     v0.unk_08.y = FX32_ONE * param2;
     v0.unk_24 = 10;
 
-    v1 = sub_02021AA0(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CC8(v1, 1);
     SpriteActor_SetSpriteAnimActive(v1, param3);
@@ -1477,7 +1477,7 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
         v5.unk_08.x = FX32_ONE * (v0 * 40 + 28);
         v5.unk_08.y = FX32_ONE * 142;
 
-        param0->unk_478[v0] = sub_02021AA0(&v5);
+        param0->unk_478[v0] = GraphicElementManager_AddElement(&v5);
 
         sub_02021CC8(param0->unk_478[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_478[v0], 10 + v0);
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 78eb540faa..2b1fb77ee0 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -462,7 +462,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
             v1.unk_08.y += v0->unk_274;
         }
 
-        param1 = sub_02021AA0(&v1);
+        param1 = GraphicElementManager_AddElement(&v1);
     }
 
     sub_02021CC8(param1, 1);
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 4c532a9162..4e0fd66776 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -94,7 +94,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
             v3.unk_08.y += (192 << FX32_SHIFT);
         }
 
-        v2 = sub_02021AA0(&v3);
+        v2 = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(v2, 1);
         SpriteActor_SetSpriteAnimActive(v2, param2);
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 05735a706c..5e63d96698 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -108,7 +108,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
             v3.unk_08.y += (192 << FX32_SHIFT);
         }
 
-        v2 = sub_02021AA0(&v3);
+        v2 = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index fc49cd785b..64e163f8ce 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -146,7 +146,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
             v3.unk_08.y += (192 << FX32_SHIFT);
         }
 
-        v2 = sub_02021AA0(&v3);
+        v2 = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 0ea504eb43..ed86893e09 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -104,7 +104,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
             v3.unk_08.y += (192 << FX32_SHIFT);
         }
 
-        v2 = sub_02021AA0(&v3);
+        v2 = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 577ece911b..f7aa70320d 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -660,7 +660,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
             v1.unk_08.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
             v1.unk_08.y = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][1];
 
-            param0->unk_29C[v0 + 1] = sub_02021AA0(&v1);
+            param0->unk_29C[v0 + 1] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_29C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 83d214378f..55fee0dfb8 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -142,7 +142,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
             v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v2 = sub_02021AA0(&v3);
+        v2 = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(v2, 0);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index fb4dafc0b0..7e1de09bfa 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1309,7 +1309,7 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_0
         param1->unk_08.x = v1 << FX32_SHIFT;
         param1->unk_08.y = v2 << FX32_SHIFT;
         param0->unk_18[v0] = param1->unk_08;
-        param0->unk_00[v0] = sub_02021AA0(param1);
+        param0->unk_00[v0] = GraphicElementManager_AddElement(param1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
         sub_02021CAC(param0->unk_00[v0], 0);
@@ -3716,7 +3716,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
         v0.unk_24 = 32;
         v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
         v0.unk_2C = param2;
-        param1->unk_00 = sub_02021AA0(&v0);
+        param1->unk_00 = GraphicElementManager_AddElement(&v0);
 
         sub_02021CAC(param1->unk_00, 0);
     }
@@ -3939,7 +3939,7 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
     v0.unk_2C = param3;
 
-    param1->unk_04 = sub_02021AA0(&v0);
+    param1->unk_04 = GraphicElementManager_AddElement(&v0);
 
     sub_02021CAC(param1->unk_04, 0);
     sub_02021E90(param1->unk_04, param2);
@@ -4000,7 +4000,7 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v1.unk_2C = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
-        param1->unk_00[v0].unk_04 = sub_02021AA0(&v1);
+        param1->unk_00[v0].unk_04 = GraphicElementManager_AddElement(&v1);
         sub_02021CAC(param1->unk_00[v0].unk_04, 0);
         sub_02021CF8(param1->unk_00[v0].unk_04, 1);
         sub_02021E90(param1->unk_00[v0].unk_04, param2);
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index b46e355af1..91ae2d06e0 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -321,7 +321,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     v1.unk_28 = param9;
     v1.unk_2C = param0->unk_00;
 
-    v0 = sub_02021AA0(&v1);
+    v0 = GraphicElementManager_AddElement(&v1);
 
     if (v0 != NULL) {
         SpriteActor_SetSpriteAnimActive(v0, param6);
@@ -574,7 +574,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     v3.unk_24 = param2->priority;
     v3.unk_28 = param2->vramType;
     v3.unk_2C = param0->unk_00;
-    v2->unk_00 = sub_02021AA0(&v3);
+    v2->unk_00 = GraphicElementManager_AddElement(&v3);
     v2->unk_0C = param2->transferToVRAM;
 
     if (v2->unk_00 != NULL) {
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 4e32c423a3..4734af3e1e 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -60,7 +60,7 @@ typedef struct GraphicElementData_t {
     u32 unk_EC;
     u16 unk_F0;
     u8 explicitPriority;
-    u16 unk_F4;
+    u16 priority;
     NNS_G2D_VRAM_TYPE type;
     struct GraphicElementData_t *prev;
     struct GraphicElementData_t *next;
@@ -69,8 +69,8 @@ typedef struct GraphicElementData_t {
 typedef struct GraphicElementManager_t {
     GraphicElementData * elements;
     int maxElements;
-    GraphicElementData ** unk_08;
-    int unk_0C;
+    GraphicElementData ** elementStack; // Stack of currently unused elements
+    int stackPointer;
     GraphicElementData sentinelData;
     NNSG2dRendererInstance * renderer;
     void * rawAnimData;
@@ -96,11 +96,11 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager * para
 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 GraphicElementManager_InsertElement(GraphicElementManager * param0, GraphicElementData * param1);
+static void GraphicElementManager_RemoveElement(GraphicElementData * param0);
 static void GraphicElementManager_InitElements(GraphicElementManager * param0);
-static GraphicElementData * sub_02022550(GraphicElementManager * param0);
-static BOOL sub_0202256C(GraphicElementManager * param0, GraphicElementData * param1);
+static GraphicElementData * GraphicElementManager_AllocElement(GraphicElementManager * param0);
+static BOOL GraphicElementManager_FreeElement(GraphicElementManager * param0, GraphicElementData * param1);
 
 GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params)
 {
@@ -119,8 +119,8 @@ GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerPara
     GF_ASSERT(gfxElemMgr->elements);
     gfxElemMgr->maxElements = params->maxElements;
 
-    gfxElemMgr->unk_08 = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData *) * params->maxElements);
-    GF_ASSERT(gfxElemMgr->unk_08);
+    gfxElemMgr->elementStack = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData *) * params->maxElements);
+    GF_ASSERT(gfxElemMgr->elementStack);
 
     GraphicElementManager_InitElements(gfxElemMgr);
     GraphicElementData_Reset(&gfxElemMgr->sentinelData);
@@ -149,7 +149,7 @@ BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr)
     sub_020219C0(gfxElemMgr);
 
     Heap_FreeToHeap(gfxElemMgr->rawAnimData);
-    Heap_FreeToHeap(gfxElemMgr->unk_08);
+    Heap_FreeToHeap(gfxElemMgr->elementStack);
     Heap_FreeToHeap(gfxElemMgr->elements);
 
     GraphicElementManager_Reset(gfxElemMgr);
@@ -229,8 +229,8 @@ static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
 {
     gfxElemMgr->elements = NULL;
     gfxElemMgr->maxElements = 0;
-    gfxElemMgr->unk_08 = NULL;
-    gfxElemMgr->unk_0C = 0;
+    gfxElemMgr->elementStack = NULL;
+    gfxElemMgr->stackPointer = 0;
     gfxElemMgr->renderer = NULL;
 
     GraphicElementData_Reset(&gfxElemMgr->sentinelData);
@@ -250,47 +250,47 @@ void GraphicElementData_Reset(GraphicElementData *elem)
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
-GraphicElementData * sub_02021AA0 (const UnkStruct_ov115_02261520 * param0)
+GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_02261520 * param0)
 {
-    GraphicElementData * v0;
+    GraphicElementData *elem;
 
-    v0 = sub_02022550(param0->unk_00);
+    elem = GraphicElementManager_AllocElement(param0->unk_00);
 
-    if (v0 == NULL) {
+    if (elem == NULL) {
         return NULL;
     }
 
-    v0->manager = param0->unk_00;
-    v0->unk_F0 = 0;
-    v0->position = param0->unk_08;
-    v0->affineScale = param0->unk_14;
-    v0->affineZRotation = param0->unk_20;
-    v0->type = param0->unk_28;
-    v0->unk_F4 = param0->unk_24;
-    v0->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
-    v0->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
-    v0->explicitMosaic = FALSE;
-    v0->explicitOamMode = GX_OAM_MODE_NORMAL;
-    v0->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
-
-    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), v0->affineOverwriteMode);
-    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), v0->flip & 1, v0->flip & 2);
-
-    v0->unk_34 = 1;
-    v0->unk_35 = 0;
-    v0->unk_38 = (FX32_ONE * 2);
-
-    if (sub_02022110(param0->unk_00, param0->unk_04, v0, param0->unk_2C) == 0) {
-        sub_02021BD4(v0);
+    elem->manager = param0->unk_00;
+    elem->unk_F0 = 0;
+    elem->position = param0->unk_08;
+    elem->affineScale = param0->unk_14;
+    elem->affineZRotation = param0->unk_20;
+    elem->type = param0->unk_28;
+    elem->priority = param0->unk_24;
+    elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+    elem->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
+    elem->explicitMosaic = FALSE;
+    elem->explicitOamMode = GX_OAM_MODE_NORMAL;
+    elem->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
+
+    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), elem->affineOverwriteMode);
+    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), elem->flip & 1, elem->flip & 2);
+
+    elem->unk_34 = 1;
+    elem->unk_35 = 0;
+    elem->unk_38 = (FX32_ONE * 2);
+
+    if (sub_02022110(param0->unk_00, param0->unk_04, elem, param0->unk_2C) == 0) {
+        sub_02021BD4(elem);
         return NULL;
     }
 
-    v0->explicitPaletteOffset = sub_020222C4(&v0->paletteProxy, v0->type);
-    v0->explicitPalette = v0->explicitPaletteOffset;
+    elem->explicitPaletteOffset = sub_020222C4(&elem->paletteProxy, elem->type);
+    elem->explicitPalette = elem->explicitPaletteOffset;
 
-    sub_02022464(param0->unk_00, v0);
+    GraphicElementManager_InsertElement(param0->unk_00, elem);
 
-    return v0;
+    return elem;
 }
 
 GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
@@ -308,7 +308,7 @@ GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
     v0.unk_28 = param0->unk_18;
     v0.unk_2C = param0->unk_1C;
 
-    return sub_02021AA0(&v0);
+    return GraphicElementManager_AddElement(&v0);
 }
 
 void sub_02021BD4 (GraphicElementData *gfxElem)
@@ -319,7 +319,7 @@ void sub_02021BD4 (GraphicElementData *gfxElem)
         CellAnimationData *v1 = (CellAnimationData *)&gfxElem->unk_40;
 
         if (gfxElem->prev != NULL) {
-            sub_020224FC(gfxElem);
+            GraphicElementManager_RemoveElement(gfxElem);
         }
 
         if (gfxElem->unk_EC == 3) {
@@ -345,7 +345,7 @@ void sub_02021BD4 (GraphicElementData *gfxElem)
         gfxElem->unk_EC = 0;
 
         gfxElemMgr = (GraphicElementManager *)gfxElem->manager;
-        sub_0202256C(gfxElemMgr, gfxElem);
+        GraphicElementManager_FreeElement(gfxElemMgr, gfxElem);
     }
 }
 
@@ -604,15 +604,15 @@ void sub_02021F58 (GraphicElementData * param0, u32 param1)
 {
     GraphicElementManager * v0 = (GraphicElementManager *)param0->manager;
 
-    param0->unk_F4 = param1;
+    param0->priority = param1;
 
-    sub_020224FC(param0);
-    sub_02022464(v0, param0);
+    GraphicElementManager_RemoveElement(param0);
+    GraphicElementManager_InsertElement(v0, param0);
 }
 
 u32 sub_02021F74 (const GraphicElementData * param0)
 {
-    return param0->unk_F4;
+    return param0->priority;
 }
 
 void sub_02021F7C (GraphicElementData * param0, const NNSG2dImageProxy * param1)
@@ -950,79 +950,79 @@ static void sub_02022460 (GraphicElementData * param0)
     return;
 }
 
-static void sub_02022464 (GraphicElementManager * param0, GraphicElementData * param1)
+static void GraphicElementManager_InsertElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
 {
-    GraphicElementData * v0;
+    // If the list is empty, insert the element as the only element
+    if (gfxElemMgr->sentinelData.next == &gfxElemMgr->sentinelData) {
+        gfxElemMgr->sentinelData.next = elem;
+        gfxElemMgr->sentinelData.prev = elem;
+        elem->prev = &gfxElemMgr->sentinelData;
+        elem->next = &gfxElemMgr->sentinelData;
+        return;
+    }
 
-    if (param0->sentinelData.next == &param0->sentinelData) {
-        param0->sentinelData.next = param1;
-        param0->sentinelData.prev = param1;
-        param1->prev = &param0->sentinelData;
-        param1->next = &param0->sentinelData;
-    } else {
-        if (param0->sentinelData.prev->unk_F4 <= param1->unk_F4) {
-            param1->prev = param0->sentinelData.prev;
-            param0->sentinelData.prev->next = param1;
-            param1->next = &param0->sentinelData;
-            param0->sentinelData.prev = param1;
-        } else {
-            v0 = param0->sentinelData.next;
-
-            while (v0 != &param0->sentinelData) {
-                if (v0->unk_F4 > param1->unk_F4) {
-                    v0->prev->next = param1;
-                    param1->prev = v0->prev;
-                    v0->prev = param1;
-                    param1->next = v0;
-                    break;
-                }
-
-                v0 = v0->next;
-            }
+    // Check if the element should be inserted at the end of the list (lowest priority)
+    if (gfxElemMgr->sentinelData.prev->priority <= elem->priority) {
+        elem->prev = gfxElemMgr->sentinelData.prev;
+        gfxElemMgr->sentinelData.prev->next = elem;
+        elem->next = &gfxElemMgr->sentinelData;
+        gfxElemMgr->sentinelData.prev = elem;
+        return;
+    }
+
+    // Insert the element in the correct position according to its priority
+    GraphicElementData *cur = gfxElemMgr->sentinelData.next;
+    while (cur != &gfxElemMgr->sentinelData) {
+        if (cur->priority > elem->priority) {
+            cur->prev->next = elem;
+            elem->prev = cur->prev;
+            cur->prev = elem;
+            elem->next = cur;
+            break;
         }
+
+        cur = cur->next;
     }
 }
 
-static void sub_020224FC (GraphicElementData * param0)
+static void GraphicElementManager_RemoveElement(GraphicElementData *elem)
 {
-    param0->prev->next = param0->next;
-    param0->next->prev = param0->prev;
+    elem->prev->next = elem->next;
+    elem->next->prev = elem->prev;
 }
 
 static void GraphicElementManager_InitElements(GraphicElementManager *gfxElemMgr)
 {
     for (int i = 0; i < gfxElemMgr->maxElements; i++) {
         GraphicElementData_Reset(&gfxElemMgr->elements[i]);
-        gfxElemMgr->unk_08[i] = gfxElemMgr->elements + i;
+        gfxElemMgr->elementStack[i] = gfxElemMgr->elements + i;
     }
 
-    gfxElemMgr->unk_0C = 0;
+    gfxElemMgr->stackPointer = 0;
 }
 
-static GraphicElementData * sub_02022550 (GraphicElementManager * param0)
+static GraphicElementData *GraphicElementManager_AllocElement(GraphicElementManager *gfxElemMgr)
 {
-    GraphicElementData * v0;
-
-    if (param0->unk_0C >= param0->maxElements) {
+    if (gfxElemMgr->stackPointer >= gfxElemMgr->maxElements) {
         return NULL;
     }
 
-    v0 = param0->unk_08[param0->unk_0C];
-    param0->unk_0C++;
+    GraphicElementData *elem = gfxElemMgr->elementStack[gfxElemMgr->stackPointer];
+    gfxElemMgr->stackPointer++;
 
-    return v0;
+    return elem;
 }
 
-static BOOL sub_0202256C (GraphicElementManager * param0, GraphicElementData * param1)
+static BOOL GraphicElementManager_FreeElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
 {
-    if (param0->unk_0C <= 0) {
-        return 0;
+    if (gfxElemMgr->stackPointer <= 0) {
+        return FALSE;
     }
 
-    GraphicElementData_Reset(param1);
+    GraphicElementData_Reset(elem);
 
-    param0->unk_0C--;
-    param0->unk_08[param0->unk_0C] = param1;
+    gfxElemMgr->stackPointer--;
+    gfxElemMgr->elementStack[gfxElemMgr->stackPointer] = elem;
 
-    return 1;
+    return TRUE;
 }
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index f1f59d1bcb..d0c43b065c 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -575,7 +575,7 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param
     v0.unk_28 = param4;
     v0.unk_2C = 4;
 
-    v1 = sub_02021AA0(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
 
     return v1;
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 9efd1f7d1f..9580f9c42e 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1627,7 +1627,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.unk_08.x = FX32_ONE * Unk_020F2984[v0][0];
             v1.unk_08.y = FX32_ONE * Unk_020F2984[v0][1];
 
-            param0->unk_390[v0] = sub_02021AA0(&v1);
+            param0->unk_390[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_390[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_390[v0], Unk_020F2984[v0][2]);
@@ -1652,7 +1652,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.unk_08.x = FX32_ONE * ((10 * 8) + v0 * 12);
             v1.unk_08.y = FX32_ONE * (4 * 8 + 7);
 
-            param0->unk_3C8[v0] = sub_02021AA0(&v1);
+            param0->unk_3C8[v0] = GraphicElementManager_AddElement(&v1);
 
             sub_02021CC8(param0->unk_3C8[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3C8[v0], 43);
@@ -1670,7 +1670,7 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520
 {
     param1->unk_08.x = FX32_ONE * 24;
     param1->unk_08.y = FX32_ONE * (16 - 8);
-    param0->unk_3F8[0] = sub_02021AA0(param1);
+    param0->unk_3F8[0] = GraphicElementManager_AddElement(param1);
 
     sub_02021CC8(param0->unk_3F8[0], 1);
 
@@ -1704,7 +1704,7 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520
         if (param0->unk_10 != 2) {
             param1->unk_08.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
             param1->unk_08.y = FX32_ONE * ((4 * 8 + 7) - 12);
-            param0->unk_3F8[1] = sub_02021AA0(param1);
+            param0->unk_3F8[1] = GraphicElementManager_AddElement(param1);
 
             if (param0->unk_10 == 0) {
                 SpriteActor_SetSpriteAnimActive(param0->unk_3F8[1], 45);
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 84786b1248..262622eb3c 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -160,7 +160,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v5.unk_28 = v0;
     v5.unk_2C = param0->unk_00;
 
-    v4->unk_00 = sub_02021AA0(&v5);
+    v4->unk_00 = GraphicElementManager_AddElement(&v5);
 
     if (v4->unk_00 != NULL) {
         SpriteActor_SetSpriteAnimActive(v4->unk_00, 0);

From a4a3fe52be17c5824d3a1694d65ab3e4415808a7 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 14:27:03 +0200
Subject: [PATCH 05/19] Document more GraphicElementManager stuff

---
 include/overlay115/struct_ov115_02261520.h |   2 +-
 include/unk_020218BC.h                     |   6 +-
 src/choose_starter/choose_starter_app.c    |   2 +-
 src/overlay005/encounter_effect_core.c     |  26 +--
 src/overlay005/ov5_021D2F14.c              |   4 +-
 src/overlay005/ov5_021D5EB8.c              |   4 +-
 src/overlay006/ov6_022426AC.c              |   2 +-
 src/overlay006/ov6_02243258.c              |  10 +-
 src/overlay007/ov7_0224BE9C.c              |   2 +-
 src/overlay007/ov7_0224CD28.c              |   2 +-
 src/overlay009/ov9_02249960.c              |   4 +-
 src/overlay019/ov19_021D79F8.c             |   2 +-
 src/overlay019/ov19_021D8B54.c             |   8 +-
 src/overlay019/ov19_021DA270.c             |   2 +-
 src/overlay019/ov19_021DA92C.c             |   4 +-
 src/overlay019/ov19_021DB8E4.c             |   4 +-
 src/overlay019/ov19_021DCF88.c             |  12 +-
 src/overlay019/ov19_021DE3E8.c             |   2 +-
 src/overlay019/ov19_021DEC04.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             |   4 +-
 src/overlay021/ov21_021D1FA4.c             |  10 +-
 src/overlay021/ov21_021D5AEC.c             |   8 +-
 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             |   8 +-
 src/overlay021/ov21_021DF734.c             |   4 +-
 src/overlay021/ov21_021E0C68.c             |   2 +-
 src/overlay021/ov21_021E1924.c             |   4 +-
 src/overlay021/ov21_021E29DC.c             |   2 +-
 src/overlay021/ov21_021E3FFC.c             |   4 +-
 src/overlay021/ov21_021E4CA4.c             |   8 +-
 src/overlay021/ov21_021E6014.c             |   2 +-
 src/overlay021/ov21_021E68F4.c             |   2 +-
 src/overlay021/ov21_021E737C.c             |  10 +-
 src/overlay021/ov21_021E8484.c             |   2 +-
 src/overlay021/ov21_021E8D48.c             |   8 +-
 src/overlay022/ov22_02255D44.c             |   4 +-
 src/overlay022/ov22_02259C58.c             |   4 +-
 src/overlay022/ov22_0225A428.c             |   2 +-
 src/overlay022/ov22_0225B660.c             |   2 +-
 src/overlay023/ov23_0223E140.c             |   2 +-
 src/overlay023/ov23_0224340C.c             |  16 +-
 src/overlay023/ov23_02248F1C.c             |   2 +-
 src/overlay056/ov56_022561C0.c             |   2 +-
 src/overlay058/ov58_021D0D80.c             |   2 +-
 src/overlay059/ov59_021D0D80.c             |   2 +-
 src/overlay063/ov63_0222AE60.c             |   8 +-
 src/overlay064/ov64_0222DCE0.c             |   6 +-
 src/overlay065/ov65_0222DCE0.c             |   4 +-
 src/overlay065/ov65_02235060.c             |   6 +-
 src/overlay068/ov68_0225C700.c             |   2 +-
 src/overlay069/ov69_0225C700.c             |   2 +-
 src/overlay070/ov70_0225D9A4.c             |   8 +-
 src/overlay071/ov71_0223CF0C.c             |   2 +-
 src/overlay072/ov72_0223D7A0.c             |   2 +-
 src/overlay077/ov77_021D54B0.c             |   2 +-
 src/overlay077/ov77_021D6670.c             |   2 +-
 src/overlay080/ov80_021D2AF4.c             |   2 +-
 src/overlay083/ov83_0223D6A8.c             |  14 +-
 src/overlay086/ov86_0223B140.c             |   2 +-
 src/overlay087/ov87_021D106C.c             |   2 +-
 src/overlay088/ov88_0223B140.c             |   2 +-
 src/overlay094/ov94_0223BCB0.c             |   2 +-
 src/overlay094/ov94_0223C610.c             |   2 +-
 src/overlay094/ov94_0223D0C4.c             |   2 +-
 src/overlay094/ov94_0223DC04.c             |   2 +-
 src/overlay094/ov94_0223E46C.c             |   2 +-
 src/overlay094/ov94_0223FB48.c             |  10 +-
 src/overlay095/ov95_02247B6C.c             |   2 +-
 src/overlay095/ov95_02248590.c             |   4 +-
 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             |   4 +-
 src/overlay097/ov97_0222D30C.c             |  10 +-
 src/overlay097/ov97_02230410.c             |  10 +-
 src/overlay097/ov97_02233B18.c             |  16 +-
 src/overlay097/ov97_02237694.c             |   4 +-
 src/overlay101/ov101_021D7E48.c            |   4 +-
 src/overlay105/ov105_02245AAC.c            |   2 +-
 src/overlay105/ov105_02245DC4.c            |   2 +-
 src/overlay105/ov105_02245E54.c            |   2 +-
 src/overlay105/ov105_02245FB8.c            |   2 +-
 src/overlay106/ov106_02243310.c            |   2 +-
 src/overlay106/ov106_022435FC.c            |   2 +-
 src/overlay107/ov107_02249604.c            |   2 +-
 src/overlay107/ov107_02249B1C.c            |   2 +-
 src/overlay108/ov108_02243030.c            |   2 +-
 src/overlay108/ov108_0224351C.c            |   2 +-
 src/overlay109/ov109_021D3D50.c            |   2 +-
 src/overlay111/ov111_021D2F80.c            |   2 +-
 src/overlay111/ov111_021D33F4.c            |   2 +-
 src/overlay114/ov114_0225C700.c            |  14 +-
 src/overlay115/ov115_02260CEC.c            |  20 +--
 src/unk_0200C6E4.c                         |   8 +-
 src/unk_02012744.c                         |   2 +-
 src/unk_020218BC.c                         | 185 ++++++++++-----------
 src/unk_0205CA94.c                         |  14 +-
 src/unk_0208694C.c                         |   2 +-
 src/unk_02098FFC.c                         |   2 +-
 108 files changed, 341 insertions(+), 346 deletions(-)

diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h
index acc469df2b..d81f9a94f0 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 {
-    GraphicElementManager * unk_00;
+    GraphicElementManager * manager;
     const UnkStruct_ov19_021DA864 * unk_04;
     VecFx32 unk_08;
     VecFx32 unk_14;
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index d469e9bc3c..27ef660cce 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -13,13 +13,13 @@
 
 GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerParams * param0);
 BOOL GraphicElementManager_Delete(GraphicElementManager * param0);
-BOOL sub_020219A4(GraphicElementManager * param0, u8 param1);
-BOOL sub_020219C0(GraphicElementManager * param0);
+BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
+BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
 GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_02261520 * param0);
 GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
-void sub_02021BD4(GraphicElementData * param0);
+void GraphicElementData_Delete(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);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 59ab4d5d44..cca97159ab 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1499,7 +1499,7 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
 
 static void ov78_021D2350 (ChooseStarterCursor * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
 }
 
 static void ov78_021D235C (ChooseStarterRotation * param0, fx32 param1, int param2)
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index 858d35677a..844a67d299 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -825,7 +825,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                sub_02021BD4(trainerEffect->pokeballSprites[v9]);
+                GraphicElementData_Delete(trainerEffect->pokeballSprites[v9]);
             }
         }
         ov5_021DE5A4(&trainerEffect->unk_48, &trainerEffect->unk_1E8);
@@ -969,7 +969,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                sub_02021BD4(v1->unk_200[v9]);
+                GraphicElementData_Delete(v1->unk_200[v9]);
             }
         }
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
@@ -1138,7 +1138,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         v1->unk_4C = 0;
 
         for (v5 = 0; v5 < 2; v5++) {
-            sub_02021BD4(v1->unk_224[v5]);
+            GraphicElementData_Delete(v1->unk_224[v5]);
         }
 
         ov5_021DE5A4(&v1->unk_50, &v1->unk_1F0);
@@ -1317,7 +1317,7 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         v1->unk_280 = 0;
 
         for (v3 = 0; v3 < 3; v3++) {
-            sub_02021BD4(v1->unk_1D4[v3]);
+            GraphicElementData_Delete(v1->unk_1D4[v3]);
             ov5_021DE6BC(v1->unk_258[v3]);
         }
 
@@ -1482,7 +1482,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        sub_02021BD4(v1->unk_230);
+        GraphicElementData_Delete(v1->unk_230);
         ov5_021DE5A4(&v1->unk_5C, &v1->unk_1FC);
         ov5_021DE4AC(&v1->unk_5C);
         EncounterEffect_Finish(v0, param0);
@@ -1663,7 +1663,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         }
 
         for (v4 = 0; v4 < 3; v4++) {
-            sub_02021BD4(v1->unk_1D4[v4]);
+            GraphicElementData_Delete(v1->unk_1D4[v4]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -1824,7 +1824,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        sub_02021BD4(v1->unk_200);
+        GraphicElementData_Delete(v1->unk_200);
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
         ov5_021DE4AC(&v1->unk_2C);
         EncounterEffect_Finish(v0, param0);
@@ -1941,7 +1941,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         }
 
         for (v3 = 0; v3 < 4; v3++) {
-            sub_02021BD4(v1->unk_1D4[v3]);
+            GraphicElementData_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -2108,7 +2108,7 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
         }
 
         for (v3 = 0; v3 < 6; v3++) {
-            sub_02021BD4(v1->unk_1D4[v3]);
+            GraphicElementData_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -2251,7 +2251,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        sub_02021BD4(v1->unk_1DC);
+        GraphicElementData_Delete(v1->unk_1DC);
         ov5_021DE5A4(&v1->unk_08, &v1->unk_1A8);
         ov5_021DE4AC(&v1->unk_08);
 
@@ -2857,7 +2857,7 @@ static void ov5_021E519C (UnkStruct_ov5_021E5128 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(param0->unk_04[v0]);
+        GraphicElementData_Delete(param0->unk_04[v0]);
     }
 }
 
@@ -3118,7 +3118,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
             *(encEffect->done) = 1;
         }
 
-        sub_02021BD4(v0->unk_24C);
+        GraphicElementData_Delete(v0->unk_24C);
         ov5_021E519C(&v0->unk_250);
         ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[0]);
         ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[1]);
@@ -3583,7 +3583,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         BGL_DeleteWindow(&v0->unk_358);
 
         for (v5 = 0; v5 < 4; v5++) {
-            sub_02021BD4(v0->unk_2CC[v5]);
+            GraphicElementData_Delete(v0->unk_2CC[v5]);
         }
 
         for (v5 = 0; v5 < 4; v5++) {
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 6bf3c59f45..8d9ef10e8b 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -110,7 +110,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v3.y = param1->unk_06 * FX32_ONE;
     v3.z = param1->unk_08 * FX32_ONE;
 
-    v0.unk_00 = param0->unk_00;
+    v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_190->unk_00[param1->unk_00];
     v0.unk_08 = v3;
     v0.unk_14 = v2;
@@ -367,7 +367,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
 
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->transferToVRAM, param1->bgPriority, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
 
-    v3.unk_00 = param0->unk_00;
+    v3.manager = param0->unk_00;
     v3.unk_04 = v2->unk_04;
     v3.unk_08.x = FX32_CONST(param1->x);
     v3.unk_08.y = FX32_CONST(param1->y);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index a9080f8366..be873a4cc1 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -1463,7 +1463,7 @@ static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B
     if (param1->unk_00 != 0xffff) {
         ov5_021D6F4C(&param1->unk_0C->unk_40, param0, param1->unk_0C, 0, 1);
         memset(&param1->unk_0C->unk_10, 0, sizeof(UnkStruct_ov115_02261520));
-        param1->unk_0C->unk_10.unk_00 = param0->unk_08.unk_130;
+        param1->unk_0C->unk_10.manager = param0->unk_08.unk_130;
         param1->unk_0C->unk_10.unk_04 = &param1->unk_0C->unk_40;
         param1->unk_0C->unk_10.unk_14.x = FX32_ONE;
         param1->unk_0C->unk_10.unk_14.y = FX32_ONE;
@@ -1489,7 +1489,7 @@ static void ov5_021D6D64 (UnkStruct_ov5_021DB4B8 * param0)
 
     for (v0 = 0; v0 < 48; v0++) {
         if (param0->unk_48[v0].unk_04) {
-            sub_02021BD4(param0->unk_48[v0].unk_04);
+            GraphicElementData_Delete(param0->unk_48[v0].unk_04);
             param0->unk_48[v0].unk_04 = NULL;
         }
     }
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index badd865830..a492944f64 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -205,7 +205,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
     {
         UnkStruct_ov115_02261520 v2;
 
-        v2.unk_00 = param0->unk_38;
+        v2.manager = param0->unk_38;
         v2.unk_04 = &v1;
         v2.unk_08.x = 0;
         v2.unk_08.y = 0;
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 84b2a56fc1..5ee66f6c6a 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -411,7 +411,7 @@ static void ov6_0224339C (UnkStruct_ov6_02243258 * param0)
     Heap_FreeToHeap(param0->unk_1AC);
     Heap_FreeToHeap(param0->unk_1B0);
     Heap_FreeToHeap(param0->unk_1B4);
-    sub_020219C0(param0->unk_08);
+    GraphicElementManager_DeleteAll(param0->unk_08);
     GraphicElementManager_Delete(param0->unk_08);
 }
 
@@ -658,7 +658,7 @@ static void ov6_022438EC (UnkStruct_ov101_021D5D90 * param0)
 static void ov6_02243914 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02249110 * v0 = param1;
-    sub_02021BD4(v0->unk_68);
+    GraphicElementData_Delete(v0->unk_68);
 }
 
 static void ov6_02243920 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -1828,7 +1828,7 @@ static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0)
     sub_02009754(param0->unk_204);
     sub_02009754(param0->unk_208);
     sub_02009754(param0->unk_20C);
-    sub_020219C0(param0->unk_70);
+    GraphicElementManager_DeleteAll(param0->unk_70);
     GraphicElementManager_Delete(param0->unk_70);
 }
 
@@ -2255,7 +2255,7 @@ static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov6_022453AC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02245364 * v0 = param1;
-    sub_02021BD4(v0->unk_08);
+    GraphicElementData_Delete(v0->unk_08);
 }
 
 static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2348,7 +2348,7 @@ static int ov6_022454B0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov6_022454DC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02249198 * v0 = param1;
-    sub_02021BD4(v0->unk_58);
+    GraphicElementData_Delete(v0->unk_58);
 }
 
 static void ov6_022454E8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index a067e84676..0793b04e8f 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -672,7 +672,7 @@ static void ov7_0224C934 (UnkStruct_ov7_0224C768 * param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_158[v0]);
+        GraphicElementData_Delete(param0->unk_158[v0]);
     }
 
     ov7_0224CB40(param0);
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index 68ae9e6d4c..cf66f04517 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -1482,7 +1482,7 @@ static void ov7_0224EB14 (UnkStruct_ov7_0224D008 * param0)
     u32 v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(param0->unk_25C[v0]);
+        GraphicElementData_Delete(param0->unk_25C[v0]);
     }
 
     ov5_021D30A8(&param0->unk_94);
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index e30c3f3e93..8e6ce42487 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2744,7 +2744,7 @@ static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0)
     sub_02009754(param0->unk_198);
     sub_02009754(param0->unk_19C);
 
-    sub_020219C0(param0->unk_00);
+    GraphicElementManager_DeleteAll(param0->unk_00);
     GraphicElementManager_Delete(param0->unk_00);
 }
 
@@ -2826,7 +2826,7 @@ static int ov9_0224B23C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov9_0224B2C0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov9_0224B2C0 * v0 = param1;
-    sub_02021BD4(v0->unk_40);
+    GraphicElementData_Delete(v0->unk_40);
 }
 
 static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index 3caa074ef0..2860015f63 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -415,7 +415,7 @@ static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_00 != NULL) {
-            sub_02021BD4(param1->unk_00);
+            GraphicElementData_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index ebc76817e6..9659bd98ca 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -204,22 +204,22 @@ void ov19_021D8E84 (UnkStruct_ov19_021D8E00 * param0)
     }
 
     if (param0->unk_04 != NULL) {
-        sub_02021BD4(param0->unk_04);
+        GraphicElementData_Delete(param0->unk_04);
         param0->unk_04 = NULL;
     }
 
     if (param0->unk_08 != NULL) {
-        sub_02021BD4(param0->unk_08);
+        GraphicElementData_Delete(param0->unk_08);
         param0->unk_08 = NULL;
     }
 
     if (param0->unk_0C != NULL) {
-        sub_02021BD4(param0->unk_0C);
+        GraphicElementData_Delete(param0->unk_0C);
         param0->unk_0C = NULL;
     }
 
     if (param0->unk_10 != NULL) {
-        sub_02021BD4(param0->unk_10);
+        GraphicElementData_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 }
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 88d8106763..5149160108 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -107,7 +107,7 @@ void ov19_021DA3F0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 {
     while (param2--) {
         if (param1->unk_00 != NULL) {
-            sub_02021BD4(param1->unk_00);
+            GraphicElementData_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 967f8f67bb..aed8310e55 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -138,7 +138,7 @@ void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0)
     }
 
     if (param0->unk_30) {
-        sub_02021BD4(param0->unk_30);
+        GraphicElementData_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
@@ -147,7 +147,7 @@ void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0] != NULL) {
-            sub_02021BD4(param0->unk_3C[v0]);
+            GraphicElementData_Delete(param0->unk_3C[v0]);
         }
     }
 
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index ce9df01272..d8d1bad32b 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -391,7 +391,7 @@ static void ov19_021DBEF8 (UnkStruct_ov19_021DBA9C * param0)
 
     for (v0 = 0; v0 < 7; v0++) {
         if (param0->unk_48[v0] != NULL) {
-            sub_02021BD4(param0->unk_48[v0]);
+            GraphicElementData_Delete(param0->unk_48[v0]);
             param0->unk_48[v0] = NULL;
         }
     }
@@ -743,6 +743,6 @@ static void ov19_021DC5B8 (UnkStruct_ov19_021DBA9C * param0, fx32 param1)
 static void ov19_021DC5E0 (UnkStruct_ov19_021DBA9C * param0)
 {
     if (param0->unk_90) {
-        sub_02021BD4(param0->unk_90);
+        GraphicElementData_Delete(param0->unk_90);
     }
 }
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index 8e6d62c9b0..c216247da3 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -395,11 +395,11 @@ void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0)
         }
 
         if (param0->unk_2C) {
-            sub_02021BD4(param0->unk_2C);
+            GraphicElementData_Delete(param0->unk_2C);
         }
 
         if (param0->unk_30) {
-            sub_02021BD4(param0->unk_30);
+            GraphicElementData_Delete(param0->unk_30);
         }
 
         if (param0->unk_84 != NULL) {
@@ -408,13 +408,13 @@ void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0)
 
         for (v0 = 0; v0 < 8; v0++) {
             if (param0->unk_34[v0]) {
-                sub_02021BD4(param0->unk_34[v0]);
+                GraphicElementData_Delete(param0->unk_34[v0]);
             }
         }
 
         for (v0 = 0; v0 < 10; v0++) {
             if (param0->unk_54[v0]) {
-                sub_02021BD4(param0->unk_54[v0]);
+                GraphicElementData_Delete(param0->unk_54[v0]);
             }
         }
 
@@ -911,7 +911,7 @@ static void ov19_021DD998 (UnkStruct_ov19_021DCF88 * param0)
 
     for (v0 = 0; v0 < 10; v0++) {
         if (param0->unk_54[v0]) {
-            sub_02021BD4(param0->unk_54[v0]);
+            GraphicElementData_Delete(param0->unk_54[v0]);
             param0->unk_54[v0] = NULL;
         }
     }
@@ -960,7 +960,7 @@ static void ov19_021DDA7C (UnkStruct_ov19_021DCF88 * param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if (param0->unk_34[v0]) {
-            sub_02021BD4(param0->unk_34[v0]);
+            GraphicElementData_Delete(param0->unk_34[v0]);
             param0->unk_34[v0] = NULL;
         }
     }
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 20f7a4670f..36d3bab72d 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -148,7 +148,7 @@ static void ov19_021DE51C (UnkStruct_ov19_021DE3E8 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_1C[v0]) {
-            sub_02021BD4(param0->unk_1C[v0]);
+            GraphicElementData_Delete(param0->unk_1C[v0]);
         }
     }
 }
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 9d5bb278d0..9d0a4e9200 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -660,15 +660,15 @@ static void ov19_021DF7D0 (UnkStruct_ov19_021DEC04 * param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_20[v0]);
-        sub_02021BD4(param0->unk_28[v0]);
+        GraphicElementData_Delete(param0->unk_20[v0]);
+        GraphicElementData_Delete(param0->unk_28[v0]);
 
         for (v1 = 0; v1 < 5; v1++) {
-            sub_02021BD4(param0->unk_34[v0][v1]);
+            GraphicElementData_Delete(param0->unk_34[v0][v1]);
         }
     }
 
-    sub_02021BD4(param0->unk_30);
+    GraphicElementData_Delete(param0->unk_30);
     Heap_FreeToHeap(param0->unk_5C);
     Heap_FreeToHeap(param0->unk_64);
 }
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index b7ff7d7267..135df71903 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -100,15 +100,15 @@ void ov20_021D2EF0 (UnkStruct_ov20_021D30F8 * param0)
     }
 
     if (param0->unk_3C) {
-        sub_02021BD4(param0->unk_3C);
+        GraphicElementData_Delete(param0->unk_3C);
     }
 
     if (param0->unk_40) {
-        sub_02021BD4(param0->unk_40);
+        GraphicElementData_Delete(param0->unk_40);
     }
 
     if (param0->unk_44) {
-        sub_02021BD4(param0->unk_44);
+        GraphicElementData_Delete(param0->unk_44);
     }
 
     if (param0->unk_48) {
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index 82f287e38a..fc1c3f5c15 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -49,7 +49,7 @@ UnkStruct_ov20_021D3980 * ov20_021D3864 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D3880 (UnkStruct_ov20_021D3980 * param0)
 {
     if (param0->unk_0C) {
-        sub_02021BD4(param0->unk_0C);
+        GraphicElementData_Delete(param0->unk_0C);
     }
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index 5f8db67236..3d2fa243fc 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -69,7 +69,7 @@ UnkStruct_ov20_021D3E0C * ov20_021D3A54 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D3A80 (UnkStruct_ov20_021D3E0C * param0)
 {
     if (param0->unk_5C) {
-        sub_02021BD4(param0->unk_5C);
+        GraphicElementData_Delete(param0->unk_5C);
     }
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 211a2cf3b4..f8be948dc1 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -73,15 +73,15 @@ UnkStruct_ov20_021D4210 * ov20_021D40E8 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D4164 (UnkStruct_ov20_021D4210 * param0)
 {
     if (param0->unk_30) {
-        sub_02021BD4(param0->unk_30);
+        GraphicElementData_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
-        sub_02021BD4(param0->unk_34);
+        GraphicElementData_Delete(param0->unk_34);
     }
 
     if (param0->unk_38) {
-        sub_02021BD4(param0->unk_38);
+        GraphicElementData_Delete(param0->unk_38);
     }
 
     if (param0->unk_3C) {
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index d54777ae0a..f3bb08fd96 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -323,11 +323,11 @@ static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1)
 static void ov20_021D4AD4 (UnkStruct_ov20_021D4AD4 * param0)
 {
     if (param0->unk_14) {
-        sub_02021BD4(param0->unk_14);
+        GraphicElementData_Delete(param0->unk_14);
     }
 
     if (param0->unk_18) {
-        sub_02021BD4(param0->unk_18);
+        GraphicElementData_Delete(param0->unk_18);
     }
 
     ov20_021D4B2C(&param0->unk_1C);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 68d33cf1a2..0d850c4eed 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -892,10 +892,10 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 
 static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
 {
-    sub_02021BD4(param0->unk_1B0.unk_00);
+    GraphicElementData_Delete(param0->unk_1B0.unk_00);
     param0->unk_1B0.unk_00 = NULL;
 
-    sub_02021BD4(param0->unk_1B0.unk_04);
+    GraphicElementData_Delete(param0->unk_1B0.unk_04);
     param0->unk_1B0.unk_04 = NULL;
 
     if (param0->unk_1B0.unk_08) {
@@ -939,10 +939,10 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
 
 void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
-    sub_02021BD4(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 
     if (param0->unk_08) {
@@ -1034,7 +1034,7 @@ static void ov21_021D300C (UnkStruct_ov21_021D13FC * param0)
     ov21_021D3054(param0);
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(v1->unk_00[v0]);
+        GraphicElementData_Delete(v1->unk_00[v0]);
     }
 }
 
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 294eb5a3a6..b4792a3ab0 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -965,15 +965,15 @@ static void ov21_021D695C (UnkStruct_ov21_021D71A8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 9; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        sub_02021BD4(param0->unk_50[v0]);
+        GraphicElementData_Delete(param0->unk_50[v0]);
     }
 
-    sub_02021BD4(param0->unk_74);
-    sub_02021BD4(param0->unk_7C);
+    GraphicElementData_Delete(param0->unk_74);
+    GraphicElementData_Delete(param0->unk_7C);
 }
 
 static void ov21_021D6994 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1)
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index 1af96f2764..e4441487f9 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -666,12 +666,12 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
 static void ov21_021D7FEC (UnkStruct_ov21_021D7C64 * param0)
 {
-    sub_02021BD4(param0->unk_00[0]);
-    sub_02021BD4(param0->unk_00[1]);
-    sub_02021BD4(param0->unk_00[2]);
-    sub_02021BD4(param0->unk_18);
-    sub_02021BD4(param0->unk_1C);
-    sub_02021BD4(param0->unk_20);
+    GraphicElementData_Delete(param0->unk_00[0]);
+    GraphicElementData_Delete(param0->unk_00[1]);
+    GraphicElementData_Delete(param0->unk_00[2]);
+    GraphicElementData_Delete(param0->unk_18);
+    GraphicElementData_Delete(param0->unk_1C);
+    GraphicElementData_Delete(param0->unk_20);
 }
 
 static void ov21_021D8018 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3)
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 08950bce3d..57bfb456c4 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -676,8 +676,8 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 
 static void ov21_021D8DC0 (UnkStruct_ov21_021D9320 * param0)
 {
-    sub_02021BD4(param0->unk_20);
-    sub_02021BD4(param0->unk_58);
+    GraphicElementData_Delete(param0->unk_20);
+    GraphicElementData_Delete(param0->unk_58);
 }
 
 static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int param2)
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index b09497cde3..63228eaa4e 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -2471,7 +2471,7 @@ static void ov21_021DB90C (UnkStruct_ov21_021DC96C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -2481,7 +2481,7 @@ static void ov21_021DB924 (UnkStruct_ov21_021DC96C * param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            sub_02021BD4(param0->unk_30[v0]);
+            GraphicElementData_Delete(param0->unk_30[v0]);
             param0->unk_30[v0] = NULL;
         }
     }
@@ -2678,7 +2678,7 @@ static void ov21_021DBDA0 (UnkStruct_ov21_021DC96C * param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_A8[v0]) {
-            sub_02021BD4(param0->unk_A8[v0]);
+            GraphicElementData_Delete(param0->unk_A8[v0]);
             param0->unk_A8[v0] = NULL;
         }
     }
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 4cdf9abe89..8a67f7f088 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -614,11 +614,11 @@ static void ov21_021DD2B8 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    sub_02021BD4(param0->unk_C8);
+    GraphicElementData_Delete(param0->unk_C8);
     param0->unk_C8 = NULL;
 
     for (v0 = 0; v0 < (22 * 2); v0++) {
-        sub_02021BD4(param0->unk_04[v0]);
+        GraphicElementData_Delete(param0->unk_04[v0]);
         param0->unk_04[v0] = NULL;
     }
 }
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index e2f100ee7d..2004c5c40b 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -455,7 +455,7 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DE2E0 (UnkStruct_ov21_021DDEC8 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
 }
 
 static void ov21_021DE2EC (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1, int param2)
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index c82ef6bb2c..9d78ed29f8 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -568,7 +568,7 @@ static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 static void ov21_021DEEF8 (UnkStruct_ov21_021DF374 * param0)
 {
     if (param0->unk_00[0]) {
-        sub_02021BD4(param0->unk_00[0]);
+        GraphicElementData_Delete(param0->unk_00[0]);
     }
 }
 
@@ -735,11 +735,11 @@ int ov21_021DF180 (int param0)
 static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0)
 {
     if (param0->unk_00[1]) {
-        sub_02021BD4(param0->unk_00[1]);
+        GraphicElementData_Delete(param0->unk_00[1]);
     }
 
     if (param0->unk_00[2]) {
-        sub_02021BD4(param0->unk_00[2]);
+        GraphicElementData_Delete(param0->unk_00[2]);
     }
 }
 
@@ -812,7 +812,7 @@ Window * ov21_021DF30C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2
 
 static void ov21_021DF35C (UnkStruct_ov21_021DF374 * param0)
 {
-    sub_02021BD4(param0->unk_0C);
+    GraphicElementData_Delete(param0->unk_0C);
     param0->unk_0C = NULL;
     ov21_021D4D1C(param0->unk_10);
 }
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index 22808ae553..a188c16e40 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -606,10 +606,10 @@ static void ov21_021DFF18 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 
-    sub_02021BD4(param0->unk_BC);
+    GraphicElementData_Delete(param0->unk_BC);
 }
 
 static void ov21_021DFF38 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3)
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 32cbe0576c..69d864b27b 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -589,7 +589,7 @@ static Window * ov21_021E1460 (UnkStruct_ov21_021E0D7C * param0, int param1, int
 
 static void ov21_021E14BC (UnkStruct_ov21_021E14D4 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
     param0->unk_00 = NULL;
     ov21_021D4D1C(param0->unk_04);
 }
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 1a99b24d55..2444e02a8b 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -772,10 +772,10 @@ static void ov21_021E2458 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
 
         if (param0->unk_50[v0]) {
-            sub_02021BD4(param0->unk_50[v0]);
+            GraphicElementData_Delete(param0->unk_50[v0]);
         }
     }
 }
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index a6b2436d92..3cfe812a25 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1324,7 +1324,7 @@ static void ov21_021E3BC0 (UnkStruct_ov21_021E3900 * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 }
 
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index 8c07b3c992..ea33a5d4da 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -603,10 +603,10 @@ static void ov21_021E4868 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            sub_02021BD4(param0->unk_20[v0].unk_00[v1].unk_00);
+            GraphicElementData_Delete(param0->unk_20[v0].unk_00[v1].unk_00);
         }
 
-        sub_02021BD4(param0->unk_20[v0].unk_48.unk_00);
+        GraphicElementData_Delete(param0->unk_20[v0].unk_48.unk_00);
     }
 }
 
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 512f46bb8b..968eb75a59 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -914,10 +914,10 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E5898 (UnkStruct_ov21_021E5004 * param0)
 {
-    sub_02021BD4(param0->unk_00);
-    sub_02021BD4(param0->unk_3C);
-    sub_02021BD4(param0->unk_04);
-    sub_02021BD4(param0->unk_20);
+    GraphicElementData_Delete(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_3C);
+    GraphicElementData_Delete(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_20);
 }
 
 static void ov21_021E58B8 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2)
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 83d2758c03..3168cbcc5e 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -444,7 +444,7 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E65EC (UnkStruct_ov21_021E6274 * param0)
 {
-    sub_02021BD4(param0->unk_10);
+    GraphicElementData_Delete(param0->unk_10);
 }
 
 static void ov21_021E65F8 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3)
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index ac370e8f0f..da8401389d 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -600,7 +600,7 @@ static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 }
 
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index 2a789e1c2c..bc3ede7a5a 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -691,11 +691,11 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E7CCC (UnkStruct_ov21_021E7714 * param0)
 {
-    sub_02021BD4(param0->unk_00);
-    sub_02021BD4(param0->unk_04);
-    sub_02021BD4(param0->unk_08);
-    sub_02021BD4(param0->unk_0C[0]);
-    sub_02021BD4(param0->unk_0C[1]);
+    GraphicElementData_Delete(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_08);
+    GraphicElementData_Delete(param0->unk_0C[0]);
+    GraphicElementData_Delete(param0->unk_0C[1]);
 }
 
 static void ov21_021E7CF0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3)
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 0b2468df84..bd710f18e6 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -564,7 +564,7 @@ static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 }
 
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index d553017855..aea77ee4d9 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -530,7 +530,7 @@ static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManag
 
 static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
 }
 
 static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
@@ -556,7 +556,7 @@ static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManag
 
 static void ov21_021E9554 (UnkStruct_ov21_021E95B0 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
 }
 
 static void ov21_021E9560 (UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, UnkStruct_02009DC8 * param4)
@@ -635,11 +635,11 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
 static void ov21_021E968C (UnkStruct_ov21_021E968C * param0)
 {
     if (param0->unk_00[0]) {
-        sub_02021BD4(param0->unk_00[0]);
+        GraphicElementData_Delete(param0->unk_00[0]);
     }
 
     if (param0->unk_00[1]) {
-        sub_02021BD4(param0->unk_00[1]);
+        GraphicElementData_Delete(param0->unk_00[1]);
     }
 }
 
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index 464b393c01..288f9bb117 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -443,7 +443,7 @@ int ov22_02256174 (OverlayManager * param0, int * param1)
     ov22_0225894C(v2->unk_18, &v0->unk_1E8);
     ov22_022566C0(v0);
 
-    sub_020219A4(v0->unk_00.unk_44, 0);
+    GraphicElementManager_SetActive(v0->unk_00.unk_44, 0);
     sub_02039734();
     sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
     sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -1278,7 +1278,7 @@ static void ov22_0225718C (UnkStruct_ov22_02255D44 * param0)
     ov22_022568DC(param0);
 
     sub_0200F344(0, 0x0);
-    sub_020219A4(param0->unk_00.unk_44, 1);
+    GraphicElementManager_SetActive(param0->unk_00.unk_44, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index 65b52bf75e..beaa3ad31d 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -79,7 +79,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
 
     v0.unk_00 = param1->unk_14;
     v0.unk_04 = param1->unk_10;
-    v0.unk_08 = param1->unk_00.unk_00->unk_00;
+    v0.unk_08 = param1->unk_00.unk_00->manager;
     v0.unk_0C = param1->unk_18;
     v0.unk_10 = param0->unk_00.unk_00;
     v0.unk_14 = param1->unk_24;
@@ -95,7 +95,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
 
 void ov22_02259CE8 (UnkStruct_ov22_02259C58 * param0)
 {
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
     memset(param0, 0, sizeof(UnkStruct_ov22_02259C58));
 }
 
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 5ec701bed3..3a7e55aaef 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -347,7 +347,7 @@ static void ov22_0225AA10 (UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714
     int v0;
 
     for (v0 = 0; v0 < 20; v0++) {
-        sub_02021BD4(param0->unk_10[v0]);
+        GraphicElementData_Delete(param0->unk_10[v0]);
     }
 
     ov22_0225AAC0(param0->unk_00, param1);
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index 3b8ea2a003..0bb863df2b 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -237,7 +237,7 @@ static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0)
     ov22_022552D8(&param0->unk_14, 1000);
     ov22_022552EC(&param0->unk_14, 1000);
     ov22_02255300(&param0->unk_14, 1000);
-    sub_02021BD4(param0->unk_1FC);
+    GraphicElementData_Delete(param0->unk_1FC);
 }
 
 static void ov22_0225BA40 (UnkStruct_ov22_0225B85C * param0)
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index f3da43ff99..77ba0008fe 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -2821,7 +2821,7 @@ static void ov23_0224108C (void)
     for (v0 = 0; v0 < 2; v0++) {
         sub_020093B4(&Unk_ov23_02257740->unk_204[v0], v0, v0, v0, v0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257740->unk_1B0[0], Unk_ov23_02257740->unk_1B0[1], Unk_ov23_02257740->unk_1B0[2], Unk_ov23_02257740->unk_1B0[3], NULL, NULL);
 
-        v2.unk_00 = Unk_ov23_02257740->unk_20;
+        v2.manager = Unk_ov23_02257740->unk_20;
         v2.unk_04 = &Unk_ov23_02257740->unk_204[v0];
         v2.unk_08.x = FX32_CONST(32);
         v2.unk_08.y = FX32_CONST(96);
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index a83f166def..9a8d50a630 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3273,7 +3273,7 @@ static void ov23_02246370 (int param0)
 
     for (v0 = 0; v0 < param0; v0++) {
         if (Unk_ov23_02257764->unk_25C[v0] != NULL) {
-            sub_02021BD4(Unk_ov23_02257764->unk_25C[v0]);
+            GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[v0]);
             Unk_ov23_02257764->unk_25C[v0] = NULL;
         }
     }
@@ -3317,7 +3317,7 @@ static void ov23_0224644C (int param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = Unk_ov23_02257764->unk_44;
+        v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
@@ -3350,7 +3350,7 @@ static void ov23_0224644C (int param0)
 static void ov23_02246548 (int param0)
 {
     if (Unk_ov23_02257764->unk_25C[param0]) {
-        sub_02021BD4(Unk_ov23_02257764->unk_25C[param0]);
+        GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[param0]);
         Unk_ov23_02257764->unk_25C[param0] = NULL;
     }
 }
@@ -3667,7 +3667,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = Unk_ov23_02257764->unk_44;
+        v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
@@ -3845,7 +3845,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = Unk_ov23_02257764->unk_44;
+        v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
@@ -4314,7 +4314,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = Unk_ov23_02257764->unk_44;
+        v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
@@ -4774,7 +4774,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = Unk_ov23_02257764->unk_44;
+        v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
@@ -4850,7 +4850,7 @@ static void ov23_02248884 (SysTask * param0, void * param1)
 
         for (v1 = 0; v1 < 25; v1++) {
             if (Unk_ov23_02257764->unk_25C[v1] != NULL) {
-                sub_02021BD4(Unk_ov23_02257764->unk_25C[v1]);
+                GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[v1]);
             }
 
             Unk_ov23_02257764->unk_25C[v1] = NULL;
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index b6f75c3a16..b79d31e44d 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -112,7 +112,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         {
             UnkStruct_ov115_02261520 v3;
 
-            v3.unk_00 = v0->unk_1BC;
+            v3.manager = v0->unk_1BC;
             v3.unk_04 = &v0->unk_36C;
             v3.unk_08.x = FX32_CONST(32);
             v3.unk_08.y = FX32_CONST(96) + (192 << FX32_SHIFT);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index b8a3c56ebe..1345f86853 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -420,7 +420,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_28;
+        v1.manager = param0->unk_28;
         v1.unk_04 = &param0->unk_1D8;
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 863cc8b58d..1af1c75e82 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -677,7 +677,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_34;
+        v1.manager = param0->unk_34;
         v1.unk_04 = &param0->unk_1F4;
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 7bd22fcc88..cf00208660 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -647,7 +647,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_50;
+        v1.manager = param0->unk_50;
         v1.unk_04 = &param0->unk_268;
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index c6d8c936cb..3a6c39c145 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -452,7 +452,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     GF_ASSERT(ov63_0222B7D4(param0, v2) == 1);
     memset(&v1, 0, sizeof(UnkStruct_ov115_02261520));
 
-    v1.unk_00 = param0->unk_00;
+    v1.manager = param0->unk_00;
     v1.unk_04 = &param0->unk_10[v2].unk_14;
     v1.unk_08.x = param1->unk_00 << FX32_SHIFT;
     v1.unk_08.y = param1->unk_02 << FX32_SHIFT;
@@ -485,7 +485,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     if (ov63_0222B96C(&param0->unk_2248)) {
         memset(&v1, 0, sizeof(UnkStruct_ov115_02261520));
 
-        v1.unk_00 = param0->unk_00;
+        v1.manager = param0->unk_00;
         v1.unk_04 = &param0->unk_2248.unk_10;
         v1.unk_08.x = param1->unk_00 << FX32_SHIFT;
         v1.unk_08.y = param1->unk_02 << FX32_SHIFT;
@@ -514,10 +514,10 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
 void ov63_0222B210 (UnkStruct_ov63_0222BB38 * param0)
 {
     if (param0->unk_08 != NULL) {
-        sub_02021BD4(param0->unk_08);
+        GraphicElementData_Delete(param0->unk_08);
     }
 
-    sub_02021BD4(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_04);
     memset(param0, 0, sizeof(UnkStruct_ov63_0222BB38));
 }
 
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index c7ca6bc762..442841e6f9 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1236,7 +1236,7 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
     int v1;
 
     for (v1 = 0; v1 < 2; v1++) {
-        v0[v1].unk_00 = param0->unk_04;
+        v0[v1].manager = param0->unk_04;
         v0[v1].unk_04 = &param0->unk_23C;
         v0[v1].unk_2C = param1;
 
@@ -1253,7 +1253,7 @@ static void ov64_0222EA0C (UnkStruct_ov64_0222E21C * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_270[v0]);
+        GraphicElementData_Delete(param0->unk_270[v0]);
     }
 }
 
@@ -2189,7 +2189,7 @@ static void ov64_0222F5F4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
 {
     int v0;
 
-    sub_02021BD4(param0->unk_104);
+    GraphicElementData_Delete(param0->unk_104);
     BGL_DeleteWindow(&param0->unk_C4);
     Strbuf_Free(param0->unk_D4);
 
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index d72953c1ad..4b88da0398 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6702,7 +6702,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
     sub_020093B4(&v2, 30, 30, 30, 30, 0xffffffff, 0xffffffff, 0, 0, param0->unk_31C[0], param0->unk_31C[1], param0->unk_31C[2], param0->unk_31C[3], NULL, NULL);
 
     for (v1 = 0; v1 < 3; v1++) {
-        v9[v1].unk_00 = param0->unk_18C;
+        v9[v1].manager = param0->unk_18C;
         v9[v1].unk_04 = &v2;
         v9[v1].unk_2C = param2;
 
@@ -6762,7 +6762,7 @@ static void ov65_02234CFC (UnkStruct_ov65_0222EBE0 * param0)
     sub_0201EE28(&param0->unk_BE0.unk_228);
 
     for (v0 = 0; v0 < 3; v0++) {
-        sub_02021BD4(param0->unk_BE0.unk_21C[v0]);
+        GraphicElementData_Delete(param0->unk_BE0.unk_21C[v0]);
     }
 
     sub_0200A4E4(param0->unk_BE0.unk_20C[0]);
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index ae0668f9c7..9fa0793aa3 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -683,7 +683,7 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
 
     memset(&v0, 0, sizeof(UnkStruct_ov115_02261520));
 
-    v0.unk_00 = param0->unk_00;
+    v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_1A0.unk_10;
     v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.unk_14.x = FX32_ONE;
@@ -702,8 +702,8 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
 
 static void ov65_02235B14 (UnkStruct_ov65_022358CC * param0)
 {
-    sub_02021BD4(param0->unk_1A0.unk_34);
-    sub_02021BD4(param0->unk_1A0.unk_38);
+    GraphicElementData_Delete(param0->unk_1A0.unk_34);
+    GraphicElementData_Delete(param0->unk_1A0.unk_38);
 }
 
 static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0)
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 3bd7baf82e..64f69c4b81 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -867,7 +867,7 @@ static void ov68_0225D02C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
     }
 
     {
-        sub_02021BD4(param0->unk_14);
+        GraphicElementData_Delete(param0->unk_14);
     }
 
     {
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index b5817e8c60..bbd5578367 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -2686,7 +2686,7 @@ static void ov69_0225EAE8 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
     sub_020057A4(1473, 0);
 
     for (v0 = 0; v0 < 12; v0++) {
-        sub_02021BD4(param0->unk_3C[v0]);
+        GraphicElementData_Delete(param0->unk_3C[v0]);
         sub_0200A4E4(param0->unk_6C[v0][0]);
 
         if (v0 == 0) {
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 3a860b1f23..f535af6fb4 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1718,7 +1718,7 @@ static void ov70_0225ED4C (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_50[v0]);
+        GraphicElementData_Delete(param0->unk_50[v0]);
         param0->unk_50[v0] = NULL;
     }
 
@@ -2757,7 +2757,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
 static void ov70_02260048 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1)
 {
-    sub_02021BD4(param0->unk_54);
+    GraphicElementData_Delete(param0->unk_54);
     param0->unk_54 = NULL;
 
     {
@@ -2830,7 +2830,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 static void ov70_02260228 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1)
 {
     sub_0201ED1C(SpriteActor_ImageProxy(param0->unk_68));
-    sub_02021BD4(param0->unk_68);
+    GraphicElementData_Delete(param0->unk_68);
 
     param0->unk_68 = NULL;
 
@@ -3049,7 +3049,7 @@ static void ov70_0226068C (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_BC[v0] != NULL) {
-            sub_02021BD4(param0->unk_7C[v0]);
+            GraphicElementData_Delete(param0->unk_7C[v0]);
 
             param0->unk_7C[v0] = NULL;
 
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 5f57539c03..b2f6bc9d1b 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -112,7 +112,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         u8 v2;
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
         v3.unk_08.x = 0;
         v3.unk_08.y = 0;
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index aec20d6e16..6b006eafcf 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -521,7 +521,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_3C;
+        v1.manager = param0->unk_3C;
         v1.unk_04 = &param0->unk_1FC;
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index c7600d9fe7..8a476830d2 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -118,7 +118,7 @@ static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, c
     sub_020093B4(param4, param0, param0, param0, param0, 0xffffffff, 0xffffffff, param5, param2, param1->unk_190[0], param1->unk_190[1], param1->unk_190[2], param1->unk_190[3], NULL, NULL);
 
     {
-        param3->unk_00 = param1->unk_00;
+        param3->manager = param1->unk_00;
         param3->unk_04 = param4;
         param3->unk_08.x = 0;
         param3->unk_08.y = 0;
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 318e631d3b..06e7585e49 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -106,7 +106,7 @@ static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, UnkStruct_ov115_022
     sub_020093B4(param2, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
     {
-        param1->unk_00 = param0->unk_00;
+        param1->manager = param0->unk_00;
         param1->unk_04 = param2;
         param1->unk_08.x = 0;
         param1->unk_08.y = 0;
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 1fadf53dff..97c3906713 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -96,7 +96,7 @@ void ov80_021D2C1C (UnkStruct_ov80_021D2C1C * param0)
     for (v1 = 0; v1 < param0->unk_00; v1++) {
         v0 = &param0->unk_08[v1];
         sub_02021C98(v0->unk_18, 0, 0);
-        sub_02021BD4(v0->unk_18);
+        GraphicElementData_Delete(v0->unk_18);
     }
 
     Heap_FreeToHeap(param0->unk_08);
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index a21c739a2e..27c023acca 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -434,8 +434,8 @@ void ov83_0223DC1C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223D784 *
     GF_ASSERT(param0->unk_00 == 1);
 
     for (v0 = 0; v0 < param0->unk_108; v0++) {
-        sub_02021BD4(param0->unk_08[v0]);
-        sub_02021BD4(param0->unk_18[v0]);
+        GraphicElementData_Delete(param0->unk_08[v0]);
+        GraphicElementData_Delete(param0->unk_18[v0]);
         ov83_0223D95C(param1, &param0->unk_28[v0]);
     }
 
@@ -705,7 +705,7 @@ void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 *
 void ov83_0223E2C8 (UnkStruct_ov83_0223E244 * param0)
 {
     GF_ASSERT(param0->unk_00 == 1);
-    sub_02021BD4(param0->unk_08);
+    GraphicElementData_Delete(param0->unk_08);
     param0->unk_00 = 0;
 }
 
@@ -934,7 +934,7 @@ void ov83_0223E63C (UnkStruct_ov83_0223E5C0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(param0->unk_04[v0]);
+        GraphicElementData_Delete(param0->unk_04[v0]);
     }
 
     param0->unk_00 = 0;
@@ -1399,7 +1399,7 @@ static void ov83_0223F054 (UnkStruct_ov83_0223F054 * param0)
 {
     GF_ASSERT(param0->unk_78);
 
-    sub_02021BD4(param0->unk_78);
+    GraphicElementData_Delete(param0->unk_78);
     memset(param0, 0, sizeof(UnkStruct_ov83_0223F054));
 }
 
@@ -1552,7 +1552,7 @@ void ov83_0223F348 (UnkStruct_ov83_0223F29C * param0)
     GF_ASSERT(param0->unk_7C == 1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021BD4(param0->unk_3C[v0].unk_00);
+        GraphicElementData_Delete(param0->unk_3C[v0].unk_00);
     }
 
     ov83_0223D95C(param0->unk_00, &param0->unk_04);
@@ -1683,7 +1683,7 @@ void ov83_0223F510 (UnkStruct_ov83_0223F4AC * param0)
     int v0;
 
     for (v0 = 0; v0 < 32; v0++) {
-        sub_02021BD4(param0->unk_0C[v0].unk_44);
+        GraphicElementData_Delete(param0->unk_0C[v0].unk_44);
     }
 
     param0->unk_00 = 0;
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 25afe0042e..55820831de 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -895,7 +895,7 @@ static void ov86_0223BD68 (UnkStruct_ov86_0223B3C8 * param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021BD4(param0->unk_1B4[v0]);
+        GraphicElementData_Delete(param0->unk_1B4[v0]);
     }
 
     Heap_FreeToHeap(param0->unk_1D4);
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 526fdda1ef..24c6fc12bd 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -471,7 +471,7 @@ static void ov87_021D186C (UnkStruct_ov87_021D106C * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_1C4[v0]) {
-            sub_02021BD4(param0->unk_1C4[v0]);
+            GraphicElementData_Delete(param0->unk_1C4[v0]);
         }
     }
 
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index cb17fa9ab5..f08b22cf7a 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1411,7 +1411,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         UnkStruct_ov115_02261520 v0;
         int v1;
 
-        v0.unk_00 = param0->unk_194;
+        v0.manager = param0->unk_194;
         v0.unk_04 = &param0->unk_354;
         v0.unk_08.x = FX32_CONST(32);
         v0.unk_08.y = FX32_CONST(96);
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index b9fcce22d5..42800e4811 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -380,7 +380,7 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0)
 
 void ov94_0223C300 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3)
 {
-    param0->unk_00 = param1->unk_BE4;
+    param0->manager = param1->unk_BE4;
     param0->unk_04 = param2;
     param0->unk_08.z = 0;
     param0->unk_14.x = FX32_ONE;
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index dccedf59d0..00162c4a14 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -321,7 +321,7 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223C9B0 (UnkStruct_ov94_0223FD4C * param0)
 {
-    sub_02021BD4(param0->unk_E20);
+    GraphicElementData_Delete(param0->unk_E20);
 }
 
 static void ov94_0223C9C0 (UnkStruct_ov94_0223FD4C * param0)
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 59f62f12d9..2003d1011f 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -276,7 +276,7 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223D428 (UnkStruct_ov94_0223FD4C * param0)
 {
-    sub_02021BD4(param0->unk_F30);
+    GraphicElementData_Delete(param0->unk_F30);
 }
 
 static const int Unk_ov94_02245B94[][4] = {
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 6bf0bd728f..0fcf2924d2 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -239,7 +239,7 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223DEC8 (UnkStruct_ov94_0223FD4C * param0)
 {
-    sub_02021BD4(param0->unk_F30);
+    GraphicElementData_Delete(param0->unk_F30);
 }
 
 static const int Unk_ov94_02245CC4[][4] = {
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 78a13e0150..4a2e79781a 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -311,7 +311,7 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223E7C4 (UnkStruct_ov94_0223FD4C * param0)
 {
-    sub_02021BD4(param0->unk_E20);
+    GraphicElementData_Delete(param0->unk_E20);
 }
 
 static const u16 Unk_ov94_02245D94[6][2] = {
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 195acade9e..6461173b64 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -426,18 +426,18 @@ static void ov94_0223FFC8 (UnkStruct_ov94_0223FD4C * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021BD4(param0->unk_F54[v0]);
+        GraphicElementData_Delete(param0->unk_F54[v0]);
     }
 
-    sub_02021BD4(param0->unk_E20);
+    GraphicElementData_Delete(param0->unk_E20);
 
     for (v0 = 0; v0 < 30; v0++) {
-        sub_02021BD4(param0->unk_E28[v0]);
-        sub_02021BD4(param0->unk_EA0[v0]);
+        GraphicElementData_Delete(param0->unk_E28[v0]);
+        GraphicElementData_Delete(param0->unk_EA0[v0]);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021BD4(param0->unk_F18[v0]);
+        GraphicElementData_Delete(param0->unk_F18[v0]);
     }
 }
 
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 0ab7a5eacc..7aee469dd6 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -506,7 +506,7 @@ static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0]) {
-            sub_02021BD4(param0->unk_3C[v0]);
+            GraphicElementData_Delete(param0->unk_3C[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 01c403f48e..594f590d88 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -639,11 +639,11 @@ static void ov95_02248DC4 (UnkStruct_ov95_02248688 * param0)
 
     for (v0 = 0; v0 < 20; v0++) {
         if (param0->unk_1C[v0][0]) {
-            sub_02021BD4(param0->unk_1C[v0][0]);
+            GraphicElementData_Delete(param0->unk_1C[v0][0]);
         }
 
         if (param0->unk_1C[v0][1]) {
-            sub_02021BD4(param0->unk_1C[v0][1]);
+            GraphicElementData_Delete(param0->unk_1C[v0][1]);
         }
     }
 
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 04b1cbefa7..42b191a33e 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -424,7 +424,7 @@ static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            sub_02021BD4(param0->unk_20[v0]);
+            GraphicElementData_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index aa6d3c720e..2c33c18436 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -399,7 +399,7 @@ static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            sub_02021BD4(param0->unk_20[v0]);
+            GraphicElementData_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 6ca34be5bf..227948b7f6 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -549,7 +549,7 @@ static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_40[v0]) {
-            sub_02021BD4(param0->unk_40[v0]);
+            GraphicElementData_Delete(param0->unk_40[v0]);
         }
     }
 
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 2bbf1397c4..f1b4356192 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -287,7 +287,7 @@ static const u16 Unk_ov96_0223DA80[][2] = {
 
 void ov96_0223BAE0 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3)
 {
-    param0->unk_00 = param1->unk_BF4;
+    param0->manager = param1->unk_BF4;
     param0->unk_04 = param2;
     param0->unk_08.z = 0;
     param0->unk_14.x = FX32_ONE;
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index 02ee4f9956..99e099973a 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -903,8 +903,8 @@ static void ov97_0222BC9C (OverlayManager * param0)
     UnkStruct_0222AE60 * v1 = OverlayManager_Data(param0);
 
     if (v1->unk_168[0] || v1->unk_168[1]) {
-        sub_02021BD4(v1->unk_168[0]);
-        sub_02021BD4(v1->unk_168[1]);
+        GraphicElementData_Delete(v1->unk_168[0]);
+        GraphicElementData_Delete(v1->unk_168[1]);
         ov97_02237DA0();
     }
 
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 7228a2410c..56de0fea69 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1182,7 +1182,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
         UnkStruct_ov115_02261520 v1;
         int v2 = (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) ? 0 : 1;
 
-        v1.unk_00 = param0->unk_0C->unk_00;
+        v1.manager = param0->unk_0C->unk_00;
         v1.unk_04 = &param0->unk_10[v2];
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
@@ -1252,13 +1252,13 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0)
 
 static void ov97_0222E664 (UnkStruct_ov97_0222E398 * param0)
 {
-    sub_02021BD4(param0->unk_3008.unk_0C);
+    GraphicElementData_Delete(param0->unk_3008.unk_0C);
     param0->unk_3008.unk_0C = NULL;
 }
 
 static void ov97_0222E67C (UnkStruct_ov97_0222E398 * param0)
 {
-    sub_02021BD4(param0->unk_3054.unk_0C);
+    GraphicElementData_Delete(param0->unk_3054.unk_0C);
     param0->unk_3054.unk_0C = NULL;
 }
 
@@ -1331,7 +1331,7 @@ static void ov97_0222E7B4 (UnkStruct_ov97_0222E398 * param0)
             continue;
         }
 
-        sub_02021BD4(param0->unk_88[v0].unk_0C);
+        GraphicElementData_Delete(param0->unk_88[v0].unk_0C);
         param0->unk_88[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_88[v0].unk_48);
     }
@@ -1342,7 +1342,7 @@ static void ov97_0222E7E4 (UnkStruct_ov97_0222E398 * param0)
     int v0;
 
     for (v0 = 0; v0 < 80; v0++) {
-        sub_02021BD4(param0->unk_1848[v0].unk_0C);
+        GraphicElementData_Delete(param0->unk_1848[v0].unk_0C);
         param0->unk_1848[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_1848[v0].unk_48);
     }
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 049cf19c27..0aec496346 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -249,25 +249,25 @@ static void ov97_02230410 (UnkStruct_ov97_02230868 * param0)
 static void ov97_02230438 (UnkStruct_ov97_02230868 * param0)
 {
     if (param0->unk_2E88[0]) {
-        sub_02021BD4(param0->unk_2E88[0]);
+        GraphicElementData_Delete(param0->unk_2E88[0]);
     }
 
     if (param0->unk_2E88[1]) {
-        sub_02021BD4(param0->unk_2E88[1]);
+        GraphicElementData_Delete(param0->unk_2E88[1]);
     }
 
     param0->unk_2E88[0] = param0->unk_2E88[1] = NULL;
 
     if (param0->unk_2E90[0]) {
-        sub_02021BD4(param0->unk_2E90[0]);
+        GraphicElementData_Delete(param0->unk_2E90[0]);
     }
 
     if (param0->unk_2E90[1]) {
-        sub_02021BD4(param0->unk_2E90[1]);
+        GraphicElementData_Delete(param0->unk_2E90[1]);
     }
 
     if (param0->unk_2E90[2]) {
-        sub_02021BD4(param0->unk_2E90[2]);
+        GraphicElementData_Delete(param0->unk_2E90[2]);
     }
 
     param0->unk_2E90[0] = param0->unk_2E90[1] = param0->unk_2E90[2] = NULL;
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index c8f32975a1..223e0e3fd9 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -553,7 +553,7 @@ static void ov97_022340B0 (UnkStruct_ov97_02234A2C * param0)
 
 static void ov97_022340FC (UnkStruct_ov115_02261520 * param0, UnkStruct_ov97_02234A2C * param1, UnkStruct_ov19_021DA864 * param2, int param3)
 {
-    param0->unk_00 = param1->unk_28;
+    param0->manager = param1->unk_28;
     param0->unk_04 = &param1->unk_1E8;
     param0->unk_08.z = 0;
     param0->unk_14.x = FX32_ONE;
@@ -1519,7 +1519,7 @@ static void ov97_02235178 (UnkStruct_ov97_02234A2C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021BD4(param0->unk_478[v0]);
+        GraphicElementData_Delete(param0->unk_478[v0]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
@@ -1545,30 +1545,30 @@ static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0)
 
     for (v0 = 0; v0 < 30; v0++) {
         if (param0->unk_20C[v0].unk_00) {
-            sub_02021BD4(param0->unk_20C[v0].unk_00);
+            GraphicElementData_Delete(param0->unk_20C[v0].unk_00);
         }
 
         if (param0->unk_20C[v0].unk_04) {
-            sub_02021BD4(param0->unk_20C[v0].unk_04);
+            GraphicElementData_Delete(param0->unk_20C[v0].unk_04);
         }
     }
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_42C[v0].unk_00) {
-            sub_02021BD4(param0->unk_42C[v0].unk_00);
+            GraphicElementData_Delete(param0->unk_42C[v0].unk_00);
         }
     }
 
     if (param0->unk_3FC[0]) {
-        sub_02021BD4(param0->unk_3FC[0]);
+        GraphicElementData_Delete(param0->unk_3FC[0]);
     }
 
     if (param0->unk_41C[0]) {
-        sub_02021BD4(param0->unk_41C[0]);
+        GraphicElementData_Delete(param0->unk_41C[0]);
     }
 
     if (param0->unk_40C[0]) {
-        sub_02021BD4(param0->unk_40C[0]);
+        GraphicElementData_Delete(param0->unk_40C[0]);
     }
 
     ov97_02235158(&param0->unk_4DC);
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 2b1fb77ee0..dfe36a19ee 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -445,7 +445,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
     if (param1 == NULL) {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = v0->unk_34.unk_00;
+        v1.manager = v0->unk_34.unk_00;
         v1.unk_04 = &v0->unk_34.unk_1D8[param0];
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
@@ -480,7 +480,7 @@ void ov97_02237DA0 (void)
     int v2;
 
     if (v0->unk_26C) {
-        sub_02021BD4(v0->unk_26C);
+        GraphicElementData_Delete(v0->unk_26C);
         v0->unk_26C = NULL;
     }
 
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index e2fd8a7840..22629ceca7 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -139,7 +139,7 @@ void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0)
     Heap_FreeToHeap(param0->unk_1BC);
     sub_0201DC3C();
     sub_0201DCF0(param0->unk_19C);
-    sub_020219C0(param0->unk_0C);
+    GraphicElementManager_DeleteAll(param0->unk_0C);
     GraphicElementManager_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 }
@@ -358,7 +358,7 @@ void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0)
         sub_0200A5B4(param0->unk_08);
     }
 
-    sub_02021BD4(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 }
 
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 4e0fd66776..5ad0d4ae60 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -71,7 +71,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
     {
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
         v3.unk_08.x = 0;
         v3.unk_08.y = 0;
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 09bcfaaa0b..72aa4dba6a 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -40,7 +40,7 @@ UnkStruct_ov105_02245E1C * ov105_02245DC4 (UnkStruct_ov105_02245AAC * param0, u3
 
 void * ov105_02245E1C (UnkStruct_ov105_02245E1C * param0)
 {
-    sub_02021BD4(param0->unk_08);
+    GraphicElementData_Delete(param0->unk_08);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index dcd47b1660..6fe7677695 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -55,7 +55,7 @@ UnkStruct_ov105_02245EA8 * ov105_02245E54 (UnkStruct_ov105_02245AAC * param0, in
 
 void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0)
 {
-    sub_02021BD4(param0->unk_0C);
+    GraphicElementData_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index 0ea339f997..88dd51c70d 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -67,7 +67,7 @@ UnkStruct_ov105_02246060 * ov105_02245FB8 (UnkStruct_ov105_02245AAC * param0, u8
 
 void * ov105_02246060 (UnkStruct_ov105_02246060 * param0)
 {
-    sub_02021BD4(param0->unk_0C);
+    GraphicElementData_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 5e63d96698..5c9034ee84 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -84,7 +84,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
     {
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
 
         v3.unk_08.x = 0;
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 2f84feaab3..ad2e3fba42 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -54,7 +54,7 @@ UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u3
 
 void * ov106_02243650 (UnkStruct_ov106_02243650 * param0)
 {
-    sub_02021BD4(param0->unk_10);
+    GraphicElementData_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 64e163f8ce..94846b33b4 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -123,7 +123,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
     {
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
         v3.unk_08.x = 0;
         v3.unk_08.y = 0;
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 16c6ac24b3..2681235957 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -60,7 +60,7 @@ void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0)
         return NULL;
     }
 
-    sub_02021BD4(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_04);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index ed86893e09..83f480b3ec 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -85,7 +85,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
     {
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
         v3.unk_08.x = 0;
         v3.unk_08.y = 0;
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index 8456eb474e..ee6e93827a 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -59,7 +59,7 @@ UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u3
 
 void * ov108_02243594 (UnkStruct_ov108_02243594 * param0)
 {
-    sub_02021BD4(param0->unk_10);
+    GraphicElementData_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index f7aa70320d..546de5ac2d 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -645,7 +645,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_60;
+        v1.manager = param0->unk_60;
         v1.unk_04 = &param0->unk_278;
         v1.unk_08.z = 0;
         v1.unk_14.x = FX32_ONE;
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 55fee0dfb8..2ff476fb84 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -124,7 +124,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
     {
         UnkStruct_ov115_02261520 v3;
 
-        v3.unk_00 = param0->unk_00;
+        v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
         v3.unk_08.x = 0;
         v3.unk_08.y = 0;
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index ad12c9bc7e..f1edc8baf7 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -51,7 +51,7 @@ UnkStruct_ov111_021D33F4 * ov111_021D33F4 (UnkStruct_ov111_021D2F80 * param0, u3
 
 void * ov111_021D3448 (UnkStruct_ov111_021D33F4 * param0)
 {
-    sub_02021BD4(param0->unk_0C);
+    GraphicElementData_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
     return NULL;
 }
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 78ca9bd9c0..fdc4c04b59 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1132,7 +1132,7 @@ void ov114_0225CB38 (UnkStruct_ov114_0225CAD4 * param0)
     }
 
     if (param0->unk_30 != NULL) {
-        sub_02021BD4(param0->unk_30);
+        GraphicElementData_Delete(param0->unk_30);
     }
 
     ov114_0225FBF0(&param0->unk_34);
@@ -2067,12 +2067,12 @@ static void ov114_0225DD94 (UnkStruct_ov114_0225DAC0 * param0)
 static void ov114_0225DDA0 (UnkStruct_ov114_0225DAC0 * param0)
 {
     if (param0->unk_10) {
-        sub_02021BD4(param0->unk_10);
+        GraphicElementData_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 
     if (param0->unk_14) {
-        sub_02021BD4(param0->unk_14);
+        GraphicElementData_Delete(param0->unk_14);
         param0->unk_14 = NULL;
     }
 
@@ -3431,7 +3431,7 @@ static void ov114_0225F578 (UnkStruct_ov114_0225F578 * param0)
         int v0;
 
         for (v0 = 0; v0 < (5 * 3); v0++) {
-            sub_02021BD4(param0->unk_08[v0]);
+            GraphicElementData_Delete(param0->unk_08[v0]);
         }
     }
 
@@ -3763,7 +3763,7 @@ static void ov114_0225FBF0 (UnkStruct_ov114_0225FAB8 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_00[v0] != NULL) {
-            sub_02021BD4(param0->unk_00[v0]);
+            GraphicElementData_Delete(param0->unk_00[v0]);
             param0->unk_00[v0] = NULL;
         }
     }
@@ -3907,7 +3907,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            sub_02021BD4(v0->unk_30);
+            GraphicElementData_Delete(v0->unk_30);
             v0->unk_30 = NULL;
             v0->unk_04++;
             v0->unk_06 = 0;
@@ -3966,7 +3966,7 @@ static void ov114_0225FF54 (SysTask * param0, void * param1)
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            sub_02021BD4(v0->unk_30);
+            GraphicElementData_Delete(v0->unk_30);
             v0->unk_30 = NULL;
             v0->unk_06 = 0;
             v0->unk_04++;
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 7e1de09bfa..372100b40d 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1259,7 +1259,7 @@ static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_0
     int v1, v2;
     u32 v3;
 
-    v0.unk_00 = param1->unk_1C;
+    v0.manager = param1->unk_1C;
     v0.unk_04 = &param1->unk_1BC;
     v0.unk_14.x = FX32_ONE;
     v0.unk_14.y = FX32_ONE;
@@ -1331,7 +1331,7 @@ static void ov115_02261648 (UnkStruct_ov115_022615B0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        sub_02021BD4(param0->unk_00[v0]);
+        GraphicElementData_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -2706,7 +2706,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
 static void ov115_022630DC (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1)
 {
     {
-        sub_02021BD4(param0->unk_34);
+        GraphicElementData_Delete(param0->unk_34);
     }
 
     {
@@ -3708,7 +3708,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     {
         UnkStruct_ov115_02261520 v0 = {0};
 
-        v0.unk_00 = param0->unk_1C;
+        v0.manager = param0->unk_1C;
         v0.unk_04 = &param0->unk_760.unk_70;
         v0.unk_14.x = FX32_ONE;
         v0.unk_14.y = FX32_ONE;
@@ -3727,7 +3727,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 
 static void ov115_02264728 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1)
 {
-    sub_02021BD4(param1->unk_00);
+    GraphicElementData_Delete(param1->unk_00);
     memset(param1, 0, sizeof(UnkStruct_ov115_022647A0));
 }
 
@@ -3930,7 +3930,7 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 {
     UnkStruct_ov115_02261520 v0 = {0};
 
-    v0.unk_00 = param0->unk_1C;
+    v0.manager = param0->unk_1C;
     v0.unk_04 = &param0->unk_760.unk_70;
     v0.unk_14.x = FX32_ONE;
     v0.unk_14.y = FX32_ONE;
@@ -3949,7 +3949,7 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 
 static void ov115_02264BA0 (UnkStruct_ov115_02264BA0 * param0)
 {
-    sub_02021BD4(param0->unk_04);
+    GraphicElementData_Delete(param0->unk_04);
 }
 
 static void ov115_02264BAC (UnkStruct_ov115_02264BA0 * param0)
@@ -3990,7 +3990,7 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     int v0;
     UnkStruct_ov115_02261520 v1 = {0};
 
-    v1.unk_00 = param0->unk_1C;
+    v1.manager = param0->unk_1C;
     v1.unk_04 = &param0->unk_760.unk_70;
     v1.unk_14.x = 9;
     v1.unk_14.y = 9;
@@ -4013,7 +4013,7 @@ static void ov115_02264C78 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        sub_02021BD4(param1->unk_00[v0].unk_04);
+        GraphicElementData_Delete(param1->unk_00[v0].unk_04);
     }
 }
 
@@ -4472,7 +4472,7 @@ static void ov115_02265688 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
         Strbuf_Free(param0->unk_5C);
     }
 
-    sub_02021BD4(param0->unk_34);
+    GraphicElementData_Delete(param0->unk_34);
 
     {
         sub_0200A4E4(param0->unk_00[0]);
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 91ae2d06e0..3b04a5372b 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -151,7 +151,7 @@ BOOL sub_0200C7C0 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param
 
 void sub_0200C7E4 (GraphicElementData * param0)
 {
-    sub_02021BD4(param0);
+    GraphicElementData_Delete(param0);
 }
 
 void sub_0200C7EC (SpriteGfxHandler * param0)
@@ -303,7 +303,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     GraphicElementData * v0 = NULL;
     UnkStruct_ov115_02261520 v1;
 
-    v1.unk_00 = param1->unk_00;
+    v1.manager = param1->unk_00;
     v1.unk_04 = &param1->unk_04->unk_00[param2];
     v1.unk_08.x = FX32_CONST(param3);
     v1.unk_08.y = FX32_CONST(param4);
@@ -557,7 +557,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
 
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param2->transferToVRAM, param2->bgPriority, param1->unk_0C[0], param1->unk_0C[1], param1->unk_0C[2], param1->unk_0C[3], param1->unk_0C[4], param1->unk_0C[5]);
 
-    v3.unk_00 = param1->unk_00;
+    v3.manager = param1->unk_00;
     v3.unk_04 = v2->unk_04;
     v3.unk_08.x = FX32_CONST(param2->x);
     v3.unk_08.y = FX32_CONST(param2->y);
@@ -643,7 +643,7 @@ void sub_0200D0F4 (CellActorData * param0)
         sub_0200A5B4(param0->unk_04->unk_00);
     }
 
-    sub_02021BD4(param0->unk_00);
+    GraphicElementData_Delete(param0->unk_00);
     sub_020095A8(param0->unk_08);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 3944f212b3..3f028bd005 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -721,7 +721,7 @@ static void sub_020130DC (FontOAM * param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021BD4(param0->unk_00[v0].unk_00);
+        GraphicElementData_Delete(param0->unk_00[v0].unk_00);
     }
 }
 
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 4734af3e1e..cbdf7f9ccc 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -15,6 +15,13 @@
 #define GRAPHIC_ELEMENT_DATA_FLIP_H 1
 #define GRAPHIC_ELEMENT_DATA_FLIP_V 2
 
+enum CellType {
+    CELL_TYPE_NONE = 0,
+    CELL_TYPE_CELL,
+    CELL_TYPE_MULTI_CELL,
+    CELL_TYPE_VRAM_CELL,
+};
+
 typedef struct {
     const NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
@@ -25,8 +32,8 @@ typedef struct {
     NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
     NNSG2dCellAnimation unk_08;
-    u32 unk_60;
-} CellDataAnimationWrapper;
+    u32 transferHandle;
+} VRamCellAnimationData;
 
 typedef struct {
     const NNSG2dCellDataBank * unk_00;
@@ -50,18 +57,18 @@ typedef struct GraphicElementData_t {
     u8 explicitPaletteOffset;
     BOOL explicitMosaic;
     GXOamMode explicitOamMode;
-    u8 unk_34;
+    u8 draw;
     u8 unk_35;
     fx32 unk_38;
     GraphicElementManager * manager;
     u32 unk_40[29];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
-    u32 unk_EC;
+    u32 type;
     u16 unk_F0;
     u8 explicitPriority;
     u16 priority;
-    NNS_G2D_VRAM_TYPE type;
+    NNS_G2D_VRAM_TYPE vramType;
     struct GraphicElementData_t *prev;
     struct GraphicElementData_t *next;
 } GraphicElementData;
@@ -75,10 +82,10 @@ typedef struct GraphicElementManager_t {
     NNSG2dRendererInstance * renderer;
     void * rawAnimData;
     NNSG2dCellAnimBankData * animData;
-    u32 unk_11C;
+    BOOL active;
 } GraphicElementManager;
 
-typedef void (* GraphicElementUpdateFunc)(const GraphicElementManager *, GraphicElementData *);
+typedef void (* GraphicElementDrawFunc)(const GraphicElementManager *, GraphicElementData *);
 typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
 
 static void GraphicElementManager_Reset(GraphicElementManager * param0);
@@ -93,7 +100,7 @@ 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 GraphicElementManager_DrawElement(const GraphicElementManager * param0, GraphicElementData * param1);
-static void sub_02022450(const GraphicElementManager * param0, GraphicElementData * param1);
+static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager * param0, GraphicElementData * param1);
 static void sub_02022454(GraphicElementData * param0);
 static void sub_02022460(GraphicElementData * param0);
 static void GraphicElementManager_InsertElement(GraphicElementManager * param0, GraphicElementData * param1);
@@ -104,13 +111,10 @@ static BOOL GraphicElementManager_FreeElement(GraphicElementManager * param0, Gr
 
 GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params)
 {
-    GraphicElementManager *gfxElemMgr;
-    int v1;
-
     GF_ASSERT(params);
     GF_ASSERT(params->renderer);
 
-    gfxElemMgr = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementManager));
+    GraphicElementManager *gfxElemMgr = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementManager));
     GF_ASSERT(gfxElemMgr);
 
     GraphicElementManager_Reset(gfxElemMgr);
@@ -131,7 +135,7 @@ GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerPara
     gfxElemMgr->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
 
     NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->animData);
-    gfxElemMgr->unk_11C = 1;
+    gfxElemMgr->active = TRUE;
 
     return gfxElemMgr;
 }
@@ -146,7 +150,7 @@ BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr)
         return TRUE;
     }
 
-    sub_020219C0(gfxElemMgr);
+    GraphicElementManager_DeleteAll(gfxElemMgr);
 
     Heap_FreeToHeap(gfxElemMgr->rawAnimData);
     Heap_FreeToHeap(gfxElemMgr->elementStack);
@@ -160,26 +164,23 @@ BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr)
     return TRUE;
 }
 
-BOOL sub_020219A4 (GraphicElementManager * param0, u8 param1)
+BOOL GraphicElementManager_SetActive(GraphicElementManager *gfxElemMgr, u8 active)
 {
-    if (param0 == NULL) {
-        return 0;
+    if (gfxElemMgr == NULL) {
+        return FALSE;
     }
 
-    if (param0->elements == NULL) {
-        return 0;
+    if (gfxElemMgr->elements == NULL) {
+        return FALSE;
     }
 
-    param0->unk_11C = param1;
+    gfxElemMgr->active = active;
 
-    return 1;
+    return TRUE;
 }
 
-BOOL sub_020219C0(GraphicElementManager *gfxElemMgr)
+BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr)
 {
-    GraphicElementData *elem;
-    GraphicElementData *next;
-
     if (gfxElemMgr == NULL) {
         return FALSE;
     }
@@ -188,21 +189,21 @@ BOOL sub_020219C0(GraphicElementManager *gfxElemMgr)
         return TRUE;
     }
 
-    elem = gfxElemMgr->sentinelData.next;
+    GraphicElementData *elem = gfxElemMgr->sentinelData.next;
     while (elem != &gfxElemMgr->sentinelData) {
-        next = elem->next;
-        sub_02021BD4(elem);
+        GraphicElementData *next = elem->next;
+        GraphicElementData_Delete(elem);
         elem = next;
     }
 
     return TRUE;
 }
 
-void sub_020219F8 (const GraphicElementManager * param0)
+void sub_020219F8 (const GraphicElementManager *gfxElemMgr)
 {
-    GraphicElementData * v0;
-    static const GraphicElementUpdateFunc v1[] = {
-        sub_02022450,
+    GraphicElementData * elem;
+    static const GraphicElementDrawFunc sDrawFuncs[] = {
+        GraphicElementManager_DrawElement_Stub,
         GraphicElementManager_DrawElement
     };
     static const GraphicElementInitializeFunc v2[] = {
@@ -210,18 +211,18 @@ void sub_020219F8 (const GraphicElementManager * param0)
         sub_02022454
     };
 
-    GF_ASSERT(param0);
+    GF_ASSERT(gfxElemMgr);
 
-    if (param0->unk_11C == 0) {
+    if (gfxElemMgr->active == FALSE) {
         return;
     }
 
-    v0 = param0->sentinelData.next;
+    elem = gfxElemMgr->sentinelData.next;
 
-    while (v0 != &param0->sentinelData) {
-        v1[v0->unk_34](param0, v0);
-        v2[v0->unk_35](v0);
-        v0 = v0->next;
+    while (elem != &gfxElemMgr->sentinelData) {
+        sDrawFuncs[elem->draw](gfxElemMgr, elem);
+        v2[elem->unk_35](elem);
+        elem = elem->next;
     }
 }
 
@@ -234,7 +235,7 @@ static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
     gfxElemMgr->renderer = NULL;
 
     GraphicElementData_Reset(&gfxElemMgr->sentinelData);
-    gfxElemMgr->unk_11C = 0;
+    gfxElemMgr->active = 0;
 }
 
 void GraphicElementData_Reset(GraphicElementData *elem)
@@ -252,20 +253,17 @@ void GraphicElementData_Reset(GraphicElementData *elem)
 
 GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_02261520 * param0)
 {
-    GraphicElementData *elem;
-
-    elem = GraphicElementManager_AllocElement(param0->unk_00);
-
+    GraphicElementData *elem = GraphicElementManager_AllocElement(param0->manager);
     if (elem == NULL) {
         return NULL;
     }
 
-    elem->manager = param0->unk_00;
+    elem->manager = param0->manager;
     elem->unk_F0 = 0;
     elem->position = param0->unk_08;
     elem->affineScale = param0->unk_14;
     elem->affineZRotation = param0->unk_20;
-    elem->type = param0->unk_28;
+    elem->vramType = param0->unk_28;
     elem->priority = param0->unk_24;
     elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
     elem->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
@@ -273,22 +271,22 @@ GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_0226
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
     elem->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
-    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->unk_00->renderer->rendererCore), elem->affineOverwriteMode);
-    NNS_G2dSetRndCoreFlipMode(&(param0->unk_00->renderer->rendererCore), elem->flip & 1, elem->flip & 2);
+    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->manager->renderer->rendererCore), elem->affineOverwriteMode);
+    NNS_G2dSetRndCoreFlipMode(&(param0->manager->renderer->rendererCore), elem->flip & 1, elem->flip & 2);
 
-    elem->unk_34 = 1;
+    elem->draw = 1;
     elem->unk_35 = 0;
     elem->unk_38 = (FX32_ONE * 2);
 
-    if (sub_02022110(param0->unk_00, param0->unk_04, elem, param0->unk_2C) == 0) {
-        sub_02021BD4(elem);
+    if (sub_02022110(param0->manager, param0->unk_04, elem, param0->unk_2C) == 0) {
+        GraphicElementData_Delete(elem);
         return NULL;
     }
 
-    elem->explicitPaletteOffset = sub_020222C4(&elem->paletteProxy, elem->type);
+    elem->explicitPaletteOffset = sub_020222C4(&elem->paletteProxy, elem->vramType);
     elem->explicitPalette = elem->explicitPaletteOffset;
 
-    GraphicElementManager_InsertElement(param0->unk_00, elem);
+    GraphicElementManager_InsertElement(param0->manager, elem);
 
     return elem;
 }
@@ -297,7 +295,7 @@ GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
 {
     UnkStruct_ov115_02261520 v0;
 
-    v0.unk_00 = param0->unk_00;
+    v0.manager = param0->unk_00;
     v0.unk_04 = param0->unk_04;
     v0.unk_08 = param0->unk_08;
     v0.unk_14.x = FX32_ONE;
@@ -311,41 +309,38 @@ GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
     return GraphicElementManager_AddElement(&v0);
 }
 
-void sub_02021BD4 (GraphicElementData *gfxElem)
+void GraphicElementData_Delete(GraphicElementData *gfxElem)
 {
-    GraphicElementManager *gfxElemMgr;
-
-    if (gfxElem->unk_EC != 0) {
-        CellAnimationData *v1 = (CellAnimationData *)&gfxElem->unk_40;
+    if (gfxElem->type != CELL_TYPE_NONE) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&gfxElem->unk_40;
 
         if (gfxElem->prev != NULL) {
             GraphicElementManager_RemoveElement(gfxElem);
         }
 
-        if (gfxElem->unk_EC == 3) {
-            CellDataAnimationWrapper * v2 = (CellDataAnimationWrapper *)&gfxElem->unk_40;
+        if (gfxElem->type == CELL_TYPE_VRAM_CELL) {
+            VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->unk_40;
 
-            if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->type) != NNS_G2D_VRAM_ADDR_NONE) {
-                NNS_G2dFreeCellTransferStateHandle(v2->unk_60);
+            if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
+                NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
             }
         }
 
-        if (gfxElem->unk_EC == 2) {
-            MultiCellAnimationData * v3 = (MultiCellAnimationData *)&gfxElem->unk_40;
+        if (gfxElem->type == CELL_TYPE_MULTI_CELL) {
+            MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->unk_40;
 
-            if (v3->unk_74 != NULL) {
-                Heap_FreeToHeap(v3->unk_74);
+            if (multiCellAnim->unk_74 != NULL) {
+                Heap_FreeToHeap(multiCellAnim->unk_74);
             }
 
-            if (v3->unk_78 != NULL) {
-                Heap_FreeToHeap(v3->unk_78);
+            if (multiCellAnim->unk_78 != NULL) {
+                Heap_FreeToHeap(multiCellAnim->unk_78);
             }
         }
 
-        gfxElem->unk_EC = 0;
+        gfxElem->type = CELL_TYPE_NONE;
 
-        gfxElemMgr = (GraphicElementManager *)gfxElem->manager;
-        GraphicElementManager_FreeElement(gfxElemMgr, gfxElem);
+        GraphicElementManager_FreeElement(gfxElem->manager, gfxElem);
     }
 }
 
@@ -386,7 +381,7 @@ void sub_02021CAC (GraphicElementData * param0, int param1)
     GF_ASSERT(param0);
     GF_ASSERT(param1 < 2);
 
-    param0->unk_34 = param1;
+    param0->draw = param1;
 }
 
 void sub_02021CC8 (GraphicElementData * param0, int param1)
@@ -436,7 +431,7 @@ u16 sub_02021D30 (const GraphicElementData * param0)
 
 int sub_02021D34 (const GraphicElementData * param0)
 {
-    return param0->unk_34;
+    return param0->draw;
 }
 
 int sub_02021D3C (const GraphicElementData * param0)
@@ -450,7 +445,7 @@ u32 sub_02021D44 (const GraphicElementData * param0)
 
     GF_ASSERT(param0);
 
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
         v0 = v1->unk_04->numSequences;
     } else {
@@ -468,7 +463,7 @@ void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
     GF_ASSERT(sub_02021D44(param0) > param1);
     param0->unk_F0 = param1;
 
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
 
         v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1);
@@ -492,7 +487,7 @@ void sub_02021DCC (GraphicElementData * param0, u32 param1)
 
 void sub_02021DE0 (GraphicElementData * param0)
 {
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
 
         NNS_G2dResetAnimCtrlState(&v0->unk_08.animCtrl);
@@ -514,7 +509,7 @@ u32 sub_02021E24 (const GraphicElementData * param0)
 
 void sub_02021E2C (GraphicElementData * param0, fx32 param1)
 {
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         NNS_G2dTickCellAnimation(&v0->unk_08, param1);
     } else {
@@ -525,7 +520,7 @@ void sub_02021E2C (GraphicElementData * param0, fx32 param1)
 
 void SpriteActor_SetAnimFrame (GraphicElementData * param0, u16 param1)
 {
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         NNS_G2dSetCellAnimationCurrentFrame(&v0->unk_08, param1);
     } else {
@@ -538,7 +533,7 @@ u16 sub_02021E74 (const GraphicElementData * param0)
 {
     NNSG2dAnimController * v0;
 
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
         v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->unk_08);
     } else {
@@ -571,7 +566,7 @@ void sub_02021E90 (GraphicElementData * param0, u32 param1)
 void sub_02021EC4 (GraphicElementData * param0, u32 param1)
 {
     sub_02021E90(param0, param1);
-    param0->explicitPalette += sub_020222C4(&param0->paletteProxy, param0->type);
+    param0->explicitPalette += sub_020222C4(&param0->paletteProxy, param0->vramType);
 }
 
 u32 sub_02021EE8 (const GraphicElementData * param0)
@@ -591,7 +586,7 @@ void sub_02021EF0 (GraphicElementData * param0, u32 param1)
 void sub_02021F24 (GraphicElementData * param0, u32 param1)
 {
     sub_02021EF0(param0, param1);
-    param0->explicitPaletteOffset += sub_020222C4(&param0->paletteProxy, param0->type);
+    param0->explicitPaletteOffset += sub_020222C4(&param0->paletteProxy, param0->vramType);
 }
 
 u32 sub_02021F48 (const GraphicElementData * param0)
@@ -643,14 +638,14 @@ void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
 
 NNS_G2D_VRAM_TYPE sub_02021FC8 (const GraphicElementData * param0)
 {
-    return param0->type;
+    return param0->vramType;
 }
 
 BOOL sub_02021FD0 (GraphicElementData * param0)
 {
     GF_ASSERT(param0);
 
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
         return NNS_G2dIsAnimCtrlActive(&v0->unk_08.animCtrl);
     } else {
@@ -704,7 +699,7 @@ u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
     const NNSG2dUserExAnimSequenceAttr * v2;
     const NNSG2dUserExAnimFrameAttr * v3;
 
-    if ((param0->unk_EC == 1) || (param0->unk_EC == 3)) {
+    if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v4 = (CellAnimationData *)&param0->unk_40;
         v0 = v4->unk_04;
     } else {
@@ -742,7 +737,7 @@ u32 sub_020220F4 (const GraphicElementData * param0)
 
 static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3)
 {
-    param2->unk_EC = sub_020221B8(param1);
+    param2->type = sub_020221B8(param1);
     param2->imageProxy = *param1->unk_00;
     param2->paletteProxy = *param1->unk_08;
 
@@ -754,13 +749,13 @@ static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_
         sub_020221D4(param0->animData, param2);
     }
 
-    if (param2->unk_EC == 2) {
+    if (param2->type == 2) {
         sub_020221D8(param1->unk_14, param2);
         sub_020221E0(param1->unk_18, param2);
         sub_02022264(param2, param3);
     } else {
-        if (param2->unk_EC == 3) {
-            CellDataAnimationWrapper * v0 = (CellDataAnimationWrapper *)&param2->unk_40;
+        if (param2->type == 3) {
+            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&param2->unk_40;
             sub_02022208(param1, param2, param3);
         } else {
             sub_020221E8(param2, param3);
@@ -827,14 +822,14 @@ static void sub_020221E8 (GraphicElementData * param0, int param1)
 
 static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2)
 {
-    CellDataAnimationWrapper * v0;
+    VRamCellAnimationData * v0;
     const NNSG2dCharacterData * v1;
 
-    v0 = (CellDataAnimationWrapper *)&param1->unk_40;
-    v0->unk_60 = NNS_G2dGetNewCellTransferStateHandle();
+    v0 = (VRamCellAnimationData *)&param1->unk_40;
+    v0->transferHandle = 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->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
+    NNS_G2dInitCellAnimationVramTransfered((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00, v0->transferHandle, NNS_G2D_VRAM_ADDR_NONE, NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
 }
 
 static void sub_02022264 (GraphicElementData * param0, int param1)
@@ -923,7 +918,7 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
     NNS_G2dSetRendererOverwriteOBJMode(gfxElemMgr->renderer, elem->explicitOamMode);
     NNS_G2dSetRendererOverwritePriority(gfxElemMgr->renderer, elem->explicitPriority);
 
-    if (elem->unk_EC == 1 || elem->unk_EC == 3) {
+    if (elem->type == 1 || elem->type == 3) {
         CellAnimationData *cellAnim = (CellAnimationData *)&elem->unk_40;
         NNS_G2dDrawCellAnimation(&cellAnim->unk_08);
     } else {
@@ -935,7 +930,7 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
     NNS_G2dEndRendering();
 }
 
-static void sub_02022450 (const GraphicElementManager * param0, GraphicElementData * param1)
+static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
 {
     return;
 }
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index d0c43b065c..ef0d1d5def 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -567,7 +567,7 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param
 
     memset(&v0, 0, sizeof(UnkStruct_ov115_02261520));
 
-    v0.unk_00 = param0->unk_00;
+    v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_04->unk_00[param1];
     v0.unk_08 = *param2;
     v0.unk_14 = v2;
@@ -606,7 +606,7 @@ void sub_0205D404 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -655,7 +655,7 @@ void sub_0205D4E0 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -694,7 +694,7 @@ void sub_0205D564 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -746,7 +746,7 @@ void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -828,7 +828,7 @@ void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -894,7 +894,7 @@ void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        sub_02021BD4(v0->unk_0C);
+        GraphicElementData_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 9580f9c42e..7a9898bd3d 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1610,7 +1610,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
     {
         UnkStruct_ov115_02261520 v1;
 
-        v1.unk_00 = param0->unk_188;
+        v1.manager = param0->unk_188;
         v1.unk_04 = &param0->unk_348;
         v1.unk_08.x = FX32_CONST(32);
         v1.unk_08.y = FX32_CONST(96);
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 262622eb3c..65251ccb14 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -142,7 +142,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
 
     sub_020093B4(v4->unk_04, 0xe000, 0xe000 + v1, 0xe000, 0xe000, 0xffffffff, 0xffffffff, 0, param5, param0->unk_1A4[0], param0->unk_1A4[1], param0->unk_1A4[2], param0->unk_1A4[3], NULL, NULL);
 
-    v5.unk_00 = param0->unk_10;
+    v5.manager = param0->unk_10;
     v5.unk_04 = v4->unk_04;
     v5.unk_08.x = FX32_CONST(param2);
     v5.unk_08.y = FX32_CONST(param3);

From 969657753c23346e721042abf6b5074dcabcc1bf Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 15:10:55 +0200
Subject: [PATCH 06/19] Rename some CellActor structs

---
 include/overlay005/struct_ov5_021DE5A4.h      |   2 +-
 include/overlay019/ov19_021D61B0.h            |   4 +-
 include/overlay019/struct_ov19_021DA864.h     |   4 +-
 include/overlay020/ov20_021D2098.h            |   4 +-
 include/overlay022/struct_ov22_02259C58_1.h   |   2 +-
 .../overlay065/struct_ov65_022358CC_sub1.h    |   2 +-
 include/overlay072/struct_ov72_0223DB98_t.h   |   4 +-
 include/overlay083/struct_ov83_0223D95C.h     |   2 +-
 include/overlay083/struct_ov83_0223D9A8.h     |   2 +-
 include/overlay094/ov94_0223BCB0.h            |   2 +-
 include/overlay094/struct_ov94_0223FD4C.h     |   6 +-
 include/overlay095/ov95_02246C20.h            |   4 +-
 include/overlay096/ov96_0223B6A0.h            |   2 +-
 include/overlay096/struct_ov96_0223BF40_t.h   |   6 +-
 include/overlay097/struct_ov97_0222D04C.h     |   2 +-
 include/overlay097/struct_ov97_02237AEC.h     |   2 +-
 include/overlay109/struct_ov109_021D5140.h    |   6 +-
 include/overlay115/struct_ov115_02261520.h    |  14 +-
 include/struct_defs/struct_02009508.h         |   2 +-
 include/struct_defs/struct_0200D0F4.h         |   2 +-
 include/struct_defs/struct_02095E80_t.h       |   4 +-
 include/struct_defs/struct_02095EAC_t.h       |   4 +-
 include/struct_defs/struct_020961E8_t.h       |   6 +-
 include/unk_020093B4.h                        |   4 +-
 include/unk_020218BC.h                        |   2 +-
 src/choose_starter/choose_starter_app.c       |   2 +-
 src/overlay005/ov5_021D2F14.c                 |  36 ++---
 src/overlay005/ov5_021D5EB8.c                 |  18 +--
 src/overlay006/ov6_022426AC.c                 |  26 ++--
 src/overlay006/ov6_02243258.c                 |   4 +-
 src/overlay007/ov7_0224BE9C.c                 |   6 +-
 src/overlay009/ov9_02249960.c                 |   2 +-
 src/overlay019/ov19_021D61B0.c                |   6 +-
 src/overlay019/ov19_021D8B54.c                |   2 +-
 src/overlay019/ov19_021DA270.c                |   4 +-
 src/overlay019/ov19_021DA814.c                |   2 +-
 src/overlay019/ov19_021DA92C.c                |   2 +-
 src/overlay019/ov19_021DB8E4.c                |   4 +-
 src/overlay019/ov19_021DCF88.c                |   8 +-
 src/overlay019/ov19_021DE3E8.c                |   2 +-
 src/overlay019/ov19_021DEC04.c                |   4 +-
 src/overlay020/ov20_021D2098.c                |   6 +-
 src/overlay020/ov20_021D2EA4.c                |   2 +-
 src/overlay020/ov20_021D3864.c                |   2 +-
 src/overlay020/ov20_021D3A54.c                |   2 +-
 src/overlay020/ov20_021D40E8.c                |   2 +-
 src/overlay020/ov20_021D4728.c                |   4 +-
 src/overlay021/ov21_021D1FA4.c                |   6 +-
 src/overlay021/ov21_021D5AEC.c                |   4 +-
 src/overlay021/ov21_021D76B0.c                |   2 +-
 src/overlay021/ov21_021D85B0.c                |   2 +-
 src/overlay021/ov21_021D94BC.c                |   6 +-
 src/overlay021/ov21_021DC9BC.c                |   2 +-
 src/overlay021/ov21_021DDD2C.c                |   2 +-
 src/overlay021/ov21_021DE668.c                |   6 +-
 src/overlay021/ov21_021DF734.c                |   2 +-
 src/overlay021/ov21_021E0C68.c                |   2 +-
 src/overlay021/ov21_021E1924.c                |   2 +-
 src/overlay021/ov21_021E29DC.c                |   2 +-
 src/overlay021/ov21_021E3FFC.c                |   2 +-
 src/overlay021/ov21_021E4CA4.c                |   2 +-
 src/overlay021/ov21_021E6014.c                |   2 +-
 src/overlay021/ov21_021E68F4.c                |   2 +-
 src/overlay021/ov21_021E737C.c                |   2 +-
 src/overlay021/ov21_021E8484.c                |   2 +-
 src/overlay021/ov21_021E8D48.c                |  10 +-
 src/overlay022/ov22_02255094.c                |   2 +-
 src/overlay022/ov22_02259C58.c                |   2 +-
 src/overlay022/ov22_0225A428.c                |   8 +-
 src/overlay023/ov23_0223E140.c                |  28 ++--
 src/overlay023/ov23_0224340C.c                | 124 +++++++++---------
 src/overlay023/ov23_02248F1C.c                |  22 ++--
 src/overlay056/ov56_022561C0.c                |  22 ++--
 src/overlay058/ov58_021D0D80.c                |  30 ++---
 src/overlay059/ov59_021D0D80.c                |  28 ++--
 src/overlay063/ov63_0222AE60.c                |  42 +++---
 src/overlay064/ov64_0222DCE0.c                |   6 +-
 src/overlay065/ov65_0222DCE0.c                |   4 +-
 src/overlay065/ov65_02235060.c                |  12 +-
 src/overlay068/ov68_0225C700.c                |   2 +-
 src/overlay069/ov69_0225C700.c                |   2 +-
 src/overlay070/ov70_0225D9A4.c                |   8 +-
 src/overlay071/ov71_0223CF0C.c                |  44 +++----
 src/overlay072/ov72_0223D7A0.c                |  20 +--
 src/overlay077/ov77_021D54B0.c                |  70 +++++-----
 src/overlay077/ov77_021D6670.c                |  28 ++--
 src/overlay086/ov86_0223B140.c                |   4 +-
 src/overlay087/ov87_021D106C.c                |   4 +-
 src/overlay088/ov88_0223B140.c                |  50 +++----
 src/overlay094/ov94_0223BCB0.c                |  16 +--
 src/overlay094/ov94_0223C610.c                |   6 +-
 src/overlay094/ov94_0223D0C4.c                |   6 +-
 src/overlay094/ov94_0223DC04.c                |   6 +-
 src/overlay094/ov94_0223E46C.c                |   6 +-
 src/overlay094/ov94_0223FB48.c                |  28 ++--
 src/overlay094/ov94_02243EF8.c                |   8 +-
 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                |  22 ++--
 src/overlay097/ov97_0222D30C.c                |  26 ++--
 src/overlay097/ov97_02230410.c                |   2 +-
 src/overlay097/ov97_02233B18.c                |  42 +++---
 src/overlay097/ov97_02237694.c                |  24 ++--
 src/overlay101/ov101_021D7E48.c               |   2 +-
 src/overlay105/ov105_02245AAC.c               |  26 ++--
 src/overlay106/ov106_02243310.c               |  26 ++--
 src/overlay107/ov107_02249604.c               |  26 ++--
 src/overlay108/ov108_02243030.c               |  26 ++--
 src/overlay109/ov109_021D3D50.c               |  24 ++--
 src/overlay111/ov111_021D2F80.c               |  24 ++--
 src/overlay114/ov114_0225C700.c               |   2 +-
 src/overlay115/ov115_02260CEC.c               |  70 +++++-----
 src/unk_020093B4.c                            |  12 +-
 src/unk_0200C6E4.c                            |  46 +++----
 src/unk_02012744.c                            |   4 +-
 src/unk_020218BC.c                            |  96 +++++++-------
 src/unk_0205CA94.c                            |  12 +-
 src/unk_0208694C.c                            |  44 +++----
 src/unk_02098FFC.c                            |  24 ++--
 123 files changed, 771 insertions(+), 763 deletions(-)

diff --git a/include/overlay005/struct_ov5_021DE5A4.h b/include/overlay005/struct_ov5_021DE5A4.h
index 55c6aa22c8..46b244b1d6 100644
--- a/include/overlay005/struct_ov5_021DE5A4.h
+++ b/include/overlay005/struct_ov5_021DE5A4.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov19_021DA864 unk_10;
+    CellActorResourceData unk_10;
 } UnkStruct_ov5_021DE5A4;
 
 #endif // POKEPLATINUM_STRUCT_OV5_021DE5A4_H
diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index 6ebc2c6e9b..43ba8f4d10 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -34,8 +34,8 @@ UnkStruct_ov19_021DE3E8 * ov19_021D7800(UnkStruct_ov19_021D61B0 * param0);
 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);
-GraphicElementData * ov19_021D785C(GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov19_021D783C(CellActorResourceData * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5);
+GraphicElementData * ov19_021D785C(GraphicElementManager * param0, CellActorResourceData * 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);
diff --git a/include/overlay019/struct_ov19_021DA864.h b/include/overlay019/struct_ov19_021DA864.h
index 7739101ffd..f5cb3f5652 100644
--- a/include/overlay019/struct_ov19_021DA864.h
+++ b/include/overlay019/struct_ov19_021DA864.h
@@ -10,11 +10,11 @@ typedef struct {
     const NNSG2dImagePaletteProxy * unk_08;
     NNSG2dCellDataBank * unk_0C;
     const NNSG2dCellAnimBankData * unk_10;
-    const NNSG2dMultiCellDataBank * unk_14;
+    const NNSG2dMultiCellDataBank * multiCellBank;
     const NNSG2dMultiCellAnimBankData * unk_18;
     int unk_1C;
     u8 unk_20;
     u8 padding_21[3];
-} UnkStruct_ov19_021DA864;
+} CellActorResourceData;
 
 #endif // POKEPLATINUM_STRUCT_OV19_021DA864_H
diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h
index 2ca47bbae6..fe4efc557f 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -19,7 +19,7 @@ BOOL ov20_021D2210(UnkStruct_ov20_021D2128 * param0, int param1);
 u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 * param0);
 BGL * ov20_021D2E04(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);
-GraphicElementData * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov20_021D2E0C(UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3);
+GraphicElementData * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
 
 #endif // POKEPLATINUM_OV20_021D2098_H
diff --git a/include/overlay022/struct_ov22_02259C58_1.h b/include/overlay022/struct_ov22_02259C58_1.h
index 6ebf135032..ae257e5cc0 100644
--- a/include/overlay022/struct_ov22_02259C58_1.h
+++ b/include/overlay022/struct_ov22_02259C58_1.h
@@ -6,7 +6,7 @@
 #include "overlay022/funcptr_ov22_02259D78.h"
 
 typedef struct {
-    UnkStruct_ov115_02261520 * unk_00;
+    CellActorInitParamsEx * unk_00;
     UnkFuncPtr_ov22_02259D78 unk_04;
     void * unk_08;
     int unk_0C;
diff --git a/include/overlay065/struct_ov65_022358CC_sub1.h b/include/overlay065/struct_ov65_022358CC_sub1.h
index cf0e7d9ebc..e4ac2da77d 100644
--- a/include/overlay065/struct_ov65_022358CC_sub1.h
+++ b/include/overlay065/struct_ov65_022358CC_sub1.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov19_021DA864 unk_10;
+    CellActorResourceData unk_10;
     GraphicElementData * unk_34;
     GraphicElementData * unk_38;
 } UnkStruct_ov65_022358CC_sub1;
diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h
index 9589dec144..b9c05df33a 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -35,8 +35,8 @@ struct UnkStruct_ov72_0223DB98_t {
     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;
+    CellActorResourceData unk_1FC;
+    CellActorResourceData unk_220;
     GraphicElementData * unk_244[14];
     GraphicElementData * unk_27C[14];
     GraphicElementData * unk_2B4[9];
diff --git a/include/overlay083/struct_ov83_0223D95C.h b/include/overlay083/struct_ov83_0223D95C.h
index a668daabb9..b983688456 100644
--- a/include/overlay083/struct_ov83_0223D95C.h
+++ b/include/overlay083/struct_ov83_0223D95C.h
@@ -7,7 +7,7 @@
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     BOOL unk_10;
-    UnkStruct_ov19_021DA864 unk_14;
+    CellActorResourceData unk_14;
 } UnkStruct_ov83_0223D95C;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223D95C_H
diff --git a/include/overlay083/struct_ov83_0223D9A8.h b/include/overlay083/struct_ov83_0223D9A8.h
index 6c109eaaa5..8ced42d06f 100644
--- a/include/overlay083/struct_ov83_0223D9A8.h
+++ b/include/overlay083/struct_ov83_0223D9A8.h
@@ -8,7 +8,7 @@
 
 typedef struct {
     GraphicElementManager * unk_00;
-    const UnkStruct_ov19_021DA864 * unk_04;
+    const CellActorResourceData * unk_04;
     VecFx32 unk_08;
     u32 unk_14;
     int unk_18;
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index bab0a1d0e3..751ee2e9a2 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -11,7 +11,7 @@
 int ov94_0223BCB0(OverlayManager * param0, int * param1);
 int ov94_0223BE2C(OverlayManager * param0, int * param1);
 int ov94_0223BF54(OverlayManager * param0, int * param1);
-void ov94_0223C300(UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3);
+void ov94_0223C300(CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * param1, CellActorResourceData * param2, int param3);
 UIControlData * ov94_0223C3C0(BGL * param0, int param1, int param2);
 void ov94_0223C3F4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2);
 void ov94_0223C3FC(GraphicElementData * param0, int param1, int param2);
diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index eaefe6de90..29bd1960f7 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -104,9 +104,9 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
     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;
+    CellActorResourceData unk_DB4;
+    CellActorResourceData unk_DD8;
+    CellActorResourceData unk_DFC;
     GraphicElementData * unk_E20;
     GraphicElementData * unk_E24;
     GraphicElementData * unk_E28[30];
diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h
index 428661629a..2da8f19d14 100644
--- a/include/overlay095/ov95_02246C20.h
+++ b/include/overlay095/ov95_02246C20.h
@@ -26,8 +26,8 @@ void ov95_022473E8(UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32
 void ov95_022474D4(UnkStruct_ov95_02247628 * param0, int param1, u32 param2, u32 param3, u32 param4, u32 param5);
 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);
-GraphicElementData * ov95_022475E4(UnkStruct_ov95_02247628 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov95_022475C4(CellActorResourceData * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4);
+GraphicElementData * ov95_022475E4(UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
 BGL * ov95_02247628(UnkStruct_ov95_02247628 * param0);
 StringTemplate * 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 c2ee102b88..118871bac4 100644
--- a/include/overlay096/ov96_0223B6A0.h
+++ b/include/overlay096/ov96_0223B6A0.h
@@ -11,7 +11,7 @@
 int ov96_0223B6A0(OverlayManager * param0, int * param1);
 int ov96_0223B7F8(OverlayManager * param0, int * param1);
 int ov96_0223B8CC(OverlayManager * param0, int * param1);
-void ov96_0223BAE0(UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3);
+void ov96_0223BAE0(CellActorInitParamsEx * param0, UnkStruct_ov96_0223BF40 * param1, CellActorResourceData * param2, int param3);
 UIControlData * ov96_0223BBC8(BGL * param0, int param1, int param2);
 void ov96_0223BBFC(UnkStruct_ov96_0223BF40 * param0, int param1, int param2);
 int ov96_0223BC50(void);
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index 0d22ebe49a..39bf60d091 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -64,9 +64,9 @@ struct UnkStruct_ov96_0223BF40_t {
     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;
+    CellActorResourceData unk_DC4;
+    CellActorResourceData unk_DE8;
+    CellActorResourceData unk_E0C;
     GraphicElementData * unk_E30[2];
     Window unk_E38;
     Window unk_E48;
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index 90af4ef038..bb54ab84c4 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -49,7 +49,7 @@ typedef struct {
     UnkStruct_0200C738 unk_448;
     UnkStruct_02009714 * unk_5D4[6];
     UnkStruct_02009DC8 * unk_5EC[6];
-    UnkStruct_ov19_021DA864 unk_604;
+    CellActorResourceData unk_604;
     GraphicElementData * unk_628;
     int unk_62C;
     int unk_630;
diff --git a/include/overlay097/struct_ov97_02237AEC.h b/include/overlay097/struct_ov97_02237AEC.h
index fe58459429..37e57fb4a6 100644
--- a/include/overlay097/struct_ov97_02237AEC.h
+++ b/include/overlay097/struct_ov97_02237AEC.h
@@ -12,7 +12,7 @@ typedef struct {
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[6];
     UnkStruct_02009DC8 * unk_1A8[2][6];
-    UnkStruct_ov19_021DA864 unk_1D8[2];
+    CellActorResourceData unk_1D8[2];
     int unk_220;
     int unk_224;
     int unk_228;
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index 6118a32baa..cb7fbb875d 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -44,9 +44,9 @@ typedef struct UnkStruct_ov109_021D5140_t {
     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;
+    CellActorResourceData unk_230;
+    CellActorResourceData unk_254;
+    CellActorResourceData unk_278;
     GraphicElementData * unk_29C[14];
     GraphicElementData * unk_2D4[14];
     Window unk_30C[5];
diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h
index d81f9a94f0..a0edfa0354 100644
--- a/include/overlay115/struct_ov115_02261520.h
+++ b/include/overlay115/struct_ov115_02261520.h
@@ -8,13 +8,13 @@
 
 typedef struct {
     GraphicElementManager * manager;
-    const UnkStruct_ov19_021DA864 * unk_04;
-    VecFx32 unk_08;
-    VecFx32 unk_14;
-    u16 unk_20;
-    u32 unk_24;
-    int unk_28;
+    const CellActorResourceData * unk_04;
+    VecFx32 position;
+    VecFx32 affineScale;
+    u16 affineZRotation;
+    u32 priority;
+    int vramType;
     int unk_2C;
-} UnkStruct_ov115_02261520;
+} CellActorInitParamsEx;
 
 #endif // POKEPLATINUM_STRUCT_OV115_02261520_H
diff --git a/include/struct_defs/struct_02009508.h b/include/struct_defs/struct_02009508.h
index 9a09902519..1b35558186 100644
--- a/include/struct_defs/struct_02009508.h
+++ b/include/struct_defs/struct_02009508.h
@@ -4,7 +4,7 @@
 #include "overlay019/struct_ov19_021DA864.h"
 
 typedef struct {
-    UnkStruct_ov19_021DA864 * unk_00;
+    CellActorResourceData * unk_00;
     int unk_04;
 } UnkStruct_02009508;
 
diff --git a/include/struct_defs/struct_0200D0F4.h b/include/struct_defs/struct_0200D0F4.h
index 070d8aead3..4ddb911218 100644
--- a/include/struct_defs/struct_0200D0F4.h
+++ b/include/struct_defs/struct_0200D0F4.h
@@ -7,7 +7,7 @@
 
 typedef struct CellActorData {
     GraphicElementData * unk_00;
-    UnkStruct_ov19_021DA864 * unk_04;
+    CellActorResourceData * unk_04;
     UnkStruct_02009508 * unk_08;
     int unk_0C;
 } CellActorData;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index ca50d15607..3c3390b498 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -75,8 +75,8 @@ struct UnkStruct_02095E80_t {
     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;
+    CellActorResourceData unk_354;
+    CellActorResourceData unk_378;
     GraphicElementData * unk_39C[14];
     GraphicElementData * unk_3D4[12];
     GraphicElementData * unk_404[12];
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 4cee959907..0c883ba275 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -33,8 +33,8 @@ struct UnkStruct_02095EAC_t {
     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;
+    CellActorResourceData unk_1F4;
+    CellActorResourceData unk_218;
     GraphicElementData * unk_23C[14];
     GraphicElementData * unk_274[14];
     GraphicElementData * unk_2AC[12];
diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h
index 19e106a2c1..a21aefdbc1 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -40,9 +40,9 @@ struct UnkStruct_020961E8_t {
     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;
+    CellActorResourceData unk_220;
+    CellActorResourceData unk_244;
+    CellActorResourceData unk_268;
     GraphicElementData * unk_28C[14];
     GraphicElementData * unk_2C4[14];
     Window unk_2FC[5];
diff --git a/include/unk_020093B4.h b/include/unk_020093B4.h
index 83a60a0b86..d041698c69 100644
--- a/include/unk_020093B4.h
+++ b/include/unk_020093B4.h
@@ -10,8 +10,8 @@
 
 #include <nitro/gx.h>
 
-void sub_020093B4(UnkStruct_ov19_021DA864 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14);
-void sub_020094F0(UnkStruct_ov19_021DA864 * param0);
+void sub_020093B4(CellActorResourceData * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14);
+void sub_020094F0(CellActorResourceData * 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);
 GraphicElementManager * sub_020095C4(int param0, UnkStruct_0200C738 * param1, int param2);
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 27ef660cce..9301eff62b 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -17,7 +17,7 @@ BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
 BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
-GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_02261520 * param0);
+GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsEx * param0);
 GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
 void GraphicElementData_Delete(GraphicElementData * param0);
 void sub_02021C50(GraphicElementData * param0, const VecFx32 * param1);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index cca97159ab..f713a41fb6 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1476,7 +1476,7 @@ static void ov78_021D2290 (ChooseStarterApp * param0, ChooseStarterCursor * para
 
 static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
 
     sub_020093B4(&v0, 10, 11, 12, 13, 0xffffffff, 0xffffffff, 0, 1, param0->unk_24C[0], param0->unk_24C[1], param0->unk_24C[2], param0->unk_24C[3], NULL, NULL);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 8d9ef10e8b..92c10f937c 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -101,7 +101,7 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
 
 GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
     GraphicElementData * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
     VecFx32 v3;
@@ -112,11 +112,11 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
 
     v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_190->unk_00[param1->unk_00];
-    v0.unk_08 = v3;
-    v0.unk_14 = v2;
-    v0.unk_20 = 0;
-    v0.unk_24 = param1->unk_0C;
-    v0.unk_28 = param1->unk_14;
+    v0.position = v3;
+    v0.affineScale = v2;
+    v0.affineZRotation = 0;
+    v0.priority = param1->unk_0C;
+    v0.vramType = param1->unk_14;
     v0.unk_2C = param0->unk_1C6;
 
     v1 = GraphicElementManager_AddElement(&v0);
@@ -339,13 +339,13 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     int v0;
     int v1;
     CellActorData * v2 = NULL;
-    UnkStruct_ov115_02261520 v3;
+    CellActorInitParamsEx v3;
     int v4[6];
 
     v2 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(CellActorData));
 
     v2->unk_08 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_02009508));
-    v2->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(UnkStruct_ov19_021DA864));
+    v2->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(CellActorResourceData));
     v2->unk_04 = v2->unk_08->unk_00;
 
     for (v0 = 0; v0 < 6; v0++) {
@@ -369,20 +369,20 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
 
     v3.manager = param0->unk_00;
     v3.unk_04 = v2->unk_04;
-    v3.unk_08.x = FX32_CONST(param1->x);
-    v3.unk_08.y = FX32_CONST(param1->y);
-    v3.unk_08.z = FX32_CONST(param1->z);
+    v3.position.x = FX32_CONST(param1->x);
+    v3.position.y = FX32_CONST(param1->y);
+    v3.position.z = FX32_CONST(param1->z);
 
     if (param1->vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
-        v3.unk_08.y += (192 << FX32_SHIFT);
+        v3.position.y += (192 << FX32_SHIFT);
     }
 
-    v3.unk_14.x = FX32_ONE;
-    v3.unk_14.y = FX32_ONE;
-    v3.unk_14.z = FX32_ONE;
-    v3.unk_20 = 0;
-    v3.unk_24 = param1->priority;
-    v3.unk_28 = param1->vramType;
+    v3.affineScale.x = FX32_ONE;
+    v3.affineScale.y = FX32_ONE;
+    v3.affineScale.z = FX32_ONE;
+    v3.affineZRotation = 0;
+    v3.priority = param1->priority;
+    v3.vramType = param1->vramType;
     v3.unk_2C = param0->unk_1C6;
 
     v2->unk_00 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index be873a4cc1..8e3f09aa14 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -56,8 +56,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov115_02261520 unk_10;
-    UnkStruct_ov19_021DA864 unk_40;
+    CellActorInitParamsEx unk_10;
+    CellActorResourceData unk_40;
 } UnkStruct_ov5_021D6690;
 
 typedef struct {
@@ -259,7 +259,7 @@ 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);
-static void ov5_021D6F4C(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4);
+static void ov5_021D6F4C(CellActorResourceData * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4);
 static BOOL ov5_021D6A48(UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B8 * param1);
 static void ov5_021D6FF0(UnkStruct_ov5_021D6FA8 * param0, UnkFuncPtr_ov5_021D6FF0 param1);
 static void ov5_021D700C(UnkStruct_ov5_021DB4B8 * param0);
@@ -1462,13 +1462,13 @@ static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B
 {
     if (param1->unk_00 != 0xffff) {
         ov5_021D6F4C(&param1->unk_0C->unk_40, param0, param1->unk_0C, 0, 1);
-        memset(&param1->unk_0C->unk_10, 0, sizeof(UnkStruct_ov115_02261520));
+        memset(&param1->unk_0C->unk_10, 0, sizeof(CellActorInitParamsEx));
         param1->unk_0C->unk_10.manager = param0->unk_08.unk_130;
         param1->unk_0C->unk_10.unk_04 = &param1->unk_0C->unk_40;
-        param1->unk_0C->unk_10.unk_14.x = FX32_ONE;
-        param1->unk_0C->unk_10.unk_14.y = FX32_ONE;
-        param1->unk_0C->unk_10.unk_14.z = FX32_ONE;
-        param1->unk_0C->unk_10.unk_28 = 1;
+        param1->unk_0C->unk_10.affineScale.x = FX32_ONE;
+        param1->unk_0C->unk_10.affineScale.y = FX32_ONE;
+        param1->unk_0C->unk_10.affineScale.z = FX32_ONE;
+        param1->unk_0C->unk_10.vramType = 1;
     }
 }
 
@@ -1594,7 +1594,7 @@ static UnkStruct_ov5_021D6FA8 * ov5_021D6F00 (UnkStruct_ov5_021DB4B8 * param0, i
     return v0;
 }
 
-static void ov5_021D6F4C (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4)
+static void ov5_021D6F4C (CellActorResourceData * param0, UnkStruct_ov5_021D6594 * param1, UnkStruct_ov5_021D6690 * param2, int param3, int param4)
 {
     int v0[4];
     int v1;
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index a492944f64..b681af05f7 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -198,27 +198,27 @@ static void ov6_02242880 (UnkStruct_02009714 * param0, UnkStruct_02009714 * para
 static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
 
     sub_020093B4(&v1, 0, 1, 2, 3, 0xffffffff, 0xffffffff, 0, 0, param0->unk_00[0], param0->unk_00[1], param0->unk_00[2], param0->unk_00[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v2;
+        CellActorInitParamsEx v2;
 
         v2.manager = param0->unk_38;
         v2.unk_04 = &v1;
-        v2.unk_08.x = 0;
-        v2.unk_08.y = 0;
-        v2.unk_08.z = 0;
-        v2.unk_14.x = FX32_ONE;
-        v2.unk_14.y = FX32_ONE;
-        v2.unk_14.z = FX32_ONE;
-        v2.unk_20 = 0;
-        v2.unk_24 = 0;
-        v2.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v2.position.x = 0;
+        v2.position.y = 0;
+        v2.position.z = 0;
+        v2.affineScale.x = FX32_ONE;
+        v2.affineScale.y = FX32_ONE;
+        v2.affineScale.z = FX32_ONE;
+        v2.affineZRotation = 0;
+        v2.priority = 0;
+        v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v2.unk_2C = 4;
-        v2.unk_08.x = FX32_ONE * (256 / 2);
-        v2.unk_08.y = FX32_ONE * (192 / 2);
+        v2.position.x = FX32_ONE * (256 / 2);
+        v2.position.y = FX32_ONE * (192 / 2);
 
         param0->unk_1C8 = GraphicElementManager_AddElement(&v2);
 
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 5ee66f6c6a..a31f42df41 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -540,7 +540,7 @@ static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa
 
 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;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     GraphicElementData * v2;
 
@@ -1841,7 +1841,7 @@ static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
 
 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;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     GraphicElementData * v2;
 
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 0793b04e8f..c80f089378 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -170,7 +170,7 @@ static void ov7_0224C934(UnkStruct_ov7_0224C768 * param0);
 static u32 ov7_0224C9A4(UnkStruct_ov7_0224C768 * param0);
 static void ov7_0224CA0C(UnkStruct_ov7_0224C768 * param0);
 static void ov7_0224CA34(UnkStruct_ov7_0224C768 * param0);
-static void ov7_0224CA54(UnkStruct_ov19_021DA864 * param0, UnkStruct_ov7_0224C768 * param1, u32 param2);
+static void ov7_0224CA54(CellActorResourceData * param0, UnkStruct_ov7_0224C768 * param1, u32 param2);
 static void ov7_0224CB40(UnkStruct_ov7_0224C768 * param0);
 static void ov7_0224CB70(UnkStruct_ov7_0224C768 * param0);
 static void ov7_0224CC44(UnkStruct_ov7_0224CC44 * param0, BGL * param1, u32 param2);
@@ -572,7 +572,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
 {
     int v0;
     Strbuf* v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     UnkStruct_ov83_0223D9A8 v3;
     static const u8 v4[2] = {
         8, 136
@@ -729,7 +729,7 @@ static void ov7_0224CA34 (UnkStruct_ov7_0224C768 * param0)
     sub_02021CAC(param0->unk_158[1], 0);
 }
 
-static void ov7_0224CA54 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov7_0224C768 * param1, u32 param2)
+static void ov7_0224CA54 (CellActorResourceData * param0, UnkStruct_ov7_0224C768 * param1, u32 param2)
 {
     NARC * v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 8e6ce42487..bb6e4a7677 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2756,7 +2756,7 @@ static void ov9_0224B124 (SysTask * param0, void * param1)
 
 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;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     GraphicElementData * v2;
 
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 6b7f4b1121..5f307447d8 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -1925,7 +1925,7 @@ int ov19_021D7820 (UnkStruct_ov19_021D61B0 * param0)
     }
 }
 
-void ov19_021D783C (UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5)
+void ov19_021D783C (CellActorResourceData * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5)
 {
     param0->unk_00 = param1;
     param0->unk_08 = param2;
@@ -1933,12 +1933,12 @@ void ov19_021D783C (UnkStruct_ov19_021DA864 * param0, NNSG2dImageProxy * param1,
     param0->unk_10 = param4;
     param0->unk_20 = param5;
     param0->unk_04 = NULL;
-    param0->unk_14 = NULL;
+    param0->multiCellBank = NULL;
     param0->unk_18 = NULL;
     param0->unk_1C = 0;
 }
 
-GraphicElementData * ov19_021D785C (GraphicElementManager * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3, u32 param4, int param5)
+GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
     GraphicElementData * v1;
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 9659bd98ca..9762ca2cf8 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -95,7 +95,7 @@ BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 *
 
 void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     u32 v1, v2;
 
     NNS_G2dInitImageProxy(&(param0->unk_24));
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 5149160108..e02a7d6c01 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -123,7 +123,7 @@ void ov19_021DA418 (const UnkStruct_ov19_021DCD18 * param0, UnkStruct_ov19_021DC
 void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 param2, s32 param3, u32 param4, u32 param5, u32 param6, UnkStruct_ov19_021DCD18 * param7)
 {
     NNSG2dCharacterData * v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     u16 v2;
     u8 v3;
     u8 v4;
@@ -162,7 +162,7 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 p
 void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 param2, u32 param3, u8 * param4, s32 param5, s32 param6, u32 param7, u32 param8, u32 param9, UnkStruct_ov19_021DCD18 * param10)
 {
     NNSG2dCharacterData * v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     BOOL v2;
     u8 v3, v4;
 
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index b01caf0229..82732cda44 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -34,7 +34,7 @@ BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 *
 
 void ov19_021DA864 (UnkStruct_ov19_021DA8D8 * param0, NARC * param1)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
 
     NNS_G2dInitImageProxy(&(param0->unk_18));
 
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index aed8310e55..4a86b8cdc0 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -218,7 +218,7 @@ void ov19_021DAADC (UnkStruct_ov19_021DA9E0 * param0)
 static void ov19_021DAB44 (UnkStruct_ov19_021DA9E0 * param0)
 {
     NNSG2dImageProxy v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     u32 v2, v3, v4;
 
     v2 = sub_0207C944();
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index d8d1bad32b..49b033ddc0 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -350,7 +350,7 @@ static void ov19_021DBD9C (UnkStruct_ov19_021DBA9C * param0, u32 param1, u32 par
 
 static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov19_021DA384 * v1;
     NNSG2dImageProxy v2;
     VecFx32 v3;
@@ -702,7 +702,7 @@ static void ov19_021DC46C (SysTask * param0, void * param1)
 static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1)
 {
     if (param1 != 0) {
-        UnkStruct_ov19_021DA864 v0;
+        CellActorResourceData v0;
         UnkStruct_ov19_021DA384 * v1;
         NNSG2dImageProxy v2;
         NNSG2dCharacterData * v3;
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index c216247da3..bb2ac27da3 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -444,7 +444,7 @@ void ov19_021DD114 (UnkStruct_ov19_021DCF88 * param0, NARC * param1)
 
 static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     NNSG2dImageProxy v1;
 
     ov19_021DD2BC(param0, param1);
@@ -806,7 +806,7 @@ BOOL ov19_021DD820 (UnkStruct_ov19_021DCF88 * param0)
 
 static void ov19_021DD854 (UnkStruct_ov19_021DCF88 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov19_021DBA9C * v1;
     NNSG2dImageProxy v2;
     int v3, v4;
@@ -839,7 +839,7 @@ static void ov19_021DD854 (UnkStruct_ov19_021DCF88 * param0)
 
 static void ov19_021DD8F8 (UnkStruct_ov19_021DCF88 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov19_021DBA9C * v1;
     int v2, v3, v4, v5, v6, v7, v8;
 
@@ -932,7 +932,7 @@ static u32 ov19_021DD9B8 (u32 param0, u32 param1)
 
 static void ov19_021DD9DC (UnkStruct_ov19_021DCF88 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     NNSG2dImageProxy v1;
     u32 v2;
     int v3;
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 36d3bab72d..d1a9c88fbb 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -103,7 +103,7 @@ void ov19_021DE440 (UnkStruct_ov19_021DE3E8 * param0)
 static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0)
 {
     if (param0->unk_00) {
-        UnkStruct_ov19_021DA864 v0;
+        CellActorResourceData v0;
         NNSG2dImageProxy v1;
         NNSG2dCharacterData * v2;
         void * v3;
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 9d0a4e9200..614c86b3b3 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -592,7 +592,7 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1)
         {256, 568},
     };
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     u32 v3, v4, v5;
 
     param0->unk_5C = sub_02007204(param1, 135, 1, &(param0->unk_60), 10);
@@ -636,7 +636,7 @@ static void ov19_021DF730 (UnkStruct_ov19_021DEC04 * param0, u32 param1)
         {144, 394},
     };
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     int v3;
 
     ov19_021D783C(&v2, &v1, ov19_021D77D0(param0->unk_04), ov19_021DA80C(param0->unk_14), ov19_021DA810(param0->unk_14), 1);
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index fe1eaec33a..25b20e78b1 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -969,7 +969,7 @@ GraphicElementManager * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
     return param0->unk_24;
 }
 
-void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 * param1, u32 param2, u32 param3)
+void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3)
 {
     param1->unk_00 = &param0->unk_1B4[param2];
     param1->unk_08 = &param0->unk_1FC[param2];
@@ -977,12 +977,12 @@ void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, UnkStruct_ov19_021DA864 *
     param1->unk_10 = param0->unk_22C[param2];
     param1->unk_20 = param3;
     param1->unk_04 = NULL;
-    param1->unk_14 = NULL;
+    param1->multiCellBank = NULL;
     param1->unk_18 = NULL;
     param1->unk_1C = 0;
 }
 
-GraphicElementData * 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, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     UnkStruct_ov83_0223D9A8 v0;
     GraphicElementData * v1;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 135df71903..c033cef019 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -213,7 +213,7 @@ static void ov20_021D312C (UnkStruct_ov20_021D30F8 * param0)
 
 static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov20_021D34CC v1;
 
     if (param0->unk_5C) {
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index fc1c3f5c15..e9a192c823 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -98,7 +98,7 @@ static void ov20_021D390C (BGL * param0, const UnkStruct_ov61_0222C884 * param1,
 
 static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
 
     ov20_021D2E0C(param0->unk_00, &v0, 0, 3);
     param0->unk_0C = ov20_021D2E50(param0->unk_00, &v0, 64, 56, 5, NNS_G2D_VRAM_TYPE_2DMAIN);
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index 3d2fa243fc..c1ae65811e 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -230,7 +230,7 @@ static u32 ov20_021D3D44 (UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 pa
 
 static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
 
     ov20_021D2E0C(param0->unk_00, &v0, 0, 1);
     param0->unk_5C = ov20_021D2E50(param0->unk_00, &v0, 48, 54, 2, NNS_G2D_VRAM_TYPE_2DMAIN);
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index f8be948dc1..f87cba9865 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -115,7 +115,7 @@ void ov20_021D41A8 (UnkStruct_ov20_021D4210 * param0)
 
 static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
 
     ov20_021D2E0C(param0->unk_00, &v0, 0, 2);
     param0->unk_30 = ov20_021D2E50(param0->unk_00, &v0, 72, 56, 3, NNS_G2D_VRAM_TYPE_2DMAIN);
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index f3bb08fd96..c064bdfa89 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -347,7 +347,7 @@ static void ov20_021D4B2C (UnkStruct_ov20_021D4B2C * param0)
 
 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;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     GraphicElementData * v2;
 
@@ -357,7 +357,7 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v0.unk_10 = param3->unk_0C;
     v0.unk_20 = param6;
     v0.unk_04 = NULL;
-    v0.unk_14 = NULL;
+    v0.multiCellBank = NULL;
     v0.unk_18 = NULL;
     v0.unk_1C = 0;
 
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 0d850c4eed..5f38105010 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -859,7 +859,7 @@ void ov21_021D2C58 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** para
 
 static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL);
@@ -906,7 +906,7 @@ static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
 
 void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, param4, param2[0], param2[1], param2[2], param2[3], NULL, NULL);
@@ -1000,7 +1000,7 @@ static void ov21_021D2F14 (UnkStruct_ov21_021D13FC * param0)
 
 static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     int v2;
     UnkStruct_ov21_021D2584 * v3 = &param0->unk_1E0;
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index b4792a3ab0..24d0908ea9 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -74,8 +74,8 @@ typedef struct {
     fx32 unk_78;
     GraphicElementData * unk_7C;
     UnkStruct_02009714 * unk_80[4];
-    UnkStruct_ov19_021DA864 unk_90;
-    UnkStruct_ov19_021DA864 unk_B4;
+    CellActorResourceData unk_90;
+    CellActorResourceData unk_B4;
     void * unk_D8;
     NNSG2dScreenData * unk_DC;
     UnkStruct_ov21_021D157C unk_E0;
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index e4441487f9..e6d5449b9c 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -595,7 +595,7 @@ static void ov21_021D7E3C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
 static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 57bfb456c4..6bef2862be 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -645,7 +645,7 @@ static void ov21_021D8CC8 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 
 static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 63228eaa4e..e5d35424e1 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -2349,7 +2349,7 @@ static void ov21_021DB6C8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 
 static void ov21_021DB708 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
@@ -2374,7 +2374,7 @@ static void ov21_021DB78C (UnkStruct_ov21_021DC96C * param0)
 
 static void ov21_021DB79C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
@@ -2599,7 +2599,7 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223
 
 static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 8a67f7f088..e663247ade 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -575,7 +575,7 @@ static void ov21_021DD114 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 2004c5c40b..55d782a975 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -433,7 +433,7 @@ static void ov21_021DE224 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 9d78ed29f8..0dc5552846 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -548,7 +548,7 @@ static void ov21_021DEE38 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
@@ -634,7 +634,7 @@ static void ov21_021DF054 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
@@ -745,7 +745,7 @@ static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0)
 
 static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index a188c16e40..d2e17875b9 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -556,7 +556,7 @@ static void ov21_021DFDC8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
 
 static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 69d864b27b..9fa1e61727 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -523,7 +523,7 @@ static void ov21_021E1328 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 2444e02a8b..37f0c5b49b 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -706,7 +706,7 @@ static void ov21_021E226C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 3cfe812a25..9a594da320 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1278,7 +1278,7 @@ static void ov21_021E3AAC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index ea33a5d4da..a3257c8268 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -573,7 +573,7 @@ static void ov21_021E4770 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 968eb75a59..61673d2f21 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -843,7 +843,7 @@ static void ov21_021E56F0 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 3168cbcc5e..06ceb7eb94 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -408,7 +408,7 @@ static void ov21_021E64D4 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     VecFx32 v3;
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index da8401389d..c4e4271504 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -565,7 +565,7 @@ static void ov21_021E6FD8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index bc3ede7a5a..bb938359a8 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -628,7 +628,7 @@ static void ov21_021E7AA0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     VecFx32 v3;
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index bd710f18e6..4c594ef940 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -537,7 +537,7 @@ static void ov21_021E8A74 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index aea77ee4d9..4ca264aaa1 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -118,7 +118,7 @@ static Sprite * ov21_021E99E0(UnkStruct_02007768 * param0, Pokemon * param1, int
 static void ov21_021E92C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov21_021E9344(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov21_021E93C4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1);
-static void ov21_021E93F8(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3);
+static void ov21_021E93F8(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, CellActorResourceData * 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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3);
@@ -488,7 +488,7 @@ static void ov21_021E93C4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p
     sub_02009D68(param1[3], param0[3]);
 }
 
-static void ov21_021E93F8 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3)
+static void ov21_021E93F8 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, CellActorResourceData * param2, int param3)
 {
     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);
 }
@@ -512,7 +512,7 @@ static void ov21_021E94A4 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714
 static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
 
     ov21_021E93F8(param0->unk_04, param2, &v1, 2);
 
@@ -536,7 +536,7 @@ static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0)
 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;
+    CellActorResourceData v1;
 
     ov21_021E93F8(param4, param2, &v1, 2);
 
@@ -600,7 +600,7 @@ static void ov21_021E95EC (UnkStruct_ov21_021E968C * param0, UnkStruct_02009714
 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;
+    CellActorResourceData v1;
     int v2, v3;
 
     v2 = PokemonPersonalData_GetSpeciesValue(param4, 6);
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 66b5bf9f6b..9721da786c 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -158,7 +158,7 @@ void ov22_022551D0 (UnkStruct_ov22_0225A0E4 * param0)
 
 GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
 
     sub_020093B4(&v0, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_48[0], param0->unk_48[1], param0->unk_48[2], param0->unk_48[3], NULL, NULL);
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index beaa3ad31d..d0052ade51 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -87,7 +87,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
     v0.unk_1C = param1->unk_20;
     v0.unk_20 = 0;
     v0.unk_24 = 0;
-    v0.unk_28 = param1->unk_00.unk_00->unk_28;
+    v0.unk_28 = param1->unk_00.unk_00->vramType;
     v0.unk_2C = param1->unk_00.unk_00->unk_2C;
 
     param0->unk_10 = sub_020127E8(&v0);
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 3a7e55aaef..5f8dddffb1 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -62,7 +62,7 @@ static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C * param0);
 static BOOL ov22_0225AF34(const UnkStruct_ov22_0225AE9C * param0);
 static void ov22_0225AA34(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, int param2, NARC * param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov22_0225AAC0(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1);
-static void ov22_0225AAF4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3);
+static void ov22_0225AAF4(UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, CellActorResourceData * param2, int param3);
 static void ov22_0225AD68(UnkStruct_ov22_0225AD68 * param0, fx32 param1, fx32 param2, int param3);
 static BOOL ov22_0225AD78(UnkStruct_ov22_0225AD68 * param0);
 
@@ -293,7 +293,7 @@ static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, i
 
 static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     int v2, v3;
 
@@ -379,14 +379,14 @@ static void ov22_0225AAC0 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p
     sub_02009D68(param1[3], param0[3]);
 }
 
-static void ov22_0225AAF4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, UnkStruct_ov19_021DA864 * param2, int param3)
+static void ov22_0225AAF4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** param1, CellActorResourceData * param2, int param3)
 {
     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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     int v2;
 
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 77ba0008fe..0c97c7f94a 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -154,8 +154,8 @@ typedef struct {
     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];
+    CellActorResourceData unk_1E0;
+    CellActorResourceData unk_204[2];
     GraphicElementData * unk_24C[8];
     UnkStruct_ov23_0223E6F8 unk_26C[250];
     UIControlData * unk_848;
@@ -2816,25 +2816,25 @@ static void ov23_02240E88 (void)
 static void ov23_0224108C (void)
 {
     int v0, v1;
-    UnkStruct_ov115_02261520 v2;
+    CellActorInitParamsEx v2;
 
     for (v0 = 0; v0 < 2; v0++) {
         sub_020093B4(&Unk_ov23_02257740->unk_204[v0], v0, v0, v0, v0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257740->unk_1B0[0], Unk_ov23_02257740->unk_1B0[1], Unk_ov23_02257740->unk_1B0[2], Unk_ov23_02257740->unk_1B0[3], NULL, NULL);
 
         v2.manager = Unk_ov23_02257740->unk_20;
         v2.unk_04 = &Unk_ov23_02257740->unk_204[v0];
-        v2.unk_08.x = FX32_CONST(32);
-        v2.unk_08.y = FX32_CONST(96);
-        v2.unk_08.z = 0;
-        v2.unk_14.x = FX32_ONE;
-        v2.unk_14.y = FX32_ONE;
-        v2.unk_14.z = FX32_ONE;
-        v2.unk_20 = 0;
-        v2.unk_24 = 0;
-        v2.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v2.position.x = FX32_CONST(32);
+        v2.position.y = FX32_CONST(96);
+        v2.position.z = 0;
+        v2.affineScale.x = FX32_ONE;
+        v2.affineScale.y = FX32_ONE;
+        v2.affineScale.z = FX32_ONE;
+        v2.affineZRotation = 0;
+        v2.priority = 0;
+        v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v2.unk_2C = 29;
-        v2.unk_08.x = FX32_ONE * 0;
-        v2.unk_08.y = FX32_ONE * 240;
+        v2.position.x = FX32_ONE * 0;
+        v2.position.y = FX32_ONE * 240;
 
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 9a8d50a630..bf1f4317eb 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -125,8 +125,8 @@ typedef struct {
     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;
+    CellActorResourceData unk_214;
+    CellActorResourceData unk_238;
     GraphicElementData * unk_25C[32];
     GraphicElementData * unk_2DC[4];
     TaskManager * unk_2EC;
@@ -3314,25 +3314,25 @@ static void ov23_0224644C (int param0)
     sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[0][0], Unk_ov23_02257764->unk_1D4[0][1], Unk_ov23_02257764->unk_1D4[0][2], Unk_ov23_02257764->unk_1D4[0][3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 4;
 
         for (v1 = 0; v1 < param0; v1++) {
-            v0.unk_08.x = FX32_ONE * 300;
-            v0.unk_08.y = FX32_ONE * 300;
+            v0.position.x = FX32_ONE * 300;
+            v0.position.y = FX32_ONE * 300;
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
@@ -3664,25 +3664,25 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
     sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[0][0], Unk_ov23_02257764->unk_1D4[0][1], Unk_ov23_02257764->unk_1D4[0][2], Unk_ov23_02257764->unk_1D4[0][3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 4;
 
         for (v1 = 0; v1 < ov23_022468C0(); v1++) {
-            v0.unk_08.x = FX32_ONE * 300;
-            v0.unk_08.y = FX32_ONE * 300;
+            v0.position.x = FX32_ONE * 300;
+            v0.position.y = FX32_ONE * 300;
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
@@ -3842,25 +3842,25 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
     sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[0][0], Unk_ov23_02257764->unk_1D4[0][1], Unk_ov23_02257764->unk_1D4[0][2], Unk_ov23_02257764->unk_1D4[0][3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 4;
 
         for (v1 = 0; v1 < 15; v1++) {
-            v0.unk_08.x = FX32_ONE * 100;
-            v0.unk_08.y = FX32_ONE * 100;
+            v0.position.x = FX32_ONE * 100;
+            v0.position.y = FX32_ONE * 100;
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
@@ -4311,25 +4311,25 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
     sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[0][0], Unk_ov23_02257764->unk_1D4[0][1], Unk_ov23_02257764->unk_1D4[0][2], Unk_ov23_02257764->unk_1D4[0][3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 4;
 
         for (v1 = 0; v1 < 1; v1++) {
-            v0.unk_08.x = FX32_ONE * 128;
-            v0.unk_08.y = FX32_ONE * 84;
+            v0.position.x = FX32_ONE * 128;
+            v0.position.y = FX32_ONE * 84;
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
@@ -4771,25 +4771,25 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
     sub_020093B4(&Unk_ov23_02257764->unk_238, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257764->unk_1D4[1][0], Unk_ov23_02257764->unk_1D4[1][1], Unk_ov23_02257764->unk_1D4[1][2], Unk_ov23_02257764->unk_1D4[1][3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
         v0.unk_04 = &Unk_ov23_02257764->unk_238;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 4;
 
         for (v1 = 0; v1 < 25; v1++) {
-            v0.unk_08.x = FX32_ONE * 300;
-            v0.unk_08.y = FX32_ONE * 300;
+            v0.position.x = FX32_ONE * 300;
+            v0.position.y = FX32_ONE * 300;
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index b79d31e44d..89265c18a7 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -60,7 +60,7 @@ struct UnkStruct_ov23_0224942C_t {
     UnkStruct_0200C738 unk_1C0;
     UnkStruct_02009714 * unk_34C[4];
     UnkStruct_02009DC8 * unk_35C[4];
-    UnkStruct_ov19_021DA864 unk_36C;
+    CellActorResourceData unk_36C;
     GraphicElementData * unk_390[8];
     GraphicElementData * unk_3B0[17];
     Window unk_3F4;
@@ -110,19 +110,19 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         sub_020093B4(&v0->unk_36C, 1000, 1000, 1000, 1000, 0xffffffff, 0xffffffff, 0, 0, v0->unk_34C[0], v0->unk_34C[1], v0->unk_34C[2], v0->unk_34C[3], NULL, NULL);
 
         {
-            UnkStruct_ov115_02261520 v3;
+            CellActorInitParamsEx v3;
 
             v3.manager = v0->unk_1BC;
             v3.unk_04 = &v0->unk_36C;
-            v3.unk_08.x = FX32_CONST(32);
-            v3.unk_08.y = FX32_CONST(96) + (192 << FX32_SHIFT);
-            v3.unk_08.z = 0;
-            v3.unk_14.x = FX32_ONE;
-            v3.unk_14.y = FX32_ONE;
-            v3.unk_14.z = FX32_ONE;
-            v3.unk_20 = 0;
-            v3.unk_24 = 0;
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.position.x = FX32_CONST(32);
+            v3.position.y = FX32_CONST(96) + (192 << FX32_SHIFT);
+            v3.position.z = 0;
+            v3.affineScale.x = FX32_ONE;
+            v3.affineScale.y = FX32_ONE;
+            v3.affineScale.z = FX32_ONE;
+            v3.affineZRotation = 0;
+            v3.priority = 0;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
             v3.unk_2C = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 1345f86853..95c646d256 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -88,7 +88,7 @@ struct UnkStruct_ov56_02256468_t {
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[4];
     UnkStruct_02009DC8 * unk_1C8[4];
-    UnkStruct_ov19_021DA864 unk_1D8;
+    CellActorResourceData unk_1D8;
     GraphicElementData * unk_1FC[8];
     int unk_21C;
     int unk_220;
@@ -418,22 +418,22 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
     sub_020093B4(&param0->unk_1D8, 999, 999, 999, 999, 0xffffffff, 0xffffffff, 0, 0, param0->unk_1B8[0], param0->unk_1B8[1], param0->unk_1B8[2], param0->unk_1B8[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_28;
         v1.unk_04 = &param0->unk_1D8;
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 0;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 0;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v1.unk_2C = 4;
 
         for (v0 = 0; v0 < 3; v0++) {
-            v1.unk_08.x = FX32_CONST((256 - 24));
-            v1.unk_08.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT);
+            v1.position.x = FX32_CONST((256 - 24));
+            v1.position.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT);
 
             param0->unk_1FC[v0] = GraphicElementManager_AddElement(&v1);
 
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 1af1c75e82..6b01483c7c 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -675,24 +675,24 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
     sub_020093B4(&param0->unk_218, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_1C4[0], param0->unk_1C4[1], param0->unk_1C4[2], param0->unk_1C4[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_34;
         v1.unk_04 = &param0->unk_1F4;
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 1;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 1;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.unk_2C = 39;
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.unk_04 = &param0->unk_218;
-            v1.unk_08.x = FX32_ONE * (24 + v0 * 40);
-            v1.unk_08.y = FX32_ONE * (32 + 32);
-            v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v1.position.x = FX32_ONE * (24 + v0 * 40);
+            v1.position.y = FX32_ONE * (32 + 32);
+            v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
 
             param0->unk_23C[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -703,8 +703,8 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
 
         for (v0 = 0; v0 < 9 + 3; v0++) {
             v1.unk_04 = &param0->unk_218;
-            v1.unk_08.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
-            v1.unk_08.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
+            v1.position.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
+            v1.position.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
 
             param0->unk_2AC[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -719,8 +719,8 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
         SpriteActor_SetSpriteAnimActive(param0->unk_2AC[0], 6);
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_08.x = FX32_ONE * 24;
-            v1.unk_08.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
+            v1.position.x = FX32_ONE * 24;
+            v1.position.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
 
             param0->unk_274[v0] = GraphicElementManager_AddElement(&v1);
 
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index cf00208660..934a99864f 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -645,20 +645,20 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
     sub_020093B4(&param0->unk_268, 2, 2, 2, 2, 0xffffffff, 0xffffffff, 0, 1, param0->unk_1E0[0], param0->unk_1E0[1], param0->unk_1E0[2], param0->unk_1E0[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_50;
         v1.unk_04 = &param0->unk_268;
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 1;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 1;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.unk_2C = 51;
-        v1.unk_08.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
-        v1.unk_08.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
+        v1.position.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
+        v1.position.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
 
         param0->unk_28C[0] = GraphicElementManager_AddElement(&v1);
 
@@ -666,8 +666,8 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         sub_02021CAC(param0->unk_28C[0], 1);
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_08.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
-            v1.unk_08.y = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][1];
+            v1.position.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
+            v1.position.y = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][1];
 
             param0->unk_28C[v0 + 1] = GraphicElementManager_AddElement(&v1);
 
@@ -677,8 +677,8 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         }
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_08.x = FX32_ONE * 24;
-            v1.unk_08.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
+            v1.position.x = FX32_ONE * 24;
+            v1.position.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
         }
     }
 
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 3a6c39c145..26f7e82a3e 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -26,7 +26,7 @@ typedef struct {
     UnkStruct_02009DC8 * unk_04[2];
     u32 unk_0C;
     int unk_10;
-    UnkStruct_ov19_021DA864 unk_14;
+    CellActorResourceData unk_14;
 } UnkStruct_ov63_0222BB38_sub1;
 
 typedef struct {
@@ -45,7 +45,7 @@ typedef struct UnkStruct_ov63_0222BB38_t {
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov19_021DA864 unk_10;
+    CellActorResourceData unk_10;
 } UnkStruct_ov63_0222B96C;
 
 typedef struct UnkStruct_ov63_0222AE60_t {
@@ -443,29 +443,29 @@ 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)
 {
     UnkStruct_ov63_0222BB38 * v0;
-    UnkStruct_ov115_02261520 v1;
+    CellActorInitParamsEx v1;
     u32 v2;
 
     v0 = ov63_0222BB00(param0);
     v2 = ov63_0222B450(param2);
 
     GF_ASSERT(ov63_0222B7D4(param0, v2) == 1);
-    memset(&v1, 0, sizeof(UnkStruct_ov115_02261520));
+    memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
     v1.manager = param0->unk_00;
     v1.unk_04 = &param0->unk_10[v2].unk_14;
-    v1.unk_08.x = param1->unk_00 << FX32_SHIFT;
-    v1.unk_08.y = param1->unk_02 << FX32_SHIFT;
-    v1.unk_14.x = FX32_ONE;
-    v1.unk_14.y = FX32_ONE;
-    v1.unk_14.z = FX32_ONE;
-    v1.unk_24 = param1->unk_04;
+    v1.position.x = param1->unk_00 << FX32_SHIFT;
+    v1.position.y = param1->unk_02 << FX32_SHIFT;
+    v1.affineScale.x = FX32_ONE;
+    v1.affineScale.y = FX32_ONE;
+    v1.affineScale.z = FX32_ONE;
+    v1.priority = param1->unk_04;
     v1.unk_2C = param3;
 
     if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     } else {
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     }
 
     v0->unk_04 = GraphicElementManager_AddElement(&v1);
@@ -483,22 +483,22 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     v0->unk_00 = &param0->unk_10[v2];
 
     if (ov63_0222B96C(&param0->unk_2248)) {
-        memset(&v1, 0, sizeof(UnkStruct_ov115_02261520));
+        memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
         v1.manager = param0->unk_00;
         v1.unk_04 = &param0->unk_2248.unk_10;
-        v1.unk_08.x = param1->unk_00 << FX32_SHIFT;
-        v1.unk_08.y = param1->unk_02 << FX32_SHIFT;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_24 = param0->unk_227C;
+        v1.position.x = param1->unk_00 << FX32_SHIFT;
+        v1.position.y = param1->unk_02 << FX32_SHIFT;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.priority = param0->unk_227C;
         v1.unk_2C = param3;
 
         if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
-            v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
         v0->unk_08 = GraphicElementManager_AddElement(&v1);
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 442841e6f9..418465d273 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -149,7 +149,7 @@ typedef struct {
     Strbuf* unk_230;
     Strbuf* unk_234;
     u32 unk_238;
-    UnkStruct_ov19_021DA864 unk_23C;
+    CellActorResourceData unk_23C;
     UnkStruct_02009DC8 * unk_260[4];
     GraphicElementData * unk_270[2];
     UnkStruct_ov64_022300E4 unk_278;
@@ -1211,7 +1211,7 @@ static void ov64_0222E990 (UnkStruct_ov64_0222E21C * param0, u32 param1)
 
 static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
 {
-    static UnkStruct_ov115_02261520 v0[2] = {
+    static CellActorInitParamsEx v0[2] = {
         {
             NULL,
             NULL,
@@ -1958,7 +1958,7 @@ static const u16 Unk_ov64_022321BC[3] = {
     0x1BB
 };
 
-static const UnkStruct_ov115_02261520 Unk_ov64_022322B4 = {
+static const CellActorInitParamsEx Unk_ov64_022322B4 = {
     NULL,
     NULL,
     {0x0, 0x0, 0x0},
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 4b88da0398..63ea38e8ac 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6644,14 +6644,14 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
 {
     BOOL v0;
     int v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     Window v3;
     Strbuf* v4;
     UnkStruct_02012B20 * v5;
     int v6;
     UnkStruct_020127E8 v7;
     u32 v8;
-    UnkStruct_ov115_02261520 v9[3] = {
+    CellActorInitParamsEx v9[3] = {
         {
             NULL,
             NULL,
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 9fa0793aa3..6516df2f04 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -679,16 +679,16 @@ static void ov65_02235A60 (UnkStruct_ov65_022358CC * param0)
 
 static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
-    memset(&v0, 0, sizeof(UnkStruct_ov115_02261520));
+    memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
     v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_1A0.unk_10;
-    v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_14.x = FX32_ONE;
-    v0.unk_14.y = FX32_ONE;
-    v0.unk_24 = 0;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.affineScale.x = FX32_ONE;
+    v0.affineScale.y = FX32_ONE;
+    v0.priority = 0;
     v0.unk_2C = param1;
 
     param0->unk_1A0.unk_34 = GraphicElementManager_AddElement(&v0);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 64f69c4b81..5a1164faf7 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -695,7 +695,7 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
     }
 
     {
-        UnkStruct_ov19_021DA864 v1;
+        CellActorResourceData v1;
         UnkStruct_ov83_0223D9A8 v2 = {0};
 
         sub_020093B4(&v1, 20, 20, 20, 20, 0xffffffff, 0xffffffff, 0, 0, param2->unk_194[0], param2->unk_194[1], param2->unk_194[2], param2->unk_194[3], NULL, NULL);
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index bbd5578367..c530fc0c2e 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -2638,7 +2638,7 @@ static void ov69_0225E910 (UnkStruct_ov69_0225E7DC * param0, u32 param1, UnkStru
 static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225D35C * param1, UnkStruct_ov69_0225E478 * param2, u32 param3)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     BOOL v2;
     UnkStruct_ov83_0223D9A8 v3 = {NULL};
 
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index f535af6fb4..e0431aba25 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1671,7 +1671,7 @@ static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param
 
 static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     int v2;
     NARC * v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
@@ -2736,7 +2736,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
     }
 
     {
-        UnkStruct_ov19_021DA864 v3;
+        CellActorResourceData v3;
         UnkStruct_ov83_0223D9A8 v4 = {NULL};
 
         sub_020093B4(&v3, 100, 100, 100, 100, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
@@ -2810,7 +2810,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
     }
 
     {
-        UnkStruct_ov19_021DA864 v6;
+        CellActorResourceData v6;
         UnkStruct_ov83_0223D9A8 v7 = {NULL};
 
         sub_020093B4(&v6, 101, 101, 101, 101, 0xffffffff, 0xffffffff, 1, 3, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
@@ -2949,7 +2949,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
     u32 v6;
     u32 v7;
     UnkStruct_ov83_0223D9A8 v8;
-    UnkStruct_ov19_021DA864 v9;
+    CellActorResourceData v9;
     const UnkStruct_ov70_0226D844 * v10;
     static const u16 v11[4][3] = {
         {192, 0, 8},
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index b2f6bc9d1b..c3f32c6187 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -104,30 +104,30 @@ void ov71_0223CF0C (UnkStruct_ov71_0223D238 * param0, NARC * param1)
 void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
 
     sub_020093B4(&v1, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 1, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
     {
         u8 v2;
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = 2;
-        v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = 2;
+        v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v3.unk_2C = 25;
 
         for (v0 = 0; v0 < 8; v0++) {
-            v3.unk_08.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
-            v3.unk_08.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
+            v3.position.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
+            v3.position.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
             param0->unk_1C0[v0] = GraphicElementManager_AddElement(&v3);
             sub_02021CC8(param0->unk_1C0[v0], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v0], v0);
@@ -141,9 +141,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v2 = 8;
 
             for (v0 = 0; v0 < 8; v0++) {
-                v3.unk_08.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
-                v3.unk_08.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
-                v3.unk_24 = 1;
+                v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
+                v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
+                v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 8);
@@ -153,9 +153,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v2 += 8;
 
             for (v0 = 0; v0 < 8; v0++) {
-                v3.unk_08.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
-                v3.unk_08.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
-                v3.unk_24 = 1;
+                v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
+                v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
+                v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 9);
@@ -166,9 +166,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
 
         {
             v1.unk_20 = 0;
-            v3.unk_08.x = FX32_ONE * (12 * 8);
-            v3.unk_08.y = FX32_ONE * (17 * 8);
-            v3.unk_24 = 0;
+            v3.position.x = FX32_ONE * (12 * 8);
+            v3.position.y = FX32_ONE * (17 * 8);
+            v3.priority = 0;
             param0->unk_1C0[v2] = GraphicElementManager_AddElement(&v3);
             sub_02021CC8(param0->unk_1C0[v2], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2], 10);
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 6b006eafcf..c2ccc1e3a1 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -519,23 +519,23 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
     sub_020093B4(&param0->unk_220, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_1CC[0], param0->unk_1CC[1], param0->unk_1CC[2], param0->unk_1CC[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_3C;
         v1.unk_04 = &param0->unk_1FC;
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 1;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 1;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.unk_2C = 39;
 
         for (v0 = 0; v0 < 1; v0++) {
             v1.unk_04 = &param0->unk_220;
-            v1.unk_08.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
-            v1.unk_08.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
+            v1.position.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
+            v1.position.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
 
             param0->unk_2B4[v0] = GraphicElementManager_AddElement(&v1);
 
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 8a476830d2..8999eb4ed8 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -36,7 +36,7 @@ typedef struct UnkStruct_ov77_021D5564_t {
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[11][4];
     GraphicElementData * unk_250[17];
-    UnkStruct_ov19_021DA864 unk_294[3];
+    CellActorResourceData unk_294[3];
     NNSG2dCellTransferState * unk_300;
 } UnkStruct_ov77_021D5564;
 
@@ -113,22 +113,22 @@ static void ov77_021D54B0 ()
     sub_0201DBEC((3 * 2), v0);
 }
 
-static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, const int param2, UnkStruct_ov115_02261520 * param3, UnkStruct_ov19_021DA864 * param4, int param5, int param6)
+static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, const int param2, CellActorInitParamsEx * param3, CellActorResourceData * param4, int param5, int param6)
 {
     sub_020093B4(param4, param0, param0, param0, param0, 0xffffffff, 0xffffffff, param5, param2, param1->unk_190[0], param1->unk_190[1], param1->unk_190[2], param1->unk_190[3], NULL, NULL);
 
     {
         param3->manager = param1->unk_00;
         param3->unk_04 = param4;
-        param3->unk_08.x = 0;
-        param3->unk_08.y = 0;
-        param3->unk_08.z = 0;
-        param3->unk_14.x = FX32_ONE;
-        param3->unk_14.y = FX32_ONE;
-        param3->unk_14.z = FX32_ONE;
-        param3->unk_20 = 0;
-        param3->unk_24 = 1;
-        param3->unk_28 = param6;
+        param3->position.x = 0;
+        param3->position.y = 0;
+        param3->position.z = 0;
+        param3->affineScale.x = FX32_ONE;
+        param3->affineScale.y = FX32_ONE;
+        param3->affineScale.z = FX32_ONE;
+        param3->affineZRotation = 0;
+        param3->priority = 1;
+        param3->vramType = param6;
         param3->unk_2C = 76;
     }
 }
@@ -243,8 +243,8 @@ void ov77_021D5BAC (UnkStruct_ov77_021D5564 * param0)
 void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
-    UnkStruct_ov115_02261520 v2;
+    CellActorResourceData v1;
+    CellActorInitParamsEx v2;
     const int v3[6] = {
         4, 5, 6, 7, 8, 9,
     };
@@ -268,8 +268,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
     {
         ov77_021D54E8(0, param0, 0, &v2, &param0->unk_294[0], 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * (128 - 48);
-        v2.unk_08.y = FX32_ONE * (14 * 8);
+        v2.position.x = FX32_ONE * (128 - 48);
+        v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[0] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[0], 0);
@@ -277,8 +277,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(1, param0, 0, &v2, &param0->unk_294[2], 1, NNS_G2D_VRAM_TYPE_2DSUB);
 
-        v2.unk_08.x = FX32_ONE * (128 - 48);
-        v2.unk_08.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
+        v2.position.x = FX32_ONE * (128 - 48);
+        v2.position.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
         param0->unk_250[1] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[1], 0);
@@ -286,8 +286,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(2, param0, 0, &v2, &param0->unk_294[1], 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * (128 + 48);
-        v2.unk_08.y = FX32_ONE * (14 * 8);
+        v2.position.x = FX32_ONE * (128 + 48);
+        v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[2] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[2], 0);
@@ -295,8 +295,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(3, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * -64;
-        v2.unk_08.y = FX32_ONE * (14 * 8);
+        v2.position.x = FX32_ONE * -64;
+        v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[3] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[3], 1);
@@ -304,8 +304,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(6, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * (256 + 64);
-        v2.unk_08.y = FX32_ONE * (14 * 8);
+        v2.position.x = FX32_ONE * (256 + 64);
+        v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[10] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[10], 1);
@@ -313,8 +313,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(7, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * 128;
-        v2.unk_08.y = FX32_ONE * (12 * 8);
+        v2.position.x = FX32_ONE * 128;
+        v2.position.y = FX32_ONE * (12 * 8);
         param0->unk_250[11] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[11], 1);
@@ -323,8 +323,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(8, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-        v2.unk_08.x = FX32_ONE * 128;
-        v2.unk_08.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
+        v2.position.x = FX32_ONE * 128;
+        v2.position.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
         param0->unk_250[12] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[12], 1);
@@ -333,8 +333,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(9, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        v2.unk_08.x = FX32_ONE * 128;
-        v2.unk_08.y = FX32_ONE * (0xd * 8);
+        v2.position.x = FX32_ONE * 128;
+        v2.position.y = FX32_ONE * (0xd * 8);
         param0->unk_250[13] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[13], 1);
@@ -347,8 +347,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         ov77_021D54E8(10, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-        v2.unk_08.x = FX32_ONE * 128;
-        v2.unk_08.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
+        v2.position.x = FX32_ONE * 128;
+        v2.position.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
         param0->unk_250[15] = GraphicElementManager_AddElement(&v2);
 
         sub_02021CC8(param0->unk_250[15], 1);
@@ -362,8 +362,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         for (v0 = 0; v0 < 6; v0++) {
             ov77_021D54E8(4, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-            v2.unk_08.x = FX32_ONE * v4[v0];
-            v2.unk_08.y = FX32_ONE * v5[v0];
+            v2.position.x = FX32_ONE * v4[v0];
+            v2.position.y = FX32_ONE * v5[v0];
             param0->unk_250[v3[v0]] = GraphicElementManager_AddElement(&v2);
 
             sub_02021CC8(param0->unk_250[v3[v0]], 1);
@@ -375,8 +375,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
-    UnkStruct_ov115_02261520 v2;
+    CellActorResourceData v1;
+    CellActorInitParamsEx v2;
     GraphicElementData ** v3;
 
     {
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 06e7585e49..b93e02530c 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -101,22 +101,22 @@ static void ov77_021D6670 ()
     sub_0201F8E4();
 }
 
-static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov19_021DA864 * param2)
+static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, CellActorInitParamsEx * param1, CellActorResourceData * param2)
 {
     sub_020093B4(param2, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
     {
         param1->manager = param0->unk_00;
         param1->unk_04 = param2;
-        param1->unk_08.x = 0;
-        param1->unk_08.y = 0;
-        param1->unk_08.z = 0;
-        param1->unk_14.x = FX32_ONE;
-        param1->unk_14.y = FX32_ONE;
-        param1->unk_14.z = FX32_ONE;
-        param1->unk_20 = 0;
-        param1->unk_24 = 1;
-        param1->unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        param1->position.x = 0;
+        param1->position.y = 0;
+        param1->position.z = 0;
+        param1->affineScale.x = FX32_ONE;
+        param1->affineScale.y = FX32_ONE;
+        param1->affineScale.z = FX32_ONE;
+        param1->affineZRotation = 0;
+        param1->priority = 1;
+        param1->vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         param1->unk_2C = 76;
     }
 }
@@ -241,13 +241,13 @@ static void ov77_021D691C (UnkStruct_ov77_021D6800 * param0)
 static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
-    UnkStruct_ov115_02261520 v2;
+    CellActorResourceData v1;
+    CellActorInitParamsEx v2;
 
     for (v0 = 0; v0 < 10; v0++) {
         ov77_021D66A0(param0, &v2, &v1);
-        v2.unk_08.x = FX32_ONE * v0 * 2;
-        v2.unk_08.y = FX32_ONE * v0 * 2;
+        v2.position.x = FX32_ONE * v0 * 2;
+        v2.position.y = FX32_ONE * v0 * 2;
 
         param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElement(&v2);
 
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 55820831de..a0821bed98 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -806,7 +806,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
         {0 + 10, 0, 10, 10}
     };
     ArchivedSprite v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     UnkStruct_ov83_0223D9A8 v3;
     UnkStruct_ov5_021DE5D0 v4;
     NNSG2dImageProxy v5;
@@ -819,7 +819,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     int v12, v13;
 
     v2.unk_04 = NULL;
-    v2.unk_14 = NULL;
+    v2.multiCellBank = NULL;
     v2.unk_18 = NULL;
     v2.unk_1C = 0;
     v2.unk_0C = param1;
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 24c6fc12bd..dd35fa343a 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -492,7 +492,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         {216, 112},
         {56, 112},
     };
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     UnkStruct_ov83_0223D9A8 v2;
     NNSG2dImageProxy v3;
     NNSG2dImagePaletteProxy v4;
@@ -503,7 +503,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
     int v9;
 
     v1.unk_04 = NULL;
-    v1.unk_14 = NULL;
+    v1.multiCellBank = NULL;
     v1.unk_18 = NULL;
     v1.unk_1C = 0;
     v1.unk_0C = param1;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index f08b22cf7a..b893a4a3f0 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1408,25 +1408,25 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
     sub_020093B4(&param0->unk_378, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_324[0], param0->unk_324[1], param0->unk_324[2], param0->unk_324[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v0;
+        CellActorInitParamsEx v0;
         int v1;
 
         v0.manager = param0->unk_194;
         v0.unk_04 = &param0->unk_354;
-        v0.unk_08.x = FX32_CONST(32);
-        v0.unk_08.y = FX32_CONST(96);
-        v0.unk_08.z = 0;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_20 = 0;
-        v0.unk_24 = 0;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v0.position.x = FX32_CONST(32);
+        v0.position.y = FX32_CONST(96);
+        v0.position.z = 0;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.affineZRotation = 0;
+        v0.priority = 0;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v0.unk_2C = 26;
 
         for (v1 = 0; v1 < 2; v1++) {
-            v0.unk_08.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
-            v0.unk_08.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
+            v0.position.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
+            v0.position.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
             param0->unk_39C[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CC8(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
@@ -1435,8 +1435,8 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         }
 
         for (v1 = 0; v1 < 12; v1++) {
-            v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
-            v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
+            v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
+            v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
             param0->unk_3D4[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CC8(param0->unk_3D4[v1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3D4[v1], 5 + v1);
@@ -1445,25 +1445,25 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         }
 
         for (v1 = 0; v1 < 12; v1++) {
-            v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20);
-            v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
-            v0.unk_24 = 0;
+            v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20);
+            v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
+            v0.priority = 0;
             param0->unk_404[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021F58(param0->unk_404[v1], 3);
             sub_02021CAC(param0->unk_404[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
-            v0.unk_08.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20 + 9);
-            v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
-            v0.unk_24 = 0;
+            v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20 + 9);
+            v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
+            v0.priority = 0;
             param0->unk_434[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021F58(param0->unk_434[v1], 3);
             sub_02021CAC(param0->unk_434[v1], 0);
         }
 
-        v0.unk_08.x = FX32_ONE * (128 - 4 * 8);
-        v0.unk_08.y = FX32_ONE * (8 * 8 + 2);
+        v0.position.x = FX32_ONE * (128 - 4 * 8);
+        v0.position.y = FX32_ONE * (8 * 8 + 2);
         param0->unk_47C = GraphicElementManager_AddElement(&v0);
         sub_02021CC8(param0->unk_47C, 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_47C, 20);
@@ -1471,9 +1471,9 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
 
         for (v1 = 0; v1 < 6; v1++) {
             v0.unk_04 = &param0->unk_378;
-            v0.unk_08.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
-            v0.unk_08.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
-            v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v0.position.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
+            v0.position.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
+            v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
             param0->unk_464[v1] = GraphicElementManager_AddElement(&v0);
             sub_02021CAC(param0->unk_464[v1], 0);
             sub_02021CC8(param0->unk_464[v1], 0);
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 42800e4811..028b6e8c88 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -378,17 +378,17 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0)
     NARC_dtor(v1);
 }
 
-void ov94_0223C300 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov94_0223FD4C * param1, UnkStruct_ov19_021DA864 * param2, int param3)
+void ov94_0223C300 (CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_BE4;
     param0->unk_04 = param2;
-    param0->unk_08.z = 0;
-    param0->unk_14.x = FX32_ONE;
-    param0->unk_14.y = FX32_ONE;
-    param0->unk_14.z = FX32_ONE;
-    param0->unk_20 = 0;
-    param0->unk_24 = 1;
-    param0->unk_28 = param3;
+    param0->position.z = 0;
+    param0->affineScale.x = FX32_ONE;
+    param0->affineScale.y = FX32_ONE;
+    param0->affineScale.z = FX32_ONE;
+    param0->affineZRotation = 0;
+    param0->priority = 1;
+    param0->vramType = param3;
     param0->unk_2C = 62;
 }
 
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 00162c4a14..b0a47118c2 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -306,12 +306,12 @@ static const u16 Unk_ov94_02245A48[][2] = {
 
 static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v0.unk_08.x = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][0];
-    v0.unk_08.y = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][1];
+    v0.position.x = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][0];
+    v0.position.y = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][1];
 
     param0->unk_E20 = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 2003d1011f..0f000f7ff0 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -260,12 +260,12 @@ static void ov94_0223D2E8 (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v0.unk_08.x = FX32_ONE * 208;
-    v0.unk_08.y = FX32_ONE * 58;
+    v0.position.x = FX32_ONE * 208;
+    v0.position.y = FX32_ONE * 58;
 
     param0->unk_F30 = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 0fcf2924d2..566ff28062 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -223,12 +223,12 @@ static void ov94_0223DE04 (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v0.unk_08.x = FX32_ONE * 208;
-    v0.unk_08.y = FX32_ONE * 58;
+    v0.position.x = FX32_ONE * 208;
+    v0.position.y = FX32_ONE * 58;
 
     param0->unk_F30 = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 4a2e79781a..d4458b13e6 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -294,12 +294,12 @@ static void ov94_0223E6B8 (UnkStruct_ov94_0223FD4C * param0)
 
 static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v0.unk_08.x = FX32_ONE;
-    v0.unk_08.y = FX32_ONE;
+    v0.position.x = FX32_ONE;
+    v0.position.y = FX32_ONE;
 
     param0->unk_E20 = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 6461173b64..8e0d33a149 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -358,12 +358,12 @@ static const u16 Unk_ov94_02245E1C[][2] = {
 static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 {
     int v0;
-    UnkStruct_ov115_02261520 v1;
+    CellActorInitParamsEx v1;
 
     ov94_0223C300(&v1, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v1.unk_08.x = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][0];
-    v1.unk_08.y = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][1];
+    v1.position.x = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][0];
+    v1.position.y = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][1];
 
     param0->unk_E20 = GraphicElementManager_AddElement(&v1);
 
@@ -377,9 +377,9 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     for (v0 = 0; v0 < 30; v0++) {
-        v1.unk_08.x = FX32_ONE * Unk_ov94_02245ED4[v0][0];
-        v1.unk_08.y = FX32_ONE * Unk_ov94_02245ED4[v0][1];
-        v1.unk_24 = 20;
+        v1.position.x = FX32_ONE * Unk_ov94_02245ED4[v0][0];
+        v1.position.y = FX32_ONE * Unk_ov94_02245ED4[v0][1];
+        v1.priority = 20;
 
         param0->unk_E28[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -388,9 +388,9 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     for (v0 = 0; v0 < 30; v0++) {
-        v1.unk_08.x = FX32_ONE * (Unk_ov94_02245ED4[v0][0] + 4);
-        v1.unk_08.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
-        v1.unk_24 = 10;
+        v1.position.x = FX32_ONE * (Unk_ov94_02245ED4[v0][0] + 4);
+        v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
+        v1.priority = 10;
 
         param0->unk_EA0[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -399,9 +399,9 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        v1.unk_08.x = FX32_ONE * (Unk_ov94_02245ED4[v0][0] + 4 + 8);
-        v1.unk_08.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
-        v1.unk_24 = 10;
+        v1.position.x = FX32_ONE * (Unk_ov94_02245ED4[v0][0] + 4 + 8);
+        v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
+        v1.priority = 10;
 
         param0->unk_F18[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -410,8 +410,8 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1.unk_08.x = FX32_ONE * Unk_ov94_02245E1C[v0][0];
-        v1.unk_08.y = FX32_ONE * Unk_ov94_02245E1C[v0][1];
+        v1.position.x = FX32_ONE * Unk_ov94_02245E1C[v0][0];
+        v1.position.y = FX32_ONE * Unk_ov94_02245E1C[v0][1];
 
         param0->unk_F54[v0] = GraphicElementManager_AddElement(&v1);
 
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index edbfc5091f..a3cb6e9e57 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -45,15 +45,15 @@ static const u16 Unk_ov94_02246322[][2] = {
 
 void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
     int v1;
 
     ov94_0224432C(param0);
     ov94_0223C300(&v0, param0, &param0->unk_DD8, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v0.unk_08.x = FX32_ONE * 128;
-    v0.unk_08.y = FX32_ONE * 130 + (256 * FX32_ONE);
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v0.position.x = FX32_ONE * 128;
+    v0.position.y = FX32_ONE * 130 + (256 * FX32_ONE);
 
     param0->unk_F34[0] = GraphicElementManager_AddElement(&v0);
 
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 4af00073b4..adf48d6665 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -634,7 +634,7 @@ void ov95_022475A0 (UnkStruct_ov95_02247568 * param0)
     }
 }
 
-void ov95_022475C4 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4)
+void ov95_022475C4 (CellActorResourceData * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4)
 {
     param0->unk_00 = param2;
     param0->unk_08 = param3;
@@ -642,12 +642,12 @@ void ov95_022475C4 (UnkStruct_ov19_021DA864 * param0, UnkStruct_ov95_02247568 *
     param0->unk_10 = param1->unk_0C;
     param0->unk_20 = param4;
     param0->unk_04 = NULL;
-    param0->unk_14 = NULL;
+    param0->multiCellBank = NULL;
     param0->unk_18 = NULL;
     param0->unk_1C = 0;
 }
 
-GraphicElementData * 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, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     GraphicElementData * v0;
     UnkStruct_ov83_0223D9A8 v1;
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 7aee469dd6..bb3519c9e7 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -480,7 +480,7 @@ static void ov95_0224829C (UnkStruct_ov95_02247C6C * param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
 
     ov95_02247568(&param0->unk_44, 93, 7, 8);
 
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 594f590d88..f82fcc4854 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -603,7 +603,7 @@ static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     int v3;
     fx32 v4, v5;
 
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 42b191a33e..a3e09ef8ba 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -402,7 +402,7 @@ static void ov95_02249B90 (UnkStruct_ov95_022497D8 * param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
 
     ov95_02247568(&param0->unk_10, 93, 7, 8);
 
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index 2c33c18436..12edc00635 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -377,7 +377,7 @@ static void ov95_0224A7B0 (UnkStruct_ov95_0224A42C * param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
     int v3;
 
     ov95_02247568(&param0->unk_10, 93, 7, 8);
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 227948b7f6..e684066a6c 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -523,7 +523,7 @@ static void ov95_0224BAE8 (UnkStruct_ov95_0224B4D4 * param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    UnkStruct_ov19_021DA864 v2;
+    CellActorResourceData v2;
 
     ov95_02247568(&param0->unk_48, 93, 7, 8);
 
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index f1b4356192..07e7505b8b 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -285,17 +285,17 @@ static const u16 Unk_ov96_0223DA80[][2] = {
     {0xE0, 0x81}
 };
 
-void ov96_0223BAE0 (UnkStruct_ov115_02261520 * param0, UnkStruct_ov96_0223BF40 * param1, UnkStruct_ov19_021DA864 * param2, int param3)
+void ov96_0223BAE0 (CellActorInitParamsEx * param0, UnkStruct_ov96_0223BF40 * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_BF4;
     param0->unk_04 = param2;
-    param0->unk_08.z = 0;
-    param0->unk_14.x = FX32_ONE;
-    param0->unk_14.y = FX32_ONE;
-    param0->unk_14.z = FX32_ONE;
-    param0->unk_20 = 0;
-    param0->unk_24 = 1;
-    param0->unk_28 = param3;
+    param0->position.z = 0;
+    param0->affineScale.x = FX32_ONE;
+    param0->affineScale.y = FX32_ONE;
+    param0->affineScale.z = FX32_ONE;
+    param0->affineZRotation = 0;
+    param0->priority = 1;
+    param0->vramType = param3;
     param0->unk_2C = 68;
 }
 
@@ -306,13 +306,13 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
     sub_020093B4(&param0->unk_DC4, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_D84[0], param0->unk_D84[1], param0->unk_D84[2], param0->unk_D84[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         ov96_0223BAE0(&v1, param0, &param0->unk_DC4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         for (v0 = 0; v0 < 2; v0++) {
-            v1.unk_08.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
-            v1.unk_08.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
+            v1.position.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
+            v1.position.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
             param0->unk_E30[v0] = GraphicElementManager_AddElement(&v1);
             sub_02021CC8(param0->unk_E30[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_E30[v0], v0);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 56de0fea69..929ff51c0c 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -107,7 +107,7 @@ typedef struct {
     int unk_04;
     s8 unk_08;
     UnkStruct_ov97_02237AEC * unk_0C;
-    UnkStruct_ov19_021DA864 unk_10[2];
+    CellActorResourceData unk_10[2];
     UnkStruct_02009DC8 * unk_58[2][6];
     UnkStruct_ov97_0222EEB8 unk_88[80];
     UnkStruct_ov97_0222EEB8 unk_1848[80];
@@ -1179,24 +1179,24 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
     GraphicElementData * v0;
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
         int v2 = (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) ? 0 : 1;
 
         v1.manager = param0->unk_0C->unk_00;
         v1.unk_04 = &param0->unk_10[v2];
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_08.x = FX32_ONE * 128;
-        v1.unk_08.y = FX32_ONE * 32;
-        v1.unk_24 = 10;
-        v1.unk_28 = param1;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.position.x = FX32_ONE * 128;
+        v1.position.y = FX32_ONE * 32;
+        v1.priority = 10;
+        v1.vramType = param1;
         v1.unk_2C = 86;
 
-        if (v1.unk_28 == NNS_G2D_VRAM_TYPE_2DSUB) {
-            v1.unk_08.y += FX32_CONST(256);
+        if (v1.vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
+            v1.position.y += FX32_CONST(256);
         }
 
         v0 = GraphicElementManager_AddElement(&v1);
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 0aec496346..806c4551cf 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -113,7 +113,7 @@ typedef struct {
     UnkStruct_0200C738 unk_2CA8;
     UnkStruct_02009714 * unk_2E34[6];
     UnkStruct_02009DC8 * unk_2E4C[6];
-    UnkStruct_ov19_021DA864 unk_2E64;
+    CellActorResourceData unk_2E64;
     GraphicElementData * unk_2E88[2];
     GraphicElementData * unk_2E90[3];
     UnkUnion_ov97_0222D2B0 unk_2E9C;
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 223e0e3fd9..99f6468382 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -142,7 +142,7 @@ typedef struct {
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[6];
     UnkStruct_02009DC8 * unk_1D0[6];
-    UnkStruct_ov19_021DA864 unk_1E8;
+    CellActorResourceData unk_1E8;
     UnkStruct_ov97_02234A2C_sub1 unk_20C[30];
     TouchScreenRect unk_374[34];
     GraphicElementData * unk_3FC[4];
@@ -551,17 +551,17 @@ static void ov97_022340B0 (UnkStruct_ov97_02234A2C * param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static void ov97_022340FC (UnkStruct_ov115_02261520 * param0, UnkStruct_ov97_02234A2C * param1, UnkStruct_ov19_021DA864 * param2, int param3)
+static void ov97_022340FC (CellActorInitParamsEx * param0, UnkStruct_ov97_02234A2C * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_28;
     param0->unk_04 = &param1->unk_1E8;
-    param0->unk_08.z = 0;
-    param0->unk_14.x = FX32_ONE;
-    param0->unk_14.y = FX32_ONE;
-    param0->unk_14.z = FX32_ONE;
-    param0->unk_20 = 0;
-    param0->unk_24 = 20;
-    param0->unk_28 = param3;
+    param0->position.z = 0;
+    param0->affineScale.x = FX32_ONE;
+    param0->affineScale.y = FX32_ONE;
+    param0->affineScale.z = FX32_ONE;
+    param0->affineZRotation = 0;
+    param0->priority = 20;
+    param0->vramType = param3;
     param0->unk_2C = 78;
 }
 
@@ -749,7 +749,7 @@ static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0)
 static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
 {
     int v0, v1, v2;
-    UnkStruct_ov115_02261520 v3;
+    CellActorInitParamsEx v3;
 
     ov97_022340FC(&v3, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -759,8 +759,8 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
         for (v1 = 0; v1 < 6; v1++) {
             ov97_02234190(&param0->unk_374[v0], v1 * 40 + 28, v2 * 24 + 40, 28, 28);
 
-            v3.unk_08.x = FX32_ONE * (v1 * 40 + 28);
-            v3.unk_08.y = FX32_ONE * (v2 * 24 + 40);
+            v3.position.x = FX32_ONE * (v1 * 40 + 28);
+            v3.position.y = FX32_ONE * (v2 * 24 + 40);
 
             if (param0->unk_20C[v0].unk_00 == NULL) {
                 param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElement(&v3);
@@ -772,8 +772,8 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             sub_02021CAC(param0->unk_20C[v0].unk_00, 1);
             sub_02021F58(param0->unk_20C[v0].unk_00, 100 + v0);
 
-            v3.unk_08.x += FX32_ONE * 6;
-            v3.unk_08.y += FX32_ONE * 12;
+            v3.position.x += FX32_ONE * 6;
+            v3.position.y += FX32_ONE * 12;
 
             if (param0->unk_20C[v0].unk_04 == NULL) {
                 param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElement(&v3);
@@ -796,14 +796,14 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
 
 static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
     GraphicElementData * v1;
 
     ov97_022340FC(&v0, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    v0.unk_08.x = FX32_ONE * param1;
-    v0.unk_08.y = FX32_ONE * param2;
-    v0.unk_24 = 10;
+    v0.position.x = FX32_ONE * param1;
+    v0.position.y = FX32_ONE * param2;
+    v0.priority = 10;
 
     v1 = GraphicElementManager_AddElement(&v0);
 
@@ -1456,7 +1456,7 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
 {
     int v0, v1, v2, v3;
     u32 v4;
-    UnkStruct_ov115_02261520 v5;
+    CellActorInitParamsEx v5;
 
     for (v0 = 0; v0 < 30; v0++) {
         sub_02021CAC(param0->unk_20C[v0].unk_00, 0);
@@ -1474,8 +1474,8 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
     ov97_022340FC(&v5, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     for (v0 = 0; v0 < 6; v0++) {
-        v5.unk_08.x = FX32_ONE * (v0 * 40 + 28);
-        v5.unk_08.y = FX32_ONE * 142;
+        v5.position.x = FX32_ONE * (v0 * 40 + 28);
+        v5.position.y = FX32_ONE * 142;
 
         param0->unk_478[v0] = GraphicElementManager_AddElement(&v5);
 
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index dfe36a19ee..12c46340ac 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -443,23 +443,23 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
     UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550;
 
     if (param1 == NULL) {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = v0->unk_34.unk_00;
         v1.unk_04 = &v0->unk_34.unk_1D8[param0];
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_08.x = FX32_ONE * param2;
-        v1.unk_08.y = FX32_ONE * param3;
-        v1.unk_24 = 10;
-        v1.unk_28 = (param0 == 0) ? NNS_G2D_VRAM_TYPE_2DMAIN : NNS_G2D_VRAM_TYPE_2DSUB;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.position.x = FX32_ONE * param2;
+        v1.position.y = FX32_ONE * param3;
+        v1.priority = 10;
+        v1.vramType = (param0 == 0) ? NNS_G2D_VRAM_TYPE_2DMAIN : NNS_G2D_VRAM_TYPE_2DSUB;
         v1.unk_2C = v0->unk_08;
 
-        if (v1.unk_28 == NNS_G2D_VRAM_TYPE_2DSUB) {
-            v1.unk_08.y += v0->unk_274;
+        if (v1.vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
+            v1.position.y += v0->unk_274;
         }
 
         param1 = GraphicElementManager_AddElement(&v1);
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 22629ceca7..c4d42d1816 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -323,7 +323,7 @@ void ov101_021D8358 (UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2,
 
 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)
 {
-    UnkStruct_ov19_021DA864 v0;
+    CellActorResourceData v0;
     UnkStruct_ov83_0223D9A8 v1;
     GraphicElementData * v2;
 
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 5ad0d4ae60..90b414c4f3 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -63,35 +63,35 @@ void ov105_02245AAC (UnkStruct_ov105_02245AAC * param0)
 GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     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);
 
     {
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = param3;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = param3;
 
         if (param5 == 0) {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
         v3.unk_2C = 93;
 
         if (param5 == 1) {
-            v3.unk_08.y += (192 << FX32_SHIFT);
+            v3.position.y += (192 << FX32_SHIFT);
         }
 
         v2 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 5c9034ee84..2f6b3c00c0 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -76,36 +76,36 @@ void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1)
 GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     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);
 
     {
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
 
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = param3;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = param3;
 
         if (param4 == 0) {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
         v3.unk_2C = 98;
 
         if (param4 == 1) {
-            v3.unk_08.y += (192 << FX32_SHIFT);
+            v3.position.y += (192 << FX32_SHIFT);
         }
 
         v2 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 94846b33b4..1d38976645 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -115,35 +115,35 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param
 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;
+    CellActorResourceData v1;
     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);
 
     {
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = param5;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = param5;
 
         if (param7 == 0) {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
         v3.unk_2C = 100;
 
         if (param7 == 1) {
-            v3.unk_08.y += (192 << FX32_SHIFT);
+            v3.position.y += (192 << FX32_SHIFT);
         }
 
         v2 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 83f480b3ec..12b624422b 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -77,31 +77,31 @@ void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party *
 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;
+    CellActorResourceData v1;
     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);
 
     {
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = param5;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = param5;
         v3.unk_2C = 103;
 
         if (param7 == 0) {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
-            v3.unk_08.y += (192 << FX32_SHIFT);
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.position.y += (192 << FX32_SHIFT);
         }
 
         v2 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 546de5ac2d..4c7c553e57 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -643,22 +643,22 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
     sub_020093B4(&param0->unk_278, 2, 2, 2, 2, 0xffffffff, 0xffffffff, 0, 1, param0->unk_1F0[0], param0->unk_1F0[1], param0->unk_1F0[2], param0->unk_1F0[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_60;
         v1.unk_04 = &param0->unk_278;
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 1;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 1;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.unk_2C = 95;
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_08.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
-            v1.unk_08.y = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][1];
+            v1.position.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
+            v1.position.y = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][1];
 
             param0->unk_29C[v0 + 1] = GraphicElementManager_AddElement(&v1);
 
@@ -668,8 +668,8 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
         }
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_08.x = FX32_ONE * 24;
-            v1.unk_08.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
+            v1.position.x = FX32_ONE * 24;
+            v1.position.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 2ff476fb84..b1164837d5 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -116,30 +116,30 @@ static void ov111_021D31F4 (UnkStruct_ov111_021D2F80 * param0, int param1)
 GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
 {
     int v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
     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);
 
     {
-        UnkStruct_ov115_02261520 v3;
+        CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
         v3.unk_04 = &v1;
-        v3.unk_08.x = 0;
-        v3.unk_08.y = 0;
-        v3.unk_08.z = 0;
-        v3.unk_14.x = FX32_ONE;
-        v3.unk_14.y = FX32_ONE;
-        v3.unk_14.z = FX32_ONE;
-        v3.unk_20 = 0;
-        v3.unk_24 = param4;
+        v3.position.x = 0;
+        v3.position.y = 0;
+        v3.position.z = 0;
+        v3.affineScale.x = FX32_ONE;
+        v3.affineScale.y = FX32_ONE;
+        v3.affineScale.z = FX32_ONE;
+        v3.affineZRotation = 0;
+        v3.priority = param4;
         v3.unk_2C = 115;
 
         if (param5 == 0) {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         } else {
-            v3.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+            v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
         v2 = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index fdc4c04b59..fa47516221 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -85,7 +85,7 @@ typedef struct {
 typedef struct {
     BOOL unk_00;
     UnkStruct_02009DC8 * unk_04[4];
-    UnkStruct_ov19_021DA864 unk_14;
+    CellActorResourceData unk_14;
 } UnkStruct_ov114_0225CDB4;
 
 typedef struct {
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 372100b40d..fee541f7c2 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -166,7 +166,7 @@ typedef struct {
     Easy3DModel unk_00[5];
     Easy3DModel unk_50;
     UnkStruct_02009DC8 * unk_60[4];
-    UnkStruct_ov19_021DA864 unk_70;
+    CellActorResourceData unk_70;
 } UnkStruct_ov115_02264A40;
 
 typedef struct {
@@ -245,7 +245,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov19_021DA864 unk_10;
+    CellActorResourceData unk_10;
     GraphicElementData * unk_34;
     u8 unk_38;
     u8 unk_39;
@@ -262,7 +262,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
-    UnkStruct_ov19_021DA864 unk_10;
+    CellActorResourceData unk_10;
     GraphicElementData * unk_34;
     Window unk_38;
     FontOAM * unk_48;
@@ -297,7 +297,7 @@ typedef struct {
     GraphicElementManager * unk_1C;
     UnkStruct_0200C738 unk_20;
     UnkStruct_02009714 * unk_1AC[4];
-    UnkStruct_ov19_021DA864 unk_1BC;
+    CellActorResourceData unk_1BC;
     UnkStruct_02009DC8 * unk_1E0[4];
     UnkStruct_02012744 * unk_1F0;
     Camera * camera;
@@ -352,7 +352,7 @@ static void ov115_02261520(UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02
 static void ov115_02261574(UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1);
 static void ov115_0226158C(UnkStruct_ov115_02261574 * param0, u32 param1, u32 param2, int param3);
 static void ov115_02261598(UnkStruct_ov115_02261574 * param0);
-static void ov115_022615B0(UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6);
+static void ov115_022615B0(UnkStruct_ov115_022615B0 * param0, CellActorInitParamsEx * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6);
 static void ov115_02261648(UnkStruct_ov115_022615B0 * param0);
 static void ov115_02261660(UnkStruct_ov115_022615B0 * param0, u32 param1, u32 param2, int param3);
 static void ov115_02261744(UnkStruct_ov115_022615B0 * param0);
@@ -1255,18 +1255,18 @@ static u32 ov115_022614F8 (UnkStruct_ov115_02260D78 * param0)
 
 static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_02261ADC * param1, u32 param2, u32 param3, u32 param4)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
     int v1, v2;
     u32 v3;
 
     v0.manager = param1->unk_1C;
     v0.unk_04 = &param1->unk_1BC;
-    v0.unk_14.x = FX32_ONE;
-    v0.unk_14.y = FX32_ONE;
-    v0.unk_14.z = FX32_ONE;
-    v0.unk_20 = 0;
-    v0.unk_24 = 0;
-    v0.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.affineScale.x = FX32_ONE;
+    v0.affineScale.y = FX32_ONE;
+    v0.affineScale.z = FX32_ONE;
+    v0.affineZRotation = 0;
+    v0.priority = 0;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.unk_2C = param4;
 
     v3 = param3;
@@ -1299,16 +1299,16 @@ static void ov115_02261598 (UnkStruct_ov115_02261574 * param0)
     }
 }
 
-static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, UnkStruct_ov115_02261520 * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6)
+static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, CellActorInitParamsEx * param1, UnkStruct_ov115_02261ADC * param2, u32 param3, u32 param4, u32 param5, u32 param6)
 {
     int v0;
     s32 v1, v2;
 
     for (v0 = 0; v0 < 3; v0++) {
         ov115_022613CC(param3, param5, param4, &v1, &v2);
-        param1->unk_08.x = v1 << FX32_SHIFT;
-        param1->unk_08.y = v2 << FX32_SHIFT;
-        param0->unk_18[v0] = param1->unk_08;
+        param1->position.x = v1 << FX32_SHIFT;
+        param1->position.y = v2 << FX32_SHIFT;
+        param0->unk_18[v0] = param1->position;
         param0->unk_00[v0] = GraphicElementManager_AddElement(param1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
@@ -1434,7 +1434,7 @@ static void ov115_022617D8 (UnkStruct_ov115_022615B0 * param0, u32 param1)
 static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6)
 {
     Strbuf* v0;
-    UnkStruct_ov115_02261520 v1;
+    CellActorInitParamsEx v1;
 
     memset(param0, 0, sizeof(UnkStruct_ov115_022617E8));
 
@@ -3706,15 +3706,15 @@ static void ov115_02264684 (UnkStruct_ov115_02261ADC * param0, u32 param1)
 static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, u32 param2)
 {
     {
-        UnkStruct_ov115_02261520 v0 = {0};
+        CellActorInitParamsEx v0 = {0};
 
         v0.manager = param0->unk_1C;
         v0.unk_04 = &param0->unk_760.unk_70;
-        v0.unk_14.x = FX32_ONE;
-        v0.unk_14.y = FX32_ONE;
-        v0.unk_14.z = FX32_ONE;
-        v0.unk_24 = 32;
-        v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+        v0.affineScale.x = FX32_ONE;
+        v0.affineScale.y = FX32_ONE;
+        v0.affineScale.z = FX32_ONE;
+        v0.priority = 32;
+        v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v0.unk_2C = param2;
         param1->unk_00 = GraphicElementManager_AddElement(&v0);
 
@@ -3928,15 +3928,15 @@ static void ov115_02264A54 (UnkStruct_ov115_022647A0 * param0)
 
 static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264BA0 * param1, u32 param2, u32 param3)
 {
-    UnkStruct_ov115_02261520 v0 = {0};
+    CellActorInitParamsEx v0 = {0};
 
     v0.manager = param0->unk_1C;
     v0.unk_04 = &param0->unk_760.unk_70;
-    v0.unk_14.x = FX32_ONE;
-    v0.unk_14.y = FX32_ONE;
-    v0.unk_14.z = FX32_ONE;
-    v0.unk_24 = 32;
-    v0.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+    v0.affineScale.x = FX32_ONE;
+    v0.affineScale.y = FX32_ONE;
+    v0.affineScale.z = FX32_ONE;
+    v0.priority = 32;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v0.unk_2C = param3;
 
     param1->unk_04 = GraphicElementManager_AddElement(&v0);
@@ -3988,15 +3988,15 @@ static void ov115_02264BF8 (UnkStruct_ov115_02264BA0 * param0)
 static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_02264C90 * param1, u32 param2, u32 param3)
 {
     int v0;
-    UnkStruct_ov115_02261520 v1 = {0};
+    CellActorInitParamsEx v1 = {0};
 
     v1.manager = param0->unk_1C;
     v1.unk_04 = &param0->unk_760.unk_70;
-    v1.unk_14.x = 9;
-    v1.unk_14.y = 9;
-    v1.unk_14.z = 9;
-    v1.unk_24 = 32;
-    v1.unk_28 = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.affineScale.x = 9;
+    v1.affineScale.y = 9;
+    v1.affineScale.z = 9;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.unk_2C = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index 3cf22cb30c..b02dc30670 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -21,7 +21,7 @@
 #include "unk_020218BC.h"
 #include "unk_0202309C.h"
 
-void sub_020093B4 (UnkStruct_ov19_021DA864 * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14)
+void sub_020093B4 (CellActorResourceData * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14)
 {
     UnkStruct_02009DC8 * v0;
     UnkStruct_02009DC8 * v1;
@@ -85,10 +85,10 @@ void sub_020093B4 (UnkStruct_ov19_021DA864 * param0, int param1, int param2, int
     }
 
     if (v4) {
-        param0->unk_14 = sub_02009E7C(v4);
+        param0->multiCellBank = sub_02009E7C(v4);
         param0->unk_18 = sub_02009E94(v5);
     } else {
-        param0->unk_14 = NULL;
+        param0->multiCellBank = NULL;
         param0->unk_18 = NULL;
     }
 
@@ -96,10 +96,10 @@ void sub_020093B4 (UnkStruct_ov19_021DA864 * param0, int param1, int param2, int
     param0->unk_20 = param8;
 }
 
-void sub_020094F0 (UnkStruct_ov19_021DA864 * param0)
+void sub_020094F0 (CellActorResourceData * param0)
 {
     sub_0200A5B4(param0->unk_00);
-    memset(param0, 0, sizeof(UnkStruct_ov19_021DA864));
+    memset(param0, 0, sizeof(CellActorResourceData));
 }
 
 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)
@@ -116,7 +116,7 @@ UnkStruct_02009508 * sub_02009508 (const UnkStruct_02009508_1 * param0, int para
     }
 
     v2 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_02009508));
-    v2->unk_00 = Heap_AllocFromHeap(param1, sizeof(UnkStruct_ov19_021DA864) * v1);
+    v2->unk_00 = Heap_AllocFromHeap(param1, sizeof(CellActorResourceData) * v1);
     v2->unk_04 = v1;
 
     for (v0 = 0; v0 < v2->unk_04; v0++) {
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 3b04a5372b..5c586afa34 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -301,24 +301,24 @@ GraphicElementData * sub_0200CA08 (SpriteRenderer * param0, SpriteGfxHandler * p
 GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * 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 * v0 = NULL;
-    UnkStruct_ov115_02261520 v1;
+    CellActorInitParamsEx v1;
 
     v1.manager = param1->unk_00;
     v1.unk_04 = &param1->unk_04->unk_00[param2];
-    v1.unk_08.x = FX32_CONST(param3);
-    v1.unk_08.y = FX32_CONST(param4);
-    v1.unk_08.z = FX32_CONST(param5);
+    v1.position.x = FX32_CONST(param3);
+    v1.position.y = FX32_CONST(param4);
+    v1.position.z = FX32_CONST(param5);
 
     if (param9 == NNS_G2D_VRAM_TYPE_2DSUB) {
-        v1.unk_08.y += (192 << FX32_SHIFT);
+        v1.position.y += (192 << FX32_SHIFT);
     }
 
-    v1.unk_14.x = FX32_ONE;
-    v1.unk_14.y = FX32_ONE;
-    v1.unk_14.z = FX32_ONE;
-    v1.unk_20 = 0;
-    v1.unk_24 = param7;
-    v1.unk_28 = param9;
+    v1.affineScale.x = FX32_ONE;
+    v1.affineScale.y = FX32_ONE;
+    v1.affineScale.z = FX32_ONE;
+    v1.affineZRotation = 0;
+    v1.priority = param7;
+    v1.vramType = param9;
     v1.unk_2C = param0->unk_00;
 
     v0 = GraphicElementManager_AddElement(&v1);
@@ -512,7 +512,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     int v0;
     int v1;
     CellActorData * v2 = NULL;
-    UnkStruct_ov115_02261520 v3;
+    CellActorInitParamsEx v3;
     int v4[6];
 
     v2 = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorData));
@@ -527,7 +527,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
         return NULL;
     }
 
-    v2->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov19_021DA864));
+    v2->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorResourceData));
     v2->unk_04 = v2->unk_08->unk_00;
 
     if (v2->unk_08->unk_00 == NULL) {
@@ -559,20 +559,20 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
 
     v3.manager = param1->unk_00;
     v3.unk_04 = v2->unk_04;
-    v3.unk_08.x = FX32_CONST(param2->x);
-    v3.unk_08.y = FX32_CONST(param2->y);
-    v3.unk_08.z = FX32_CONST(param2->z);
+    v3.position.x = FX32_CONST(param2->x);
+    v3.position.y = FX32_CONST(param2->y);
+    v3.position.z = FX32_CONST(param2->z);
 
     if (param2->vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
-        v3.unk_08.y += (192 << FX32_SHIFT);
+        v3.position.y += (192 << FX32_SHIFT);
     }
 
-    v3.unk_14.x = FX32_ONE;
-    v3.unk_14.y = FX32_ONE;
-    v3.unk_14.z = FX32_ONE;
-    v3.unk_20 = 0;
-    v3.unk_24 = param2->priority;
-    v3.unk_28 = param2->vramType;
+    v3.affineScale.x = FX32_ONE;
+    v3.affineScale.y = FX32_ONE;
+    v3.affineScale.z = FX32_ONE;
+    v3.affineZRotation = 0;
+    v3.priority = param2->priority;
+    v3.vramType = param2->vramType;
     v3.unk_2C = param0->unk_00;
     v2->unk_00 = GraphicElementManager_AddElement(&v3);
     v2->unk_0C = param2->transferToVRAM;
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 3f028bd005..e2bd57f78c 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -728,14 +728,14 @@ static void sub_020130DC (FontOAM * param0)
 static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
 {
     UnkStruct_ov83_0223D9A8 v0;
-    UnkStruct_ov19_021DA864 v1;
+    CellActorResourceData v1;
 
     v1.unk_00 = param2;
     v1.unk_04 = NULL;
     v1.unk_08 = param0->unk_0C;
     v1.unk_0C = param0->unk_00->unk_30[param1->unk_08];
     v1.unk_10 = NULL;
-    v1.unk_14 = NULL;
+    v1.multiCellBank = NULL;
     v1.unk_18 = NULL;
     v1.unk_1C = 0;
     v1.unk_20 = param0->unk_20;
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index cbdf7f9ccc..f71c827010 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -89,15 +89,15 @@ typedef void (* GraphicElementDrawFunc)(const GraphicElementManager *, GraphicEl
 typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
 
 static void GraphicElementManager_Reset(GraphicElementManager * param0);
-static u32 sub_020221B8(const UnkStruct_ov19_021DA864 * param0);
+static enum CellType sub_020221B8(const CellActorResourceData * param0);
 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_02022208(const CellActorResourceData * 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 BOOL GraphicElementManager_InitElementFromResource(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, int param3);
 static u32 sub_020222C4(const NNSG2dImagePaletteProxy * param0, u32 param1);
 static void GraphicElementManager_DrawElement(const GraphicElementManager * param0, GraphicElementData * param1);
 static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager * param0, GraphicElementData * param1);
@@ -251,7 +251,7 @@ void GraphicElementData_Reset(GraphicElementData *elem)
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
-GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_02261520 * param0)
+GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsEx * param0)
 {
     GraphicElementData *elem = GraphicElementManager_AllocElement(param0->manager);
     if (elem == NULL) {
@@ -260,25 +260,32 @@ GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_0226
 
     elem->manager = param0->manager;
     elem->unk_F0 = 0;
-    elem->position = param0->unk_08;
-    elem->affineScale = param0->unk_14;
-    elem->affineZRotation = param0->unk_20;
-    elem->vramType = param0->unk_28;
-    elem->priority = param0->unk_24;
+    elem->position = param0->position;
+    elem->affineScale = param0->affineScale;
+    elem->affineZRotation = param0->affineZRotation;
+    elem->vramType = param0->vramType;
+    elem->priority = param0->priority;
     elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
     elem->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
     elem->explicitMosaic = FALSE;
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
     elem->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
-    NNS_G2dSetRndCoreAffineOverwriteMode(&(param0->manager->renderer->rendererCore), elem->affineOverwriteMode);
-    NNS_G2dSetRndCoreFlipMode(&(param0->manager->renderer->rendererCore), elem->flip & 1, elem->flip & 2);
-
-    elem->draw = 1;
+    NNS_G2dSetRndCoreAffineOverwriteMode(
+        &param0->manager->renderer->rendererCore, 
+        elem->affineOverwriteMode
+    );
+    NNS_G2dSetRndCoreFlipMode(
+        &param0->manager->renderer->rendererCore, 
+        elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_H,
+        elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_V
+    );
+
+    elem->draw = TRUE;
     elem->unk_35 = 0;
     elem->unk_38 = (FX32_ONE * 2);
 
-    if (sub_02022110(param0->manager, param0->unk_04, elem, param0->unk_2C) == 0) {
+    if (GraphicElementManager_InitElementFromResource(param0->manager, param0->unk_04, elem, param0->unk_2C) == 0) {
         GraphicElementData_Delete(elem);
         return NULL;
     }
@@ -293,17 +300,17 @@ GraphicElementData * GraphicElementManager_AddElement(const UnkStruct_ov115_0226
 
 GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
 
     v0.manager = param0->unk_00;
     v0.unk_04 = param0->unk_04;
-    v0.unk_08 = param0->unk_08;
-    v0.unk_14.x = FX32_ONE;
-    v0.unk_14.y = FX32_ONE;
-    v0.unk_14.z = FX32_ONE;
-    v0.unk_20 = 0;
-    v0.unk_24 = param0->unk_14;
-    v0.unk_28 = param0->unk_18;
+    v0.position = param0->unk_08;
+    v0.affineScale.x = FX32_ONE;
+    v0.affineScale.y = FX32_ONE;
+    v0.affineScale.z = FX32_ONE;
+    v0.affineZRotation = 0;
+    v0.priority = param0->unk_14;
+    v0.vramType = param0->unk_18;
     v0.unk_2C = param0->unk_1C;
 
     return GraphicElementManager_AddElement(&v0);
@@ -735,49 +742,50 @@ u32 sub_020220F4 (const GraphicElementData * param0)
     return sub_0202207C(param0, v0, v1);
 }
 
-static BOOL sub_02022110 (const GraphicElementManager * param0, const UnkStruct_ov19_021DA864 * param1, GraphicElementData * param2, int param3)
+static BOOL GraphicElementManager_InitElementFromResource(const GraphicElementManager *gfxElemMgr, 
+    const CellActorResourceData * param1, GraphicElementData *elem, int param3)
 {
-    param2->type = sub_020221B8(param1);
-    param2->imageProxy = *param1->unk_00;
-    param2->paletteProxy = *param1->unk_08;
+    elem->type = sub_020221B8(param1);
+    elem->imageProxy = *param1->unk_00;
+    elem->paletteProxy = *param1->unk_08;
 
-    sub_020221D0(param1->unk_0C, param2);
+    sub_020221D0(param1->unk_0C, elem);
 
     if (param1->unk_10) {
-        sub_020221D4(param1->unk_10, param2);
+        sub_020221D4(param1->unk_10, elem);
     } else {
-        sub_020221D4(param0->animData, param2);
+        sub_020221D4(gfxElemMgr->animData, elem);
     }
 
-    if (param2->type == 2) {
-        sub_020221D8(param1->unk_14, param2);
-        sub_020221E0(param1->unk_18, param2);
-        sub_02022264(param2, param3);
+    if (elem->type == 2) {
+        sub_020221D8(param1->multiCellBank, elem);
+        sub_020221E0(param1->unk_18, elem);
+        sub_02022264(elem, param3);
     } else {
-        if (param2->type == 3) {
-            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&param2->unk_40;
-            sub_02022208(param1, param2, param3);
+        if (elem->type == 3) {
+            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&elem->unk_40;
+            sub_02022208(param1, elem, param3);
         } else {
-            sub_020221E8(param2, param3);
+            sub_020221E8(elem, param3);
         }
     }
 
-    param2->explicitPriority = param1->unk_20;
+    elem->explicitPriority = param1->unk_20;
 
     return 1;
 }
 
-static u32 sub_020221B8 (const UnkStruct_ov19_021DA864 * param0)
+static enum CellType sub_020221B8 (const CellActorResourceData * param0)
 {
-    if (param0->unk_14 != NULL) {
-        return 2;
+    if (param0->multiCellBank != NULL) {
+        return CELL_TYPE_MULTI_CELL;
     }
 
     if (param0->unk_1C == 1) {
-        return 3;
+        return CELL_TYPE_VRAM_CELL;
     }
 
-    return 1;
+    return CELL_TYPE_CELL;
 }
 
 static void sub_020221D0 (const NNSG2dCellDataBank * param0, GraphicElementData * param1)
@@ -820,7 +828,7 @@ static void sub_020221E8 (GraphicElementData * param0, int param1)
     NNS_G2dInitCellAnimation((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00);
 }
 
-static void sub_02022208 (const UnkStruct_ov19_021DA864 * param0, GraphicElementData * param1, int param2)
+static void sub_02022208 (const CellActorResourceData * param0, GraphicElementData * param1, int param2)
 {
     VRamCellAnimationData * v0;
     const NNSG2dCharacterData * v1;
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index ef0d1d5def..a888ae26a3 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -561,18 +561,18 @@ void sub_0205D274 (UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int
 
 static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4)
 {
-    UnkStruct_ov115_02261520 v0;
+    CellActorInitParamsEx v0;
     GraphicElementData * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
 
-    memset(&v0, 0, sizeof(UnkStruct_ov115_02261520));
+    memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
     v0.manager = param0->unk_00;
     v0.unk_04 = &param0->unk_04->unk_00[param1];
-    v0.unk_08 = *param2;
-    v0.unk_14 = v2;
-    v0.unk_24 = param3;
-    v0.unk_28 = param4;
+    v0.position = *param2;
+    v0.affineScale = v2;
+    v0.priority = param3;
+    v0.vramType = param4;
     v0.unk_2C = 4;
 
     v1 = GraphicElementManager_AddElement(&v0);
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 7a9898bd3d..45ebca15a0 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -103,8 +103,8 @@ struct UnkStruct_02087A10_t {
     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;
+    CellActorResourceData unk_348;
+    CellActorResourceData unk_36C;
     GraphicElementData * unk_390[14];
     GraphicElementData * unk_3C8[12];
     GraphicElementData * unk_3F8[2];
@@ -192,7 +192,7 @@ static void sub_02087CDC(SysTask * param0, void * param1);
 static void sub_02086B30(NNSG2dCharacterData * param0, NNSG2dPaletteData * param1, int param2, int param3);
 static void sub_0208732C(int param0);
 static void sub_02087544(UnkStruct_02087A10 * param0, OverlayManager * param1);
-static void sub_02087BE4(UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 * param1);
+static void sub_02087BE4(UnkStruct_02087A10 * param0, CellActorInitParamsEx * param1);
 static void sub_02086E6C(UnkStruct_02087A10 * param0, UnkStruct_0208737C * param1);
 static void sub_02087F48(Window * param0, int param1, Strbuf *param2);
 static void sub_02088FD0(UnkStruct_02087A10 * param0);
@@ -1608,24 +1608,24 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
     sub_020093B4(&param0->unk_36C, 1, 1, 1, 1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_318[0], param0->unk_318[1], param0->unk_318[2], param0->unk_318[3], NULL, NULL);
 
     {
-        UnkStruct_ov115_02261520 v1;
+        CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_188;
         v1.unk_04 = &param0->unk_348;
-        v1.unk_08.x = FX32_CONST(32);
-        v1.unk_08.y = FX32_CONST(96);
-        v1.unk_08.z = 0;
-        v1.unk_14.x = FX32_ONE;
-        v1.unk_14.y = FX32_ONE;
-        v1.unk_14.z = FX32_ONE;
-        v1.unk_20 = 0;
-        v1.unk_24 = 1;
-        v1.unk_28 = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.position.x = FX32_CONST(32);
+        v1.position.y = FX32_CONST(96);
+        v1.position.z = 0;
+        v1.affineScale.x = FX32_ONE;
+        v1.affineScale.y = FX32_ONE;
+        v1.affineScale.z = FX32_ONE;
+        v1.affineZRotation = 0;
+        v1.priority = 1;
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.unk_2C = 18;
 
         for (v0 = 0; v0 < 9; v0++) {
-            v1.unk_08.x = FX32_ONE * Unk_020F2984[v0][0];
-            v1.unk_08.y = FX32_ONE * Unk_020F2984[v0][1];
+            v1.position.x = FX32_ONE * Unk_020F2984[v0][0];
+            v1.position.y = FX32_ONE * Unk_020F2984[v0][1];
 
             param0->unk_390[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -1649,8 +1649,8 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
         }
 
         for (v0 = 0; v0 < param0->unk_0C; v0++) {
-            v1.unk_08.x = FX32_ONE * ((10 * 8) + v0 * 12);
-            v1.unk_08.y = FX32_ONE * (4 * 8 + 7);
+            v1.position.x = FX32_ONE * ((10 * 8) + v0 * 12);
+            v1.position.y = FX32_ONE * (4 * 8 + 7);
 
             param0->unk_3C8[v0] = GraphicElementManager_AddElement(&v1);
 
@@ -1666,10 +1666,10 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520 * param1)
+static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * param1)
 {
-    param1->unk_08.x = FX32_ONE * 24;
-    param1->unk_08.y = FX32_ONE * (16 - 8);
+    param1->position.x = FX32_ONE * 24;
+    param1->position.y = FX32_ONE * (16 - 8);
     param0->unk_3F8[0] = GraphicElementManager_AddElement(param1);
 
     sub_02021CC8(param0->unk_3F8[0], 1);
@@ -1702,8 +1702,8 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, UnkStruct_ov115_02261520
         SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 50);
 
         if (param0->unk_10 != 2) {
-            param1->unk_08.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
-            param1->unk_08.y = FX32_ONE * ((4 * 8 + 7) - 12);
+            param1->position.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
+            param1->position.y = FX32_ONE * ((4 * 8 + 7) - 12);
             param0->unk_3F8[1] = GraphicElementManager_AddElement(param1);
 
             if (param0->unk_10 == 0) {
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 65251ccb14..7d3aaac76b 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -109,7 +109,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     u32 v2;
     UnkStruct_0209916C * v3;
     CellActorData * v4 = NULL;
-    UnkStruct_ov115_02261520 v5;
+    CellActorInitParamsEx v5;
     UnkStruct_02009DC8 * v6;
 
     v1 = sub_020994B8(param0, param1);
@@ -137,27 +137,27 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorData));
 
     v4->unk_08 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_02009508));
-    v4->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_00, sizeof(UnkStruct_ov19_021DA864));
+    v4->unk_08->unk_00 = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorResourceData));
     v4->unk_04 = v4->unk_08->unk_00;
 
     sub_020093B4(v4->unk_04, 0xe000, 0xe000 + v1, 0xe000, 0xe000, 0xffffffff, 0xffffffff, 0, param5, param0->unk_1A4[0], param0->unk_1A4[1], param0->unk_1A4[2], param0->unk_1A4[3], NULL, NULL);
 
     v5.manager = param0->unk_10;
     v5.unk_04 = v4->unk_04;
-    v5.unk_08.x = FX32_CONST(param2);
-    v5.unk_08.y = FX32_CONST(param3);
-    v5.unk_08.z = FX32_CONST(param4);
+    v5.position.x = FX32_CONST(param2);
+    v5.position.y = FX32_CONST(param3);
+    v5.position.z = FX32_CONST(param4);
 
     if (v0 == NNS_G2D_VRAM_TYPE_2DSUB) {
-        v5.unk_08.y += (192 << FX32_SHIFT);
+        v5.position.y += (192 << FX32_SHIFT);
     }
 
-    v5.unk_14.x = FX32_ONE;
-    v5.unk_14.y = FX32_ONE;
-    v5.unk_14.z = FX32_ONE;
-    v5.unk_20 = 0;
-    v5.unk_24 = param6;
-    v5.unk_28 = v0;
+    v5.affineScale.x = FX32_ONE;
+    v5.affineScale.y = FX32_ONE;
+    v5.affineScale.z = FX32_ONE;
+    v5.affineZRotation = 0;
+    v5.priority = param6;
+    v5.vramType = v0;
     v5.unk_2C = param0->unk_00;
 
     v4->unk_00 = GraphicElementManager_AddElement(&v5);

From 9233307c7c4c06de3a9c390524f6886cb6affff7 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 15:12:35 +0200
Subject: [PATCH 07/19] CellActor struct rename part 2

---
 include/overlay083/struct_ov83_0223D9A8.h  |  14 +-
 include/overlay115/struct_ov115_02261520.h |   4 +-
 include/unk_020218BC.h                     |   2 +-
 src/choose_starter/choose_starter_app.c    |  16 +--
 src/overlay005/encounter_effect.c          |  18 +--
 src/overlay005/ov5_021D2F14.c              |   8 +-
 src/overlay005/ov5_021D5EB8.c              |   2 +-
 src/overlay006/ov6_022426AC.c              |   4 +-
 src/overlay006/ov6_02243258.c              |  28 ++--
 src/overlay007/ov7_0224BE9C.c              |  16 +--
 src/overlay009/ov9_02249960.c              |  14 +-
 src/overlay019/ov19_021D61B0.c             |  18 +--
 src/overlay020/ov20_021D2098.c             |  18 +--
 src/overlay020/ov20_021D4728.c             |  18 +--
 src/overlay021/ov21_021D1FA4.c             |  56 ++++----
 src/overlay021/ov21_021D5AEC.c             |  26 ++--
 src/overlay021/ov21_021D76B0.c             |  48 +++----
 src/overlay021/ov21_021D85B0.c             |  20 +--
 src/overlay021/ov21_021D94BC.c             | 160 ++++++++++-----------
 src/overlay021/ov21_021DC9BC.c             |  30 ++--
 src/overlay021/ov21_021DDD2C.c             |  18 +--
 src/overlay021/ov21_021DE668.c             |  52 +++----
 src/overlay021/ov21_021DF734.c             |  26 ++--
 src/overlay021/ov21_021E0C68.c             |  16 +--
 src/overlay021/ov21_021E1924.c             |  46 +++---
 src/overlay021/ov21_021E29DC.c             |  26 ++--
 src/overlay021/ov21_021E3FFC.c             |  16 +--
 src/overlay021/ov21_021E4CA4.c             |  36 ++---
 src/overlay021/ov21_021E6014.c             |  16 +--
 src/overlay021/ov21_021E68F4.c             |  24 ++--
 src/overlay021/ov21_021E737C.c             |  42 +++---
 src/overlay021/ov21_021E8484.c             |  18 +--
 src/overlay021/ov21_021E8D48.c             |  52 +++----
 src/overlay022/ov22_02255094.c             |  18 +--
 src/overlay022/ov22_02259C58.c             |   2 +-
 src/overlay022/ov22_0225A428.c             |  42 +++---
 src/overlay023/ov23_0223E140.c             |   4 +-
 src/overlay023/ov23_0224340C.c             |  20 +--
 src/overlay023/ov23_02248F1C.c             |   4 +-
 src/overlay056/ov56_022561C0.c             |   4 +-
 src/overlay058/ov58_021D0D80.c             |   8 +-
 src/overlay059/ov59_021D0D80.c             |   4 +-
 src/overlay063/ov63_0222AE60.c             |   8 +-
 src/overlay064/ov64_0222DCE0.c             |   4 +-
 src/overlay065/ov65_0222DCE0.c             |   4 +-
 src/overlay065/ov65_02235060.c             |   4 +-
 src/overlay068/ov68_0225C700.c             |  12 +-
 src/overlay069/ov69_0225C700.c             |  12 +-
 src/overlay070/ov70_0225D9A4.c             |  66 ++++-----
 src/overlay071/ov71_0223CF0C.c             |   4 +-
 src/overlay072/ov72_0223D7A0.c             |   6 +-
 src/overlay077/ov77_021D54B0.c             |   4 +-
 src/overlay077/ov77_021D6670.c             |   4 +-
 src/overlay083/ov83_0223D6A8.c             |  18 +--
 src/overlay086/ov86_0223B140.c             |  16 +--
 src/overlay087/ov87_021D106C.c             |  18 +--
 src/overlay088/ov88_0223B140.c             |   6 +-
 src/overlay094/ov94_0223BCB0.c             |   4 +-
 src/overlay095/ov95_02246C20.c             |  20 +--
 src/overlay096/ov96_0223B6A0.c             |   4 +-
 src/overlay097/ov97_0222D30C.c             |   4 +-
 src/overlay097/ov97_02233B18.c             |   4 +-
 src/overlay097/ov97_02237694.c             |   4 +-
 src/overlay101/ov101_021D7E48.c            |  14 +-
 src/overlay105/ov105_02245AAC.c            |   4 +-
 src/overlay106/ov106_02243310.c            |   4 +-
 src/overlay107/ov107_02249604.c            |   4 +-
 src/overlay108/ov108_02243030.c            |   4 +-
 src/overlay109/ov109_021D3D50.c            |   4 +-
 src/overlay111/ov111_021D2F80.c            |   4 +-
 src/overlay114/ov114_0225C700.c            |  18 +--
 src/overlay115/ov115_02260CEC.c            |  50 +++----
 src/unk_0200C6E4.c                         |   8 +-
 src/unk_02012744.c                         |  24 ++--
 src/unk_020218BC.c                         |  28 ++--
 src/unk_0205CA94.c                         |   4 +-
 src/unk_0208694C.c                         |   4 +-
 src/unk_02098FFC.c                         |   4 +-
 78 files changed, 709 insertions(+), 709 deletions(-)

diff --git a/include/overlay083/struct_ov83_0223D9A8.h b/include/overlay083/struct_ov83_0223D9A8.h
index 8ced42d06f..4527bb5aa6 100644
--- a/include/overlay083/struct_ov83_0223D9A8.h
+++ b/include/overlay083/struct_ov83_0223D9A8.h
@@ -7,12 +7,12 @@
 #include <nitro/fx/fx.h>
 
 typedef struct {
-    GraphicElementManager * unk_00;
-    const CellActorResourceData * unk_04;
-    VecFx32 unk_08;
-    u32 unk_14;
-    int unk_18;
-    int unk_1C;
-} UnkStruct_ov83_0223D9A8;
+    GraphicElementManager * manager;
+    const CellActorResourceData * resourceData;
+    VecFx32 position;
+    u32 priority;
+    int vramType;
+    int heapID;
+} CellActorInitParams;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223D9A8_H
diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h
index a0edfa0354..1c006df6d3 100644
--- a/include/overlay115/struct_ov115_02261520.h
+++ b/include/overlay115/struct_ov115_02261520.h
@@ -8,13 +8,13 @@
 
 typedef struct {
     GraphicElementManager * manager;
-    const CellActorResourceData * unk_04;
+    const CellActorResourceData * resourceData;
     VecFx32 position;
     VecFx32 affineScale;
     u16 affineZRotation;
     u32 priority;
     int vramType;
-    int unk_2C;
+    int heapID;
 } CellActorInitParamsEx;
 
 #endif // POKEPLATINUM_STRUCT_OV115_02261520_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 9301eff62b..534feef2e8 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -18,7 +18,7 @@ BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
 GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsEx * param0);
-GraphicElementData * sub_02021B90(const UnkStruct_ov83_0223D9A8 * param0);
+GraphicElementData * sub_02021B90(const CellActorInitParams * param0);
 void GraphicElementData_Delete(GraphicElementData * param0);
 void sub_02021C50(GraphicElementData * param0, const VecFx32 * param1);
 void sub_02021C60(GraphicElementData * param0, const VecFx32 * param1);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index f713a41fb6..70e929eea5 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1477,18 +1477,18 @@ static void ov78_021D2290 (ChooseStarterApp * param0, ChooseStarterCursor * para
 static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCursor * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
 
     sub_020093B4(&v0, 10, 11, 12, 13, 0xffffffff, 0xffffffff, 0, 1, param0->unk_24C[0], param0->unk_24C[1], param0->unk_24C[2], param0->unk_24C[3], NULL, NULL);
 
-    v1.unk_00 = param0->unk_248;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
+    v1.manager = param0->unk_248;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
 
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     param1->unk_00 = sub_02021B90(&v1);
     sub_02021CAC(param1->unk_00, 0);
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index 9db618d76a..825e83d4dc 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -801,17 +801,17 @@ void ov5_021DE5D0(GraphicElementData *param0, u32 param1, u32 param2, u8 param3,
 
 GraphicElementData *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     GraphicElementData *v1;
 
-    v0.unk_00 = param0->unk_00;
-    v0.unk_04 = &param1->unk_10;
-    v0.unk_08.x = param2;
-    v0.unk_08.y = param3;
-    v0.unk_08.z = param4;
-    v0.unk_14 = param5;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_1C = 4;
+    v0.manager = param0->unk_00;
+    v0.resourceData = &param1->unk_10;
+    v0.position.x = param2;
+    v0.position.y = param3;
+    v0.position.z = param4;
+    v0.priority = param5;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.heapID = 4;
 
     v1 = sub_02021B90(&v0);
     GF_ASSERT(v1);
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 92c10f937c..ce4a5945a8 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -111,13 +111,13 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v3.z = param1->unk_08 * FX32_ONE;
 
     v0.manager = param0->unk_00;
-    v0.unk_04 = &param0->unk_190->unk_00[param1->unk_00];
+    v0.resourceData = &param0->unk_190->unk_00[param1->unk_00];
     v0.position = v3;
     v0.affineScale = v2;
     v0.affineZRotation = 0;
     v0.priority = param1->unk_0C;
     v0.vramType = param1->unk_14;
-    v0.unk_2C = param0->unk_1C6;
+    v0.heapID = param0->unk_1C6;
 
     v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
@@ -368,7 +368,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->transferToVRAM, param1->bgPriority, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
 
     v3.manager = param0->unk_00;
-    v3.unk_04 = v2->unk_04;
+    v3.resourceData = v2->unk_04;
     v3.position.x = FX32_CONST(param1->x);
     v3.position.y = FX32_CONST(param1->y);
     v3.position.z = FX32_CONST(param1->z);
@@ -383,7 +383,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     v3.affineZRotation = 0;
     v3.priority = param1->priority;
     v3.vramType = param1->vramType;
-    v3.unk_2C = param0->unk_1C6;
+    v3.heapID = param0->unk_1C6;
 
     v2->unk_00 = GraphicElementManager_AddElement(&v3);
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 8e3f09aa14..85683fd019 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -1464,7 +1464,7 @@ static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B
         ov5_021D6F4C(&param1->unk_0C->unk_40, param0, param1->unk_0C, 0, 1);
         memset(&param1->unk_0C->unk_10, 0, sizeof(CellActorInitParamsEx));
         param1->unk_0C->unk_10.manager = param0->unk_08.unk_130;
-        param1->unk_0C->unk_10.unk_04 = &param1->unk_0C->unk_40;
+        param1->unk_0C->unk_10.resourceData = &param1->unk_0C->unk_40;
         param1->unk_0C->unk_10.affineScale.x = FX32_ONE;
         param1->unk_0C->unk_10.affineScale.y = FX32_ONE;
         param1->unk_0C->unk_10.affineScale.z = FX32_ONE;
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index b681af05f7..856dab21cc 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -206,7 +206,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         CellActorInitParamsEx v2;
 
         v2.manager = param0->unk_38;
-        v2.unk_04 = &v1;
+        v2.resourceData = &v1;
         v2.position.x = 0;
         v2.position.y = 0;
         v2.position.z = 0;
@@ -216,7 +216,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         v2.affineZRotation = 0;
         v2.priority = 0;
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v2.unk_2C = 4;
+        v2.heapID = 4;
         v2.position.x = FX32_ONE * (256 / 2);
         v2.position.y = FX32_ONE * (192 / 2);
 
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index a31f42df41..e3bc823d5a 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -541,7 +541,7 @@ static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa
 static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     GraphicElementData * v2;
 
     if (param5 == param0->unk_07) {
@@ -551,12 +551,12 @@ static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const
     sub_020093B4(
         &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_198, param0->unk_19C, param0->unk_1A0, param0->unk_1A4, NULL, NULL);
 
-    v1.unk_00 = param0->unk_08;
-    v1.unk_04 = &v0;
-    v1.unk_08 = *param1;
-    v1.unk_14 = param7;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = 4;
+    v1.manager = param0->unk_08;
+    v1.resourceData = &v0;
+    v1.position = *param1;
+    v1.priority = param7;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = 4;
     v2 = sub_02021B90(&v1);
 
     GF_ASSERT(v2 != NULL);
@@ -1842,7 +1842,7 @@ static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
 static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     GraphicElementData * v2;
 
     if (param5 == 4) {
@@ -1853,12 +1853,12 @@ static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const
             &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_200, param0->unk_204, param0->unk_208, param0->unk_20C, NULL, NULL);
     }
 
-    v1.unk_00 = param0->unk_70;
-    v1.unk_04 = &v0;
-    v1.unk_08 = *param1;
-    v1.unk_14 = param7;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = 4;
+    v1.manager = param0->unk_70;
+    v1.resourceData = &v0;
+    v1.position = *param1;
+    v1.priority = param7;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = 4;
 
     v2 = sub_02021B90(&v1);
     GF_ASSERT(v2 != NULL);
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index c80f089378..0803cc4daf 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -573,7 +573,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
     int v0;
     Strbuf* v1;
     CellActorResourceData v2;
-    UnkStruct_ov83_0223D9A8 v3;
+    CellActorInitParams v3;
     static const u8 v4[2] = {
         8, 136
     };
@@ -647,15 +647,15 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
 
     ov7_0224CA54(&v2, param0, param2);
 
-    v3.unk_00 = param8;
-    v3.unk_04 = &v2;
-    v3.unk_14 = 0;
-    v3.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v3.unk_1C = param2;
-    v3.unk_08.x = 192 * FX32_ONE;
+    v3.manager = param8;
+    v3.resourceData = &v2;
+    v3.priority = 0;
+    v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v3.heapID = param2;
+    v3.position.x = 192 * FX32_ONE;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v3.unk_08.y = v4[v0] * FX32_ONE;
+        v3.position.y = v4[v0] * FX32_ONE;
         param0->unk_158[v0] = sub_02021B90(&v3);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_158[v0], v0);
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index bb6e4a7677..f765b77e41 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2757,17 +2757,17 @@ static void ov9_0224B124 (SysTask * param0, void * param1)
 static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     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);
 
-    v1.unk_00 = param0->unk_00;
-    v1.unk_04 = &v0;
-    v1.unk_08 = *param1;
-    v1.unk_14 = param7;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = 4;
+    v1.manager = param0->unk_00;
+    v1.resourceData = &v0;
+    v1.position = *param1;
+    v1.priority = param7;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = 4;
 
     v2 = sub_02021B90(&v1);
     GF_ASSERT(v2 != NULL);
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 5f307447d8..03950a5a27 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -1940,17 +1940,17 @@ void ov19_021D783C (CellActorResourceData * param0, NNSG2dImageProxy * param1, N
 
 GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     GraphicElementData * v1;
 
-    v0.unk_00 = param0;
-    v0.unk_04 = param1;
-    v0.unk_08.x = param2 * FX32_ONE;
-    v0.unk_08.y = param3 * FX32_ONE;
-    v0.unk_08.z = 0;
-    v0.unk_14 = param4;
-    v0.unk_18 = param5;
-    v0.unk_1C = 10;
+    v0.manager = param0;
+    v0.resourceData = param1;
+    v0.position.x = param2 * FX32_ONE;
+    v0.position.y = param3 * FX32_ONE;
+    v0.position.z = 0;
+    v0.priority = param4;
+    v0.vramType = param5;
+    v0.heapID = 10;
 
     {
         OSIntrMode v2 = OS_DisableInterrupts();
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index 25b20e78b1..07deedfd16 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -984,18 +984,18 @@ void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * pa
 
 GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     GraphicElementData * v1;
     OSIntrMode v2;
 
-    v0.unk_00 = param0->unk_24;
-    v0.unk_04 = param1;
-    v0.unk_08.x = param2 * FX32_ONE;
-    v0.unk_08.y = param3 * FX32_ONE;
-    v0.unk_08.z = 0;
-    v0.unk_14 = param4;
-    v0.unk_18 = param5;
-    v0.unk_1C = 35;
+    v0.manager = param0->unk_24;
+    v0.resourceData = param1;
+    v0.position.x = param2 * FX32_ONE;
+    v0.position.y = param3 * FX32_ONE;
+    v0.position.z = 0;
+    v0.priority = param4;
+    v0.vramType = param5;
+    v0.heapID = 35;
 
     v2 = OS_DisableInterrupts();
     v1 = sub_02021B90(&v0);
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index c064bdfa89..b650f0e264 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -348,7 +348,7 @@ static void ov20_021D4B2C (UnkStruct_ov20_021D4B2C * param0)
 static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     GraphicElementData * v2;
 
     v0.unk_00 = param1;
@@ -361,14 +361,14 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v0.unk_18 = NULL;
     v0.unk_1C = 0;
 
-    v1.unk_00 = param0->unk_10;
-    v1.unk_04 = &v0;
-    v1.unk_08.x = param4 * FX32_ONE;
-    v1.unk_08.y = (param5 + 192) * FX32_ONE;
-    v1.unk_08.z = 0;
-    v1.unk_14 = param7;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = 35;
+    v1.manager = param0->unk_10;
+    v1.resourceData = &v0;
+    v1.position.x = param4 * FX32_ONE;
+    v1.position.y = (param5 + 192) * FX32_ONE;
+    v1.position.z = 0;
+    v1.priority = param7;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = 35;
 
     v2 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 5f38105010..e207d44bc9 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -860,25 +860,25 @@ void ov21_021D2C58 (UnkStruct_ov21_021D22F8 * param0, UnkStruct_02009714 ** para
 static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = param0->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param1;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.manager = param0->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param1;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     param0->unk_1B0.unk_00 = sub_02021B90(&v1);
 
     sub_02021CAC(param0->unk_1B0.unk_00, 0);
     sub_02021F58(param0->unk_1B0.unk_00, 1);
 
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     param0->unk_1B0.unk_04 = sub_02021B90(&v1);
 
@@ -907,25 +907,25 @@ static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
 void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, param4, param2[0], param2[1], param2[2], param2[3], NULL, NULL);
 
-    v1.unk_00 = param1;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.manager = param1;
+    v1.resourceData = &v0;
+    v1.priority = 0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     param0->unk_00 = sub_02021B90(&v1);
 
     sub_02021CAC(param0->unk_00, 0);
     sub_02021F58(param0->unk_00, 1);
 
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     param0->unk_04 = sub_02021B90(&v1);
 
@@ -1001,19 +1001,19 @@ static void ov21_021D2F14 (UnkStruct_ov21_021D13FC * param0)
 static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     int v2;
     UnkStruct_ov21_021D2584 * v3 = &param0->unk_1E0;
 
     sub_020093B4(&v0, 12000, 12000, 12000, 12000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = param0->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param1;
-    v1.unk_08.y = (192 << FX32_SHIFT) + (100 * FX32_ONE);
-    v1.unk_08.x = (100 * FX32_ONE);
+    v1.manager = param0->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param1;
+    v1.position.y = (192 << FX32_SHIFT) + (100 * FX32_ONE);
+    v1.position.x = (100 * FX32_ONE);
 
     for (v2 = 0; v2 < 4; v2++) {
         v3->unk_00[v2] = sub_02021B90(&v1);
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 24d0908ea9..ef8ad5fd68 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -833,37 +833,37 @@ static void ov21_021D65DC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
 
 static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, int param2)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     int v1;
 
-    memset(&v0, 0, sizeof(UnkStruct_ov83_0223D9A8));
-    v0.unk_00 = param1->unk_138;
-    v0.unk_04 = &param0->unk_90;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_1C = param2;
-    v0.unk_14 = 32;
+    memset(&v0, 0, sizeof(CellActorInitParams));
+    v0.manager = param1->unk_138;
+    v0.resourceData = &param0->unk_90;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.heapID = param2;
+    v0.priority = 32;
 
     for (v1 = 0; v1 < 9; v1++) {
         param0->unk_00[v1] = sub_02021B90(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v1], 0);
     }
 
-    v0.unk_14 = 0;
+    v0.priority = 0;
 
     for (v1 = 0; v1 < 9; v1++) {
         param0->unk_50[v1] = sub_02021B90(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_50[v1], 1);
     }
 
-    v0.unk_14 = 0;
+    v0.priority = 0;
     param0->unk_74 = sub_02021B90(&v0);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_74, 2);
 
-    v0.unk_14 = 0;
-    v0.unk_08.x = 56 << FX32_SHIFT;
-    v0.unk_08.y = 80 << FX32_SHIFT;
-    v0.unk_04 = &param0->unk_B4;
+    v0.priority = 0;
+    v0.position.x = 56 << FX32_SHIFT;
+    v0.position.y = 80 << FX32_SHIFT;
+    v0.resourceData = &param0->unk_B4;
 
     param0->unk_7C = sub_02021B90(&v0);
 
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index e6d5449b9c..6156b2df89 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -596,20 +596,20 @@ static void ov21_021D7E3C (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
     sub_020093B4(&v0, 84 + 1000, 3 + 1000, 82 + 1000, 83 + 1000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 8;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param3;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 8;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param3;
 
-    v1.unk_08.x = 48 << FX32_SHIFT;
-    v1.unk_08.y = 40 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 48 << FX32_SHIFT;
+    v1.position.y = 40 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[0] = sub_02021B90(&v1);
 
@@ -619,9 +619,9 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
         sub_02021CAC(param0->unk_00[0], 0);
     }
 
-    v1.unk_08.x = 48 << FX32_SHIFT;
-    v1.unk_08.y = 88 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 48 << FX32_SHIFT;
+    v1.position.y = 88 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[1] = sub_02021B90(&v1);
 
@@ -631,33 +631,33 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
         sub_02021CAC(param0->unk_00[1], 0);
     }
 
-    v1.unk_08.x = 48 << FX32_SHIFT;
-    v1.unk_08.y = 152 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 48 << FX32_SHIFT;
+    v1.position.y = 152 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[2] = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 1);
 
-    v1.unk_08.x = 124 << FX32_SHIFT;
-    v1.unk_08.y = 64 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 124 << FX32_SHIFT;
+    v1.position.y = 64 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_18 = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_18, 3);
 
-    v1.unk_08.x = 124 << FX32_SHIFT;
-    v1.unk_08.y = 146 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 124 << FX32_SHIFT;
+    v1.position.y = 146 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_1C = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_1C, 4);
 
-    v1.unk_08.x = 124 << FX32_SHIFT;
-    v1.unk_08.y = 8 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 124 << FX32_SHIFT;
+    v1.position.y = 8 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_20 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 6bef2862be..dd12c95797 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -646,25 +646,25 @@ static void ov21_021D8CC8 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D879C * param1, const UnkStruct_ov21_021D8788 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
     sub_020093B4(&v0, 81 + 15000, 3 + 15000, 79 + 15000, 80 + 15000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = 164 << FX32_SHIFT;
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = 164 << FX32_SHIFT;
     param0->unk_20 = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_20, 3);
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = 96 << FX32_SHIFT;
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = 96 << FX32_SHIFT;
 
     param0->unk_58 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index e5d35424e1..45c5d60d6b 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -131,16 +131,16 @@ static void ov21_021DC90C(UnkStruct_ov21_021DC96C * param0, int param1);
 static void ov21_021DC93C(UnkStruct_ov21_021DC96C * param0, int param1);
 static void ov21_021DB708(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2);
 static void ov21_021DB78C(UnkStruct_ov21_021DC96C * param0);
-static void ov21_021DB81C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1, int param2, int param3);
+static void ov21_021DB81C(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1, int param2, int param3);
 static void ov21_021DB79C(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2);
-static void ov21_021DB858(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
+static void ov21_021DB858(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
 static void ov21_021DB90C(UnkStruct_ov21_021DC96C * param0);
 static void ov21_021DB924(UnkStruct_ov21_021DC96C * param0);
-static void ov21_021DB944(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
-static void ov21_021DB9B4(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
-static void ov21_021DBA24(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
-static void ov21_021DBAB8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
-static void ov21_021DBB74(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1);
+static void ov21_021DB944(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
+static void ov21_021DB9B4(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
+static void ov21_021DBA24(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
+static void ov21_021DBAB8(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
+static void ov21_021DBB74(UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1);
 static void ov21_021DBBE4(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2);
 static void ov21_021DBDA0(UnkStruct_ov21_021DC96C * param0);
 static void ov21_021DBDC8(UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2);
@@ -2350,17 +2350,17 @@ static void ov21_021DB6C8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 static void ov21_021DB708 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
     ov21_021DB858(param0, &v1);
     ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108);
@@ -2375,23 +2375,23 @@ static void ov21_021DB78C (UnkStruct_ov21_021DC96C * param0)
 static void ov21_021DB79C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
     ov21_021DB924(param0);
     ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108);
 }
 
-static void ov21_021DB81C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1, int param2, int param3)
+static void ov21_021DB81C (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1, int param2, int param3)
 {
     switch (param2) {
     case 0:
@@ -2415,35 +2415,35 @@ static void ov21_021DB81C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223
     }
 }
 
-static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
         switch (v0) {
         case 0:
-            param1->unk_08.y = (16 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 212 * FX32_ONE;
+            param1->position.y = (16 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 212 * FX32_ONE;
             break;
         case 1:
-            param1->unk_08.y = (48 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 224 * FX32_ONE;
+            param1->position.y = (48 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 224 * FX32_ONE;
             break;
         case 2:
-            param1->unk_08.y = (80 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 224 * FX32_ONE;
+            param1->position.y = (80 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 224 * FX32_ONE;
             break;
         case 3:
-            param1->unk_08.y = (112 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 224 * FX32_ONE;
+            param1->position.y = (112 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 224 * FX32_ONE;
             break;
         case 4:
-            param1->unk_08.y = (144 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 224 * FX32_ONE;
+            param1->position.y = (144 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 224 * FX32_ONE;
             break;
         case 5:
-            param1->unk_08.y = (176 * FX32_ONE) + (192 << FX32_SHIFT);
-            param1->unk_08.x = 212 * FX32_ONE;
+            param1->position.y = (176 * FX32_ONE) + (192 << FX32_SHIFT);
+            param1->position.x = 212 * FX32_ONE;
             break;
         }
 
@@ -2487,109 +2487,109 @@ static void ov21_021DB924 (UnkStruct_ov21_021DC96C * param0)
     }
 }
 
-static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 3; v0++) {
-        param1->unk_08.y = 48 + (v0 * (48 - 16));
-        param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        param1->position.y = 48 + (v0 * (48 - 16));
+        param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v1 = 0; v1 < 2; v1++) {
-            param1->unk_08.x = 48 + (v1 * (128 - 48));
-            param1->unk_08.x <<= FX32_SHIFT;
+            param1->position.x = 48 + (v1 * (128 - 48));
+            param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
 
-static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        param1->unk_08.y = 16 + (v0 * (48 - 16));
-        param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        param1->position.y = 16 + (v0 * (48 - 16));
+        param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v1 = 0; v1 < 2; v1++) {
-            param1->unk_08.x = 48 + (v1 * (128 - 48));
-            param1->unk_08.x <<= FX32_SHIFT;
+            param1->position.x = 48 + (v1 * (128 - 48));
+            param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
 
-static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        param1->unk_08.y = 16 + (v0 * (48 - 16));
-        param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        param1->position.y = 16 + (v0 * (48 - 16));
+        param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v1 = 0; v1 < 2; v1++) {
-            param1->unk_08.x = 48 + (v1 * (128 - 48));
-            param1->unk_08.x <<= FX32_SHIFT;
+            param1->position.x = 48 + (v1 * (128 - 48));
+            param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
-    param1->unk_08.y = 176;
-    param1->unk_08.x = (48 - 24);
-    param1->unk_08.x <<= FX32_SHIFT;
-    param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+    param1->position.y = 176;
+    param1->position.x = (48 - 24);
+    param1->position.x <<= FX32_SHIFT;
+    param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[10] = sub_02021B90(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[10], 5);
 }
 
-static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 4; v0++) {
-        param1->unk_08.y = 16 + (v0 * (48 - 16));
-        param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        param1->position.y = 16 + (v0 * (48 - 16));
+        param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v1 = 0; v1 < 2; v1++) {
-            param1->unk_08.x = 48 + (v1 * (128 - 48));
-            param1->unk_08.x <<= FX32_SHIFT;
+            param1->position.x = 48 + (v1 * (128 - 48));
+            param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
-    param1->unk_08.y = 144;
-    param1->unk_08.x = 128;
-    param1->unk_08.x <<= FX32_SHIFT;
-    param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+    param1->position.y = 144;
+    param1->position.x = 128;
+    param1->position.x <<= FX32_SHIFT;
+    param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[8] = sub_02021B90(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[8], 0);
 
-    param1->unk_08.y = 176;
-    param1->unk_08.x = (48 - 24);
-    param1->unk_08.x <<= FX32_SHIFT;
-    param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+    param1->position.y = 176;
+    param1->position.x = (48 - 24);
+    param1->position.x <<= FX32_SHIFT;
+    param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[9] = sub_02021B90(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[9], 4);
 }
 
-static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223D9A8 * param1)
+static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 5; v0++) {
-        param1->unk_08.y = 16 + (v0 * (48 - 16));
-        param1->unk_08.y = (param1->unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        param1->position.y = 16 + (v0 * (48 - 16));
+        param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v1 = 0; v1 < 3; v1++) {
-            param1->unk_08.x = 28 + (v1 * 56);
-            param1->unk_08.x <<= FX32_SHIFT;
+            param1->position.x = 28 + (v1 * 56);
+            param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 3) + v1] = sub_02021B90(param1);
 
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 3) + v1], 6);
@@ -2600,25 +2600,25 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov83_0223
 static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D95CC * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
 
     sub_020093B4(&v0, 128 + 16000, 3 + 16000, 129 + 16000, 127 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 15;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 15;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
     for (v3 = 0; v3 < 5; v3++) {
-        v1.unk_08.y = 16 + (v3 * (48 - 16));
-        v1.unk_08.y = (v1.unk_08.y << FX32_SHIFT) + (192 << FX32_SHIFT);
+        v1.position.y = 16 + (v3 * (48 - 16));
+        v1.position.y = (v1.position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
 
         for (v4 = 0; v4 < 3; v4++) {
-            v1.unk_08.x = 28 + (v4 * 56);
-            v1.unk_08.x <<= FX32_SHIFT;
+            v1.position.x = 28 + (v4 * 56);
+            v1.position.x <<= FX32_SHIFT;
             param0->unk_A8[(v3 * 3) + v4] = sub_02021B90(&v1);
 
             switch ((v3 * 3) + v4) {
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index e663247ade..907fd9d1cd 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -576,32 +576,32 @@ static void ov21_021DD114 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021DCAE0 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 93 + 6000, 14 + 6000, 91 + 6000, 92 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
-    v1.unk_08.x = 160 * FX32_ONE;
-    v1.unk_08.y = 96 * FX32_ONE;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
+    v1.position.x = 160 * FX32_ONE;
+    v1.position.y = 96 * FX32_ONE;
 
     param0->unk_C8 = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_C8, 2);
     sub_020093B4(&v0, 108 + 6000, 14 + 6000, 106 + 6000, 107 + 6000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     for (v3 = 0; v3 < (22 * 2); v3++) {
         param0->unk_04[v3] = sub_02021B90(&v1);
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 55d782a975..d64e0692d8 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -434,19 +434,19 @@ static void ov21_021DE224 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
 static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
     sub_020093B4(&v0, 105 + 6000, 11 + 2100, 103 + 6000, 104 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
+    v1.position.x = 0;
+    v1.position.y = 0;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 0dc5552846..b87f9a512e 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -549,18 +549,18 @@ static void ov21_021DEE38 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
 
     sub_020093B4(&v0, 4000, 4000, 4000, 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
-    v1.unk_08.y = (88 * FX32_ONE);
-    v1.unk_08.x = (120 * FX32_ONE);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
+    v1.position.y = (88 * FX32_ONE);
+    v1.position.x = (120 * FX32_ONE);
 
     param0->unk_00[0] = sub_02021B90(&v1);
 }
@@ -635,7 +635,7 @@ static void ov21_021DF054 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
     int v4, v5;
@@ -648,21 +648,21 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = (170 * FX32_ONE);
-    v1.unk_08.y = (72 * FX32_ONE);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = (170 * FX32_ONE);
+    v1.position.y = (72 * FX32_ONE);
 
     param0->unk_00[1] = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v4);
 
     if (v4 != v5) {
-        v1.unk_08.x = (220 * FX32_ONE);
-        v1.unk_08.y = (72 * FX32_ONE);
+        v1.position.x = (220 * FX32_ONE);
+        v1.position.y = (72 * FX32_ONE);
         param0->unk_00[2] = sub_02021B90(&v1);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 0 + v5);
     } else {
@@ -746,7 +746,7 @@ static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0)
 static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021DE760 * param1, const UnkStruct_ov21_021DE6D4 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
     Window * v4;
@@ -755,13 +755,13 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = (192 * FX32_ONE);
-    v1.unk_08.y = (52 * FX32_ONE);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = (192 * FX32_ONE);
+    v1.position.y = (52 * FX32_ONE);
 
     param0->unk_0C = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index d2e17875b9..36583fb14a 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -557,25 +557,25 @@ static void ov21_021DFDC8 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
 static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
     int v5;
 
     sub_020093B4(&v0, 122 + 14000, 22 + 14000, 123 + 14000, 121 + 14000, 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     for (v5 = 0; v5 < 4; v5++) {
         ov21_021E0B24(v5, &v3, &v4);
-        v1.unk_08.x = v3 << FX32_SHIFT;
-        v1.unk_08.y = (v4 + 8) << FX32_SHIFT;
+        v1.position.x = v3 << FX32_SHIFT;
+        v1.position.y = (v4 + 8) << FX32_SHIFT;
 
         param0->unk_00[v5] = sub_02021B90(&v1);
 
@@ -586,9 +586,9 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
         }
     }
 
-    v1.unk_08.x = 248 << FX32_SHIFT;
-    v1.unk_08.y = 96 << FX32_SHIFT;
-    v1.unk_14 = 0;
+    v1.position.x = 248 << FX32_SHIFT;
+    v1.position.y = 96 << FX32_SHIFT;
+    v1.priority = 0;
 
     param0->unk_BC = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 9fa1e61727..0442510c8e 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -524,7 +524,7 @@ static void ov21_021E1328 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E0D7C * param1, const UnkStruct_ov21_021E0D68 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3 = ov21_021D37BC(param2->unk_04);
     Window * v4;
@@ -533,13 +533,13 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = (192 * FX32_ONE);
-    v1.unk_08.y = (52 * FX32_ONE);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = (192 * FX32_ONE);
+    v1.position.y = (52 * FX32_ONE);
 
     param0->unk_00 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 37f0c5b49b..1c247aeaf0 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -707,57 +707,57 @@ static void ov21_021E226C (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E1A90 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 102 + 5000, 11 + 2100, 100 + 5000, 101 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = 132 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = 132 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[0] = sub_02021B90(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0);
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = 76 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = 76 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[1] = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
     sub_020093B4(&v0, 99 + 5000, 11 + 2100, 97 + 5000, 98 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_04 = &v0;
-    v1.unk_08.y = 176 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.resourceData = &v0;
+    v1.position.y = 176 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     for (v3 = 0; v3 < (7 - 2 + 1); ++v3) {
-        v1.unk_08.x = Unk_ov21_021E9D80[v3];
+        v1.position.x = Unk_ov21_021E9D80[v3];
         param0->unk_00[v3 + 2] = sub_02021B90(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
     }
 
-    v1.unk_14 = 31 - 1;
+    v1.priority = 31 - 1;
 
-    v1.unk_08.x = (128 + (+32)) << FX32_SHIFT;
-    v1.unk_08.y = (132 + 2) << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = (128 + (+32)) << FX32_SHIFT;
+    v1.position.y = (132 + 2) << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_50[0] = sub_02021B90(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_50[0], 13);
 
-    v1.unk_08.x = (128 + -32) << FX32_SHIFT;
-    v1.unk_08.y = (76 + 2) << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = (128 + -32) << FX32_SHIFT;
+    v1.position.y = (76 + 2) << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_50[1] = sub_02021B90(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_50[1], 12);
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 9a594da320..2d46e45c3d 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1279,38 +1279,38 @@ static void ov21_021E3AAC (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
 static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E3440 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 96 + 2100, 11 + 2100, 94 + 2100, 95 + 2100, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 32;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
-    v1.unk_08.y = (24 * FX32_ONE) + (192 << FX32_SHIFT);
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 32;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
+    v1.position.y = (24 * FX32_ONE) + (192 << FX32_SHIFT);
 
     for (v3 = 0; v3 < 6; v3++) {
         switch (v3) {
         case 5:
-            v1.unk_08.x = 228 * FX32_ONE;
+            v1.position.x = 228 * FX32_ONE;
             break;
         case 0:
-            v1.unk_08.x = 28 * FX32_ONE;
+            v1.position.x = 28 * FX32_ONE;
             break;
         case 1:
-            v1.unk_08.x = 68 * FX32_ONE;
+            v1.position.x = 68 * FX32_ONE;
             break;
         case 2:
-            v1.unk_08.x = 108 * FX32_ONE;
+            v1.position.x = 108 * FX32_ONE;
             break;
         case 3:
-            v1.unk_08.x = 148 * FX32_ONE;
+            v1.position.x = 148 * FX32_ONE;
             break;
         case 4:
-            v1.unk_08.x = 188 * FX32_ONE;
+            v1.position.x = 188 * FX32_ONE;
             break;
         }
 
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index a3257c8268..b39e3b8ee5 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -574,19 +574,19 @@ static void ov21_021E4770 (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E
 static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E4108 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3, v4;
 
     sub_020093B4(&v0, 116 + 11000, 19 + 11000, 117 + 11000, 115 + 11000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 17;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
-    v1.unk_08.x = 0;
-    v1.unk_08.y = 0;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 17;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
+    v1.position.x = 0;
+    v1.position.y = 0;
 
     for (v3 = 0; v3 < 9; v3++) {
         for (v4 = 0; v4 < 9; v4++) {
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 61673d2f21..814a80a058 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -844,22 +844,22 @@ static void ov21_021E56F0 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
     int v4, v5;
 
     sub_020093B4(&v0, 113 + 10000, 18 + 10000, 114 + 10000, 112 + 10000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
-    v1.unk_08.x = 64 << FX32_SHIFT;
-    v1.unk_08.y = 67 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 64 << FX32_SHIFT;
+    v1.position.y = 67 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_3C = sub_02021B90(&v1);
 
@@ -868,18 +868,18 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     sub_02021CE4(param0->unk_3C, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_3C, 8);
 
-    v1.unk_08.x = 51 << FX32_SHIFT;
-    v1.unk_08.y = 157 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 51 << FX32_SHIFT;
+    v1.position.y = 157 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00 = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 1);
     sub_02021CF8(param0->unk_00, 1);
 
-    v1.unk_08.x = 180 << FX32_SHIFT;
-    v1.unk_08.y = 131 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 180 << FX32_SHIFT;
+    v1.position.y = 131 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_04 = sub_02021B90(&v1);
 
@@ -894,9 +894,9 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     param0->unk_08.unk_10 = 5;
     param0->unk_08.unk_14 = 2;
 
-    v1.unk_08.x = 230 << FX32_SHIFT;
-    v1.unk_08.y = 166 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 230 << FX32_SHIFT;
+    v1.position.y = 166 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_20 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 06ceb7eb94..7776ab7c15 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -409,7 +409,7 @@ static void ov21_021E64D4 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     VecFx32 v3;
     short v4;
@@ -418,17 +418,17 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
 
     v4 = sub_02098848(param2->unk_04->unk_1748, v6);
     v5 = sub_02098888(param2->unk_04->unk_1748, v6);
 
-    v1.unk_08.x = 168 << FX32_SHIFT;
-    v1.unk_08.y = (88 + v4) << FX32_SHIFT;
+    v1.position.x = 168 << FX32_SHIFT;
+    v1.position.y = (88 + v4) << FX32_SHIFT;
 
     param0->unk_10 = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index c4e4271504..a3f2d0c0d2 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -566,29 +566,29 @@ static void ov21_021E6FD8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
 static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E6A34 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 102 + 9000, 11 + 2100, 100 + 9000, 101 + 9000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
-    v1.unk_08.x = 68 << FX32_SHIFT;
-    v1.unk_08.y = 120 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 68 << FX32_SHIFT;
+    v1.position.y = 120 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[0] = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 1);
 
-    v1.unk_08.x = 188 << FX32_SHIFT;
-    v1.unk_08.y = 120 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 188 << FX32_SHIFT;
+    v1.position.y = 120 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[1] = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index bb938359a8..b481545be9 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -629,7 +629,7 @@ static void ov21_021E7AA0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     VecFx32 v3;
     short v4;
@@ -639,13 +639,13 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = 184 << FX32_SHIFT;
-    v1.unk_08.y = 64 << FX32_SHIFT;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = 184 << FX32_SHIFT;
+    v1.position.y = 64 << FX32_SHIFT;
 
     param0->unk_00 = sub_02021B90(&v1);
 
@@ -655,35 +655,35 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
         SpriteActor_SetSpriteAnimActive(param0->unk_00, 4);
     }
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = (96 + 10) << FX32_SHIFT;
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = (96 + 10) << FX32_SHIFT;
 
     param0->unk_08 = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_08, 1);
     sub_02021E80(param0->unk_08, 1);
 
-    v1.unk_08.x = 184 << FX32_SHIFT;
-    v1.unk_08.y = (64 + 24) << FX32_SHIFT;
+    v1.position.x = 184 << FX32_SHIFT;
+    v1.position.y = (64 + 24) << FX32_SHIFT;
 
     param0->unk_0C[0] = sub_02021B90(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_0C[0], 0);
 
-    v1.unk_08.x = 72 << FX32_SHIFT;
-    v1.unk_08.y = (64 + 24) << FX32_SHIFT;
+    v1.position.x = 72 << FX32_SHIFT;
+    v1.position.y = (64 + 24) << FX32_SHIFT;
 
     param0->unk_0C[1] = sub_02021B90(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_0C[1], 0);
     sub_020093B4(&v0, sub_02009E08(param0->unk_14[0]), sub_02009E08(param0->unk_14[1]), sub_02009E08(param0->unk_14[2]), sub_02009E08(param0->unk_14[3]), 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param3;
-    v1.unk_08.x = 72 << FX32_SHIFT;
-    v1.unk_08.y = 64 << FX32_SHIFT;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param3;
+    v1.position.x = 72 << FX32_SHIFT;
+    v1.position.y = 64 << FX32_SHIFT;
 
     param0->unk_04 = sub_02021B90(&v1);
     sub_02021EC4(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 4c594ef940..2b7da60bbb 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -538,21 +538,21 @@ static void ov21_021E8A74 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
 static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E8584 * param1, int param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     UnkStruct_ov21_021D13FC * v2 = param1->unk_00;
     int v3;
 
     sub_020093B4(&v0, 102 + 13000, 11 + 2100, 100 + 13000, 101 + 13000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.unk_00 = v2->unk_138;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 31;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_1C = param2;
+    v1.manager = v2->unk_138;
+    v1.resourceData = &v0;
+    v1.priority = 31;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.heapID = param2;
 
-    v1.unk_08.x = 128 << FX32_SHIFT;
-    v1.unk_08.y = 144 << FX32_SHIFT;
-    v1.unk_08.y += (192 << FX32_SHIFT);
+    v1.position.x = 128 << FX32_SHIFT;
+    v1.position.y = 144 << FX32_SHIFT;
+    v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[0] = sub_02021B90(&v1);
 
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 4ca264aaa1..180916a9f1 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -511,18 +511,18 @@ static void ov21_021E94A4 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714
 
 static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     CellActorResourceData v1;
 
     ov21_021E93F8(param0->unk_04, param2, &v1, 2);
 
-    v0.unk_00 = param1;
-    v0.unk_04 = &v1;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_14 = 32;
-    v0.unk_1C = param3;
-    v0.unk_08.x = (120 * FX32_ONE);
-    v0.unk_08.y = (88 * FX32_ONE);
+    v0.manager = param1;
+    v0.resourceData = &v1;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.priority = 32;
+    v0.heapID = param3;
+    v0.position.x = (120 * FX32_ONE);
+    v0.position.y = (88 * FX32_ONE);
 
     param0->unk_00 = sub_02021B90(&v0);
     GF_ASSERT(param0->unk_00);
@@ -535,18 +535,18 @@ static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0)
 
 static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     CellActorResourceData v1;
 
     ov21_021E93F8(param4, param2, &v1, 2);
 
-    v0.unk_00 = param1;
-    v0.unk_04 = &v1;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_14 = 32;
-    v0.unk_1C = param3;
-    v0.unk_08.x = (192 * FX32_ONE);
-    v0.unk_08.y = (52 * FX32_ONE);
+    v0.manager = param1;
+    v0.resourceData = &v1;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.priority = 32;
+    v0.heapID = param3;
+    v0.position.x = (192 * FX32_ONE);
+    v0.position.y = (52 * FX32_ONE);
 
     param0->unk_00 = sub_02021B90(&v0);
 
@@ -599,7 +599,7 @@ static void ov21_021E95EC (UnkStruct_ov21_021E968C * param0, UnkStruct_02009714
 
 static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     CellActorResourceData v1;
     int v2, v3;
 
@@ -610,21 +610,21 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
 
     ov21_021E93F8(param0->unk_08, param2, &v1, 2);
 
-    v0.unk_00 = param1;
-    v0.unk_04 = &v1;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_14 = 32;
-    v0.unk_1C = param3;
-    v0.unk_08.x = (170 * FX32_ONE);
-    v0.unk_08.y = (72 * FX32_ONE);
+    v0.manager = param1;
+    v0.resourceData = &v1;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.priority = 32;
+    v0.heapID = param3;
+    v0.position.x = (170 * FX32_ONE);
+    v0.position.y = (72 * FX32_ONE);
 
     param0->unk_00[0] = sub_02021B90(&v0);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0 + v2);
 
     if (v2 != v3) {
-        v0.unk_08.x = (220 * FX32_ONE);
-        v0.unk_08.y = (72 * FX32_ONE);
+        v0.position.x = (220 * FX32_ONE);
+        v0.position.y = (72 * FX32_ONE);
         param0->unk_00[1] = sub_02021B90(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v3);
     } else {
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 9721da786c..5c1e08b7b2 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -159,18 +159,18 @@ void ov22_022551D0 (UnkStruct_ov22_0225A0E4 * param0)
 GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
 
     sub_020093B4(&v0, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_48[0], param0->unk_48[1], param0->unk_48[2], param0->unk_48[3], NULL, NULL);
 
-    v1.unk_00 = param0->unk_44;
-    v1.unk_04 = &v0;
-    v1.unk_08.x = param2 << FX32_SHIFT;
-    v1.unk_08.y = param3 << FX32_SHIFT;
-    v1.unk_08.z = 0;
-    v1.unk_14 = param4;
-    v1.unk_18 = param5;
-    v1.unk_1C = 14;
+    v1.manager = param0->unk_44;
+    v1.resourceData = &v0;
+    v1.position.x = param2 << FX32_SHIFT;
+    v1.position.y = param3 << FX32_SHIFT;
+    v1.position.z = 0;
+    v1.priority = param4;
+    v1.vramType = param5;
+    v1.heapID = 14;
 
     return sub_02021B90(&v1);
 }
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index d0052ade51..83c05b5f93 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -88,7 +88,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
     v0.unk_20 = 0;
     v0.unk_24 = 0;
     v0.unk_28 = param1->unk_00.unk_00->vramType;
-    v0.unk_2C = param1->unk_00.unk_00->unk_2C;
+    v0.unk_2C = param1->unk_00.unk_00->heapID;
 
     param0->unk_10 = sub_020127E8(&v0);
 }
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 5f8dddffb1..fff5b2b338 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -294,26 +294,26 @@ static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, i
 static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     int v2, v3;
 
     ov22_0225AA34(param0->unk_00, param2, 14, param4, 103, 225, 102, 101, 2, 2000);
     ov22_0225AAF4(param0->unk_00, param2, &v0, 0);
 
-    v1.unk_00 = param1;
-    v1.unk_04 = &v0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_14 = 0;
-    v1.unk_1C = 14;
+    v1.manager = param1;
+    v1.resourceData = &v0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.priority = 0;
+    v1.heapID = 14;
 
     for (v2 = 0; v2 < (20 / 10); v2++) {
-        v1.unk_08.y = 104 + (18 * v2);
-        v1.unk_08.y *= FX32_ONE;
-        v1.unk_08.y += (512 * FX32_ONE);
+        v1.position.y = 104 + (18 * v2);
+        v1.position.y *= FX32_ONE;
+        v1.position.y += (512 * FX32_ONE);
 
         for (v3 = 0; v3 < 10; v3++) {
-            v1.unk_08.x = 38 + (18 * v3);
-            v1.unk_08.x *= FX32_ONE;
+            v1.position.x = 38 + (18 * v3);
+            v1.position.x *= FX32_ONE;
 
             param0->unk_10[(v2 * 10) + v3] = sub_02021B90(&v1);
             SpriteActor_SetSpriteAnimActive(param0->unk_10[(v2 * 10) + v3], 1);
@@ -387,23 +387,23 @@ static void ov22_0225AAF4 (UnkStruct_02009DC8 ** param0, UnkStruct_02009714 ** p
 static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     int v2;
 
     ov22_0225AA34(param0->unk_00, param2, 14, param6, 229, 230, 228, 227, 2, 3000);
     ov22_0225AAF4(param0->unk_00, param2, &v0, 0);
 
-    v1.unk_00 = param1;
-    v1.unk_04 = &v0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_14 = 0;
-    v1.unk_1C = 14;
-    v1.unk_08.y = 58 * FX32_ONE;
-    v1.unk_08.y += (512 * FX32_ONE);
+    v1.manager = param1;
+    v1.resourceData = &v0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v1.priority = 0;
+    v1.heapID = 14;
+    v1.position.y = 58 * FX32_ONE;
+    v1.position.y += (512 * FX32_ONE);
 
     for (v2 = 0; v2 < 2; v2++) {
-        v1.unk_08.x = 103 + (v2 * 24);
-        v1.unk_08.x *= FX32_ONE;
+        v1.position.x = 103 + (v2 * 24);
+        v1.position.x *= FX32_ONE;
         param0->unk_10[v2] = sub_02021B90(&v1);
     }
 
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 0c97c7f94a..d531bfb149 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -2822,7 +2822,7 @@ static void ov23_0224108C (void)
         sub_020093B4(&Unk_ov23_02257740->unk_204[v0], v0, v0, v0, v0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257740->unk_1B0[0], Unk_ov23_02257740->unk_1B0[1], Unk_ov23_02257740->unk_1B0[2], Unk_ov23_02257740->unk_1B0[3], NULL, NULL);
 
         v2.manager = Unk_ov23_02257740->unk_20;
-        v2.unk_04 = &Unk_ov23_02257740->unk_204[v0];
+        v2.resourceData = &Unk_ov23_02257740->unk_204[v0];
         v2.position.x = FX32_CONST(32);
         v2.position.y = FX32_CONST(96);
         v2.position.z = 0;
@@ -2832,7 +2832,7 @@ static void ov23_0224108C (void)
         v2.affineZRotation = 0;
         v2.priority = 0;
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v2.unk_2C = 29;
+        v2.heapID = 29;
         v2.position.x = FX32_ONE * 0;
         v2.position.y = FX32_ONE * 240;
 
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index bf1f4317eb..d9fc35e7e1 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3318,7 +3318,7 @@ static void ov23_0224644C (int param0)
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
-        v0.unk_04 = &Unk_ov23_02257764->unk_238;
+        v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -3328,7 +3328,7 @@ static void ov23_0224644C (int param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 4;
+        v0.heapID = 4;
 
         for (v1 = 0; v1 < param0; v1++) {
             v0.position.x = FX32_ONE * 300;
@@ -3668,7 +3668,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
-        v0.unk_04 = &Unk_ov23_02257764->unk_238;
+        v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -3678,7 +3678,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 4;
+        v0.heapID = 4;
 
         for (v1 = 0; v1 < ov23_022468C0(); v1++) {
             v0.position.x = FX32_ONE * 300;
@@ -3846,7 +3846,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
-        v0.unk_04 = &Unk_ov23_02257764->unk_238;
+        v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -3856,7 +3856,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 4;
+        v0.heapID = 4;
 
         for (v1 = 0; v1 < 15; v1++) {
             v0.position.x = FX32_ONE * 100;
@@ -4315,7 +4315,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
-        v0.unk_04 = &Unk_ov23_02257764->unk_238;
+        v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -4325,7 +4325,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 4;
+        v0.heapID = 4;
 
         for (v1 = 0; v1 < 1; v1++) {
             v0.position.x = FX32_ONE * 128;
@@ -4775,7 +4775,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
         int v1;
 
         v0.manager = Unk_ov23_02257764->unk_44;
-        v0.unk_04 = &Unk_ov23_02257764->unk_238;
+        v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -4785,7 +4785,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 4;
+        v0.heapID = 4;
 
         for (v1 = 0; v1 < 25; v1++) {
             v0.position.x = FX32_ONE * 300;
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 89265c18a7..8705aad663 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -113,7 +113,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             CellActorInitParamsEx v3;
 
             v3.manager = v0->unk_1BC;
-            v3.unk_04 = &v0->unk_36C;
+            v3.resourceData = &v0->unk_36C;
             v3.position.x = FX32_CONST(32);
             v3.position.y = FX32_CONST(96) + (192 << FX32_SHIFT);
             v3.position.z = 0;
@@ -123,7 +123,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             v3.affineZRotation = 0;
             v3.priority = 0;
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-            v3.unk_2C = 4;
+            v3.heapID = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
                 v0->unk_390[v2] = GraphicElementManager_AddElement(&v3);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 95c646d256..959f5aa6ef 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -421,7 +421,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_28;
-        v1.unk_04 = &param0->unk_1D8;
+        v1.resourceData = &param0->unk_1D8;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -429,7 +429,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
         v1.affineZRotation = 0;
         v1.priority = 0;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-        v1.unk_2C = 4;
+        v1.heapID = 4;
 
         for (v0 = 0; v0 < 3; v0++) {
             v1.position.x = FX32_CONST((256 - 24));
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 6b01483c7c..83d0836ee3 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -678,7 +678,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_34;
-        v1.unk_04 = &param0->unk_1F4;
+        v1.resourceData = &param0->unk_1F4;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -686,10 +686,10 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
         v1.affineZRotation = 0;
         v1.priority = 1;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_2C = 39;
+        v1.heapID = 39;
 
         for (v0 = 0; v0 < 5; v0++) {
-            v1.unk_04 = &param0->unk_218;
+            v1.resourceData = &param0->unk_218;
             v1.position.x = FX32_ONE * (24 + v0 * 40);
             v1.position.y = FX32_ONE * (32 + 32);
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -702,7 +702,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
         }
 
         for (v0 = 0; v0 < 9 + 3; v0++) {
-            v1.unk_04 = &param0->unk_218;
+            v1.resourceData = &param0->unk_218;
             v1.position.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
 
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 934a99864f..c493c61f7b 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -648,7 +648,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_50;
-        v1.unk_04 = &param0->unk_268;
+        v1.resourceData = &param0->unk_268;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -656,7 +656,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         v1.affineZRotation = 0;
         v1.priority = 1;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_2C = 51;
+        v1.heapID = 51;
         v1.position.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
         v1.position.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
 
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 26f7e82a3e..1527ec6b58 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -453,14 +453,14 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
     v1.manager = param0->unk_00;
-    v1.unk_04 = &param0->unk_10[v2].unk_14;
+    v1.resourceData = &param0->unk_10[v2].unk_14;
     v1.position.x = param1->unk_00 << FX32_SHIFT;
     v1.position.y = param1->unk_02 << FX32_SHIFT;
     v1.affineScale.x = FX32_ONE;
     v1.affineScale.y = FX32_ONE;
     v1.affineScale.z = FX32_ONE;
     v1.priority = param1->unk_04;
-    v1.unk_2C = param3;
+    v1.heapID = param3;
 
     if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -486,14 +486,14 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
         memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
         v1.manager = param0->unk_00;
-        v1.unk_04 = &param0->unk_2248.unk_10;
+        v1.resourceData = &param0->unk_2248.unk_10;
         v1.position.x = param1->unk_00 << FX32_SHIFT;
         v1.position.y = param1->unk_02 << FX32_SHIFT;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
         v1.affineScale.z = FX32_ONE;
         v1.priority = param0->unk_227C;
-        v1.unk_2C = param3;
+        v1.heapID = param3;
 
         if ((param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_MAX) || (param0->unk_10[v2].unk_0C == NNS_G2D_VRAM_TYPE_2DMAIN)) {
             v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 418465d273..8b2d8c2c06 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1237,8 +1237,8 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
 
     for (v1 = 0; v1 < 2; v1++) {
         v0[v1].manager = param0->unk_04;
-        v0[v1].unk_04 = &param0->unk_23C;
-        v0[v1].unk_2C = param1;
+        v0[v1].resourceData = &param0->unk_23C;
+        v0[v1].heapID = param1;
 
         param0->unk_270[v1] = GraphicElementManager_AddElement(&v0[v1]);
 
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 63ea38e8ac..4e20f2a78d 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6703,8 +6703,8 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
 
     for (v1 = 0; v1 < 3; v1++) {
         v9[v1].manager = param0->unk_18C;
-        v9[v1].unk_04 = &v2;
-        v9[v1].unk_2C = param2;
+        v9[v1].resourceData = &v2;
+        v9[v1].heapID = param2;
 
         param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElement(&v9[v1]);
 
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 6516df2f04..78712e26e7 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -684,12 +684,12 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
     v0.manager = param0->unk_00;
-    v0.unk_04 = &param0->unk_1A0.unk_10;
+    v0.resourceData = &param0->unk_1A0.unk_10;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
     v0.priority = 0;
-    v0.unk_2C = param1;
+    v0.heapID = param1;
 
     param0->unk_1A0.unk_34 = GraphicElementManager_AddElement(&v0);
     param0->unk_1A0.unk_38 = GraphicElementManager_AddElement(&v0);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 5a1164faf7..590cbdb4cf 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -696,15 +696,15 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
 
     {
         CellActorResourceData v1;
-        UnkStruct_ov83_0223D9A8 v2 = {0};
+        CellActorInitParams v2 = {0};
 
         sub_020093B4(&v1, 20, 20, 20, 20, 0xffffffff, 0xffffffff, 0, 0, param2->unk_194[0], param2->unk_194[1], param2->unk_194[2], param2->unk_194[3], NULL, NULL);
 
-        v2.unk_00 = param2->unk_04;
-        v2.unk_04 = &v1;
-        v2.unk_14 = 0;
-        v2.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v2.unk_1C = param3;
+        v2.manager = param2->unk_04;
+        v2.resourceData = &v1;
+        v2.priority = 0;
+        v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v2.heapID = param3;
 
         param0->unk_14 = sub_02021B90(&v2);
         sub_02021CAC(param0->unk_14, 0);
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index c530fc0c2e..1082e4345e 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -2640,18 +2640,18 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
     int v0;
     CellActorResourceData v1;
     BOOL v2;
-    UnkStruct_ov83_0223D9A8 v3 = {NULL};
+    CellActorInitParams v3 = {NULL};
 
     memset(param0, 0, sizeof(UnkStruct_ov69_0225EB60));
 
     param0->unk_30 = 2;
     param0->unk_32 = 128;
 
-    v3.unk_00 = param1->unk_04;
-    v3.unk_04 = &v1;
-    v3.unk_14 = 64;
-    v3.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-    v3.unk_1C = param3;
+    v3.manager = param1->unk_04;
+    v3.resourceData = &v1;
+    v3.priority = 64;
+    v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+    v3.heapID = param3;
 
     param0->unk_6C[0][1] = sub_02009B04(param1->unk_194[1], param1->unk_1A8, 20, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB, 12, param3);
     v2 = sub_0200A640(param0->unk_6C[0][1]);
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index e0431aba25..9234b88490 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1672,7 +1672,7 @@ static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param
 static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225E4EC * param1, u32 param2)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     int v2;
     NARC * v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
 
@@ -1686,15 +1686,15 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
     sub_0200A640(param0->unk_40[1]);
     sub_020093B4(&v0, 5000, 5000, 5000, 5000, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-    v1.unk_00 = param1->unk_04;
-    v1.unk_04 = &v0;
-    v1.unk_14 = 0;
-    v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v1.unk_1C = param2;
-    v1.unk_08.x = 192 * FX32_ONE;
+    v1.manager = param1->unk_04;
+    v1.resourceData = &v0;
+    v1.priority = 0;
+    v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v1.heapID = param2;
+    v1.position.x = 192 * FX32_ONE;
 
     for (v2 = 0; v2 < 2; v2++) {
-        v1.unk_08.y = Unk_ov70_0226D580[v2] * FX32_ONE;
+        v1.position.y = Unk_ov70_0226D580[v2] * FX32_ONE;
         param0->unk_50[v2] = sub_02021B90(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_50[v2], v2);
@@ -2737,17 +2737,17 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
     {
         CellActorResourceData v3;
-        UnkStruct_ov83_0223D9A8 v4 = {NULL};
+        CellActorInitParams v4 = {NULL};
 
         sub_020093B4(&v3, 100, 100, 100, 100, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        v4.unk_00 = param1->unk_04;
-        v4.unk_04 = &v3;
-        v4.unk_14 = 16;
-        v4.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-        v4.unk_1C = param3;
-        v4.unk_08.x = (FX32_CONST(208));
-        v4.unk_08.y = (FX32_CONST(152) + (256 * FX32_ONE));
+        v4.manager = param1->unk_04;
+        v4.resourceData = &v3;
+        v4.priority = 16;
+        v4.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+        v4.heapID = param3;
+        v4.position.x = (FX32_CONST(208));
+        v4.position.y = (FX32_CONST(152) + (256 * FX32_ONE));
         param0->unk_54 = sub_02021B90(&v4);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_54, v1);
@@ -2811,17 +2811,17 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
     {
         CellActorResourceData v6;
-        UnkStruct_ov83_0223D9A8 v7 = {NULL};
+        CellActorInitParams v7 = {NULL};
 
         sub_020093B4(&v6, 101, 101, 101, 101, 0xffffffff, 0xffffffff, 1, 3, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        v7.unk_00 = param1->unk_04;
-        v7.unk_04 = &v6;
-        v7.unk_14 = 32;
-        v7.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-        v7.unk_1C = param3;
-        v7.unk_08.x = FX32_CONST(v1);
-        v7.unk_08.y = FX32_CONST(v2) + (256 * FX32_ONE);
+        v7.manager = param1->unk_04;
+        v7.resourceData = &v6;
+        v7.priority = 32;
+        v7.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+        v7.heapID = param3;
+        v7.position.x = FX32_CONST(v1);
+        v7.position.y = FX32_CONST(v2) + (256 * FX32_ONE);
 
         param0->unk_68 = sub_02021B90(&v7);
     }
@@ -2948,7 +2948,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
     u32 v5;
     u32 v6;
     u32 v7;
-    UnkStruct_ov83_0223D9A8 v8;
+    CellActorInitParams v8;
     CellActorResourceData v9;
     const UnkStruct_ov70_0226D844 * v10;
     static const u16 v11[4][3] = {
@@ -3025,14 +3025,14 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
             sub_02009D4C(param0->unk_BC[v0]);
             sub_020093B4(&v9, 150 + v0, 150 + v10->unk_00, 150 + v10->unk_00, 150 + v10->unk_00, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-            v8.unk_00 = param1->unk_04;
-            v8.unk_04 = &v9;
-            v8.unk_14 = 0;
-            v8.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-            v8.unk_1C = param3;
-            v8.unk_08 = Unk_ov70_0226D7B4[v0];
-            v8.unk_08.x += FX32_CONST(v10->unk_04);
-            v8.unk_08.y += FX32_CONST(v10->unk_06);
+            v8.manager = param1->unk_04;
+            v8.resourceData = &v9;
+            v8.priority = 0;
+            v8.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+            v8.heapID = param3;
+            v8.position = Unk_ov70_0226D7B4[v0];
+            v8.position.x += FX32_CONST(v10->unk_04);
+            v8.position.y += FX32_CONST(v10->unk_06);
 
             param0->unk_7C[v0] = sub_02021B90(&v8);
 
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index c3f32c6187..2eaab1b0f5 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -113,7 +113,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
         v3.position.z = 0;
@@ -123,7 +123,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         v3.affineZRotation = 0;
         v3.priority = 2;
         v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v3.unk_2C = 25;
+        v3.heapID = 25;
 
         for (v0 = 0; v0 < 8; v0++) {
             v3.position.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index c2ccc1e3a1..9172b1b455 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -522,7 +522,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_3C;
-        v1.unk_04 = &param0->unk_1FC;
+        v1.resourceData = &param0->unk_1FC;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -530,10 +530,10 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
         v1.affineZRotation = 0;
         v1.priority = 1;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_2C = 39;
+        v1.heapID = 39;
 
         for (v0 = 0; v0 < 1; v0++) {
-            v1.unk_04 = &param0->unk_220;
+            v1.resourceData = &param0->unk_220;
             v1.position.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
 
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 8999eb4ed8..8a0073810d 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -119,7 +119,7 @@ static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, c
 
     {
         param3->manager = param1->unk_00;
-        param3->unk_04 = param4;
+        param3->resourceData = param4;
         param3->position.x = 0;
         param3->position.y = 0;
         param3->position.z = 0;
@@ -129,7 +129,7 @@ static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, c
         param3->affineZRotation = 0;
         param3->priority = 1;
         param3->vramType = param6;
-        param3->unk_2C = 76;
+        param3->heapID = 76;
     }
 }
 
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index b93e02530c..3288e63ad4 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -107,7 +107,7 @@ static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, CellActorInitParams
 
     {
         param1->manager = param0->unk_00;
-        param1->unk_04 = param2;
+        param1->resourceData = param2;
         param1->position.x = 0;
         param1->position.y = 0;
         param1->position.z = 0;
@@ -117,7 +117,7 @@ static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, CellActorInitParams
         param1->affineZRotation = 0;
         param1->priority = 1;
         param1->vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        param1->unk_2C = 76;
+        param1->heapID = 76;
     }
 }
 
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 27c023acca..d5a8d87fa7 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -273,17 +273,17 @@ void ov83_0223D95C (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C *
 
 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;
+    CellActorInitParams v0;
     GraphicElementData * v1;
 
-    v0.unk_00 = param0->unk_00;
-    v0.unk_04 = &param1->unk_14;
-    v0.unk_08.x = param2;
-    v0.unk_08.y = param3;
-    v0.unk_08.z = param4;
-    v0.unk_14 = param5;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_1C = param6;
+    v0.manager = param0->unk_00;
+    v0.resourceData = &param1->unk_14;
+    v0.position.x = param2;
+    v0.position.y = param3;
+    v0.position.z = param4;
+    v0.priority = param5;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.heapID = param6;
 
     v1 = sub_02021B90(&v0);
     GF_ASSERT(v1);
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index a0821bed98..bef837f3c8 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -807,7 +807,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     };
     ArchivedSprite v1;
     CellActorResourceData v2;
-    UnkStruct_ov83_0223D9A8 v3;
+    CellActorInitParams v3;
     UnkStruct_ov5_021DE5D0 v4;
     NNSG2dImageProxy v5;
     NNSG2dImagePaletteProxy v6;
@@ -828,13 +828,13 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     v2.unk_00 = &v5;
     v2.unk_08 = &v6;
 
-    v3.unk_00 = param0->unk_24;
-    v3.unk_04 = &v2;
+    v3.manager = param0->unk_24;
+    v3.resourceData = &v2;
 
-    VEC_Set(&(v3.unk_08), 0, 0, 0);
+    VEC_Set(&(v3.position), 0, 0, 0);
 
-    v3.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v3.unk_1C = 63;
+    v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v3.heapID = 63;
 
     v9 = sub_020071B4(param3, 76, 0, &v7, 63);
     v10 = sub_020071EC(param3, 75, &v8, 63);
@@ -845,7 +845,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
         NNS_G2dLoadImage1DMapping(v7, v12 * 2 * 3200, NNS_G2D_VRAM_TYPE_2DMAIN, &v5);
         NNS_G2dLoadPalette(v8, v12 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v6);
 
-        v3.unk_14 = 1 + v12;
+        v3.priority = 1 + v12;
         param0->unk_1B4[v12] = sub_02021B90(&v3);
 
         sub_02021CAC(param0->unk_1B4[v12], 0);
@@ -882,7 +882,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
 
     sub_02006E84(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63);
 
-    v3.unk_14 = 0;
+    v3.priority = 0;
     param0->unk_1CC = sub_02021B90(&v3);
 
     sub_02021CAC(param0->unk_1CC, 0);
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index dd35fa343a..2f0b14e2a6 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -493,7 +493,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         {56, 112},
     };
     CellActorResourceData v1;
-    UnkStruct_ov83_0223D9A8 v2;
+    CellActorInitParams v2;
     NNSG2dImageProxy v3;
     NNSG2dImagePaletteProxy v4;
     NNSG2dCharacterData * v5;
@@ -511,11 +511,11 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
     v1.unk_20 = 0;
     v1.unk_00 = &v3;
     v1.unk_08 = &v4;
-    v2.unk_00 = param0->unk_34;
-    v2.unk_04 = &v1;
-    v2.unk_08.z = 0;
-    v2.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v2.unk_1C = 61;
+    v2.manager = param0->unk_34;
+    v2.resourceData = &v1;
+    v2.position.z = 0;
+    v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v2.heapID = 61;
 
     v7 = sub_02006F50(27, 76, 0, &v5, 61);
     v8 = sub_02006F88(27, 75, &v6, 61);
@@ -526,9 +526,9 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         NNS_G2dLoadImage1DMapping(v5, v9 * 3200, NNS_G2D_VRAM_TYPE_2DMAIN, &v3);
         NNS_G2dLoadPalette(v6, v9 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v4);
 
-        v2.unk_08.x = v0[v9].x << FX32_SHIFT;
-        v2.unk_08.y = v0[v9].y << FX32_SHIFT;
-        v2.unk_14 = v9 + 1;
+        v2.position.x = v0[v9].x << FX32_SHIFT;
+        v2.position.y = v0[v9].y << FX32_SHIFT;
+        v2.priority = v9 + 1;
 
         param0->unk_1C4[v9] = sub_02021B90(&v2);
         sub_02021CAC(param0->unk_1C4[v9], 0);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index b893a4a3f0..4f632111b0 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1412,7 +1412,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         int v1;
 
         v0.manager = param0->unk_194;
-        v0.unk_04 = &param0->unk_354;
+        v0.resourceData = &param0->unk_354;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
         v0.position.z = 0;
@@ -1422,7 +1422,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         v0.affineZRotation = 0;
         v0.priority = 0;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v0.unk_2C = 26;
+        v0.heapID = 26;
 
         for (v1 = 0; v1 < 2; v1++) {
             v0.position.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
@@ -1470,7 +1470,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         sub_02021CAC(param0->unk_47C, 0);
 
         for (v1 = 0; v1 < 6; v1++) {
-            v0.unk_04 = &param0->unk_378;
+            v0.resourceData = &param0->unk_378;
             v0.position.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
             v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 028b6e8c88..36eba2c065 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -381,7 +381,7 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0)
 void ov94_0223C300 (CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_BE4;
-    param0->unk_04 = param2;
+    param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
     param0->affineScale.y = FX32_ONE;
@@ -389,7 +389,7 @@ void ov94_0223C300 (CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * pa
     param0->affineZRotation = 0;
     param0->priority = 1;
     param0->vramType = param3;
-    param0->unk_2C = 62;
+    param0->heapID = 62;
 }
 
 static void ov94_0223C32C (UnkStruct_ov94_0223FD4C * param0)
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index adf48d6665..1c5f68b40c 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -650,16 +650,16 @@ void ov95_022475C4 (CellActorResourceData * param0, UnkStruct_ov95_02247568 * pa
 GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     GraphicElementData * v0;
-    UnkStruct_ov83_0223D9A8 v1;
-
-    v1.unk_00 = param0->unk_18;
-    v1.unk_04 = param1;
-    v1.unk_08.x = param2 * FX32_ONE;
-    v1.unk_08.y = param3 * FX32_ONE;
-    v1.unk_08.z = 0;
-    v1.unk_14 = param4;
-    v1.unk_18 = param5;
-    v1.unk_1C = 57;
+    CellActorInitParams v1;
+
+    v1.manager = param0->unk_18;
+    v1.resourceData = param1;
+    v1.position.x = param2 * FX32_ONE;
+    v1.position.y = param3 * FX32_ONE;
+    v1.position.z = 0;
+    v1.priority = param4;
+    v1.vramType = param5;
+    v1.heapID = 57;
 
     v0 = sub_02021B90(&v1);
 
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 07e7505b8b..c9ad90bef5 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -288,7 +288,7 @@ static const u16 Unk_ov96_0223DA80[][2] = {
 void ov96_0223BAE0 (CellActorInitParamsEx * param0, UnkStruct_ov96_0223BF40 * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_BF4;
-    param0->unk_04 = param2;
+    param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
     param0->affineScale.y = FX32_ONE;
@@ -296,7 +296,7 @@ void ov96_0223BAE0 (CellActorInitParamsEx * param0, UnkStruct_ov96_0223BF40 * pa
     param0->affineZRotation = 0;
     param0->priority = 1;
     param0->vramType = param3;
-    param0->unk_2C = 68;
+    param0->heapID = 68;
 }
 
 static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 929ff51c0c..9c410ff489 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1183,7 +1183,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
         int v2 = (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) ? 0 : 1;
 
         v1.manager = param0->unk_0C->unk_00;
-        v1.unk_04 = &param0->unk_10[v2];
+        v1.resourceData = &param0->unk_10[v2];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -1193,7 +1193,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
         v1.position.y = FX32_ONE * 32;
         v1.priority = 10;
         v1.vramType = param1;
-        v1.unk_2C = 86;
+        v1.heapID = 86;
 
         if (v1.vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
             v1.position.y += FX32_CONST(256);
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 99f6468382..928a726fe3 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -554,7 +554,7 @@ static void ov97_022340B0 (UnkStruct_ov97_02234A2C * param0)
 static void ov97_022340FC (CellActorInitParamsEx * param0, UnkStruct_ov97_02234A2C * param1, CellActorResourceData * param2, int param3)
 {
     param0->manager = param1->unk_28;
-    param0->unk_04 = &param1->unk_1E8;
+    param0->resourceData = &param1->unk_1E8;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
     param0->affineScale.y = FX32_ONE;
@@ -562,7 +562,7 @@ static void ov97_022340FC (CellActorInitParamsEx * param0, UnkStruct_ov97_02234A
     param0->affineZRotation = 0;
     param0->priority = 20;
     param0->vramType = param3;
-    param0->unk_2C = 78;
+    param0->heapID = 78;
 }
 
 static int ov97_02234124 (UnkStruct_ov97_02234A2C * param0, int param1, int param2)
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 12c46340ac..6a20aaf1df 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -446,7 +446,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
         CellActorInitParamsEx v1;
 
         v1.manager = v0->unk_34.unk_00;
-        v1.unk_04 = &v0->unk_34.unk_1D8[param0];
+        v1.resourceData = &v0->unk_34.unk_1D8[param0];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -456,7 +456,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
         v1.position.y = FX32_ONE * param3;
         v1.priority = 10;
         v1.vramType = (param0 == 0) ? NNS_G2D_VRAM_TYPE_2DMAIN : NNS_G2D_VRAM_TYPE_2DSUB;
-        v1.unk_2C = v0->unk_08;
+        v1.heapID = v0->unk_08;
 
         if (v1.vramType == NNS_G2D_VRAM_TYPE_2DSUB) {
             v1.position.y += v0->unk_274;
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index c4d42d1816..221745b380 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -324,7 +324,7 @@ void ov101_021D8358 (UnkStruct_ov101_021D7E48 * param0, u32 param1, u32 param2,
 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)
 {
     CellActorResourceData v0;
-    UnkStruct_ov83_0223D9A8 v1;
+    CellActorInitParams v1;
     GraphicElementData * v2;
 
     if (param8 == param0->unk_0B) {
@@ -341,12 +341,12 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
         param1->unk_00 = 0;
     }
 
-    v1.unk_00 = param0->unk_0C;
-    v1.unk_04 = &v0;
-    v1.unk_08 = *param2;
-    v1.unk_14 = param10;
-    v1.unk_18 = param3;
-    v1.unk_1C = param0->unk_00;
+    v1.manager = param0->unk_0C;
+    v1.resourceData = &v0;
+    v1.position = *param2;
+    v1.priority = param10;
+    v1.vramType = param3;
+    v1.heapID = param0->unk_00;
 
     param1->unk_04 = sub_02021B90(&v1);
     GF_ASSERT(param1->unk_04 != NULL);
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 90b414c4f3..fb123beb5b 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -72,7 +72,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
         v3.position.z = 0;
@@ -88,7 +88,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v3.unk_2C = 93;
+        v3.heapID = 93;
 
         if (param5 == 1) {
             v3.position.y += (192 << FX32_SHIFT);
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 2f6b3c00c0..14855fb90e 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -85,7 +85,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
 
         v3.position.x = 0;
         v3.position.y = 0;
@@ -102,7 +102,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v3.unk_2C = 98;
+        v3.heapID = 98;
 
         if (param4 == 1) {
             v3.position.y += (192 << FX32_SHIFT);
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 1d38976645..bdb6e7089f 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -124,7 +124,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
         v3.position.z = 0;
@@ -140,7 +140,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v3.unk_2C = 100;
+        v3.heapID = 100;
 
         if (param7 == 1) {
             v3.position.y += (192 << FX32_SHIFT);
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 12b624422b..af65462480 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -86,7 +86,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
         v3.position.z = 0;
@@ -95,7 +95,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
         v3.affineScale.z = FX32_ONE;
         v3.affineZRotation = 0;
         v3.priority = param5;
-        v3.unk_2C = 103;
+        v3.heapID = 103;
 
         if (param7 == 0) {
             v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 4c7c553e57..2bda07162c 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -646,7 +646,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_60;
-        v1.unk_04 = &param0->unk_278;
+        v1.resourceData = &param0->unk_278;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
         v1.affineScale.y = FX32_ONE;
@@ -654,7 +654,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
         v1.affineZRotation = 0;
         v1.priority = 1;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_2C = 95;
+        v1.heapID = 95;
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.position.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index b1164837d5..436eda7690 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -125,7 +125,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
         CellActorInitParamsEx v3;
 
         v3.manager = param0->unk_00;
-        v3.unk_04 = &v1;
+        v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
         v3.position.z = 0;
@@ -134,7 +134,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
         v3.affineScale.z = FX32_ONE;
         v3.affineZRotation = 0;
         v3.priority = param4;
-        v3.unk_2C = 115;
+        v3.heapID = 115;
 
         if (param5 == 0) {
             v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index fa47516221..bd2939126b 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1285,15 +1285,15 @@ static UnkStruct_ov114_0225CDB4 * ov114_0225CD54 (UnkStruct_ov114_0225CCD0 * par
 
 static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5)
 {
-    UnkStruct_ov83_0223D9A8 v0;
-
-    v0.unk_00 = param1;
-    v0.unk_04 = &param0->unk_14;
-    v0.unk_08.x = param2 << FX32_SHIFT;
-    v0.unk_08.y = param3 << FX32_SHIFT;
-    v0.unk_14 = param4;
-    v0.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_1C = param5;
+    CellActorInitParams v0;
+
+    v0.manager = param1;
+    v0.resourceData = &param0->unk_14;
+    v0.position.x = param2 << FX32_SHIFT;
+    v0.position.y = param3 << FX32_SHIFT;
+    v0.priority = param4;
+    v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+    v0.heapID = param5;
 
     return sub_02021B90(&v0);
 }
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index fee541f7c2..2e24a12763 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1260,14 +1260,14 @@ static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_0
     u32 v3;
 
     v0.manager = param1->unk_1C;
-    v0.unk_04 = &param1->unk_1BC;
+    v0.resourceData = &param1->unk_1BC;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
     v0.affineScale.z = FX32_ONE;
     v0.affineZRotation = 0;
     v0.priority = 0;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-    v0.unk_2C = param4;
+    v0.heapID = param4;
 
     v3 = param3;
 
@@ -2686,15 +2686,15 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
     }
 
     {
-        UnkStruct_ov83_0223D9A8 v2;
+        CellActorInitParams v2;
 
-        v2.unk_00 = param1->unk_1C;
-        v2.unk_04 = &param0->unk_10;
-        v2.unk_08.x = FX32_CONST(128);
-        v2.unk_08.y = FX32_CONST(120) + (512 << FX32_SHIFT);
-        v2.unk_14 = 0;
-        v2.unk_18 = NNS_G2D_VRAM_TYPE_2DSUB;
-        v2.unk_1C = param2;
+        v2.manager = param1->unk_1C;
+        v2.resourceData = &param0->unk_10;
+        v2.position.x = FX32_CONST(128);
+        v2.position.y = FX32_CONST(120) + (512 << FX32_SHIFT);
+        v2.priority = 0;
+        v2.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
+        v2.heapID = param2;
 
         param0->unk_34 = sub_02021B90(&v2);
         sub_02021CAC(param0->unk_34, 0);
@@ -3709,13 +3709,13 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
         CellActorInitParamsEx v0 = {0};
 
         v0.manager = param0->unk_1C;
-        v0.unk_04 = &param0->unk_760.unk_70;
+        v0.resourceData = &param0->unk_760.unk_70;
         v0.affineScale.x = FX32_ONE;
         v0.affineScale.y = FX32_ONE;
         v0.affineScale.z = FX32_ONE;
         v0.priority = 32;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-        v0.unk_2C = param2;
+        v0.heapID = param2;
         param1->unk_00 = GraphicElementManager_AddElement(&v0);
 
         sub_02021CAC(param1->unk_00, 0);
@@ -3931,13 +3931,13 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     CellActorInitParamsEx v0 = {0};
 
     v0.manager = param0->unk_1C;
-    v0.unk_04 = &param0->unk_760.unk_70;
+    v0.resourceData = &param0->unk_760.unk_70;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
     v0.affineScale.z = FX32_ONE;
     v0.priority = 32;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-    v0.unk_2C = param3;
+    v0.heapID = param3;
 
     param1->unk_04 = GraphicElementManager_AddElement(&v0);
 
@@ -3991,13 +3991,13 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     CellActorInitParamsEx v1 = {0};
 
     v1.manager = param0->unk_1C;
-    v1.unk_04 = &param0->unk_760.unk_70;
+    v1.resourceData = &param0->unk_760.unk_70;
     v1.affineScale.x = 9;
     v1.affineScale.y = 9;
     v1.affineScale.z = 9;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-    v1.unk_2C = param3;
+    v1.heapID = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
         param1->unk_00[v0].unk_04 = GraphicElementManager_AddElement(&v1);
@@ -4402,15 +4402,15 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
     }
 
     {
-        UnkStruct_ov83_0223D9A8 v1;
-
-        v1.unk_00 = param1->unk_1C;
-        v1.unk_04 = &param0->unk_10;
-        v1.unk_08.x = (-FX32_CONST(64));
-        v1.unk_08.y = (FX32_CONST(48));
-        v1.unk_14 = (0 + 1);
-        v1.unk_18 = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_1C = param3;
+        CellActorInitParams v1;
+
+        v1.manager = param1->unk_1C;
+        v1.resourceData = &param0->unk_10;
+        v1.position.x = (-FX32_CONST(64));
+        v1.position.y = (FX32_CONST(48));
+        v1.priority = (0 + 1);
+        v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
+        v1.heapID = param3;
 
         param0->unk_34 = sub_02021B90(&v1);
         sub_02021CAC(param0->unk_34, 0);
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 5c586afa34..73d389af4b 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -304,7 +304,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     CellActorInitParamsEx v1;
 
     v1.manager = param1->unk_00;
-    v1.unk_04 = &param1->unk_04->unk_00[param2];
+    v1.resourceData = &param1->unk_04->unk_00[param2];
     v1.position.x = FX32_CONST(param3);
     v1.position.y = FX32_CONST(param4);
     v1.position.z = FX32_CONST(param5);
@@ -319,7 +319,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     v1.affineZRotation = 0;
     v1.priority = param7;
     v1.vramType = param9;
-    v1.unk_2C = param0->unk_00;
+    v1.heapID = param0->unk_00;
 
     v0 = GraphicElementManager_AddElement(&v1);
 
@@ -558,7 +558,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param2->transferToVRAM, param2->bgPriority, param1->unk_0C[0], param1->unk_0C[1], param1->unk_0C[2], param1->unk_0C[3], param1->unk_0C[4], param1->unk_0C[5]);
 
     v3.manager = param1->unk_00;
-    v3.unk_04 = v2->unk_04;
+    v3.resourceData = v2->unk_04;
     v3.position.x = FX32_CONST(param2->x);
     v3.position.y = FX32_CONST(param2->y);
     v3.position.z = FX32_CONST(param2->z);
@@ -573,7 +573,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     v3.affineZRotation = 0;
     v3.priority = param2->priority;
     v3.vramType = param2->vramType;
-    v3.unk_2C = param0->unk_00;
+    v3.heapID = param0->unk_00;
     v2->unk_00 = GraphicElementManager_AddElement(&v3);
     v2->unk_0C = param2->transferToVRAM;
 
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index e2bd57f78c..7f2b02c47d 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -727,7 +727,7 @@ static void sub_020130DC (FontOAM * param0)
 
 static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
 {
-    UnkStruct_ov83_0223D9A8 v0;
+    CellActorInitParams v0;
     CellActorResourceData v1;
 
     v1.unk_00 = param2;
@@ -740,24 +740,24 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     v1.unk_1C = 0;
     v1.unk_20 = param0->unk_20;
 
-    v0.unk_00 = param0->unk_08;
-    v0.unk_04 = &v1;
-    v0.unk_14 = param0->unk_24;
-    v0.unk_18 = param0->unk_28;
-    v0.unk_1C = param0->unk_2C;
-    v0.unk_08.x = 0;
-    v0.unk_08.y = 0;
-    v0.unk_08.z = 0;
+    v0.manager = param0->unk_08;
+    v0.resourceData = &v1;
+    v0.priority = param0->unk_24;
+    v0.vramType = param0->unk_28;
+    v0.heapID = param0->unk_2C;
+    v0.position.x = 0;
+    v0.position.y = 0;
+    v0.position.z = 0;
 
     if (param0->unk_10) {
         const VecFx32 * v2;
 
         v2 = sub_02021D28(param0->unk_10);
-        v0.unk_08 = *v2;
+        v0.position = *v2;
     }
 
-    v0.unk_08.x += (param0->unk_18 << FX32_SHIFT) + ((param1->unk_00 * 8) << FX32_SHIFT);
-    v0.unk_08.y += (param0->unk_1C << FX32_SHIFT) + ((param1->unk_04 * 8) << FX32_SHIFT);
+    v0.position.x += (param0->unk_18 << FX32_SHIFT) + ((param1->unk_00 * 8) << FX32_SHIFT);
+    v0.position.y += (param0->unk_1C << FX32_SHIFT) + ((param1->unk_04 * 8) << FX32_SHIFT);
 
     return sub_02021B90(&v0);
 }
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index f71c827010..eb9a1cf1d7 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -285,7 +285,7 @@ GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsE
     elem->unk_35 = 0;
     elem->unk_38 = (FX32_ONE * 2);
 
-    if (GraphicElementManager_InitElementFromResource(param0->manager, param0->unk_04, elem, param0->unk_2C) == 0) {
+    if (GraphicElementManager_InitElementFromResource(param0->manager, param0->resourceData, elem, param0->heapID) == 0) {
         GraphicElementData_Delete(elem);
         return NULL;
     }
@@ -298,22 +298,22 @@ GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsE
     return elem;
 }
 
-GraphicElementData * sub_02021B90 (const UnkStruct_ov83_0223D9A8 * param0)
+GraphicElementData * sub_02021B90 (const CellActorInitParams * params)
 {
-    CellActorInitParamsEx v0;
+    CellActorInitParamsEx paramsEx;
 
-    v0.manager = param0->unk_00;
-    v0.unk_04 = param0->unk_04;
-    v0.position = param0->unk_08;
-    v0.affineScale.x = FX32_ONE;
-    v0.affineScale.y = FX32_ONE;
-    v0.affineScale.z = FX32_ONE;
-    v0.affineZRotation = 0;
-    v0.priority = param0->unk_14;
-    v0.vramType = param0->unk_18;
-    v0.unk_2C = param0->unk_1C;
+    paramsEx.manager = params->manager;
+    paramsEx.resourceData = params->resourceData;
+    paramsEx.position = params->position;
+    paramsEx.affineScale.x = FX32_ONE;
+    paramsEx.affineScale.y = FX32_ONE;
+    paramsEx.affineScale.z = FX32_ONE;
+    paramsEx.affineZRotation = 0;
+    paramsEx.priority = params->priority;
+    paramsEx.vramType = params->vramType;
+    paramsEx.heapID = params->heapID;
 
-    return GraphicElementManager_AddElement(&v0);
+    return GraphicElementManager_AddElement(&paramsEx);
 }
 
 void GraphicElementData_Delete(GraphicElementData *gfxElem)
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index a888ae26a3..41b278b446 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -568,12 +568,12 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param
     memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
     v0.manager = param0->unk_00;
-    v0.unk_04 = &param0->unk_04->unk_00[param1];
+    v0.resourceData = &param0->unk_04->unk_00[param1];
     v0.position = *param2;
     v0.affineScale = v2;
     v0.priority = param3;
     v0.vramType = param4;
-    v0.unk_2C = 4;
+    v0.heapID = 4;
 
     v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 45ebca15a0..e9431cc5a5 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1611,7 +1611,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
         CellActorInitParamsEx v1;
 
         v1.manager = param0->unk_188;
-        v1.unk_04 = &param0->unk_348;
+        v1.resourceData = &param0->unk_348;
         v1.position.x = FX32_CONST(32);
         v1.position.y = FX32_CONST(96);
         v1.position.z = 0;
@@ -1621,7 +1621,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
         v1.affineZRotation = 0;
         v1.priority = 1;
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
-        v1.unk_2C = 18;
+        v1.heapID = 18;
 
         for (v0 = 0; v0 < 9; v0++) {
             v1.position.x = FX32_ONE * Unk_020F2984[v0][0];
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 7d3aaac76b..ba9d8d9f1a 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -143,7 +143,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     sub_020093B4(v4->unk_04, 0xe000, 0xe000 + v1, 0xe000, 0xe000, 0xffffffff, 0xffffffff, 0, param5, param0->unk_1A4[0], param0->unk_1A4[1], param0->unk_1A4[2], param0->unk_1A4[3], NULL, NULL);
 
     v5.manager = param0->unk_10;
-    v5.unk_04 = v4->unk_04;
+    v5.resourceData = v4->unk_04;
     v5.position.x = FX32_CONST(param2);
     v5.position.y = FX32_CONST(param3);
     v5.position.z = FX32_CONST(param4);
@@ -158,7 +158,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v5.affineZRotation = 0;
     v5.priority = param6;
     v5.vramType = v0;
-    v5.unk_2C = param0->unk_00;
+    v5.heapID = param0->unk_00;
 
     v4->unk_00 = GraphicElementManager_AddElement(&v5);
 

From fb6e35c7bc41a6a96fac90a898eee7c35c2884f1 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Mon, 24 Jun 2024 22:34:08 +0200
Subject: [PATCH 08/19] More struct field labelling

---
 src/unk_020218BC.c | 272 ++++++++++++++++++++++-----------------------
 1 file changed, 134 insertions(+), 138 deletions(-)

diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index eb9a1cf1d7..049ede09a0 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -38,11 +38,11 @@ typedef struct {
 typedef struct {
     const NNSG2dCellDataBank * unk_00;
     const NNSG2dCellAnimBankData * unk_04;
-    NNSG2dMultiCellAnimation unk_08;
-    const NNSG2dMultiCellDataBank * unk_6C;
-    const NNSG2dMultiCellAnimBankData * unk_70;
-    NNSG2dNode * unk_74;
-    NNSG2dCellAnimation * unk_78;
+    NNSG2dMultiCellAnimation anim;
+    const NNSG2dMultiCellDataBank * cellBank;
+    const NNSG2dMultiCellAnimBankData * animBank;
+    NNSG2dNode * nodes;
+    NNSG2dCellAnimation * cellAnims;
 } MultiCellAnimationData;
 
 typedef struct GraphicElementData_t {
@@ -61,7 +61,7 @@ typedef struct GraphicElementData_t {
     u8 unk_35;
     fx32 unk_38;
     GraphicElementManager * manager;
-    u32 unk_40[29];
+    u32 animData[29];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
     u32 type;
@@ -89,16 +89,16 @@ typedef void (* GraphicElementDrawFunc)(const GraphicElementManager *, GraphicEl
 typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
 
 static void GraphicElementManager_Reset(GraphicElementManager * param0);
-static enum CellType sub_020221B8(const CellActorResourceData * param0);
-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 enum CellType CellActorResourceData_GetCellType(const CellActorResourceData * param0);
+static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank * param0, GraphicElementData * param1);
+static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1);
+static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1);
+static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1);
 static void sub_020221E8(GraphicElementData * param0, int param1);
 static void sub_02022208(const CellActorResourceData * param0, GraphicElementData * param1, int param2);
-static void sub_02022264(GraphicElementData * param0, int param1);
-static BOOL GraphicElementManager_InitElementFromResource(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, int param3);
-static u32 sub_020222C4(const NNSG2dImagePaletteProxy * param0, u32 param1);
+static void GraphicElementData_CreateMultiCellAnim(GraphicElementData * param0, int param1);
+static BOOL GraphicElementManager_InitElement(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, int param3);
+static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy * param0, u32 param1);
 static void GraphicElementManager_DrawElement(const GraphicElementManager * param0, GraphicElementData * param1);
 static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager * param0, GraphicElementData * param1);
 static void sub_02022454(GraphicElementData * param0);
@@ -235,13 +235,11 @@ static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
     gfxElemMgr->renderer = NULL;
 
     GraphicElementData_Reset(&gfxElemMgr->sentinelData);
-    gfxElemMgr->active = 0;
+    gfxElemMgr->active = FALSE;
 }
 
 void GraphicElementData_Reset(GraphicElementData *elem)
 {
-    int v0;
-
     elem->manager = NULL;
     memset(elem, 0, sizeof(GraphicElementData));
 
@@ -251,20 +249,20 @@ void GraphicElementData_Reset(GraphicElementData *elem)
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
-GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsEx * param0)
+GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParamsEx *params)
 {
-    GraphicElementData *elem = GraphicElementManager_AllocElement(param0->manager);
+    GraphicElementData *elem = GraphicElementManager_AllocElement(params->manager);
     if (elem == NULL) {
         return NULL;
     }
 
-    elem->manager = param0->manager;
+    elem->manager = params->manager;
     elem->unk_F0 = 0;
-    elem->position = param0->position;
-    elem->affineScale = param0->affineScale;
-    elem->affineZRotation = param0->affineZRotation;
-    elem->vramType = param0->vramType;
-    elem->priority = param0->priority;
+    elem->position = params->position;
+    elem->affineScale = params->affineScale;
+    elem->affineZRotation = params->affineZRotation;
+    elem->vramType = params->vramType;
+    elem->priority = params->priority;
     elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
     elem->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
     elem->explicitMosaic = FALSE;
@@ -272,11 +270,11 @@ GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsE
     elem->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
     NNS_G2dSetRndCoreAffineOverwriteMode(
-        &param0->manager->renderer->rendererCore, 
+        &params->manager->renderer->rendererCore, 
         elem->affineOverwriteMode
     );
     NNS_G2dSetRndCoreFlipMode(
-        &param0->manager->renderer->rendererCore, 
+        &params->manager->renderer->rendererCore, 
         elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_H,
         elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_V
     );
@@ -285,15 +283,15 @@ GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsE
     elem->unk_35 = 0;
     elem->unk_38 = (FX32_ONE * 2);
 
-    if (GraphicElementManager_InitElementFromResource(param0->manager, param0->resourceData, elem, param0->heapID) == 0) {
+    if (GraphicElementManager_InitElement(params->manager, params->resourceData, elem, params->heapID) == FALSE) {
         GraphicElementData_Delete(elem);
         return NULL;
     }
 
-    elem->explicitPaletteOffset = sub_020222C4(&elem->paletteProxy, elem->vramType);
+    elem->explicitPaletteOffset = GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
     elem->explicitPalette = elem->explicitPaletteOffset;
 
-    GraphicElementManager_InsertElement(param0->manager, elem);
+    GraphicElementManager_InsertElement(params->manager, elem);
 
     return elem;
 }
@@ -319,14 +317,14 @@ GraphicElementData * sub_02021B90 (const CellActorInitParams * params)
 void GraphicElementData_Delete(GraphicElementData *gfxElem)
 {
     if (gfxElem->type != CELL_TYPE_NONE) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&gfxElem->unk_40;
+        CellAnimationData *cellAnim = (CellAnimationData *)&gfxElem->animData;
 
         if (gfxElem->prev != NULL) {
             GraphicElementManager_RemoveElement(gfxElem);
         }
 
         if (gfxElem->type == CELL_TYPE_VRAM_CELL) {
-            VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->unk_40;
+            VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->animData;
 
             if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
                 NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
@@ -334,14 +332,14 @@ void GraphicElementData_Delete(GraphicElementData *gfxElem)
         }
 
         if (gfxElem->type == CELL_TYPE_MULTI_CELL) {
-            MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->unk_40;
+            MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->animData;
 
-            if (multiCellAnim->unk_74 != NULL) {
-                Heap_FreeToHeap(multiCellAnim->unk_74);
+            if (multiCellAnim->nodes != NULL) {
+                Heap_FreeToHeap(multiCellAnim->nodes);
             }
 
-            if (multiCellAnim->unk_78 != NULL) {
-                Heap_FreeToHeap(multiCellAnim->unk_78);
+            if (multiCellAnim->cellAnims != NULL) {
+                Heap_FreeToHeap(multiCellAnim->cellAnims);
             }
         }
 
@@ -453,11 +451,11 @@ u32 sub_02021D44 (const GraphicElementData * param0)
     GF_ASSERT(param0);
 
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
         v0 = v1->unk_04->numSequences;
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
-        v0 = v2->unk_70->numSequences;
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
+        v0 = v2->animBank->numSequences;
     }
 
     return v0;
@@ -471,17 +469,17 @@ void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
     param0->unk_F0 = param1;
 
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
 
         v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1);
         NNS_G2dSetCellAnimationSequence(&v1->unk_08, v0);
         NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl);
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
 
-        v0 = NNS_G2dGetAnimSequenceByIdx(v2->unk_70, param1);
-        NNS_G2dSetAnimSequenceToMCAnimation(&v2->unk_08, v0);
-        NNS_G2dStartAnimCtrl(&v2->unk_08.animCtrl);
+        v0 = NNS_G2dGetAnimSequenceByIdx(v2->animBank, param1);
+        NNS_G2dSetAnimSequenceToMCAnimation(&v2->anim, v0);
+        NNS_G2dStartAnimCtrl(&v2->anim.animCtrl);
     }
 }
 
@@ -495,16 +493,16 @@ void sub_02021DCC (GraphicElementData * param0, u32 param1)
 void sub_02021DE0 (GraphicElementData * param0)
 {
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
 
         NNS_G2dResetAnimCtrlState(&v0->unk_08.animCtrl);
         NNS_G2dStartAnimCtrl(&v0->unk_08.animCtrl);
         SpriteActor_SetAnimFrame(param0, 0);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
 
-        NNS_G2dResetAnimCtrlState(&v1->unk_08.animCtrl);
-        NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl);
+        NNS_G2dResetAnimCtrlState(&v1->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&v1->anim.animCtrl);
         SpriteActor_SetAnimFrame(param0, 0);
     }
 }
@@ -517,22 +515,22 @@ u32 sub_02021E24 (const GraphicElementData * param0)
 void sub_02021E2C (GraphicElementData * param0, fx32 param1)
 {
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
         NNS_G2dTickCellAnimation(&v0->unk_08, param1);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
-        NNS_G2dTickMCAnimation(&v1->unk_08, param1);
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
+        NNS_G2dTickMCAnimation(&v1->anim, param1);
     }
 }
 
 void SpriteActor_SetAnimFrame (GraphicElementData * param0, u16 param1)
 {
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
         NNS_G2dSetCellAnimationCurrentFrame(&v0->unk_08, param1);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
-        NNS_G2dSetMCAnimationCurrentFrame(&v1->unk_08, param1);
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
+        NNS_G2dSetMCAnimationCurrentFrame(&v1->anim, param1);
     }
 }
 
@@ -541,11 +539,11 @@ u16 sub_02021E74 (const GraphicElementData * param0)
     NNSG2dAnimController * v0;
 
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
         v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->unk_08);
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->unk_40;
-        v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->unk_08);
+        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
+        v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->anim);
     }
 
     return NNS_G2dGetAnimCtrlCurrentFrame(v0);
@@ -573,7 +571,7 @@ void sub_02021E90 (GraphicElementData * param0, u32 param1)
 void sub_02021EC4 (GraphicElementData * param0, u32 param1)
 {
     sub_02021E90(param0, param1);
-    param0->explicitPalette += sub_020222C4(&param0->paletteProxy, param0->vramType);
+    param0->explicitPalette += GetPaletteIndexForProxy(&param0->paletteProxy, param0->vramType);
 }
 
 u32 sub_02021EE8 (const GraphicElementData * param0)
@@ -593,7 +591,7 @@ void sub_02021EF0 (GraphicElementData * param0, u32 param1)
 void sub_02021F24 (GraphicElementData * param0, u32 param1)
 {
     sub_02021EF0(param0, param1);
-    param0->explicitPaletteOffset += sub_020222C4(&param0->paletteProxy, param0->vramType);
+    param0->explicitPaletteOffset += GetPaletteIndexForProxy(&param0->paletteProxy, param0->vramType);
 }
 
 u32 sub_02021F48 (const GraphicElementData * param0)
@@ -653,11 +651,11 @@ BOOL sub_02021FD0 (GraphicElementData * param0)
     GF_ASSERT(param0);
 
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
         return NNS_G2dIsAnimCtrlActive(&v0->unk_08.animCtrl);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->unk_40;
-        return NNS_G2dIsAnimCtrlActive(&v1->unk_08.animCtrl);
+        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
+        return NNS_G2dIsAnimCtrlActive(&v1->anim.animCtrl);
     }
 }
 
@@ -707,11 +705,11 @@ u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
     const NNSG2dUserExAnimFrameAttr * v3;
 
     if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v4 = (CellAnimationData *)&param0->unk_40;
+        CellAnimationData * v4 = (CellAnimationData *)&param0->animData;
         v0 = v4->unk_04;
     } else {
-        MultiCellAnimationData * v5 = (MultiCellAnimationData *)&param0->unk_40;
-        v0 = v5->unk_70;
+        MultiCellAnimationData * v5 = (MultiCellAnimationData *)&param0->animData;
+        v0 = v5->animBank;
     }
 
     v1 = NNS_G2dGetUserExAnimAttrBank(v0);
@@ -742,89 +740,81 @@ u32 sub_020220F4 (const GraphicElementData * param0)
     return sub_0202207C(param0, v0, v1);
 }
 
-static BOOL GraphicElementManager_InitElementFromResource(const GraphicElementManager *gfxElemMgr, 
-    const CellActorResourceData * param1, GraphicElementData *elem, int param3)
+static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
+    const CellActorResourceData *resourceData, GraphicElementData *elem, int param3)
 {
-    elem->type = sub_020221B8(param1);
-    elem->imageProxy = *param1->unk_00;
-    elem->paletteProxy = *param1->unk_08;
+    elem->type = CellActorResourceData_GetCellType(resourceData);
+    elem->imageProxy = *resourceData->unk_00;
+    elem->paletteProxy = *resourceData->unk_08;
 
-    sub_020221D0(param1->unk_0C, elem);
+    GraphicElementData_SetCellBank(resourceData->unk_0C, elem);
 
-    if (param1->unk_10) {
-        sub_020221D4(param1->unk_10, elem);
+    if (resourceData->unk_10) {
+        GraphicElementData_SetCellAnimBank(resourceData->unk_10, elem);
     } else {
-        sub_020221D4(gfxElemMgr->animData, elem);
+        GraphicElementData_SetCellAnimBank(gfxElemMgr->animData, elem);
     }
 
-    if (elem->type == 2) {
-        sub_020221D8(param1->multiCellBank, elem);
-        sub_020221E0(param1->unk_18, elem);
-        sub_02022264(elem, param3);
+    if (elem->type == CELL_TYPE_MULTI_CELL) {
+        GraphicElementData_SetMultiCellBank(resourceData->multiCellBank, elem);
+        GraphicElementData_SetMultiCellAnimBank(resourceData->unk_18, elem);
+        GraphicElementData_CreateMultiCellAnim(elem, param3);
     } else {
-        if (elem->type == 3) {
-            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&elem->unk_40;
-            sub_02022208(param1, elem, param3);
+        if (elem->type == CELL_TYPE_VRAM_CELL) {
+            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&elem->animData;
+            sub_02022208(resourceData, elem, param3);
         } else {
             sub_020221E8(elem, param3);
         }
     }
 
-    elem->explicitPriority = param1->unk_20;
+    elem->explicitPriority = resourceData->unk_20;
 
     return 1;
 }
 
-static enum CellType sub_020221B8 (const CellActorResourceData * param0)
+static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData)
 {
-    if (param0->multiCellBank != NULL) {
+    if (resourceData->multiCellBank != NULL) {
         return CELL_TYPE_MULTI_CELL;
     }
 
-    if (param0->unk_1C == 1) {
+    if (resourceData->unk_1C == 1) {
         return CELL_TYPE_VRAM_CELL;
     }
 
     return CELL_TYPE_CELL;
 }
 
-static void sub_020221D0 (const NNSG2dCellDataBank * param0, GraphicElementData * param1)
+static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, GraphicElementData *elem)
 {
-    CellAnimationData * v0;
-
-    v0 = (CellAnimationData *)&param1->unk_40;
-    v0->unk_00 = param0;
+    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    cellAnim->unk_00 = cellBank;
 }
 
-static void sub_020221D4 (const NNSG2dCellAnimBankData * param0, GraphicElementData * param1)
+static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem)
 {
-    CellAnimationData * v0;
-
-    v0 = (CellAnimationData *)&param1->unk_40;
-    v0->unk_04 = param0;
+    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    cellAnim->unk_04 = cellAnimBank;
 }
 
-static void sub_020221D8 (const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1)
+static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem)
 {
-    MultiCellAnimationData * v0;
-
-    v0 = (MultiCellAnimationData *)&param1->unk_40;
-    v0->unk_6C = param0;
+    MultiCellAnimationData *multiCell = (MultiCellAnimationData *)&elem->animData;
+    multiCell->cellBank = multiCellBank;
 }
 
-static void sub_020221E0 (const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1)
+static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, GraphicElementData *elem)
 {
-    MultiCellAnimationData * v0;
-
-    v0 = (MultiCellAnimationData *)&param1->unk_40;
-    v0->unk_70 = param0;
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+    multiCellAnim->animBank = multiCellAnimBank;
 }
 
 static void sub_020221E8 (GraphicElementData * param0, int param1)
 {
     CellAnimationData * v0;
 
-    v0 = (CellAnimationData *)&param0->unk_40;
+    v0 = (CellAnimationData *)&param0->animData;
     NNS_G2dInitCellAnimation((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00);
 }
 
@@ -833,53 +823,59 @@ static void sub_02022208 (const CellActorResourceData * param0, GraphicElementDa
     VRamCellAnimationData * v0;
     const NNSG2dCharacterData * v1;
 
-    v0 = (VRamCellAnimationData *)&param1->unk_40;
+    v0 = (VRamCellAnimationData *)&param1->animData;
     v0->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
     v1 = param0->unk_04;
 
     NNS_G2dInitCellAnimationVramTransfered((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00, v0->transferHandle, NNS_G2D_VRAM_ADDR_NONE, NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
 }
 
-static void sub_02022264 (GraphicElementData * param0, int param1)
+static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, int heapID)
 {
-    MultiCellAnimationData * v0;
-    const NNSG2dMultiCellAnimSequence * v1;
-    u16 v2;
+    MultiCellAnimationData *multiCellAnim;
+    const NNSG2dMultiCellAnimSequence * animSequence;
+    u16 maxNodes;
 
-    v0 = (MultiCellAnimationData *)&param0->unk_40;
-    v1 = NNS_G2dGetAnimSequenceByIdx(v0->unk_70, 0);
-    v2 = NNS_G2dGetMCBankNumNodesRequired(v0->unk_6C);
+    multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+    animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
+    maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
 
-    v0->unk_74 = Heap_AllocFromHeap(param1, sizeof(NNSG2dNode) * v2);
-    v0->unk_78 = Heap_AllocFromHeap(param1, sizeof(NNSG2dCellAnimation) * v2);
+    multiCellAnim->nodes = Heap_AllocFromHeap(heapID, sizeof(NNSG2dNode) * maxNodes);
+    multiCellAnim->cellAnims = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
 
-    NNS_G2dInitMCAnimation((NNSG2dMultiCellAnimation *)&v0->unk_08, v0->unk_74, v0->unk_78, v2, v0->unk_04, v0->unk_00, v0->unk_6C);
-    NNS_G2dSetAnimSequenceToMCAnimation((NNSG2dMultiCellAnimation *)&v0->unk_08, v1);
+    NNS_G2dInitMCAnimation(
+        &multiCellAnim->anim, 
+        multiCellAnim->nodes, 
+        multiCellAnim->cellAnims, 
+        maxNodes, 
+        multiCellAnim->unk_04, 
+        multiCellAnim->unk_00, 
+        multiCellAnim->cellBank
+    );
+
+    NNS_G2dSetAnimSequenceToMCAnimation(
+        &multiCellAnim->anim, 
+        animSequence
+    );
 }
 
-static u32 sub_020222C4 (const NNSG2dImagePaletteProxy * param0, u32 param1)
+static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType)
 {
-    u32 v0;
-    u32 v1;
+    u32 paletteSize;
 
-    if (param0->bExtendedPlt) {
-        v0 = 32 * 16;
+    if (paletteProxy->bExtendedPlt) {
+        paletteSize = 32 * 16;
     } else {
-        if (param0->fmt == GX_TEXFMT_PLTT256) {
-            v0 = 0;
+        if (paletteProxy->fmt == GX_TEXFMT_PLTT256) {
+            paletteSize = 0;
         } else {
-            v0 = 32;
+            paletteSize = 32;
         }
     }
 
-    if (v0 != 0) {
-        v1 = NNS_G2dGetImagePaletteLocation(param0, param1);
-        v1 /= v0;
-    } else {
-        v1 = 0;
-    }
-
-    return v1;
+    return paletteSize != 0
+        ? NNS_G2dGetImagePaletteLocation(paletteProxy, vramType) / paletteSize
+        : 0;
 }
 
 static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
@@ -927,11 +923,11 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
     NNS_G2dSetRendererOverwritePriority(gfxElemMgr->renderer, elem->explicitPriority);
 
     if (elem->type == 1 || elem->type == 3) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->unk_40;
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
         NNS_G2dDrawCellAnimation(&cellAnim->unk_08);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->unk_40;
-        NNS_G2dDrawMultiCellAnimation(&multiCellAnim->unk_08);
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        NNS_G2dDrawMultiCellAnimation(&multiCellAnim->anim);
     }
 
     NNS_G2dPopMtx();

From 30c14ed5d62e2acc8736dafd06e29da167365daa Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Tue, 25 Jun 2024 08:32:40 +0200
Subject: [PATCH 09/19] More documenting struct fields and cell animations

---
 include/unk_020218BC.h                  |   4 +-
 src/choose_starter/choose_starter_app.c |   2 +-
 src/overlay005/encounter_effect.c       |   2 +-
 src/overlay005/ov5_021D2F14.c           |   4 +-
 src/overlay005/ov5_021D5EB8.c           |   2 +-
 src/overlay006/ov6_022426AC.c           |   2 +-
 src/overlay006/ov6_02243258.c           |   4 +-
 src/overlay007/ov7_0224BE9C.c           |   2 +-
 src/overlay009/ov9_02249960.c           |   2 +-
 src/overlay019/ov19_021D61B0.c          |   2 +-
 src/overlay020/ov20_021D2098.c          |   2 +-
 src/overlay020/ov20_021D4728.c          |   2 +-
 src/overlay021/ov21_021D1FA4.c          |  10 +-
 src/overlay021/ov21_021D5AEC.c          |   8 +-
 src/overlay021/ov21_021D76B0.c          |  12 +--
 src/overlay021/ov21_021D85B0.c          |   4 +-
 src/overlay021/ov21_021D94BC.c          |  20 ++--
 src/overlay021/ov21_021DC9BC.c          |   4 +-
 src/overlay021/ov21_021DDD2C.c          |   2 +-
 src/overlay021/ov21_021DE668.c          |   8 +-
 src/overlay021/ov21_021DF734.c          |   4 +-
 src/overlay021/ov21_021E0C68.c          |   2 +-
 src/overlay021/ov21_021E1924.c          |  10 +-
 src/overlay021/ov21_021E29DC.c          |   2 +-
 src/overlay021/ov21_021E3FFC.c          |   4 +-
 src/overlay021/ov21_021E4CA4.c          |   8 +-
 src/overlay021/ov21_021E6014.c          |   2 +-
 src/overlay021/ov21_021E68F4.c          |   4 +-
 src/overlay021/ov21_021E737C.c          |  10 +-
 src/overlay021/ov21_021E8484.c          |   2 +-
 src/overlay021/ov21_021E8D48.c          |   8 +-
 src/overlay022/ov22_02255094.c          |   2 +-
 src/overlay022/ov22_02259C58.c          |   2 +-
 src/overlay022/ov22_0225A428.c          |   4 +-
 src/overlay023/ov23_0223E140.c          |   4 +-
 src/overlay023/ov23_0224340C.c          |  10 +-
 src/overlay023/ov23_02248F1C.c          |   4 +-
 src/overlay056/ov56_022561C0.c          |   2 +-
 src/overlay058/ov58_021D0D80.c          |   6 +-
 src/overlay059/ov59_021D0D80.c          |   4 +-
 src/overlay063/ov63_0222AE60.c          |   4 +-
 src/overlay064/ov64_0222DCE0.c          |   4 +-
 src/overlay065/ov65_0222DCE0.c          |   2 +-
 src/overlay065/ov65_02235060.c          |   4 +-
 src/overlay068/ov68_0225C700.c          |   2 +-
 src/overlay069/ov69_0225C700.c          |   2 +-
 src/overlay070/ov70_0225D9A4.c          |   8 +-
 src/overlay071/ov71_0223CF0C.c          |   8 +-
 src/overlay072/ov72_0223D7A0.c          |   2 +-
 src/overlay077/ov77_021D54B0.c          |  26 +++---
 src/overlay077/ov77_021D6670.c          |   2 +-
 src/overlay083/ov83_0223D6A8.c          |   2 +-
 src/overlay086/ov86_0223B140.c          |   4 +-
 src/overlay087/ov87_021D106C.c          |   2 +-
 src/overlay088/ov88_0223B140.c          |  12 +--
 src/overlay094/ov94_0223C610.c          |   2 +-
 src/overlay094/ov94_0223D0C4.c          |   2 +-
 src/overlay094/ov94_0223DC04.c          |   2 +-
 src/overlay094/ov94_0223E46C.c          |   2 +-
 src/overlay094/ov94_0223FB48.c          |  10 +-
 src/overlay094/ov94_02243EF8.c          |   4 +-
 src/overlay095/ov95_02246C20.c          |   2 +-
 src/overlay096/ov96_0223B6A0.c          |   2 +-
 src/overlay097/ov97_0222D30C.c          |   2 +-
 src/overlay097/ov97_02233B18.c          |   8 +-
 src/overlay097/ov97_02237694.c          |   2 +-
 src/overlay101/ov101_021D7E48.c         |   2 +-
 src/overlay105/ov105_02245AAC.c         |   2 +-
 src/overlay106/ov106_02243310.c         |   2 +-
 src/overlay107/ov107_02249604.c         |   2 +-
 src/overlay108/ov108_02243030.c         |   2 +-
 src/overlay109/ov109_021D3D50.c         |   2 +-
 src/overlay111/ov111_021D2F80.c         |   2 +-
 src/overlay114/ov114_0225C700.c         |   2 +-
 src/overlay115/ov115_02260CEC.c         |  12 +--
 src/unk_0200C6E4.c                      |   4 +-
 src/unk_02012744.c                      |   2 +-
 src/unk_020218BC.c                      | 117 ++++++++++++------------
 src/unk_0205CA94.c                      |   2 +-
 src/unk_0208694C.c                      |   8 +-
 src/unk_02098FFC.c                      |   2 +-
 81 files changed, 240 insertions(+), 237 deletions(-)

diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 534feef2e8..b7c15ab7b7 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -17,8 +17,8 @@ BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
 BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
 void sub_020219F8(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
-GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParamsEx * param0);
-GraphicElementData * sub_02021B90(const CellActorInitParams * param0);
+GraphicElementData * GraphicElementManager_AddElementEx(const CellActorInitParamsEx * param0);
+GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams * param0);
 void GraphicElementData_Delete(GraphicElementData * param0);
 void sub_02021C50(GraphicElementData * param0, const VecFx32 * param1);
 void sub_02021C60(GraphicElementData * param0, const VecFx32 * param1);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 70e929eea5..4dd87f9147 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1490,7 +1490,7 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param1->unk_00 = sub_02021B90(&v1);
+    param1->unk_00 = GraphicElementManager_AddElement(&v1);
     sub_02021CAC(param1->unk_00, 0);
 
     param1->unk_1C.x = 0;
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index 825e83d4dc..bcaa380ad0 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -813,7 +813,7 @@ GraphicElementData *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_0
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = 4;
 
-    v1 = sub_02021B90(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
     return v1;
 }
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index ce4a5945a8..f466ebe532 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -119,7 +119,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v0.vramType = param1->unk_14;
     v0.heapID = param0->unk_1C6;
 
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = GraphicElementManager_AddElementEx(&v0);
     GF_ASSERT(v1);
 
     SpriteActor_SetSpriteAnimActive(v1, param1->unk_0A);
@@ -385,7 +385,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     v3.vramType = param1->vramType;
     v3.heapID = param0->unk_1C6;
 
-    v2->unk_00 = GraphicElementManager_AddElement(&v3);
+    v2->unk_00 = GraphicElementManager_AddElementEx(&v3);
 
     if (v2->unk_00 != NULL) {
         v1 = sub_02021EE8(v2->unk_00);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 85683fd019..181073595c 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -1477,7 +1477,7 @@ static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 48; v0++) {
-        param0->unk_48[v0].unk_04 = GraphicElementManager_AddElement(&param0->unk_08->unk_10);
+        param0->unk_48[v0].unk_04 = GraphicElementManager_AddElementEx(&param0->unk_08->unk_10);
         sub_02021CAC(param0->unk_48[v0].unk_04, 0);
         GF_ASSERT(param0->unk_48[v0].unk_04);
     }
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 856dab21cc..441d1a8228 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -220,7 +220,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         v2.position.x = FX32_ONE * (256 / 2);
         v2.position.y = FX32_ONE * (192 / 2);
 
-        param0->unk_1C8 = GraphicElementManager_AddElement(&v2);
+        param0->unk_1C8 = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_1C8, 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C8, 0);
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index e3bc823d5a..18104e5a30 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -557,7 +557,7 @@ static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
-    v2 = sub_02021B90(&v1);
+    v2 = GraphicElementManager_AddElement(&v1);
 
     GF_ASSERT(v2 != NULL);
     return v2;
@@ -1860,7 +1860,7 @@ static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = sub_02021B90(&v1);
+    v2 = GraphicElementManager_AddElement(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 0803cc4daf..24b381ec4b 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -656,7 +656,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
 
     for (v0 = 0; v0 < 2; v0++) {
         v3.position.y = v4[v0] * FX32_ONE;
-        param0->unk_158[v0] = sub_02021B90(&v3);
+        param0->unk_158[v0] = GraphicElementManager_AddElement(&v3);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_158[v0], v0);
         sub_02021CC8(param0->unk_158[v0], 1);
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index f765b77e41..4b175c6674 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2769,7 +2769,7 @@ static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = sub_02021B90(&v1);
+    v2 = GraphicElementManager_AddElement(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 03950a5a27..5c14d6b060 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -1955,7 +1955,7 @@ GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorRes
     {
         OSIntrMode v2 = OS_DisableInterrupts();
 
-        v1 = sub_02021B90(&v0);
+        v1 = GraphicElementManager_AddElement(&v0);
         OS_RestoreInterrupts(v2);
     }
 
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index 07deedfd16..34325f031b 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -998,7 +998,7 @@ GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorR
     v0.heapID = 35;
 
     v2 = OS_DisableInterrupts();
-    v1 = sub_02021B90(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
 
     OS_RestoreInterrupts(v2);
 
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index b650f0e264..e7c9a493ce 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -370,7 +370,7 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.heapID = 35;
 
-    v2 = sub_02021B90(&v1);
+    v2 = GraphicElementManager_AddElement(&v1);
 
     if (v2) {
         sub_02021CC8(v2, 1);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index e207d44bc9..999e39f5cd 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -872,7 +872,7 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_00 = sub_02021B90(&v1);
+    param0->unk_1B0.unk_00 = GraphicElementManager_AddElement(&v1);
 
     sub_02021CAC(param0->unk_1B0.unk_00, 0);
     sub_02021F58(param0->unk_1B0.unk_00, 1);
@@ -880,7 +880,7 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_04 = sub_02021B90(&v1);
+    param0->unk_1B0.unk_04 = GraphicElementManager_AddElement(&v1);
 
     sub_02021CAC(param0->unk_1B0.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_1B0.unk_04, 1);
@@ -919,7 +919,7 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_00 = sub_02021B90(&v1);
+    param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     sub_02021CAC(param0->unk_00, 0);
     sub_02021F58(param0->unk_00, 1);
@@ -927,7 +927,7 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_04 = sub_02021B90(&v1);
+    param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
     sub_02021CAC(param0->unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
@@ -1016,7 +1016,7 @@ static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
     v1.position.x = (100 * FX32_ONE);
 
     for (v2 = 0; v2 < 4; v2++) {
-        v3->unk_00[v2] = sub_02021B90(&v1);
+        v3->unk_00[v2] = GraphicElementManager_AddElement(&v1);
         SpriteActor_SetSpriteAnimActive(v3->unk_00[v2], v2);
     }
 
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index ef8ad5fd68..86f5d12a25 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -844,19 +844,19 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     v0.priority = 32;
 
     for (v1 = 0; v1 < 9; v1++) {
-        param0->unk_00[v1] = sub_02021B90(&v0);
+        param0->unk_00[v1] = GraphicElementManager_AddElement(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v1], 0);
     }
 
     v0.priority = 0;
 
     for (v1 = 0; v1 < 9; v1++) {
-        param0->unk_50[v1] = sub_02021B90(&v0);
+        param0->unk_50[v1] = GraphicElementManager_AddElement(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_50[v1], 1);
     }
 
     v0.priority = 0;
-    param0->unk_74 = sub_02021B90(&v0);
+    param0->unk_74 = GraphicElementManager_AddElement(&v0);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_74, 2);
 
@@ -865,7 +865,7 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     v0.position.y = 80 << FX32_SHIFT;
     v0.resourceData = &param0->unk_B4;
 
-    param0->unk_7C = sub_02021B90(&v0);
+    param0->unk_7C = GraphicElementManager_AddElement(&v0);
 
     sub_02021CAC(param0->unk_7C, 0);
     sub_02021FE0(param0->unk_7C, GX_OAM_MODE_XLU);
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index 6156b2df89..ac0533fd51 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -611,7 +611,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 40 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = sub_02021B90(&v1);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2);
 
@@ -623,7 +623,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 88 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = sub_02021B90(&v1);
+    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
 
@@ -635,7 +635,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 152 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[2] = sub_02021B90(&v1);
+    param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 1);
 
@@ -643,7 +643,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 64 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_18 = sub_02021B90(&v1);
+    param0->unk_18 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_18, 3);
 
@@ -651,7 +651,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 146 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_1C = sub_02021B90(&v1);
+    param0->unk_1C = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_1C, 4);
 
@@ -659,7 +659,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 8 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_20 = sub_02021B90(&v1);
+    param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_20, 5);
 }
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index dd12c95797..1b6ec10fe1 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -659,14 +659,14 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 164 << FX32_SHIFT;
-    param0->unk_20 = sub_02021B90(&v1);
+    param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_20, 3);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 96 << FX32_SHIFT;
 
-    param0->unk_58 = sub_02021B90(&v1);
+    param0->unk_58 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_58, 17);
     sub_02021CAC(param0->unk_58, 0);
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 45c5d60d6b..2b212bc1df 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -2447,7 +2447,7 @@ static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             break;
         }
 
-        param0->unk_00[v0] = sub_02021B90(param1);
+        param0->unk_00[v0] = GraphicElementManager_AddElement(param1);
 
         switch (v0) {
         case 0:
@@ -2498,7 +2498,7 @@ static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
+            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
@@ -2515,7 +2515,7 @@ static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
+            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
@@ -2532,7 +2532,7 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
+            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
@@ -2541,7 +2541,7 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.x = (48 - 24);
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[10] = sub_02021B90(param1);
+    param0->unk_30[10] = GraphicElementManager_AddElement(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[10], 5);
 }
@@ -2557,7 +2557,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = sub_02021B90(param1);
+            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
@@ -2566,7 +2566,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.x = 128;
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[8] = sub_02021B90(param1);
+    param0->unk_30[8] = GraphicElementManager_AddElement(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[8], 0);
 
@@ -2574,7 +2574,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.x = (48 - 24);
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[9] = sub_02021B90(param1);
+    param0->unk_30[9] = GraphicElementManager_AddElement(param1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30[9], 4);
 }
@@ -2590,7 +2590,7 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 3; v1++) {
             param1->position.x = 28 + (v1 * 56);
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 3) + v1] = sub_02021B90(param1);
+            param0->unk_30[(v0 * 3) + v1] = GraphicElementManager_AddElement(param1);
 
             SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 3) + v1], 6);
         }
@@ -2619,7 +2619,7 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
         for (v4 = 0; v4 < 3; v4++) {
             v1.position.x = 28 + (v4 * 56);
             v1.position.x <<= FX32_SHIFT;
-            param0->unk_A8[(v3 * 3) + v4] = sub_02021B90(&v1);
+            param0->unk_A8[(v3 * 3) + v4] = GraphicElementManager_AddElement(&v1);
 
             switch ((v3 * 3) + v4) {
             case 0:
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 907fd9d1cd..bfc383c4b1 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -590,7 +590,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
     v1.position.x = 160 * FX32_ONE;
     v1.position.y = 96 * FX32_ONE;
 
-    param0->unk_C8 = sub_02021B90(&v1);
+    param0->unk_C8 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_C8, 2);
     sub_020093B4(&v0, 108 + 6000, 14 + 6000, 106 + 6000, 107 + 6000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
@@ -604,7 +604,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
     v1.position.y = 0;
 
     for (v3 = 0; v3 < (22 * 2); v3++) {
-        param0->unk_04[v3] = sub_02021B90(&v1);
+        param0->unk_04[v3] = GraphicElementManager_AddElement(&v1);
         sub_02021CAC(param0->unk_04[v3], 0);
         sub_02021FE0(param0->unk_04[v3], GX_OAM_MODE_XLU);
     }
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index d64e0692d8..bf45cd1e9e 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -448,7 +448,7 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
     v1.position.y = 0;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00 = sub_02021B90(&v1);
+    param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 0);
 }
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index b87f9a512e..752279a1e3 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -562,7 +562,7 @@ static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.y = (88 * FX32_ONE);
     v1.position.x = (120 * FX32_ONE);
 
-    param0->unk_00[0] = sub_02021B90(&v1);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 }
 
 static void ov21_021DEEF8 (UnkStruct_ov21_021DF374 * param0)
@@ -656,14 +656,14 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.x = (170 * FX32_ONE);
     v1.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[1] = sub_02021B90(&v1);
+    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v4);
 
     if (v4 != v5) {
         v1.position.x = (220 * FX32_ONE);
         v1.position.y = (72 * FX32_ONE);
-        param0->unk_00[2] = sub_02021B90(&v1);
+        param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 0 + v5);
     } else {
         param0->unk_00[2] = NULL;
@@ -763,7 +763,7 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_0C = sub_02021B90(&v1);
+    param0->unk_0C = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_0C, 0x11);
 
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index 36583fb14a..f5785f93f0 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -577,7 +577,7 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
         v1.position.x = v3 << FX32_SHIFT;
         v1.position.y = (v4 + 8) << FX32_SHIFT;
 
-        param0->unk_00[v5] = sub_02021B90(&v1);
+        param0->unk_00[v5] = GraphicElementManager_AddElement(&v1);
 
         if ((v5 % 2) == 0) {
             SpriteActor_SetSpriteAnimActive(param0->unk_00[v5], 0);
@@ -590,7 +590,7 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
     v1.position.y = 96 << FX32_SHIFT;
     v1.priority = 0;
 
-    param0->unk_BC = sub_02021B90(&v1);
+    param0->unk_BC = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_BC, 1);
     sub_02021CC8(param0->unk_BC, 1);
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 0442510c8e..d52737121e 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -541,7 +541,7 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = sub_02021B90(&v1);
+    param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 0x11);
 
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 1c247aeaf0..392e414a83 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -723,14 +723,14 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y = 132 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = sub_02021B90(&v1);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 76 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = sub_02021B90(&v1);
+    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
     sub_020093B4(&v0, 99 + 5000, 11 + 2100, 97 + 5000, 98 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
@@ -741,7 +741,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 
     for (v3 = 0; v3 < (7 - 2 + 1); ++v3) {
         v1.position.x = Unk_ov21_021E9D80[v3];
-        param0->unk_00[v3 + 2] = sub_02021B90(&v1);
+        param0->unk_00[v3 + 2] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
     }
@@ -752,14 +752,14 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y = (132 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_50[0] = sub_02021B90(&v1);
+    param0->unk_50[0] = GraphicElementManager_AddElement(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_50[0], 13);
 
     v1.position.x = (128 + -32) << FX32_SHIFT;
     v1.position.y = (76 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_50[1] = sub_02021B90(&v1);
+    param0->unk_50[1] = GraphicElementManager_AddElement(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_50[1], 12);
 
     for (v3 = 1 + 1; v3 < 8; v3++) {
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 2d46e45c3d..1fc728fe0a 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1314,7 +1314,7 @@ static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
             break;
         }
 
-        param0->unk_00[v3] = sub_02021B90(&v1);
+        param0->unk_00[v3] = GraphicElementManager_AddElement(&v1);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v3], v3);
     }
 }
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index b39e3b8ee5..747c2bdee1 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -590,10 +590,10 @@ static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E
 
     for (v3 = 0; v3 < 9; v3++) {
         for (v4 = 0; v4 < 9; v4++) {
-            param0->unk_20[v3].unk_00[v4].unk_00 = sub_02021B90(&v1);
+            param0->unk_20[v3].unk_00[v4].unk_00 = GraphicElementManager_AddElement(&v1);
         }
 
-        param0->unk_20[v3].unk_48.unk_00 = sub_02021B90(&v1);
+        param0->unk_20[v3].unk_48.unk_00 = GraphicElementManager_AddElement(&v1);
     }
 }
 
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 814a80a058..a3c3b4912c 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -861,7 +861,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 67 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_3C = sub_02021B90(&v1);
+    param0->unk_3C = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_3C, 4);
     sub_02021CC8(param0->unk_3C, 1);
@@ -872,7 +872,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 157 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00 = sub_02021B90(&v1);
+    param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 1);
     sub_02021CF8(param0->unk_00, 1);
@@ -881,7 +881,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 131 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_04 = sub_02021B90(&v1);
+    param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_04, 3);
     sub_02021CC8(param0->unk_04, 1);
@@ -898,7 +898,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 166 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_20 = sub_02021B90(&v1);
+    param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_20, 6);
     sub_02021CC8(param0->unk_20, 1);
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 7776ab7c15..a97665797b 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -430,7 +430,7 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
     v1.position.x = 168 << FX32_SHIFT;
     v1.position.y = (88 + v4) << FX32_SHIFT;
 
-    param0->unk_10 = sub_02021B90(&v1);
+    param0->unk_10 = GraphicElementManager_AddElement(&v1);
 
     if (ov21_021D3920(param2->unk_04) == 0) {
         SpriteActor_SetSpriteAnimActive(param0->unk_10, 5);
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index a3f2d0c0d2..c2fcf3daf0 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -582,7 +582,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
     v1.position.y = 120 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = sub_02021B90(&v1);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 1);
 
@@ -590,7 +590,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
     v1.position.y = 120 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = sub_02021B90(&v1);
+    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 1);
 }
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index b481545be9..78e9cde839 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -647,7 +647,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_00 = sub_02021B90(&v1);
+    param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     if (ov21_021D3920(param2->unk_00) == 0) {
         SpriteActor_SetSpriteAnimActive(param0->unk_00, 3);
@@ -658,7 +658,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = (96 + 10) << FX32_SHIFT;
 
-    param0->unk_08 = sub_02021B90(&v1);
+    param0->unk_08 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_08, 1);
     sub_02021E80(param0->unk_08, 1);
@@ -666,13 +666,13 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[0] = sub_02021B90(&v1);
+    param0->unk_0C[0] = GraphicElementManager_AddElement(&v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_0C[0], 0);
 
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[1] = sub_02021B90(&v1);
+    param0->unk_0C[1] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_0C[1], 0);
     sub_020093B4(&v0, sub_02009E08(param0->unk_14[0]), sub_02009E08(param0->unk_14[1]), sub_02009E08(param0->unk_14[2]), sub_02009E08(param0->unk_14[3]), 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
@@ -685,7 +685,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_04 = sub_02021B90(&v1);
+    param0->unk_04 = GraphicElementManager_AddElement(&v1);
     sub_02021EC4(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
 }
 
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 2b7da60bbb..6cfb0bc89b 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -554,7 +554,7 @@ static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
     v1.position.y = 144 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = sub_02021B90(&v1);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2);
 }
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 180916a9f1..317540fcbf 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -524,7 +524,7 @@ static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManag
     v0.position.x = (120 * FX32_ONE);
     v0.position.y = (88 * FX32_ONE);
 
-    param0->unk_00 = sub_02021B90(&v0);
+    param0->unk_00 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(param0->unk_00);
 }
 
@@ -548,7 +548,7 @@ static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManag
     v0.position.x = (192 * FX32_ONE);
     v0.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = sub_02021B90(&v0);
+    param0->unk_00 = GraphicElementManager_AddElement(&v0);
 
     GF_ASSERT(param0->unk_00);
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 0x11);
@@ -618,14 +618,14 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
     v0.position.x = (170 * FX32_ONE);
     v0.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[0] = sub_02021B90(&v0);
+    param0->unk_00[0] = GraphicElementManager_AddElement(&v0);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0 + v2);
 
     if (v2 != v3) {
         v0.position.x = (220 * FX32_ONE);
         v0.position.y = (72 * FX32_ONE);
-        param0->unk_00[1] = sub_02021B90(&v0);
+        param0->unk_00[1] = GraphicElementManager_AddElement(&v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v3);
     } else {
         param0->unk_00[1] = NULL;
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 5c1e08b7b2..6239ac7d13 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -172,7 +172,7 @@ GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1
     v1.vramType = param5;
     v1.heapID = 14;
 
-    return sub_02021B90(&v1);
+    return GraphicElementManager_AddElement(&v1);
 }
 
 void ov22_02255248 (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5)
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index 83c05b5f93..62474a7494 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -58,7 +58,7 @@ void ov22_02259C58 (UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1
     GF_ASSERT(param0);
     GF_ASSERT(param1);
 
-    param0->unk_00 = GraphicElementManager_AddElement(param1->unk_00);
+    param0->unk_00 = GraphicElementManager_AddElementEx(param1->unk_00);
     GF_ASSERT(param0->unk_00);
 
     param0->unk_04 = param1->unk_0C;
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index fff5b2b338..0670a6d1e6 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -315,7 +315,7 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag
             v1.position.x = 38 + (18 * v3);
             v1.position.x *= FX32_ONE;
 
-            param0->unk_10[(v2 * 10) + v3] = sub_02021B90(&v1);
+            param0->unk_10[(v2 * 10) + v3] = GraphicElementManager_AddElement(&v1);
             SpriteActor_SetSpriteAnimActive(param0->unk_10[(v2 * 10) + v3], 1);
 
             if (((v2 * 10) + v3) >= param3) {
@@ -404,7 +404,7 @@ static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManag
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.x = 103 + (v2 * 24);
         v1.position.x *= FX32_ONE;
-        param0->unk_10[v2] = sub_02021B90(&v1);
+        param0->unk_10[v2] = GraphicElementManager_AddElement(&v1);
     }
 
     param0->unk_1C = param3;
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index d531bfb149..e49016e814 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -2838,12 +2838,12 @@ static void ov23_0224108C (void)
 
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
-                Unk_ov23_02257740->unk_24C[v1] = GraphicElementManager_AddElement(&v2);
+                Unk_ov23_02257740->unk_24C[v1] = GraphicElementManager_AddElementEx(&v2);
                 sub_02021CC8(Unk_ov23_02257740->unk_24C[v1], 1);
             }
         }
 
-        Unk_ov23_02257740->unk_24C[v0] = GraphicElementManager_AddElement(&v2);
+        Unk_ov23_02257740->unk_24C[v0] = GraphicElementManager_AddElementEx(&v2);
         sub_02021CC8(Unk_ov23_02257740->unk_24C[v0], 1);
     }
 
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index d9fc35e7e1..2851d4ce57 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3334,7 +3334,7 @@ static void ov23_0224644C (int param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
             sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 0);
@@ -3684,7 +3684,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
@@ -3862,7 +3862,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
             v0.position.x = FX32_ONE * 100;
             v0.position.y = FX32_ONE * 100;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
             sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
@@ -4331,7 +4331,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
             v0.position.x = FX32_ONE * 128;
             v0.position.y = FX32_ONE * 84;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
@@ -4791,7 +4791,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElement(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             if (v1 == 0) {
                 sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 8705aad663..853ff90d4b 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -126,7 +126,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             v3.heapID = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
-                v0->unk_390[v2] = GraphicElementManager_AddElement(&v3);
+                v0->unk_390[v2] = GraphicElementManager_AddElementEx(&v3);
                 sub_02021CC8(v0->unk_390[v2], 1);
                 sub_02021CAC(v0->unk_390[v2], 0);
 
@@ -136,7 +136,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             }
 
             for (v2 = 0; v2 < 16 + 1; v2++) {
-                v0->unk_3B0[v2] = GraphicElementManager_AddElement(&v3);
+                v0->unk_3B0[v2] = GraphicElementManager_AddElementEx(&v3);
                 sub_02021CC8(v0->unk_3B0[v2], 1);
                 sub_02021CAC(v0->unk_3B0[v2], 0);
                 SpriteActor_SetSpriteAnimActive(v0->unk_3B0[v2], 2);
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 959f5aa6ef..9f61c5db17 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -435,7 +435,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
             v1.position.x = FX32_CONST((256 - 24));
             v1.position.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT);
 
-            param0->unk_1FC[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_1FC[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_1FC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_1FC[v0], v0);
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 83d0836ee3..1b3e36ab2d 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -694,7 +694,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.position.y = FX32_ONE * (32 + 32);
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
 
-            param0->unk_23C[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_23C[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_23C[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_23C[v0], v0);
@@ -706,7 +706,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.position.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
 
-            param0->unk_2AC[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_2AC[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_2AC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
@@ -722,7 +722,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.position.x = FX32_ONE * 24;
             v1.position.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
 
-            param0->unk_274[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_274[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_274[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_274[v0], v0);
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index c493c61f7b..fb91e81bbf 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -660,7 +660,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         v1.position.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
         v1.position.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
 
-        param0->unk_28C[0] = GraphicElementManager_AddElement(&v1);
+        param0->unk_28C[0] = GraphicElementManager_AddElementEx(&v1);
 
         sub_02021CC8(param0->unk_28C[0], 1);
         sub_02021CAC(param0->unk_28C[0], 1);
@@ -669,7 +669,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
             v1.position.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
             v1.position.y = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][1];
 
-            param0->unk_28C[v0 + 1] = GraphicElementManager_AddElement(&v1);
+            param0->unk_28C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_28C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 1527ec6b58..07c91c2edd 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -468,7 +468,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     }
 
-    v0->unk_04 = GraphicElementManager_AddElement(&v1);
+    v0->unk_04 = GraphicElementManager_AddElementEx(&v1);
     sub_02021E80(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
@@ -501,7 +501,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v0->unk_08 = GraphicElementManager_AddElement(&v1);
+        v0->unk_08 = GraphicElementManager_AddElementEx(&v1);
 
         sub_02021E80(v0->unk_08, param1->unk_06);
     } else {
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 8b2d8c2c06..34e67c6c0f 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1240,7 +1240,7 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
         v0[v1].resourceData = &param0->unk_23C;
         v0[v1].heapID = param1;
 
-        param0->unk_270[v1] = GraphicElementManager_AddElement(&v0[v1]);
+        param0->unk_270[v1] = GraphicElementManager_AddElementEx(&v0[v1]);
 
         sub_02021CC8(param0->unk_270[v1], 1);
         sub_02021CAC(param0->unk_270[v1], 0);
@@ -2171,7 +2171,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     ldr r0, [sp, #0x18]
     str r0, [sp, #0x54]
     add r0, sp, #0x28
-    bl GraphicElementManager_AddElement
+    bl GraphicElementManager_AddElementEx
     mov r2, #0x42
     ldr r1, [sp, #0x14]
     lsl r2, r2, #2
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 4e20f2a78d..bfbe86c5fe 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6706,7 +6706,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
         v9[v1].resourceData = &v2;
         v9[v1].heapID = param2;
 
-        param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElement(&v9[v1]);
+        param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElementEx(&v9[v1]);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
     }
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 78712e26e7..6372b50a61 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -691,8 +691,8 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     v0.priority = 0;
     v0.heapID = param1;
 
-    param0->unk_1A0.unk_34 = GraphicElementManager_AddElement(&v0);
-    param0->unk_1A0.unk_38 = GraphicElementManager_AddElement(&v0);
+    param0->unk_1A0.unk_34 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_1A0.unk_38 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CAC(param0->unk_1A0.unk_34, 0);
     sub_02021CAC(param0->unk_1A0.unk_38, 0);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 590cbdb4cf..74830b162a 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -706,7 +706,7 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v2.heapID = param3;
 
-        param0->unk_14 = sub_02021B90(&v2);
+        param0->unk_14 = GraphicElementManager_AddElement(&v2);
         sub_02021CAC(param0->unk_14, 0);
     }
 
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 1082e4345e..d30ba3cfd5 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -2669,7 +2669,7 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
         sub_02009D4C(param0->unk_6C[v0][0]);
         sub_020093B4(&v1, v0, 0, v0, v0, 0xffffffff, 0xffffffff, 0, 1, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        param0->unk_3C[v0] = sub_02021B90(&v3);
+        param0->unk_3C[v0] = GraphicElementManager_AddElement(&v3);
 
         sub_02021CC8(param0->unk_3C[v0], 1);
         sub_02021CE4(param0->unk_3C[v0], FX32_ONE);
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 9234b88490..4458ec765c 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1695,7 +1695,7 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
 
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.y = Unk_ov70_0226D580[v2] * FX32_ONE;
-        param0->unk_50[v2] = sub_02021B90(&v1);
+        param0->unk_50[v2] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_50[v2], v2);
         sub_02021CC8(param0->unk_50[v2], 1);
@@ -2748,7 +2748,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
         v4.heapID = param3;
         v4.position.x = (FX32_CONST(208));
         v4.position.y = (FX32_CONST(152) + (256 * FX32_ONE));
-        param0->unk_54 = sub_02021B90(&v4);
+        param0->unk_54 = GraphicElementManager_AddElement(&v4);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_54, v1);
         sub_02021CAC(param0->unk_54, param5);
@@ -2823,7 +2823,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
         v7.position.x = FX32_CONST(v1);
         v7.position.y = FX32_CONST(v2) + (256 * FX32_ONE);
 
-        param0->unk_68 = sub_02021B90(&v7);
+        param0->unk_68 = GraphicElementManager_AddElement(&v7);
     }
 }
 
@@ -3034,7 +3034,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
             v8.position.x += FX32_CONST(v10->unk_04);
             v8.position.y += FX32_CONST(v10->unk_06);
 
-            param0->unk_7C[v0] = sub_02021B90(&v8);
+            param0->unk_7C[v0] = GraphicElementManager_AddElement(&v8);
 
             sub_02021F24(param0->unk_7C[v0], v10->unk_01);
         }
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 2eaab1b0f5..5e47baad32 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -128,7 +128,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         for (v0 = 0; v0 < 8; v0++) {
             v3.position.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
             v3.position.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
-            param0->unk_1C0[v0] = GraphicElementManager_AddElement(&v3);
+            param0->unk_1C0[v0] = GraphicElementManager_AddElementEx(&v3);
             sub_02021CC8(param0->unk_1C0[v0], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v0], v0);
 
@@ -144,7 +144,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
-                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
+                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 8);
                 sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
@@ -156,7 +156,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
-                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElement(&v3);
+                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
                 sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 9);
                 sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
@@ -169,7 +169,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.position.x = FX32_ONE * (12 * 8);
             v3.position.y = FX32_ONE * (17 * 8);
             v3.priority = 0;
-            param0->unk_1C0[v2] = GraphicElementManager_AddElement(&v3);
+            param0->unk_1C0[v2] = GraphicElementManager_AddElementEx(&v3);
             sub_02021CC8(param0->unk_1C0[v2], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2], 10);
             sub_02021CAC(param0->unk_1C0[v2], 0);
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 9172b1b455..5e1d1da79e 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -537,7 +537,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
             v1.position.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
 
-            param0->unk_2B4[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_2B4[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_2B4[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 8a0073810d..1ef833190c 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -270,7 +270,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * (128 - 48);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[0] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[0] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[0], 0);
         sub_02021CAC(param0->unk_250[0], 0);
@@ -279,7 +279,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * (128 - 48);
         v2.position.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[1] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[1] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[1], 0);
         sub_02021CAC(param0->unk_250[1], 0);
@@ -288,7 +288,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * (128 + 48);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[2] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[2] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[2], 0);
         sub_02021CAC(param0->unk_250[2], 0);
@@ -297,7 +297,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * -64;
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[3] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[3] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[3], 1);
         sub_02021CAC(param0->unk_250[3], 0);
@@ -306,7 +306,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * (256 + 64);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[10] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[10] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[10], 1);
         sub_02021CAC(param0->unk_250[10], 0);
@@ -315,7 +315,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (12 * 8);
-        param0->unk_250[11] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[11] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[11], 1);
         sub_02021CAC(param0->unk_250[11], 0);
@@ -325,7 +325,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[12] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[12] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[12], 1);
         sub_02021CAC(param0->unk_250[12], 0);
@@ -335,12 +335,12 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (0xd * 8);
-        param0->unk_250[13] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[13] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[13], 1);
         sub_02021CAC(param0->unk_250[13], 0);
 
-        param0->unk_250[14] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[14] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[14], 1);
         sub_02021CAC(param0->unk_250[14], 0);
@@ -349,12 +349,12 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[15] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[15] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[15], 1);
         sub_02021CAC(param0->unk_250[15], 0);
 
-        param0->unk_250[16] = GraphicElementManager_AddElement(&v2);
+        param0->unk_250[16] = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_250[16], 1);
         sub_02021CAC(param0->unk_250[16], 0);
@@ -364,7 +364,7 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
             v2.position.x = FX32_ONE * v4[v0];
             v2.position.y = FX32_ONE * v5[v0];
-            param0->unk_250[v3[v0]] = GraphicElementManager_AddElement(&v2);
+            param0->unk_250[v3[v0]] = GraphicElementManager_AddElementEx(&v2);
 
             sub_02021CC8(param0->unk_250[v3[v0]], 1);
             sub_02021CAC(param0->unk_250[v3[v0]], 0);
@@ -384,7 +384,7 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 
         for (v0 = 0; v0 < 16; v0++) {
             v3 = ov77_021D6794(param1, v0);
-            (*v3) = GraphicElementManager_AddElement(&v2);
+            (*v3) = GraphicElementManager_AddElementEx(&v2);
             sub_02021CC8(*v3, 0);
             sub_02021CAC(*v3, 0);
         }
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 3288e63ad4..7bec85c512 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -249,7 +249,7 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
         v2.position.x = FX32_ONE * v0 * 2;
         v2.position.y = FX32_ONE * v0 * 2;
 
-        param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElement(&v2);
+        param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElementEx(&v2);
 
         sub_02021CC8(param0->unk_1B0[v0].unk_04, 0);
         sub_02021CAC(param0->unk_1B0[v0].unk_04, 0);
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index d5a8d87fa7..0a3c43d61f 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -285,7 +285,7 @@ GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param6;
 
-    v1 = sub_02021B90(&v0);
+    v1 = GraphicElementManager_AddElement(&v0);
     GF_ASSERT(v1);
 
     return v1;
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index bef837f3c8..ff869bef64 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -846,7 +846,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
         NNS_G2dLoadPalette(v8, v12 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v6);
 
         v3.priority = 1 + v12;
-        param0->unk_1B4[v12] = sub_02021B90(&v3);
+        param0->unk_1B4[v12] = GraphicElementManager_AddElement(&v3);
 
         sub_02021CAC(param0->unk_1B4[v12], 0);
         v11 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, param0->unk_2C8[v12]);
@@ -883,7 +883,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     sub_02006E84(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63);
 
     v3.priority = 0;
-    param0->unk_1CC = sub_02021B90(&v3);
+    param0->unk_1CC = GraphicElementManager_AddElement(&v3);
 
     sub_02021CAC(param0->unk_1CC, 0);
     Heap_FreeToHeap(v10);
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 2f0b14e2a6..102e06e5bd 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -530,7 +530,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         v2.position.y = v0[v9].y << FX32_SHIFT;
         v2.priority = v9 + 1;
 
-        param0->unk_1C4[v9] = sub_02021B90(&v2);
+        param0->unk_1C4[v9] = GraphicElementManager_AddElement(&v2);
         sub_02021CAC(param0->unk_1C4[v9], 0);
     }
 
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 4f632111b0..76346f7a4c 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -1427,7 +1427,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         for (v1 = 0; v1 < 2; v1++) {
             v0.position.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
             v0.position.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
-            param0->unk_39C[v1] = GraphicElementManager_AddElement(&v0);
+            param0->unk_39C[v1] = GraphicElementManager_AddElementEx(&v0);
             sub_02021CC8(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
             sub_02021F58(param0->unk_39C[v1], 100);
@@ -1437,7 +1437,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         for (v1 = 0; v1 < 12; v1++) {
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
-            param0->unk_3D4[v1] = GraphicElementManager_AddElement(&v0);
+            param0->unk_3D4[v1] = GraphicElementManager_AddElementEx(&v0);
             sub_02021CC8(param0->unk_3D4[v1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3D4[v1], 5 + v1);
             sub_02021F58(param0->unk_3D4[v1], 5);
@@ -1448,7 +1448,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
-            param0->unk_404[v1] = GraphicElementManager_AddElement(&v0);
+            param0->unk_404[v1] = GraphicElementManager_AddElementEx(&v0);
             sub_02021F58(param0->unk_404[v1], 3);
             sub_02021CAC(param0->unk_404[v1], 0);
         }
@@ -1457,14 +1457,14 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20 + 9);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
-            param0->unk_434[v1] = GraphicElementManager_AddElement(&v0);
+            param0->unk_434[v1] = GraphicElementManager_AddElementEx(&v0);
             sub_02021F58(param0->unk_434[v1], 3);
             sub_02021CAC(param0->unk_434[v1], 0);
         }
 
         v0.position.x = FX32_ONE * (128 - 4 * 8);
         v0.position.y = FX32_ONE * (8 * 8 + 2);
-        param0->unk_47C = GraphicElementManager_AddElement(&v0);
+        param0->unk_47C = GraphicElementManager_AddElementEx(&v0);
         sub_02021CC8(param0->unk_47C, 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_47C, 20);
         sub_02021CAC(param0->unk_47C, 0);
@@ -1474,7 +1474,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
             v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-            param0->unk_464[v1] = GraphicElementManager_AddElement(&v0);
+            param0->unk_464[v1] = GraphicElementManager_AddElementEx(&v0);
             sub_02021CAC(param0->unk_464[v1], 0);
             sub_02021CC8(param0->unk_464[v1], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index b0a47118c2..274bc12e3f 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -313,7 +313,7 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][0];
     v0.position.y = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][1];
 
-    param0->unk_E20 = GraphicElementManager_AddElement(&v0);
+    param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 1);
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 0f000f7ff0..33ab0eb997 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -267,7 +267,7 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = GraphicElementManager_AddElement(&v0);
+    param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 566ff28062..2905498af6 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -230,7 +230,7 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = GraphicElementManager_AddElement(&v0);
+    param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index d4458b13e6..7739665f5e 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -301,7 +301,7 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE;
     v0.position.y = FX32_ONE;
 
-    param0->unk_E20 = GraphicElementManager_AddElement(&v0);
+    param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 0);
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 8e0d33a149..37656cb0ad 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -365,7 +365,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     v1.position.x = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][0];
     v1.position.y = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][1];
 
-    param0->unk_E20 = GraphicElementManager_AddElement(&v1);
+    param0->unk_E20 = GraphicElementManager_AddElementEx(&v1);
 
     sub_02021CC8(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 4);
@@ -381,7 +381,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * Unk_ov94_02245ED4[v0][1];
         v1.priority = 20;
 
-        param0->unk_E28[v0] = GraphicElementManager_AddElement(&v1);
+        param0->unk_E28[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_E28[v0], 6 + v0);
         sub_02021E80(param0->unk_E28[v0], 1);
@@ -392,7 +392,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.priority = 10;
 
-        param0->unk_EA0[v0] = GraphicElementManager_AddElement(&v1);
+        param0->unk_EA0[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_EA0[v0], 40);
         sub_02021E80(param0->unk_EA0[v0], 1);
@@ -403,7 +403,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.priority = 10;
 
-        param0->unk_F18[v0] = GraphicElementManager_AddElement(&v1);
+        param0->unk_F18[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_F18[v0], 42);
         sub_02021E80(param0->unk_F18[v0], 1);
@@ -413,7 +413,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.x = FX32_ONE * Unk_ov94_02245E1C[v0][0];
         v1.position.y = FX32_ONE * Unk_ov94_02245E1C[v0][1];
 
-        param0->unk_F54[v0] = GraphicElementManager_AddElement(&v1);
+        param0->unk_F54[v0] = GraphicElementManager_AddElementEx(&v1);
 
         sub_02021CC8(param0->unk_F54[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F54[v0], 38 + v0);
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index a3cb6e9e57..0fd3cb093e 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -55,14 +55,14 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
     v0.position.x = FX32_ONE * 128;
     v0.position.y = FX32_ONE * 130 + (256 * FX32_ONE);
 
-    param0->unk_F34[0] = GraphicElementManager_AddElement(&v0);
+    param0->unk_F34[0] = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(param0->unk_F34[0], 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F34[0], 3 + param1 * 7);
     sub_02021CAC(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
-        param0->unk_F34[v1 + 1] = GraphicElementManager_AddElement(&v0);
+        param0->unk_F34[v1 + 1] = GraphicElementManager_AddElementEx(&v0);
 
         sub_02021CC8(param0->unk_F34[v1 + 1], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F34[v1 + 1], 14 + v1 * 4);
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 1c5f68b40c..4f61796b4d 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -661,7 +661,7 @@ GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorR
     v1.vramType = param5;
     v1.heapID = 57;
 
-    v0 = sub_02021B90(&v1);
+    v0 = GraphicElementManager_AddElement(&v1);
 
     if (v0) {
         sub_02021CC8(v0, 1);
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index c9ad90bef5..480e1eda32 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -313,7 +313,7 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
         for (v0 = 0; v0 < 2; v0++) {
             v1.position.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
             v1.position.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
-            param0->unk_E30[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_E30[v0] = GraphicElementManager_AddElementEx(&v1);
             sub_02021CC8(param0->unk_E30[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_E30[v0], v0);
             sub_02021CAC(param0->unk_E30[v0], 0);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 9c410ff489..ba77e08208 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1199,7 +1199,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
             v1.position.y += FX32_CONST(256);
         }
 
-        v0 = GraphicElementManager_AddElement(&v1);
+        v0 = GraphicElementManager_AddElementEx(&v1);
     }
 
     if (v0) {
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 928a726fe3..a63591ee07 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -763,7 +763,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             v3.position.y = FX32_ONE * (v2 * 24 + 40);
 
             if (param0->unk_20C[v0].unk_00 == NULL) {
-                param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElement(&v3);
+                param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElementEx(&v3);
             }
 
             sub_02021CC8(param0->unk_20C[v0].unk_00, 1);
@@ -776,7 +776,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             v3.position.y += FX32_ONE * 12;
 
             if (param0->unk_20C[v0].unk_04 == NULL) {
-                param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElement(&v3);
+                param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElementEx(&v3);
             }
 
             sub_02021CC8(param0->unk_20C[v0].unk_04, 1);
@@ -805,7 +805,7 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int
     v0.position.y = FX32_ONE * param2;
     v0.priority = 10;
 
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CC8(v1, 1);
     SpriteActor_SetSpriteAnimActive(v1, param3);
@@ -1477,7 +1477,7 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
         v5.position.x = FX32_ONE * (v0 * 40 + 28);
         v5.position.y = FX32_ONE * 142;
 
-        param0->unk_478[v0] = GraphicElementManager_AddElement(&v5);
+        param0->unk_478[v0] = GraphicElementManager_AddElementEx(&v5);
 
         sub_02021CC8(param0->unk_478[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_478[v0], 10 + v0);
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 6a20aaf1df..34d08d33c7 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -462,7 +462,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
             v1.position.y += v0->unk_274;
         }
 
-        param1 = GraphicElementManager_AddElement(&v1);
+        param1 = GraphicElementManager_AddElementEx(&v1);
     }
 
     sub_02021CC8(param1, 1);
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 221745b380..2fa2f15e4d 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -348,7 +348,7 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
     v1.vramType = param3;
     v1.heapID = param0->unk_00;
 
-    param1->unk_04 = sub_02021B90(&v1);
+    param1->unk_04 = GraphicElementManager_AddElement(&v1);
     GF_ASSERT(param1->unk_04 != NULL);
 }
 
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index fb123beb5b..a0e19f7271 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -94,7 +94,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElement(&v3);
+        v2 = GraphicElementManager_AddElementEx(&v3);
 
         sub_02021CC8(v2, 1);
         SpriteActor_SetSpriteAnimActive(v2, param2);
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 14855fb90e..4780377923 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -108,7 +108,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElement(&v3);
+        v2 = GraphicElementManager_AddElementEx(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index bdb6e7089f..ccdddf52cb 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -146,7 +146,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElement(&v3);
+        v2 = GraphicElementManager_AddElementEx(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index af65462480..607dd98c01 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -104,7 +104,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElement(&v3);
+        v2 = GraphicElementManager_AddElementEx(&v3);
 
         sub_02021CC8(v2, 1);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 2bda07162c..b91d360e77 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -660,7 +660,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
             v1.position.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
             v1.position.y = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][1];
 
-            param0->unk_29C[v0 + 1] = GraphicElementManager_AddElement(&v1);
+            param0->unk_29C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_29C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 436eda7690..b57bbf9a3b 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -142,7 +142,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v2 = GraphicElementManager_AddElement(&v3);
+        v2 = GraphicElementManager_AddElementEx(&v3);
 
         sub_02021CC8(v2, 0);
         sub_02021CE4(v2, FX32_ONE);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index bd2939126b..2c7e48850b 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1295,7 +1295,7 @@ static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, G
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param5;
 
-    return sub_02021B90(&v0);
+    return GraphicElementManager_AddElement(&v0);
 }
 
 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)
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 2e24a12763..db5f257789 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1309,7 +1309,7 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, CellActorInitPara
         param1->position.x = v1 << FX32_SHIFT;
         param1->position.y = v2 << FX32_SHIFT;
         param0->unk_18[v0] = param1->position;
-        param0->unk_00[v0] = GraphicElementManager_AddElement(param1);
+        param0->unk_00[v0] = GraphicElementManager_AddElementEx(param1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
         sub_02021CAC(param0->unk_00[v0], 0);
@@ -2696,7 +2696,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         v2.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v2.heapID = param2;
 
-        param0->unk_34 = sub_02021B90(&v2);
+        param0->unk_34 = GraphicElementManager_AddElement(&v2);
         sub_02021CAC(param0->unk_34, 0);
     }
 
@@ -3716,7 +3716,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
         v0.priority = 32;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v0.heapID = param2;
-        param1->unk_00 = GraphicElementManager_AddElement(&v0);
+        param1->unk_00 = GraphicElementManager_AddElementEx(&v0);
 
         sub_02021CAC(param1->unk_00, 0);
     }
@@ -3939,7 +3939,7 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v0.heapID = param3;
 
-    param1->unk_04 = GraphicElementManager_AddElement(&v0);
+    param1->unk_04 = GraphicElementManager_AddElementEx(&v0);
 
     sub_02021CAC(param1->unk_04, 0);
     sub_02021E90(param1->unk_04, param2);
@@ -4000,7 +4000,7 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v1.heapID = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
-        param1->unk_00[v0].unk_04 = GraphicElementManager_AddElement(&v1);
+        param1->unk_00[v0].unk_04 = GraphicElementManager_AddElementEx(&v1);
         sub_02021CAC(param1->unk_00[v0].unk_04, 0);
         sub_02021CF8(param1->unk_00[v0].unk_04, 1);
         sub_02021E90(param1->unk_00[v0].unk_04, param2);
@@ -4412,7 +4412,7 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.heapID = param3;
 
-        param0->unk_34 = sub_02021B90(&v1);
+        param0->unk_34 = GraphicElementManager_AddElement(&v1);
         sub_02021CAC(param0->unk_34, 0);
     }
 
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 73d389af4b..bf52155819 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -321,7 +321,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     v1.vramType = param9;
     v1.heapID = param0->unk_00;
 
-    v0 = GraphicElementManager_AddElement(&v1);
+    v0 = GraphicElementManager_AddElementEx(&v1);
 
     if (v0 != NULL) {
         SpriteActor_SetSpriteAnimActive(v0, param6);
@@ -574,7 +574,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     v3.priority = param2->priority;
     v3.vramType = param2->vramType;
     v3.heapID = param0->unk_00;
-    v2->unk_00 = GraphicElementManager_AddElement(&v3);
+    v2->unk_00 = GraphicElementManager_AddElementEx(&v3);
     v2->unk_0C = param2->transferToVRAM;
 
     if (v2->unk_00 != NULL) {
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 7f2b02c47d..d205db1310 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -759,7 +759,7 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     v0.position.x += (param0->unk_18 << FX32_SHIFT) + ((param1->unk_00 * 8) << FX32_SHIFT);
     v0.position.y += (param0->unk_1C << FX32_SHIFT) + ((param1->unk_04 * 8) << FX32_SHIFT);
 
-    return sub_02021B90(&v0);
+    return GraphicElementManager_AddElement(&v0);
 }
 
 static UnkStruct_02013034 * sub_02013188 (int param0)
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 049ede09a0..58b808ee33 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -23,21 +23,21 @@ enum CellType {
 };
 
 typedef struct {
-    const NNSG2dCellDataBank * unk_00;
+    const NNSG2dCellDataBank * cellBank;
     const NNSG2dCellAnimBankData * unk_04;
-    NNSG2dCellAnimation unk_08;
+    NNSG2dCellAnimation anim;
 } CellAnimationData;
 
 typedef struct {
-    NNSG2dCellDataBank * unk_00;
+    NNSG2dCellDataBank * cellBank;
     const NNSG2dCellAnimBankData * unk_04;
-    NNSG2dCellAnimation unk_08;
+    NNSG2dCellAnimation anim;
     u32 transferHandle;
 } VRamCellAnimationData;
 
 typedef struct {
-    const NNSG2dCellDataBank * unk_00;
-    const NNSG2dCellAnimBankData * unk_04;
+    const NNSG2dCellDataBank * individualCellBank;
+    const NNSG2dCellAnimBankData * individualAnimBank;
     NNSG2dMultiCellAnimation anim;
     const NNSG2dMultiCellDataBank * cellBank;
     const NNSG2dMultiCellAnimBankData * animBank;
@@ -81,7 +81,7 @@ typedef struct GraphicElementManager_t {
     GraphicElementData sentinelData;
     NNSG2dRendererInstance * renderer;
     void * rawAnimData;
-    NNSG2dCellAnimBankData * animData;
+    NNSG2dCellAnimBankData * defaultAnimBank;
     BOOL active;
 } GraphicElementManager;
 
@@ -94,10 +94,10 @@ static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank * param0, Gr
 static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1);
 static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1);
 static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1);
-static void sub_020221E8(GraphicElementData * param0, int param1);
-static void sub_02022208(const CellActorResourceData * param0, GraphicElementData * param1, int param2);
-static void GraphicElementData_CreateMultiCellAnim(GraphicElementData * param0, int param1);
-static BOOL GraphicElementManager_InitElement(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, int param3);
+static void GraphicElementData_CreateCellAnim(GraphicElementData * param0, enum HeapId param1);
+static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData * param0, GraphicElementData * param1, enum HeapId param2);
+static void GraphicElementData_CreateMultiCellAnim(GraphicElementData * param0, enum HeapId param1);
+static BOOL GraphicElementManager_InitElement(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, enum HeapId param3);
 static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy * param0, u32 param1);
 static void GraphicElementManager_DrawElement(const GraphicElementManager * param0, GraphicElementData * param1);
 static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager * param0, GraphicElementData * param1);
@@ -134,7 +134,7 @@ GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerPara
     gfxElemMgr->renderer = params->renderer;
     gfxElemMgr->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
 
-    NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->animData);
+    NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->defaultAnimBank);
     gfxElemMgr->active = TRUE;
 
     return gfxElemMgr;
@@ -249,7 +249,7 @@ void GraphicElementData_Reset(GraphicElementData *elem)
     elem->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
-GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParamsEx *params)
+GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParamsEx *params)
 {
     GraphicElementData *elem = GraphicElementManager_AllocElement(params->manager);
     if (elem == NULL) {
@@ -296,7 +296,7 @@ GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParamsEx
     return elem;
 }
 
-GraphicElementData * sub_02021B90 (const CellActorInitParams * params)
+GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams *params)
 {
     CellActorInitParamsEx paramsEx;
 
@@ -311,7 +311,7 @@ GraphicElementData * sub_02021B90 (const CellActorInitParams * params)
     paramsEx.vramType = params->vramType;
     paramsEx.heapID = params->heapID;
 
-    return GraphicElementManager_AddElement(&paramsEx);
+    return GraphicElementManager_AddElementEx(&paramsEx);
 }
 
 void GraphicElementData_Delete(GraphicElementData *gfxElem)
@@ -472,8 +472,8 @@ void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
         CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
 
         v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1);
-        NNS_G2dSetCellAnimationSequence(&v1->unk_08, v0);
-        NNS_G2dStartAnimCtrl(&v1->unk_08.animCtrl);
+        NNS_G2dSetCellAnimationSequence(&v1->anim, v0);
+        NNS_G2dStartAnimCtrl(&v1->anim.animCtrl);
     } else {
         MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
 
@@ -495,8 +495,8 @@ void sub_02021DE0 (GraphicElementData * param0)
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
 
-        NNS_G2dResetAnimCtrlState(&v0->unk_08.animCtrl);
-        NNS_G2dStartAnimCtrl(&v0->unk_08.animCtrl);
+        NNS_G2dResetAnimCtrlState(&v0->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&v0->anim.animCtrl);
         SpriteActor_SetAnimFrame(param0, 0);
     } else {
         MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
@@ -516,7 +516,7 @@ void sub_02021E2C (GraphicElementData * param0, fx32 param1)
 {
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        NNS_G2dTickCellAnimation(&v0->unk_08, param1);
+        NNS_G2dTickCellAnimation(&v0->anim, param1);
     } else {
         MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
         NNS_G2dTickMCAnimation(&v1->anim, param1);
@@ -527,7 +527,7 @@ void SpriteActor_SetAnimFrame (GraphicElementData * param0, u16 param1)
 {
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        NNS_G2dSetCellAnimationCurrentFrame(&v0->unk_08, param1);
+        NNS_G2dSetCellAnimationCurrentFrame(&v0->anim, param1);
     } else {
         MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
         NNS_G2dSetMCAnimationCurrentFrame(&v1->anim, param1);
@@ -540,7 +540,7 @@ u16 sub_02021E74 (const GraphicElementData * param0)
 
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
-        v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->unk_08);
+        v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->anim);
     } else {
         MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
         v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->anim);
@@ -652,7 +652,7 @@ BOOL sub_02021FD0 (GraphicElementData * param0)
 
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        return NNS_G2dIsAnimCtrlActive(&v0->unk_08.animCtrl);
+        return NNS_G2dIsAnimCtrlActive(&v0->anim.animCtrl);
     } else {
         MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
         return NNS_G2dIsAnimCtrlActive(&v1->anim.animCtrl);
@@ -741,7 +741,7 @@ u32 sub_020220F4 (const GraphicElementData * param0)
 }
 
 static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
-    const CellActorResourceData *resourceData, GraphicElementData *elem, int param3)
+    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId param3)
 {
     elem->type = CellActorResourceData_GetCellType(resourceData);
     elem->imageProxy = *resourceData->unk_00;
@@ -752,25 +752,22 @@ static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxEl
     if (resourceData->unk_10) {
         GraphicElementData_SetCellAnimBank(resourceData->unk_10, elem);
     } else {
-        GraphicElementData_SetCellAnimBank(gfxElemMgr->animData, elem);
+        GraphicElementData_SetCellAnimBank(gfxElemMgr->defaultAnimBank, elem);
     }
 
     if (elem->type == CELL_TYPE_MULTI_CELL) {
         GraphicElementData_SetMultiCellBank(resourceData->multiCellBank, elem);
         GraphicElementData_SetMultiCellAnimBank(resourceData->unk_18, elem);
         GraphicElementData_CreateMultiCellAnim(elem, param3);
+    } else if (elem->type == CELL_TYPE_VRAM_CELL) {
+        GraphicElementData_CreateVRamCellAnim(resourceData, elem, param3);
     } else {
-        if (elem->type == CELL_TYPE_VRAM_CELL) {
-            VRamCellAnimationData * v0 = (VRamCellAnimationData *)&elem->animData;
-            sub_02022208(resourceData, elem, param3);
-        } else {
-            sub_020221E8(elem, param3);
-        }
+        GraphicElementData_CreateCellAnim(elem, param3);
     }
 
     elem->explicitPriority = resourceData->unk_20;
 
-    return 1;
+    return TRUE;
 }
 
 static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData)
@@ -789,7 +786,7 @@ static enum CellType CellActorResourceData_GetCellType(const CellActorResourceDa
 static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, GraphicElementData *elem)
 {
     CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
-    cellAnim->unk_00 = cellBank;
+    cellAnim->cellBank = cellBank;
 }
 
 static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem)
@@ -810,35 +807,41 @@ static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBan
     multiCellAnim->animBank = multiCellAnimBank;
 }
 
-static void sub_020221E8 (GraphicElementData * param0, int param1)
+static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum HeapId heapID)
 {
-    CellAnimationData * v0;
-
-    v0 = (CellAnimationData *)&param0->animData;
-    NNS_G2dInitCellAnimation((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00);
+    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    NNS_G2dInitCellAnimation(
+        &cellAnim->anim, 
+        NNS_G2dGetAnimSequenceByIdx(cellAnim->unk_04, 0), 
+        cellAnim->cellBank
+    );
 }
 
-static void sub_02022208 (const CellActorResourceData * param0, GraphicElementData * param1, int param2)
+static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID)
 {
-    VRamCellAnimationData * v0;
-    const NNSG2dCharacterData * v1;
-
-    v0 = (VRamCellAnimationData *)&param1->animData;
-    v0->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
-    v1 = param0->unk_04;
+    VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&elem->animData;
+    vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
+    const NNSG2dCharacterData *charData = resourceData->unk_04;
 
-    NNS_G2dInitCellAnimationVramTransfered((NNSG2dCellAnimation *)&v0->unk_08, NNS_G2dGetAnimSequenceByIdx(v0->unk_04, 0), v0->unk_00, v0->transferHandle, NNS_G2D_VRAM_ADDR_NONE, NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), NNS_G2dGetImageLocation(&param1->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), v1->pRawData, NULL, v1->szByte);
+    NNS_G2dInitCellAnimationVramTransfered(
+        &vramCellAnim->anim, 
+        NNS_G2dGetAnimSequenceByIdx(vramCellAnim->unk_04, 0), 
+        vramCellAnim->cellBank, 
+        vramCellAnim->transferHandle, 
+        NNS_G2D_VRAM_ADDR_NONE, 
+        NNS_G2dGetImageLocation(&elem->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), 
+        NNS_G2dGetImageLocation(&elem->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), 
+        charData->pRawData, 
+        NULL, 
+        charData->szByte
+    );
 }
 
-static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, int heapID)
+static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enum HeapId heapID)
 {
-    MultiCellAnimationData *multiCellAnim;
-    const NNSG2dMultiCellAnimSequence * animSequence;
-    u16 maxNodes;
-
-    multiCellAnim = (MultiCellAnimationData *)&elem->animData;
-    animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
-    maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+    const NNSG2dMultiCellAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
+    u16 maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
 
     multiCellAnim->nodes = Heap_AllocFromHeap(heapID, sizeof(NNSG2dNode) * maxNodes);
     multiCellAnim->cellAnims = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
@@ -848,8 +851,8 @@ static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, int
         multiCellAnim->nodes, 
         multiCellAnim->cellAnims, 
         maxNodes, 
-        multiCellAnim->unk_04, 
-        multiCellAnim->unk_00, 
+        multiCellAnim->individualAnimBank, 
+        multiCellAnim->individualCellBank, 
         multiCellAnim->cellBank
     );
 
@@ -924,7 +927,7 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
 
     if (elem->type == 1 || elem->type == 3) {
         CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
-        NNS_G2dDrawCellAnimation(&cellAnim->unk_08);
+        NNS_G2dDrawCellAnimation(&cellAnim->anim);
     } else {
         MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
         NNS_G2dDrawMultiCellAnimation(&multiCellAnim->anim);
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index 41b278b446..bba773436d 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -575,7 +575,7 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param
     v0.vramType = param4;
     v0.heapID = 4;
 
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = GraphicElementManager_AddElementEx(&v0);
     GF_ASSERT(v1);
 
     return v1;
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index e9431cc5a5..124c329711 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1627,7 +1627,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.position.x = FX32_ONE * Unk_020F2984[v0][0];
             v1.position.y = FX32_ONE * Unk_020F2984[v0][1];
 
-            param0->unk_390[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_390[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_390[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_390[v0], Unk_020F2984[v0][2]);
@@ -1652,7 +1652,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.position.x = FX32_ONE * ((10 * 8) + v0 * 12);
             v1.position.y = FX32_ONE * (4 * 8 + 7);
 
-            param0->unk_3C8[v0] = GraphicElementManager_AddElement(&v1);
+            param0->unk_3C8[v0] = GraphicElementManager_AddElementEx(&v1);
 
             sub_02021CC8(param0->unk_3C8[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3C8[v0], 43);
@@ -1670,7 +1670,7 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
 {
     param1->position.x = FX32_ONE * 24;
     param1->position.y = FX32_ONE * (16 - 8);
-    param0->unk_3F8[0] = GraphicElementManager_AddElement(param1);
+    param0->unk_3F8[0] = GraphicElementManager_AddElementEx(param1);
 
     sub_02021CC8(param0->unk_3F8[0], 1);
 
@@ -1704,7 +1704,7 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
         if (param0->unk_10 != 2) {
             param1->position.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
             param1->position.y = FX32_ONE * ((4 * 8 + 7) - 12);
-            param0->unk_3F8[1] = GraphicElementManager_AddElement(param1);
+            param0->unk_3F8[1] = GraphicElementManager_AddElementEx(param1);
 
             if (param0->unk_10 == 0) {
                 SpriteActor_SetSpriteAnimActive(param0->unk_3F8[1], 45);
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index ba9d8d9f1a..5e1adeea74 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -160,7 +160,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v5.vramType = v0;
     v5.heapID = param0->unk_00;
 
-    v4->unk_00 = GraphicElementManager_AddElement(&v5);
+    v4->unk_00 = GraphicElementManager_AddElementEx(&v5);
 
     if (v4->unk_00 != NULL) {
         SpriteActor_SetSpriteAnimActive(v4->unk_00, 0);

From 396ed5e9cdd95cc040eb227fd39f75550eb9cb5a Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Tue, 25 Jun 2024 15:51:49 +0200
Subject: [PATCH 10/19] Documented last static functions + cleanup

---
 include/struct_decls/struct_020218BC_decl.h |   2 +-
 include/struct_decls/struct_02022550_decl.h |   2 +-
 include/unk_020218BC.h                      |   2 +-
 src/field_menu.c                            |   2 +-
 src/overlay007/ov7_0224CD28.c               |   4 +-
 src/overlay010/ov10_0221F800.c              |   2 +-
 src/overlay021/ov21_021D0D80.c              |   2 +-
 src/overlay023/ov23_0224F294.c              |   2 +-
 src/overlay063/ov63_0222AE60.c              |  14 +-
 src/overlay065/ov65_0222DCE0.c              |   4 +-
 src/overlay080/ov80_021D1458.c              |   2 +-
 src/overlay080/ov80_021D2AF4.c              |   2 +-
 src/overlay091/ov91_021D0D80.c              |   2 +-
 src/overlay097/ov97_0222D30C.c              |   8 +-
 src/overlay101/ov101_021D59AC.c             |   4 +-
 src/overlay104/ov104_0222DCE0.c             |   2 +-
 src/overlay114/ov114_0225C700.c             |   2 +-
 src/overlay115/ov115_02260CEC.c             |   2 +-
 src/unk_0200C6E4.c                          |   6 +-
 src/unk_0200DA60.c                          |   2 +-
 src/unk_020218BC.c                          | 142 ++++++++++----------
 src/unk_0205CA94.c                          |  20 +--
 src/unk_0206A780.c                          |   2 +-
 src/unk_02082C2C.c                          |   4 +-
 src/unk_0208EA44.c                          |  16 +--
 25 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/include/struct_decls/struct_020218BC_decl.h b/include/struct_decls/struct_020218BC_decl.h
index 4e8e5c9d3b..f0db683c00 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 GraphicElementManager_t GraphicElementManager;
+typedef struct GraphicElementManager 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 b097e21fe6..6b68557017 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 GraphicElementData_t GraphicElementData;
+typedef struct GraphicElementData GraphicElementData;
 
 #endif // POKEPLATINUM_STRUCT_02022550_DECL_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index b7c15ab7b7..7bf02c6702 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -41,7 +41,7 @@ void SpriteActor_SetSpriteAnimActive(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 GraphicElementData_UpdateAnim(GraphicElementData * param0, fx32 param1);
 void SpriteActor_SetAnimFrame(GraphicElementData * param0, u16 param1);
 u16 sub_02021E74(const GraphicElementData * param0);
 void sub_02021E80(GraphicElementData * param0, u8 param1);
diff --git a/src/field_menu.c b/src/field_menu.c
index 48eee87c01..313475c63f 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -849,7 +849,7 @@ static void sub_0203B520 (FieldMenu * menu)
     u16 v0;
 
     for (v0 = 0; v0 < menu->unk_220; v0++) {
-        sub_02021E2C(menu->unk_200[v0]->unk_00, FX32_ONE);
+        GraphicElementData_UpdateAnim(menu->unk_200[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index cf66f04517..ec57e7800d 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -303,8 +303,8 @@ BOOL ov7_0224CEAC (TaskManager * param0)
     }
 
     if ((v1->unk_297 >= 4) && (v1->unk_297 <= 11)) {
-        sub_02021E2C(v1->unk_25C[0], FX32_ONE);
-        sub_02021E2C(v1->unk_25C[1], FX32_ONE);
+        GraphicElementData_UpdateAnim(v1->unk_25C[0], FX32_ONE);
+        GraphicElementData_UpdateAnim(v1->unk_25C[1], FX32_ONE);
         sub_020219F8(v1->unk_94.unk_00);
     }
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 808b9037f4..e5e8988376 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -1259,7 +1259,7 @@ static void ov10_02220C2C (UnkStruct_ov10_0221FB28 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_210; v0++) {
-        sub_02021E2C(param0->unk_198[v0]->unk_00, FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_198[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 606a2332bb..3269a641bd 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -555,7 +555,7 @@ void ov21_021D144C (GraphicElementData * param0, int param1)
     case 3:
     case (3 + 1):
         if (sub_02021E74(param0) > 0) {
-            sub_02021E2C(param0, -(FX32_ONE * 2));
+            GraphicElementData_UpdateAnim(param0, -(FX32_ONE * 2));
         }
         break;
     default:
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 74452ec4e2..d3ce8e56f0 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -245,7 +245,7 @@ static void ov23_0224F498 (UnkStruct_ov23_02250CD4 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_25C; v0++) {
-        sub_02021E2C(param0->unk_23C[v0]->unk_00, FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_23C[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 07c91c2edd..8d1a7d741f 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -1069,12 +1069,12 @@ static void ov63_0222BBD0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 
 static void ov63_0222BBE0 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (2 * FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BBF0 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (2 * FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0)
@@ -1088,27 +1088,27 @@ static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0)
 
 static void ov63_0222BC20 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (2 * FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC30 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC40 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC50 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (8 * FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (8 * FX32_ONE));
 }
 
 static void ov63_0222BC60 (UnkStruct_ov63_0222BB38 * param0)
 {
-    sub_02021E2C(param0->unk_04, (6 * FX32_ONE));
+    GraphicElementData_UpdateAnim(param0->unk_04, (6 * FX32_ONE));
 }
 
 static BOOL ov63_0222BC70 (const UnkStruct_ov63_0222BB38 * param0)
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index bfbe86c5fe..2b88e9f95e 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6860,7 +6860,7 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
             }
 
             if (v1 < 3) {
-                sub_02021E2C(param0->unk_21C[param1], FX32_CONST(2));
+                GraphicElementData_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
                 v1 = sub_02021E74(param0->unk_21C[param1]);
 
                 if (param1 == 1) {
@@ -6885,7 +6885,7 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
             SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1) - v1);
         }
 
-        sub_02021E2C(param0->unk_21C[param1], FX32_CONST(2));
+        GraphicElementData_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
     }
 
     return v0;
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index 2105e737d7..32665e712f 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -627,7 +627,7 @@ static void ov80_021D1C24 (UnkStruct_ov80_021D2A08 * param0)
 
     if (v1->unk_13-- == 3) {
         SpriteActor_SetPositionXY(v1->unk_104, v1->unk_18 * 7 + (48 - 23), v1->unk_1C * 7 + (6 - 40));
-        sub_02021E2C(v1->unk_104, FX32_ONE);
+        GraphicElementData_UpdateAnim(v1->unk_104, FX32_ONE);
 
         ov80_021D1A30(param0);
         ov80_021D1AB0(param0, &(v1->unk_28[0]), sub_02039F04((const UnkStruct_02039EBC *)param0->unk_30, v1->unk_18, v1->unk_1C), v1->unk_18, v1->unk_1C);
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 97c3906713..5368641754 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -81,7 +81,7 @@ UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (SpriteRenderer * param0, SpriteGfxHandl
             }
         }
 
-        sub_02021E2C(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
+        GraphicElementData_UpdateAnim(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
         SpriteActor_SetPositionXY(v1->unk_18, v1->unk_00.unk_0C + 25, v1->unk_00.unk_10 + -34);
     }
 
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index e69d36206e..60cd9d0c4d 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -1335,7 +1335,7 @@ static void ov91_021D20E8 (UnkStruct_ov91_021D0ED8 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < 13; v0++) {
-        sub_02021E2C(param0->unk_118[v0]->unk_00, FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_118[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index ba77e08208..b1c0119d35 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1268,20 +1268,20 @@ static void ov97_0222E694 (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         if (param0->unk_88[v0].unk_0C) {
-            sub_02021E2C(param0->unk_88[v0].unk_0C, FX32_CONST(2));
+            GraphicElementData_UpdateAnim(param0->unk_88[v0].unk_0C, FX32_CONST(2));
         }
 
         if (param0->unk_1848[v0].unk_0C) {
-            sub_02021E2C(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
+            GraphicElementData_UpdateAnim(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
         }
     }
 
     if (param0->unk_3008.unk_0C) {
-        sub_02021E2C(param0->unk_3008.unk_0C, FX32_CONST(2));
+        GraphicElementData_UpdateAnim(param0->unk_3008.unk_0C, FX32_CONST(2));
     }
 
     if (param0->unk_3054.unk_0C) {
-        sub_02021E2C(param0->unk_3054.unk_0C, FX32_CONST(2));
+        GraphicElementData_UpdateAnim(param0->unk_3054.unk_0C, FX32_CONST(2));
     }
 }
 
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 6d2dfa53b1..54e26f128e 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -1166,7 +1166,7 @@ static int ov101_021D6908 (UnkStruct_ov101_021D66D0 * param0)
 
 static int ov101_021D6968 (UnkStruct_ov101_021D66D0 * param0)
 {
-    sub_02021E2C(param0->unk_24.unk_04, (FX32_ONE * 1));
+    GraphicElementData_UpdateAnim(param0->unk_24.unk_04, (FX32_ONE * 1));
     param0->unk_14++;
 
     if (param0->unk_14 >= 9) {
@@ -1364,7 +1364,7 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0)
 
 static int ov101_021D6CE0 (UnkStruct_ov101_021D66D0 * param0)
 {
-    sub_02021E2C(param0->unk_24.unk_04, FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
 
     if (sub_02021FD0(param0->unk_24.unk_04) == 0) {
         param0->unk_14++;
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 8c91eef7bf..338a6f6d51 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -392,7 +392,7 @@ void ov104_0222E1D8 (GraphicElementData * param0, u8 param1)
 
     SpriteActor_SetAnimFrame(param0, 0);
     SpriteActor_SetSpriteAnimActive(param0, param1);
-    sub_02021E2C(param0, FX32_ONE);
+    GraphicElementData_UpdateAnim(param0, FX32_ONE);
     return;
 }
 
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 2c7e48850b..0c36b623c8 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -3857,7 +3857,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
         break;
     case 3:
         v2 = sub_02021E74(v0->unk_30);
-        sub_02021E2C(v0->unk_30, FX32_CONST(2));
+        GraphicElementData_UpdateAnim(v0->unk_30, FX32_CONST(2));
         v3 = sub_02021E74(v0->unk_30);
 
         if (v2 != v3) {
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index db5f257789..005284349a 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -2744,7 +2744,7 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         param0->unk_3A++;
         break;
     case 1:
-        sub_02021E2C(param0->unk_34, FX32_CONST(2));
+        GraphicElementData_UpdateAnim(param0->unk_34, FX32_CONST(2));
 
         {
             u32 v0;
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index bf52155819..391d38c1d8 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -790,7 +790,7 @@ static BOOL sub_0200D2D0 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para
 
 void SpriteActor_UpdateObject (GraphicElementData * param0)
 {
-    sub_02021E2C(param0, FX32_ONE);
+    GraphicElementData_UpdateAnim(param0, FX32_ONE);
 }
 
 void sub_0200D330 (CellActorData * param0)
@@ -800,12 +800,12 @@ void sub_0200D330 (CellActorData * param0)
 
 void sub_0200D33C (CellActorData * param0)
 {
-    sub_02021E2C(param0->unk_00, FX32_CONST(2));
+    GraphicElementData_UpdateAnim(param0->unk_00, FX32_CONST(2));
 }
 
 void sub_0200D34C (CellActorData * param0, fx32 param1)
 {
-    sub_02021E2C(param0->unk_00, param1);
+    GraphicElementData_UpdateAnim(param0->unk_00, param1);
 }
 
 u32 sub_0200D358 (CellActorData * param0)
diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c
index 636af5803f..70d5076cec 100644
--- a/src/unk_0200DA60.c
+++ b/src/unk_0200DA60.c
@@ -597,7 +597,7 @@ static void sub_0200EC9C (SysTask * param0, void * param1)
         }
     }
 
-    sub_02021E2C(v0->unk_1C8->unk_00, FX32_ONE);
+    GraphicElementData_UpdateAnim(v0->unk_1C8->unk_00, FX32_ONE);
     sub_020219F8(v0->unk_00.unk_00);
 }
 
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 58b808ee33..36fa2bc6aa 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -11,9 +11,9 @@
 #include "heap.h"
 #include "unk_020218BC.h"
 
-#define GRAPHIC_ELEMENT_DATA_FLIP_NONE 0
-#define GRAPHIC_ELEMENT_DATA_FLIP_H 1
-#define GRAPHIC_ELEMENT_DATA_FLIP_V 2
+#define GRAPHIC_ELEMENT_DATA_FLIP_NONE  0
+#define GRAPHIC_ELEMENT_DATA_FLIP_H     1
+#define GRAPHIC_ELEMENT_DATA_FLIP_V     2
 
 enum CellType {
     CELL_TYPE_NONE = 0,
@@ -22,30 +22,30 @@ enum CellType {
     CELL_TYPE_VRAM_CELL,
 };
 
-typedef struct {
-    const NNSG2dCellDataBank * cellBank;
-    const NNSG2dCellAnimBankData * unk_04;
+typedef struct CellAnimationData {
+    const NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *unk_04;
     NNSG2dCellAnimation anim;
 } CellAnimationData;
 
-typedef struct {
-    NNSG2dCellDataBank * cellBank;
-    const NNSG2dCellAnimBankData * unk_04;
+typedef struct VRamCellAnimationData {
+    NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *unk_04;
     NNSG2dCellAnimation anim;
     u32 transferHandle;
 } VRamCellAnimationData;
 
-typedef struct {
-    const NNSG2dCellDataBank * individualCellBank;
-    const NNSG2dCellAnimBankData * individualAnimBank;
+typedef struct MultiCellAnimationData {
+    const NNSG2dCellDataBank *individualCellBank;
+    const NNSG2dCellAnimBankData *individualAnimBank;
     NNSG2dMultiCellAnimation anim;
-    const NNSG2dMultiCellDataBank * cellBank;
-    const NNSG2dMultiCellAnimBankData * animBank;
-    NNSG2dNode * nodes;
-    NNSG2dCellAnimation * cellAnims;
+    const NNSG2dMultiCellDataBank *cellBank;
+    const NNSG2dMultiCellAnimBankData *animBank;
+    NNSG2dNode *nodes;
+    NNSG2dCellAnimation *cellAnims;
 } MultiCellAnimationData;
 
-typedef struct GraphicElementData_t {
+typedef struct GraphicElementData {
     VecFx32 position;
     VecFx32 affineTranslation;
     VecFx32 affineScale;
@@ -58,9 +58,9 @@ typedef struct GraphicElementData_t {
     BOOL explicitMosaic;
     GXOamMode explicitOamMode;
     u8 draw;
-    u8 unk_35;
-    fx32 unk_38;
-    GraphicElementManager * manager;
+    u8 animate;
+    fx32 animSpeed;
+    GraphicElementManager *manager;
     u32 animData[29];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
@@ -69,45 +69,46 @@ typedef struct GraphicElementData_t {
     u8 explicitPriority;
     u16 priority;
     NNS_G2D_VRAM_TYPE vramType;
-    struct GraphicElementData_t *prev;
-    struct GraphicElementData_t *next;
+    struct GraphicElementData *prev;
+    struct GraphicElementData *next;
 } GraphicElementData;
 
-typedef struct GraphicElementManager_t {
-    GraphicElementData * elements;
+typedef struct GraphicElementManager {
+    GraphicElementData *elements;
     int maxElements;
-    GraphicElementData ** elementStack; // Stack of currently unused elements
+    GraphicElementData **elementStack; // Stack of currently unused elements
     int stackPointer;
     GraphicElementData sentinelData;
-    NNSG2dRendererInstance * renderer;
-    void * rawAnimData;
-    NNSG2dCellAnimBankData * defaultAnimBank;
+    NNSG2dRendererInstance *renderer;
+    void *rawAnimData;
+    NNSG2dCellAnimBankData *defaultAnimBank;
     BOOL active;
 } GraphicElementManager;
 
 typedef void (* GraphicElementDrawFunc)(const GraphicElementManager *, GraphicElementData *);
-typedef void (* GraphicElementInitializeFunc)(GraphicElementData *);
+typedef void (* GraphicElementAnimUpdateFunc)(GraphicElementData *);
 
-static void GraphicElementManager_Reset(GraphicElementManager * param0);
-static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData * param0);
+static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr);
+static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData);
 static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank * param0, GraphicElementData * param1);
-static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData * param0, GraphicElementData * param1);
-static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank * param0, GraphicElementData * param1);
-static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData * param0, GraphicElementData * param1);
-static void GraphicElementData_CreateCellAnim(GraphicElementData * param0, enum HeapId param1);
-static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData * param0, GraphicElementData * param1, enum HeapId param2);
-static void GraphicElementData_CreateMultiCellAnim(GraphicElementData * param0, enum HeapId param1);
-static BOOL GraphicElementManager_InitElement(const GraphicElementManager * param0, const CellActorResourceData * param1, GraphicElementData * param2, enum HeapId param3);
+static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem);
+static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem);
+static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, GraphicElementData *elem);
+static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum HeapId heapID);
+static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID);
+static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enum HeapId heapID);
+static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
+    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID);
 static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy * param0, u32 param1);
-static void GraphicElementManager_DrawElement(const GraphicElementManager * param0, GraphicElementData * param1);
-static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager * param0, GraphicElementData * param1);
-static void sub_02022454(GraphicElementData * param0);
-static void sub_02022460(GraphicElementData * param0);
-static void GraphicElementManager_InsertElement(GraphicElementManager * param0, GraphicElementData * param1);
-static void GraphicElementManager_RemoveElement(GraphicElementData * param0);
-static void GraphicElementManager_InitElements(GraphicElementManager * param0);
-static GraphicElementData * GraphicElementManager_AllocElement(GraphicElementManager * param0);
-static BOOL GraphicElementManager_FreeElement(GraphicElementManager * param0, GraphicElementData * param1);
+static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
+static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
+static void GraphicElementData_UpdateAnimInternal(GraphicElementData *gfxElemMgr);
+static void GraphicElementData_UpdateAnimInternal_Stub(GraphicElementData *gfxElemMgr);
+static void GraphicElementManager_InsertElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
+static void GraphicElementManager_RemoveElement(GraphicElementData *elem);
+static void GraphicElementManager_InitElements(GraphicElementManager *gfxElemMgr);
+static GraphicElementData *GraphicElementManager_AllocElement(GraphicElementManager *gfxElemMgr);
+static BOOL GraphicElementManager_FreeElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
 
 GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params)
 {
@@ -201,14 +202,13 @@ BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr)
 
 void sub_020219F8 (const GraphicElementManager *gfxElemMgr)
 {
-    GraphicElementData * elem;
     static const GraphicElementDrawFunc sDrawFuncs[] = {
         GraphicElementManager_DrawElement_Stub,
         GraphicElementManager_DrawElement
     };
-    static const GraphicElementInitializeFunc v2[] = {
-        sub_02022460,
-        sub_02022454
+    static const GraphicElementAnimUpdateFunc sAnimUpdateFuncs[] = {
+        GraphicElementData_UpdateAnimInternal_Stub,
+        GraphicElementData_UpdateAnimInternal
     };
 
     GF_ASSERT(gfxElemMgr);
@@ -217,11 +217,11 @@ void sub_020219F8 (const GraphicElementManager *gfxElemMgr)
         return;
     }
 
-    elem = gfxElemMgr->sentinelData.next;
+    GraphicElementData *elem = gfxElemMgr->sentinelData.next;
 
     while (elem != &gfxElemMgr->sentinelData) {
         sDrawFuncs[elem->draw](gfxElemMgr, elem);
-        v2[elem->unk_35](elem);
+        sAnimUpdateFuncs[elem->animate](elem);
         elem = elem->next;
     }
 }
@@ -280,8 +280,8 @@ GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParams
     );
 
     elem->draw = TRUE;
-    elem->unk_35 = 0;
-    elem->unk_38 = (FX32_ONE * 2);
+    elem->animate = 0;
+    elem->animSpeed = (FX32_ONE * 2);
 
     if (GraphicElementManager_InitElement(params->manager, params->resourceData, elem, params->heapID) == FALSE) {
         GraphicElementData_Delete(elem);
@@ -394,14 +394,14 @@ void sub_02021CC8 (GraphicElementData * param0, int param1)
     GF_ASSERT(param0);
     GF_ASSERT(param1 < 2);
 
-    param0->unk_35 = param1;
+    param0->animate = param1;
 }
 
 void sub_02021CE4 (GraphicElementData * param0, fx32 param1)
 {
     GF_ASSERT(param0);
 
-    param0->unk_38 = param1;
+    param0->animSpeed = param1;
 }
 
 void sub_02021CF8 (GraphicElementData * param0, int param1)
@@ -441,7 +441,7 @@ int sub_02021D34 (const GraphicElementData * param0)
 
 int sub_02021D3C (const GraphicElementData * param0)
 {
-    return param0->unk_35;
+    return param0->animate;
 }
 
 u32 sub_02021D44 (const GraphicElementData * param0)
@@ -512,14 +512,14 @@ u32 sub_02021E24 (const GraphicElementData * param0)
     return param0->unk_F0;
 }
 
-void sub_02021E2C (GraphicElementData * param0, fx32 param1)
+void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames)
 {
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        NNS_G2dTickCellAnimation(&v0->anim, param1);
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        NNS_G2dTickCellAnimation(&cellAnim->anim, frames);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
-        NNS_G2dTickMCAnimation(&v1->anim, param1);
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        NNS_G2dTickMCAnimation(&multiCellAnim->anim, frames);
     }
 }
 
@@ -741,7 +741,7 @@ u32 sub_020220F4 (const GraphicElementData * param0)
 }
 
 static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
-    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId param3)
+    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID)
 {
     elem->type = CellActorResourceData_GetCellType(resourceData);
     elem->imageProxy = *resourceData->unk_00;
@@ -758,11 +758,11 @@ static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxEl
     if (elem->type == CELL_TYPE_MULTI_CELL) {
         GraphicElementData_SetMultiCellBank(resourceData->multiCellBank, elem);
         GraphicElementData_SetMultiCellAnimBank(resourceData->unk_18, elem);
-        GraphicElementData_CreateMultiCellAnim(elem, param3);
+        GraphicElementData_CreateMultiCellAnim(elem, heapID);
     } else if (elem->type == CELL_TYPE_VRAM_CELL) {
-        GraphicElementData_CreateVRamCellAnim(resourceData, elem, param3);
+        GraphicElementData_CreateVRamCellAnim(resourceData, elem, heapID);
     } else {
-        GraphicElementData_CreateCellAnim(elem, param3);
+        GraphicElementData_CreateCellAnim(elem, heapID);
     }
 
     elem->explicitPriority = resourceData->unk_20;
@@ -942,12 +942,12 @@ static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *
     return;
 }
 
-static void sub_02022454 (GraphicElementData * param0)
+static void GraphicElementData_UpdateAnimInternal(GraphicElementData *elem)
 {
-    sub_02021E2C(param0, param0->unk_38);
+    GraphicElementData_UpdateAnim(elem, elem->animSpeed);
 }
 
-static void sub_02022460 (GraphicElementData * param0)
+static void GraphicElementData_UpdateAnimInternal_Stub(GraphicElementData *elem)
 {
     return;
 }
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index bba773436d..a54cf1aff2 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -624,7 +624,7 @@ int sub_0205D424 (struct UnkStruct_0205D3AC_t * param0)
 
         sub_02021C50(v1->unk_0C, &v0);
         v1->unk_10 += (0x8000 / 16);
-        sub_02021E2C(v1->unk_0C, FX32_ONE);
+        GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
 
         if (v1->unk_10 == ((0x8000 / 16) * 16)) {
             return 2;
@@ -667,7 +667,7 @@ int sub_0205D500 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 7) {
-        sub_02021E2C(v0->unk_0C, FX32_ONE);
+        GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
@@ -707,7 +707,7 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0)
     v0->unk_00.y += (FX32_ONE * 8);
 
     sub_02021C50(v0->unk_0C, &v0->unk_00);
-    sub_02021E2C(v0->unk_0C, FX32_ONE);
+    GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
 
     if (v0->unk_10 == 0) {
         if (v0->unk_00.y >= (384 * FX32_ONE)) {
@@ -761,7 +761,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     switch (v0->unk_10) {
     case 0:
         v0->unk_14 += (FX32_CONST(0.20f));
-        sub_02021E2C(v0->unk_0C, v0->unk_14);
+        GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if (v0->unk_14 >= (2 * FX32_ONE)) {
             v0->unk_10++;
@@ -771,7 +771,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
         if (v0->unk_00.y > (-32 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
             sub_02021C50(v0->unk_0C, &v0->unk_00);
-            sub_02021E2C(v0->unk_0C, v0->unk_14);
+            GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_00.y = (384 * FX32_ONE);
             v0->unk_10++;
@@ -781,7 +781,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
         v0->unk_00.y -= (FX32_ONE * 8);
 
         sub_02021C50(v0->unk_0C, &v0->unk_00);
-        sub_02021E2C(v0->unk_0C, v0->unk_14);
+        GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if ((v0->unk_00.y < (300 * FX32_ONE))) {
             v1 = 2;
@@ -792,7 +792,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
         if (v0->unk_00.y > (192 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
             sub_02021C50(v0->unk_0C, &v0->unk_00);
-            sub_02021E2C(v0->unk_0C, v0->unk_14);
+            GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_10++;
         }
@@ -852,14 +852,14 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0)
 
             sub_02021C50(v1->unk_0C, &v0);
             v1->unk_14 += (0x8000 / 8);
-            sub_02021E2C(v1->unk_0C, FX32_ONE);
+            GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
         } else {
             v1->unk_10++;
         }
         break;
     case 2:
         v1->unk_14 -= (FX32_CONST(0.40f));
-        sub_02021E2C(v1->unk_0C, v1->unk_14);
+        GraphicElementData_UpdateAnim(v1->unk_0C, v1->unk_14);
 
         if (v1->unk_14 <= 0) {
             v1->unk_10++;
@@ -905,7 +905,7 @@ int sub_0205D8A8 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 8) {
-        sub_02021E2C(v0->unk_0C, FX32_ONE);
+        GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index 6521002d9c..2a6468610b 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -90,7 +90,7 @@ void sub_0206A870 (UnkStruct_0206A844 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_1C8[v0] != NULL) {
-            sub_02021E2C(param0->unk_1C8[v0]->unk_00, FX32_ONE);
+            GraphicElementData_UpdateAnim(param0->unk_1C8[v0]->unk_00, FX32_ONE);
         }
     }
 
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index e826229748..f2edc22fad 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -325,7 +325,7 @@ void sub_020831B4 (GameWindowLayout * param0)
         }
 
         sub_02083138(v0->unk_24, v2);
-        sub_02021E2C(v0->unk_24, FX32_ONE);
+        GraphicElementData_UpdateAnim(v0->unk_24, FX32_ONE);
 
         if ((param0->unk_B11 == v1) && (v2 != 0) && (v2 != 5)) {
             if (sub_02021E74(v0->unk_24) == 0) {
@@ -370,7 +370,7 @@ void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2)
 void sub_02083334 (GameWindowLayout * param0)
 {
     if (sub_02021D34(param0->unk_5B0[28]) == 1) {
-        sub_02021E2C(param0->unk_5B0[28], FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
 
         if (sub_02021E74(param0->unk_5B0[28]) == 2) {
             sub_02021CAC(param0->unk_5B0[28], 0);
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index 282c19bb9c..0f3895c9e8 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -183,11 +183,11 @@ void sub_0208EAF4 (PokemonSummaryApp * param0)
 
 void sub_0208EB14 (PokemonSummaryApp * param0)
 {
-    sub_02021E2C(param0->unk_41C[21], FX32_ONE);
-    sub_02021E2C(param0->unk_41C[22], FX32_ONE);
-    sub_02021E2C(param0->unk_41C[41], FX32_ONE);
-    sub_02021E2C(param0->unk_41C[68], FX32_ONE);
-    sub_02021E2C(param0->unk_41C[69], FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_41C[21], FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_41C[22], FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_41C[41], FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_41C[68], FX32_ONE);
+    GraphicElementData_UpdateAnim(param0->unk_41C[69], FX32_ONE);
 }
 
 void sub_0208EB64 (PokemonSummaryApp * param0)
@@ -580,7 +580,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
             continue;
         }
 
-        sub_02021E2C(param0->unk_41C[v0], FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_41C[v0], FX32_ONE);
 
         if (sub_02021E74(param0->unk_41C[v0]) == 6) {
             sub_02021CAC(param0->unk_41C[v0], 0);
@@ -784,7 +784,7 @@ void sub_0208FB00 (PokemonSummaryApp * param0)
 void sub_0208FB30 (PokemonSummaryApp * param0)
 {
     if (sub_02021D34(param0->unk_41C[70]) == 1) {
-        sub_02021E2C(param0->unk_41C[70], FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_41C[70], FX32_ONE);
     }
 }
 
@@ -864,6 +864,6 @@ void sub_0208FCD4 (PokemonSummaryApp * param0)
     u32 v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        sub_02021E2C(param0->unk_41C[71 + v0], FX32_ONE);
+        GraphicElementData_UpdateAnim(param0->unk_41C[71 + v0], FX32_ONE);
     }
 }

From 1957a5fafa309cfe9b2de5a23c965a2ddbd755c4 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 10:10:30 +0200
Subject: [PATCH 11/19] Document CellActorResourceData

---
 include/overlay019/struct_ov19_021DA864.h | 18 +++++-----
 src/overlay019/ov19_021D61B0.c            | 16 ++++-----
 src/overlay019/ov19_021D8B54.c            |  2 +-
 src/overlay019/ov19_021DA270.c            |  4 +--
 src/overlay019/ov19_021DB8E4.c            |  2 +-
 src/overlay020/ov20_021D2098.c            | 16 ++++-----
 src/overlay020/ov20_021D4728.c            | 16 ++++-----
 src/overlay021/ov21_021D5AEC.c            |  6 ++--
 src/overlay071/ov71_0223CF0C.c            |  2 +-
 src/overlay086/ov86_0223B140.c            | 16 ++++-----
 src/overlay087/ov87_021D106C.c            | 16 ++++-----
 src/overlay095/ov95_02246C20.c            | 16 ++++-----
 src/overlay101/ov101_021D7E48.c           |  2 +-
 src/unk_020093B4.c                        | 24 ++++++-------
 src/unk_0200C6E4.c                        |  2 +-
 src/unk_02012744.c                        | 16 ++++-----
 src/unk_020218BC.c                        | 44 ++++++++++++-----------
 17 files changed, 110 insertions(+), 108 deletions(-)

diff --git a/include/overlay019/struct_ov19_021DA864.h b/include/overlay019/struct_ov19_021DA864.h
index f5cb3f5652..e7221d3447 100644
--- a/include/overlay019/struct_ov19_021DA864.h
+++ b/include/overlay019/struct_ov19_021DA864.h
@@ -5,15 +5,15 @@
 #include <nnsys.h>
 
 typedef struct {
-    const NNSG2dImageProxy * unk_00;
-    const NNSG2dCharacterData * unk_04;
-    const NNSG2dImagePaletteProxy * unk_08;
-    NNSG2dCellDataBank * unk_0C;
-    const NNSG2dCellAnimBankData * unk_10;
-    const NNSG2dMultiCellDataBank * multiCellBank;
-    const NNSG2dMultiCellAnimBankData * unk_18;
-    int unk_1C;
-    u8 unk_20;
+    const NNSG2dImageProxy *imageProxy;
+    const NNSG2dCharacterData *charData;
+    const NNSG2dImagePaletteProxy *paletteProxy;
+    NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *cellAnimBank;
+    const NNSG2dMultiCellDataBank *multiCellBank;
+    const NNSG2dMultiCellAnimBankData *multiCellAnimBank;
+    BOOL isVRamTransfer;
+    u8 priority;
     u8 padding_21[3];
 } CellActorResourceData;
 
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 5c14d6b060..cb778525d2 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -1927,15 +1927,15 @@ int ov19_021D7820 (UnkStruct_ov19_021D61B0 * param0)
 
 void ov19_021D783C (CellActorResourceData * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5)
 {
-    param0->unk_00 = param1;
-    param0->unk_08 = param2;
-    param0->unk_0C = param3;
-    param0->unk_10 = param4;
-    param0->unk_20 = param5;
-    param0->unk_04 = NULL;
+    param0->imageProxy = param1;
+    param0->paletteProxy = param2;
+    param0->cellBank = param3;
+    param0->cellAnimBank = param4;
+    param0->priority = param5;
+    param0->charData = NULL;
     param0->multiCellBank = NULL;
-    param0->unk_18 = NULL;
-    param0->unk_1C = 0;
+    param0->multiCellAnimBank = NULL;
+    param0->isVRamTransfer = 0;
 }
 
 GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 9762ca2cf8..ba9635483d 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -121,7 +121,7 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
             v4 = 236 + -44;
         }
 
-        v0.unk_20 = 2;
+        v0.priority = 2;
         param0->unk_0C = ov19_021D785C(param0->unk_00, &v0, v3, 20, 43, NNS_G2D_VRAM_TYPE_2DMAIN);
         param0->unk_10 = ov19_021D785C(param0->unk_00, &v0, v4, 20, 43, NNS_G2D_VRAM_TYPE_2DMAIN);
     }
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index e02a7d6c01..004b25adb2 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -149,7 +149,7 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 p
 
     NNS_G2dLoadImage1DMapping(v0, param6 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param7->unk_04));
 
-    v1.unk_00 = &(param7->unk_04);
+    v1.imageProxy = &(param7->unk_04);
     param7->unk_00 = ov19_021D785C(param0->unk_24, &v1, param2, param3, param5, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     GF_ASSERT(param7->unk_00 != NULL);
@@ -185,7 +185,7 @@ void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 p
 
     NNS_G2dLoadImage1DMapping(v0, param9 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param10->unk_04));
 
-    v1.unk_00 = &(param10->unk_04);
+    v1.imageProxy = &(param10->unk_04);
     param10->unk_00 = ov19_021D785C(param0->unk_24, &v1, param5, param6, param8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     GF_ASSERT(param10->unk_00 != NULL);
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index 49b033ddc0..5dd73ac217 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -365,7 +365,7 @@ static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0)
         NNS_G2dInitImageProxy(&v2);
         ov19_021DBBA8(param0, v5, 1584 + 32 * v4, NNS_G2D_VRAM_TYPE_2DMAIN, &v2);
 
-        v0.unk_00 = &v2;
+        v0.imageProxy = &v2;
         param0->unk_48[v4] = ov19_021D785C(param0->unk_08, &v0, 512, 256, 11, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         GF_ASSERT(param0->unk_48[v4] != NULL);
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index 34325f031b..1e63dbd407 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -971,15 +971,15 @@ GraphicElementManager * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
 
 void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3)
 {
-    param1->unk_00 = &param0->unk_1B4[param2];
-    param1->unk_08 = &param0->unk_1FC[param2];
-    param1->unk_0C = param0->unk_224[param2];
-    param1->unk_10 = param0->unk_22C[param2];
-    param1->unk_20 = param3;
-    param1->unk_04 = NULL;
+    param1->imageProxy = &param0->unk_1B4[param2];
+    param1->paletteProxy = &param0->unk_1FC[param2];
+    param1->cellBank = param0->unk_224[param2];
+    param1->cellAnimBank = param0->unk_22C[param2];
+    param1->priority = param3;
+    param1->charData = NULL;
     param1->multiCellBank = NULL;
-    param1->unk_18 = NULL;
-    param1->unk_1C = 0;
+    param1->multiCellAnimBank = NULL;
+    param1->isVRamTransfer = 0;
 }
 
 GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index e7c9a493ce..5976b2084c 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -351,15 +351,15 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     CellActorInitParams v1;
     GraphicElementData * v2;
 
-    v0.unk_00 = param1;
-    v0.unk_08 = param2;
-    v0.unk_0C = param3->unk_04;
-    v0.unk_10 = param3->unk_0C;
-    v0.unk_20 = param6;
-    v0.unk_04 = NULL;
+    v0.imageProxy = param1;
+    v0.paletteProxy = param2;
+    v0.cellBank = param3->unk_04;
+    v0.cellAnimBank = param3->unk_0C;
+    v0.priority = param6;
+    v0.charData = NULL;
     v0.multiCellBank = NULL;
-    v0.unk_18 = NULL;
-    v0.unk_1C = 0;
+    v0.multiCellAnimBank = NULL;
+    v0.isVRamTransfer = 0;
 
     v1.manager = param0->unk_10;
     v1.resourceData = &v0;
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 86f5d12a25..28929a8539 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -883,7 +883,7 @@ static void ov21_021D67EC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     int v7;
 
     v4.unk_00 = param1->unk_14C;
-    v4.unk_08 = param0->unk_90.unk_08;
+    v4.unk_08 = param0->unk_90.paletteProxy;
     v4.unk_0C = NULL;
     v4.unk_10 = 0;
     v4.unk_14 = 0;
@@ -1270,7 +1270,7 @@ static void ov21_021D6D78 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     GF_ASSERT(v2);
 
     v0.unk_00 = param1->unk_14C;
-    v0.unk_08 = param0->unk_90.unk_08;
+    v0.unk_08 = param0->unk_90.paletteProxy;
     v0.unk_0C = NULL;
     v0.unk_10 = 0;
     v0.unk_14 = 0;
@@ -1299,7 +1299,7 @@ static void ov21_021D6DF4 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     MessageLoader * v3 = MessageLoader_Init(0, 26, 697, param2);
 
     v0.unk_00 = param1->unk_14C;
-    v0.unk_08 = param0->unk_90.unk_08;
+    v0.unk_08 = param0->unk_90.paletteProxy;
     v0.unk_0C = NULL;
     v0.unk_10 = 0;
     v0.unk_14 = 0;
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 5e47baad32..5ef40b410f 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -165,7 +165,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         v2 += 8;
 
         {
-            v1.unk_20 = 0;
+            v1.priority = 0;
             v3.position.x = FX32_ONE * (12 * 8);
             v3.position.y = FX32_ONE * (17 * 8);
             v3.priority = 0;
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index ff869bef64..4b01acd06c 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -818,15 +818,15 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     const Pokemon * v11;
     int v12, v13;
 
-    v2.unk_04 = NULL;
+    v2.charData = NULL;
     v2.multiCellBank = NULL;
-    v2.unk_18 = NULL;
-    v2.unk_1C = 0;
-    v2.unk_0C = param1;
-    v2.unk_10 = param2;
-    v2.unk_20 = 3;
-    v2.unk_00 = &v5;
-    v2.unk_08 = &v6;
+    v2.multiCellAnimBank = NULL;
+    v2.isVRamTransfer = 0;
+    v2.cellBank = param1;
+    v2.cellAnimBank = param2;
+    v2.priority = 3;
+    v2.imageProxy = &v5;
+    v2.paletteProxy = &v6;
 
     v3.manager = param0->unk_24;
     v3.resourceData = &v2;
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 102e06e5bd..c09d358b93 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -502,15 +502,15 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
     void * v8;
     int v9;
 
-    v1.unk_04 = NULL;
+    v1.charData = NULL;
     v1.multiCellBank = NULL;
-    v1.unk_18 = NULL;
-    v1.unk_1C = 0;
-    v1.unk_0C = param1;
-    v1.unk_10 = param2;
-    v1.unk_20 = 0;
-    v1.unk_00 = &v3;
-    v1.unk_08 = &v4;
+    v1.multiCellAnimBank = NULL;
+    v1.isVRamTransfer = 0;
+    v1.cellBank = param1;
+    v1.cellAnimBank = param2;
+    v1.priority = 0;
+    v1.imageProxy = &v3;
+    v1.paletteProxy = &v4;
     v2.manager = param0->unk_34;
     v2.resourceData = &v1;
     v2.position.z = 0;
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 4f61796b4d..27b70af358 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -636,15 +636,15 @@ void ov95_022475A0 (UnkStruct_ov95_02247568 * param0)
 
 void ov95_022475C4 (CellActorResourceData * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4)
 {
-    param0->unk_00 = param2;
-    param0->unk_08 = param3;
-    param0->unk_0C = param1->unk_08;
-    param0->unk_10 = param1->unk_0C;
-    param0->unk_20 = param4;
-    param0->unk_04 = NULL;
+    param0->imageProxy = param2;
+    param0->paletteProxy = param3;
+    param0->cellBank = param1->unk_08;
+    param0->cellAnimBank = param1->unk_0C;
+    param0->priority = param4;
+    param0->charData = NULL;
     param0->multiCellBank = NULL;
-    param0->unk_18 = NULL;
-    param0->unk_1C = 0;
+    param0->multiCellAnimBank = NULL;
+    param0->isVRamTransfer = 0;
 }
 
 GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 2fa2f15e4d..e1ed5f63a2 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -335,7 +335,7 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
         &v0, param5, param6, param7, param8, 0xffffffff, 0xffffffff, param4, param9, param0->unk_1A0, param0->unk_1A4, param0->unk_1A8, param0->unk_1AC, NULL, NULL);
 
     if (param4 == 1) {
-        param1->unk_08 = v0.unk_00;
+        param1->unk_08 = v0.imageProxy;
         param1->unk_00 = 1;
     } else {
         param1->unk_00 = 0;
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index b02dc30670..ddd1eab994 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -67,38 +67,38 @@ void sub_020093B4 (CellActorResourceData * param0, int param1, int param2, int p
         v6 = sub_0200A558(v0, v2);
         GF_ASSERT(v6);
 
-        param0->unk_04 = sub_02009E1C(v0);
+        param0->charData = sub_02009E1C(v0);
     } else {
         v6 = sub_0200A534(v0);
         GF_ASSERT(v6);
-        param0->unk_04 = NULL;
+        param0->charData = NULL;
     }
 
-    param0->unk_08 = sub_0200A72C(v1, v6);
-    param0->unk_00 = v6;
-    param0->unk_0C = sub_02009E4C(v2);
+    param0->paletteProxy = sub_0200A72C(v1, v6);
+    param0->imageProxy = v6;
+    param0->cellBank = sub_02009E4C(v2);
 
     if (v3) {
-        param0->unk_10 = sub_02009E64(v3);
+        param0->cellAnimBank = sub_02009E64(v3);
     } else {
-        param0->unk_10 = NULL;
+        param0->cellAnimBank = NULL;
     }
 
     if (v4) {
         param0->multiCellBank = sub_02009E7C(v4);
-        param0->unk_18 = sub_02009E94(v5);
+        param0->multiCellAnimBank = sub_02009E94(v5);
     } else {
         param0->multiCellBank = NULL;
-        param0->unk_18 = NULL;
+        param0->multiCellAnimBank = NULL;
     }
 
-    param0->unk_1C = param7;
-    param0->unk_20 = param8;
+    param0->isVRamTransfer = param7;
+    param0->priority = param8;
 }
 
 void sub_020094F0 (CellActorResourceData * param0)
 {
-    sub_0200A5B4(param0->unk_00);
+    sub_0200A5B4(param0->imageProxy);
     memset(param0, 0, sizeof(CellActorResourceData));
 }
 
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 391d38c1d8..3c0fa23838 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -640,7 +640,7 @@ void sub_0200D0B0 (SpriteRenderer * param0, SpriteGfxHandler * param1)
 void sub_0200D0F4 (CellActorData * param0)
 {
     if (param0->unk_0C) {
-        sub_0200A5B4(param0->unk_04->unk_00);
+        sub_0200A5B4(param0->unk_04->imageProxy);
     }
 
     GraphicElementData_Delete(param0->unk_00);
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index d205db1310..6868088ce7 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -730,15 +730,15 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     CellActorInitParams v0;
     CellActorResourceData v1;
 
-    v1.unk_00 = param2;
-    v1.unk_04 = NULL;
-    v1.unk_08 = param0->unk_0C;
-    v1.unk_0C = param0->unk_00->unk_30[param1->unk_08];
-    v1.unk_10 = NULL;
+    v1.imageProxy = param2;
+    v1.charData = NULL;
+    v1.paletteProxy = param0->unk_0C;
+    v1.cellBank = param0->unk_00->unk_30[param1->unk_08];
+    v1.cellAnimBank = NULL;
     v1.multiCellBank = NULL;
-    v1.unk_18 = NULL;
-    v1.unk_1C = 0;
-    v1.unk_20 = param0->unk_20;
+    v1.multiCellAnimBank = NULL;
+    v1.isVRamTransfer = 0;
+    v1.priority = param0->unk_20;
 
     v0.manager = param0->unk_08;
     v0.resourceData = &v1;
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 36fa2bc6aa..fbb5ab2028 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -1,6 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "nnsys/g2d/g2d_Image.h"
 #include "nnsys/g2d/g2d_RendererCore.h"
 #include "struct_defs/struct_020095C4.h"
 #include "overlay019/struct_ov19_021DA864.h"
@@ -15,6 +16,8 @@
 #define GRAPHIC_ELEMENT_DATA_FLIP_H     1
 #define GRAPHIC_ELEMENT_DATA_FLIP_V     2
 
+#define GRAPHIC_ELEMENT_ANIM_DATA_SIZE 29
+
 enum CellType {
     CELL_TYPE_NONE = 0,
     CELL_TYPE_CELL,
@@ -24,13 +27,13 @@ enum CellType {
 
 typedef struct CellAnimationData {
     const NNSG2dCellDataBank *cellBank;
-    const NNSG2dCellAnimBankData *unk_04;
+    const NNSG2dCellAnimBankData *animBank;
     NNSG2dCellAnimation anim;
 } CellAnimationData;
 
 typedef struct VRamCellAnimationData {
     NNSG2dCellDataBank *cellBank;
-    const NNSG2dCellAnimBankData *unk_04;
+    const NNSG2dCellAnimBankData *animBank;
     NNSG2dCellAnimation anim;
     u32 transferHandle;
 } VRamCellAnimationData;
@@ -61,7 +64,7 @@ typedef struct GraphicElementData {
     u8 animate;
     fx32 animSpeed;
     GraphicElementManager *manager;
-    u32 animData[29];
+    u32 animData[GRAPHIC_ELEMENT_ANIM_DATA_SIZE];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
     u32 type;
@@ -90,7 +93,7 @@ typedef void (* GraphicElementAnimUpdateFunc)(GraphicElementData *);
 
 static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr);
 static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData);
-static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank * param0, GraphicElementData * param1);
+static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, GraphicElementData *elem);
 static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem);
 static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem);
 static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, GraphicElementData *elem);
@@ -99,7 +102,7 @@ static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *r
 static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enum HeapId heapID);
 static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
     const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID);
-static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy * param0, u32 param1);
+static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType);
 static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
 static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
 static void GraphicElementData_UpdateAnimInternal(GraphicElementData *gfxElemMgr);
@@ -452,7 +455,7 @@ u32 sub_02021D44 (const GraphicElementData * param0)
 
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
-        v0 = v1->unk_04->numSequences;
+        v0 = v1->animBank->numSequences;
     } else {
         MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
         v0 = v2->animBank->numSequences;
@@ -471,7 +474,7 @@ void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
 
-        v0 = NNS_G2dGetAnimSequenceByIdx(v1->unk_04, param1);
+        v0 = NNS_G2dGetAnimSequenceByIdx(v1->animBank, param1);
         NNS_G2dSetCellAnimationSequence(&v1->anim, v0);
         NNS_G2dStartAnimCtrl(&v1->anim.animCtrl);
     } else {
@@ -706,7 +709,7 @@ u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
 
     if ((param0->type == 1) || (param0->type == 3)) {
         CellAnimationData * v4 = (CellAnimationData *)&param0->animData;
-        v0 = v4->unk_04;
+        v0 = v4->animBank;
     } else {
         MultiCellAnimationData * v5 = (MultiCellAnimationData *)&param0->animData;
         v0 = v5->animBank;
@@ -744,20 +747,20 @@ static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxEl
     const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID)
 {
     elem->type = CellActorResourceData_GetCellType(resourceData);
-    elem->imageProxy = *resourceData->unk_00;
-    elem->paletteProxy = *resourceData->unk_08;
+    elem->imageProxy = *resourceData->imageProxy;
+    elem->paletteProxy = *resourceData->paletteProxy;
 
-    GraphicElementData_SetCellBank(resourceData->unk_0C, elem);
+    GraphicElementData_SetCellBank(resourceData->cellBank, elem);
 
-    if (resourceData->unk_10) {
-        GraphicElementData_SetCellAnimBank(resourceData->unk_10, elem);
+    if (resourceData->cellAnimBank) {
+        GraphicElementData_SetCellAnimBank(resourceData->cellAnimBank, elem);
     } else {
         GraphicElementData_SetCellAnimBank(gfxElemMgr->defaultAnimBank, elem);
     }
 
     if (elem->type == CELL_TYPE_MULTI_CELL) {
         GraphicElementData_SetMultiCellBank(resourceData->multiCellBank, elem);
-        GraphicElementData_SetMultiCellAnimBank(resourceData->unk_18, elem);
+        GraphicElementData_SetMultiCellAnimBank(resourceData->multiCellAnimBank, elem);
         GraphicElementData_CreateMultiCellAnim(elem, heapID);
     } else if (elem->type == CELL_TYPE_VRAM_CELL) {
         GraphicElementData_CreateVRamCellAnim(resourceData, elem, heapID);
@@ -765,7 +768,7 @@ static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxEl
         GraphicElementData_CreateCellAnim(elem, heapID);
     }
 
-    elem->explicitPriority = resourceData->unk_20;
+    elem->explicitPriority = resourceData->priority;
 
     return TRUE;
 }
@@ -776,7 +779,7 @@ static enum CellType CellActorResourceData_GetCellType(const CellActorResourceDa
         return CELL_TYPE_MULTI_CELL;
     }
 
-    if (resourceData->unk_1C == 1) {
+    if (resourceData->isVRamTransfer == TRUE) {
         return CELL_TYPE_VRAM_CELL;
     }
 
@@ -792,7 +795,7 @@ static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, G
 static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem)
 {
     CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
-    cellAnim->unk_04 = cellAnimBank;
+    cellAnim->animBank = cellAnimBank;
 }
 
 static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem)
@@ -812,7 +815,7 @@ static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum Hea
     CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
     NNS_G2dInitCellAnimation(
         &cellAnim->anim, 
-        NNS_G2dGetAnimSequenceByIdx(cellAnim->unk_04, 0), 
+        NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, 0), 
         cellAnim->cellBank
     );
 }
@@ -821,11 +824,11 @@ static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *r
 {
     VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&elem->animData;
     vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
-    const NNSG2dCharacterData *charData = resourceData->unk_04;
+    const NNSG2dCharacterData *charData = resourceData->charData;
 
     NNS_G2dInitCellAnimationVramTransfered(
         &vramCellAnim->anim, 
-        NNS_G2dGetAnimSequenceByIdx(vramCellAnim->unk_04, 0), 
+        NNS_G2dGetAnimSequenceByIdx(vramCellAnim->animBank, 0), 
         vramCellAnim->cellBank, 
         vramCellAnim->transferHandle, 
         NNS_G2D_VRAM_ADDR_NONE, 
@@ -842,7 +845,6 @@ static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enu
     MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
     const NNSG2dMultiCellAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
     u16 maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
-
     multiCellAnim->nodes = Heap_AllocFromHeap(heapID, sizeof(NNSG2dNode) * maxNodes);
     multiCellAnim->cellAnims = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
 

From d2191891ab96343a8386801c0ac5714bf1149ee2 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 12:40:44 +0200
Subject: [PATCH 12/19] Document simple getter/setter functions

---
 include/unk_020218BC.h                  |  72 ++++---
 src/battle/battle_script.c              |   2 +-
 src/battle/healthbar.c                  |   4 +-
 src/battle/ov16_0226871C.c              |   2 +-
 src/choose_starter/choose_starter_app.c |   6 +-
 src/field_menu.c                        |   8 +-
 src/overlay005/encounter_effect.c       |   2 +-
 src/overlay005/encounter_effect_core.c  | 242 ++++++++++++------------
 src/overlay005/ov5_021D2F14.c           |   6 +-
 src/overlay005/ov5_021D5EB8.c           |  10 +-
 src/overlay006/ov6_022426AC.c           |   2 +-
 src/overlay006/ov6_02243258.c           | 176 ++++++++---------
 src/overlay007/ov7_0224BE9C.c           |  14 +-
 src/overlay007/ov7_0224CD28.c           |  42 ++--
 src/overlay009/ov9_02249960.c           |   6 +-
 src/overlay012/ov12_0221FC20.c          |   4 +-
 src/overlay012/ov12_02225864.c          |   2 +-
 src/overlay012/ov12_02226B84.c          |   2 +-
 src/overlay012/ov12_0222AC70.c          |  10 +-
 src/overlay012/ov12_0222E91C.c          |  10 +-
 src/overlay017/ov17_0224A0FC.c          |   2 +-
 src/overlay017/ov17_02250744.c          |   2 +-
 src/overlay019/ov19_021D61B0.c          |   6 +-
 src/overlay019/ov19_021D79F8.c          |  10 +-
 src/overlay019/ov19_021D8B54.c          |  62 +++---
 src/overlay019/ov19_021DA270.c          |  12 +-
 src/overlay019/ov19_021DA814.c          |   2 +-
 src/overlay019/ov19_021DA92C.c          |  26 +--
 src/overlay019/ov19_021DB8E4.c          |  10 +-
 src/overlay019/ov19_021DC5F0.c          |  22 +--
 src/overlay019/ov19_021DCF88.c          |  10 +-
 src/overlay019/ov19_021DE3E8.c          |  30 +--
 src/overlay019/ov19_021DEC04.c          |  24 +--
 src/overlay020/ov20_021D2098.c          |   4 +-
 src/overlay020/ov20_021D2EA4.c          |  18 +-
 src/overlay020/ov20_021D3864.c          |   8 +-
 src/overlay020/ov20_021D3A54.c          |   6 +-
 src/overlay020/ov20_021D40E8.c          |  22 +--
 src/overlay020/ov20_021D4728.c          |  16 +-
 src/overlay021/ov21_021D0D80.c          |  14 +-
 src/overlay021/ov21_021D1FA4.c          |  30 +--
 src/overlay021/ov21_021D57B4.c          |   2 +-
 src/overlay021/ov21_021D5AEC.c          |  52 ++---
 src/overlay021/ov21_021D76B0.c          |   4 +-
 src/overlay021/ov21_021D85B0.c          |  16 +-
 src/overlay021/ov21_021D94BC.c          |   2 +-
 src/overlay021/ov21_021DC9BC.c          |  16 +-
 src/overlay021/ov21_021DDD2C.c          |   2 +-
 src/overlay021/ov21_021DF734.c          |  12 +-
 src/overlay021/ov21_021E1924.c          |  24 +--
 src/overlay021/ov21_021E29DC.c          |   2 +-
 src/overlay021/ov21_021E3FFC.c          |  22 +--
 src/overlay021/ov21_021E4CA4.c          |  24 +--
 src/overlay021/ov21_021E6014.c          |   4 +-
 src/overlay021/ov21_021E737C.c          |  22 +--
 src/overlay022/ov22_02259C58.c          |   4 +-
 src/overlay022/ov22_0225A428.c          |  14 +-
 src/overlay022/ov22_0225B660.c          |   4 +-
 src/overlay023/ov23_0223E140.c          |  30 +--
 src/overlay023/ov23_0224340C.c          |  72 +++----
 src/overlay023/ov23_02248F1C.c          |  22 +--
 src/overlay023/ov23_0224F294.c          |   8 +-
 src/overlay056/ov56_022561C0.c          |  12 +-
 src/overlay058/ov58_021D0D80.c          |  28 +--
 src/overlay059/ov59_021D0D80.c          |  10 +-
 src/overlay063/ov63_0222AE60.c          |  20 +-
 src/overlay063/ov63_0222CCE4.c          |   2 +-
 src/overlay064/ov64_0222DCE0.c          |  20 +-
 src/overlay065/ov65_0222DCE0.c          |   2 +-
 src/overlay065/ov65_02235060.c          |  20 +-
 src/overlay068/ov68_0225C700.c          |   8 +-
 src/overlay069/ov69_0225C700.c          |  12 +-
 src/overlay070/ov70_0225D9A4.c          |  22 +--
 src/overlay071/ov71_0223B140.c          |  14 +-
 src/overlay071/ov71_0223CF0C.c          |  18 +-
 src/overlay072/ov72_0223D7A0.c          |   6 +-
 src/overlay076/ov76_0223B870.c          |   2 +-
 src/overlay077/ov77_021D54B0.c          | 170 ++++++++---------
 src/overlay077/ov77_021D6670.c          |  34 ++--
 src/overlay079/ov79_021D0D80.c          |  18 +-
 src/overlay079/ov79_021D183C.c          |  20 +-
 src/overlay079/ov79_021D20F4.c          |  12 +-
 src/overlay079/ov79_021D2268.c          |  20 +-
 src/overlay080/ov80_021D1458.c          |  28 +--
 src/overlay080/ov80_021D2AF4.c          |  16 +-
 src/overlay083/ov83_0223D6A8.c          |  76 ++++----
 src/overlay084/ov84_022403F4.c          |  10 +-
 src/overlay086/ov86_0223B140.c          |  26 +--
 src/overlay087/ov87_021D106C.c          |  12 +-
 src/overlay088/ov88_0223B140.c          | 120 ++++++------
 src/overlay090/ov90_021D0D80.c          |  40 ++--
 src/overlay094/ov94_0223BCB0.c          |   2 +-
 src/overlay094/ov94_0223C610.c          |  14 +-
 src/overlay094/ov94_0223D0C4.c          |   2 +-
 src/overlay094/ov94_0223DC04.c          |   2 +-
 src/overlay094/ov94_0223E46C.c          |   6 +-
 src/overlay094/ov94_0223FB48.c          |  44 ++---
 src/overlay094/ov94_02243EF8.c          |  16 +-
 src/overlay095/ov95_02246C20.c          |   4 +-
 src/overlay095/ov95_02247B6C.c          |  10 +-
 src/overlay095/ov95_02248590.c          |  14 +-
 src/overlay095/ov95_02249740.c          |   4 +-
 src/overlay095/ov95_0224A390.c          |   4 +-
 src/overlay095/ov95_0224B3D8.c          |  10 +-
 src/overlay096/ov96_0223B6A0.c          |   4 +-
 src/overlay096/ov96_0223BCE0.c          |   4 +-
 src/overlay097/ov97_0222AE60.c          |   8 +-
 src/overlay097/ov97_0222C174.c          |   8 +-
 src/overlay097/ov97_0222D30C.c          |  62 +++---
 src/overlay097/ov97_02230410.c          |   8 +-
 src/overlay097/ov97_02233B18.c          |  78 ++++----
 src/overlay097/ov97_02237694.c          |  16 +-
 src/overlay101/ov101_021D59AC.c         | 228 +++++++++++-----------
 src/overlay101/ov101_021D7E48.c         |   4 +-
 src/overlay104/ov104_0222DCE0.c         |   2 +-
 src/overlay104/ov104_02231F74.c         |   4 +-
 src/overlay104/ov104_02237378.c         |  20 +-
 src/overlay104/ov104_02237DD8.c         |  28 +--
 src/overlay104/ov104_0223DC7C.c         |   6 +-
 src/overlay105/ov105_02245AAC.c         |   2 +-
 src/overlay105/ov105_02245DC4.c         |   2 +-
 src/overlay105/ov105_02245E54.c         |  20 +-
 src/overlay105/ov105_02245FB8.c         |  12 +-
 src/overlay106/ov106_02243310.c         |   4 +-
 src/overlay106/ov106_022435FC.c         |  12 +-
 src/overlay107/ov107_02249604.c         |   4 +-
 src/overlay107/ov107_02249B1C.c         |  14 +-
 src/overlay108/ov108_02243030.c         |   4 +-
 src/overlay108/ov108_0224351C.c         |  14 +-
 src/overlay109/ov109_021D3D50.c         |   6 +-
 src/overlay111/ov111_021D2F80.c         |   4 +-
 src/overlay111/ov111_021D33F4.c         |  22 +--
 src/overlay114/ov114_0225C700.c         |  48 ++---
 src/overlay115/ov115_02260CEC.c         |  78 ++++----
 src/overlay119/ov119_021D191C.c         |   4 +-
 src/pokemon.c                           |   2 +-
 src/pokemon_summary_app.c               |  34 ++--
 src/unk_0200C6E4.c                      |  88 ++++-----
 src/unk_02012744.c                      |  24 +--
 src/unk_020218BC.c                      | 206 ++++++++++----------
 src/unk_0205CA94.c                      |  18 +-
 src/unk_0207E0B8.c                      |  14 +-
 src/unk_02082C2C.c                      |  30 +--
 src/unk_02083370.c                      |  14 +-
 src/unk_0208694C.c                      |  62 +++---
 src/unk_0208EA44.c                      | 122 ++++++------
 src/unk_02098FFC.c                      |   2 +-
 147 files changed, 1795 insertions(+), 1797 deletions(-)

diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 7bf02c6702..20cc554011 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -11,6 +11,16 @@
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
 
+#define GRAPHIC_ELEMENT_DATA_FLIP_NONE  0
+#define GRAPHIC_ELEMENT_DATA_FLIP_H     1
+#define GRAPHIC_ELEMENT_DATA_FLIP_V     2
+
+enum AffineOverwriteMode {
+    AFFINE_OVERWRITE_MODE_NONE = 0,
+    AFFINE_OVERWRITE_MODE_NORMAL,
+    AFFINE_OVERWRITE_MODE_DOUBLE, // Extends the cell actor's drawable area by 2x, use when the cell actor is scaled up
+};
+
 GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerParams * param0);
 BOOL GraphicElementManager_Delete(GraphicElementManager * param0);
 BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
@@ -20,23 +30,23 @@ void GraphicElementData_Reset(GraphicElementData * param0);
 GraphicElementData * GraphicElementManager_AddElementEx(const CellActorInitParamsEx * param0);
 GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams * param0);
 void GraphicElementData_Delete(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 GraphicElementData_SetPosition(GraphicElementData * param0, const VecFx32 * param1);
+void GraphicElementData_SetAffineTranslation(GraphicElementData * param0, const VecFx32 * param1);
+void GraphicElementData_SetAffineScale(GraphicElementData * param0, const VecFx32 * param1);
+void GraphicElementData_SetAffineScaleEx(GraphicElementData * param0, const VecFx32 * param1, enum AffineOverwriteMode param2);
+void GraphicElementData_SetAffineZRotation(GraphicElementData * param0, u16 param1);
+void GraphicElementData_SetAffineZRotationEx(GraphicElementData * param0, u16 param1, enum AffineOverwriteMode param2);
+void GraphicElementData_SetDrawFlag(GraphicElementData * param0, BOOL param1);
+void GraphicElementData_SetAnimateFlag(GraphicElementData * param0, BOOL param1);
+void GraphicElementData_SetAnimSpeed(GraphicElementData * param0, fx32 param1);
+void GraphicElementData_SetAffineOverwriteMode(GraphicElementData * param0, enum AffineOverwriteMode param1);
+void GraphicElementData_SetFlipMode(GraphicElementData * param0, u32 param1);
+const VecFx32 * GraphicElementData_GetPosition(const GraphicElementData * param0);
+const VecFx32 * GraphicElementData_GetAffineScale(const GraphicElementData * param0);
+u16 GraphicElementData_GetAffineZRotation(const GraphicElementData * param0);
+BOOL GraphicElementData_GetDrawFlag(const GraphicElementData * param0);
+BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData * param0);
+u32 GraphicElementData_GetAnimSequenceCount(const GraphicElementData * param0);
 void SpriteActor_SetSpriteAnimActive(GraphicElementData * param0, u32 param1);
 void sub_02021DCC(GraphicElementData * param0, u32 param1);
 void sub_02021DE0(GraphicElementData * param0);
@@ -44,21 +54,21 @@ u32 sub_02021E24(const GraphicElementData * param0);
 void GraphicElementData_UpdateAnim(GraphicElementData * param0, fx32 param1);
 void SpriteActor_SetAnimFrame(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);
+void GraphicElementData_SetExplicitPriority(GraphicElementData * param0, u8 param1);
+u8 GraphicElementData_GetExplicitPriority(const GraphicElementData * param0);
+void GraphicElementData_SetExplicitPalette(GraphicElementData * param0, u32 param1);
+void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData * param0, u32 param1);
+u32 GraphicElementData_GetExplicitPalette(const GraphicElementData * param0);
+void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData * param0, u32 param1);
+void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData * param0, u32 param1);
+u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData * param0);
+void GraphicElementData_SetPriority(GraphicElementData * param0, u32 param1);
+u32 GraphicElementData_GetPriority(const GraphicElementData * param0);
+void GraphicElementData_SetImageProxy(GraphicElementData * param0, const NNSG2dImageProxy * param1);
 NNSG2dImageProxy * SpriteActor_ImageProxy(GraphicElementData * param0);
-NNSG2dImagePaletteProxy * sub_02021F9C(GraphicElementData * param0);
-void sub_02021FA0(GraphicElementData * param0, BOOL param1);
-NNS_G2D_VRAM_TYPE sub_02021FC8(const GraphicElementData * param0);
+NNSG2dImagePaletteProxy * GraphicElementData_GetPaletteProxy(GraphicElementData * param0);
+void GraphicElementData_SetPixelated(GraphicElementData * param0, BOOL param1);
+NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData * param0);
 BOOL sub_02021FD0(GraphicElementData * param0);
 void sub_02021FE0(GraphicElementData * param0, GXOamMode param1);
 void sub_02022014(int param0);
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index 407ef793c7..42513ae5bb 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -12248,7 +12248,7 @@ static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScri
 
     param1->cellActorData[1] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_0226E6F8);
 
-    sub_02021F24(param1->cellActorData[1]->unk_00, Pokemon_IconPaletteIndex(param2));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param1->cellActorData[1]->unk_00, Pokemon_IconPaletteIndex(param2));
     sub_0200D330(param1->cellActorData[1]);
 
     param1->tmpPtr[0] = sub_02012744(1, 5);
diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c
index 27961de3e1..ab97b26ae3 100644
--- a/src/battle/healthbar.c
+++ b/src/battle/healthbar.c
@@ -897,7 +897,7 @@ s32 ov16_02267560 (Healthbar * param0)
 void ov16_0226757C (Healthbar * param0)
 {
     if (param0->arrowActor != NULL) {
-        sub_02021CC8(param0->arrowActor->unk_00, 1);
+        GraphicElementData_SetAnimateFlag(param0->arrowActor->unk_00, 1);
         Healthbar_EnableArrow(param0, 1);
     }
 
@@ -909,7 +909,7 @@ void ov16_0226757C (Healthbar * param0)
 void ov16_022675AC (Healthbar * param0)
 {
     if (param0->arrowActor != NULL) {
-        sub_02021CC8(param0->arrowActor->unk_00, 0);
+        GraphicElementData_SetAnimateFlag(param0->arrowActor->unk_00, 0);
         SpriteActor_SetAnimFrame(param0->arrowActor->unk_00, 0);
         Healthbar_EnableArrow(param0, 0);
     }
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index 79b60e7aa3..77ab0badc1 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -2528,7 +2528,7 @@ static CellActorData * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon
     v4 = SpriteActor_LoadResources(v0, v1, &v3);
 
     sub_0200D500(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
-    sub_02021F24(v4->unk_00, Pokemon_IconPaletteIndex(param1));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(param1));
 
     {
         int v6 = 0;
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 4dd87f9147..a38906775b 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1491,7 +1491,7 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
     v1.position.y = 0;
 
     param1->unk_00 = GraphicElementManager_AddElement(&v1);
-    sub_02021CAC(param1->unk_00, 0);
+    GraphicElementData_SetDrawFlag(param1->unk_00, 0);
 
     param1->unk_1C.x = 0;
     param1->unk_1C.y = 0;
@@ -1541,7 +1541,7 @@ static void ov78_021D23E8 (SysTask * param0, void * param1)
     v1 = v0->unk_1C;
     v1.y += v0->unk_2C.unk_00;
 
-    sub_02021C50(v0->unk_00, &v1);
+    GraphicElementData_SetPosition(v0->unk_00, &v1);
 }
 
 static void ov78_021D241C (ChooseStarterCursor * param0)
@@ -1554,7 +1554,7 @@ static void ov78_021D241C (ChooseStarterCursor * param0)
 
 static void ov78_021D2430 (ChooseStarterCursor * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_00, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_00, param1);
 }
 
 static void ov78_021D243C (ChooseStarterCursor * param0, int param1, int param2)
diff --git a/src/field_menu.c b/src/field_menu.c
index 313475c63f..109811013c 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -821,7 +821,7 @@ static void sub_0203B318 (FieldMenu * menu, u8 * param1, u32 param2, u8 param3)
 
         {
             VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE};
-            sub_02021C80(menu->unk_200[1 + i]->unk_00, &v4, 1);
+            GraphicElementData_SetAffineScaleEx(menu->unk_200[1 + i]->unk_00, &v4, 1);
         }
     }
 
@@ -857,10 +857,10 @@ static void sub_0203B558 (GraphicElementData * graphicElement, u32 param1)
 {
     VecFx32 vec;
 
-    vec = *(sub_02021D28(graphicElement));
+    vec = *(GraphicElementData_GetPosition(graphicElement));
     vec.y = (20 + 24 * param1) * FX32_ONE;
 
-    sub_02021C50(graphicElement, &vec);
+    GraphicElementData_SetPosition(graphicElement, &vec);
 }
 
 static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 param2)
@@ -868,7 +868,7 @@ static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 p
     u32 v0 = sub_02021E24(graphicElement);
 
     SpriteActor_SetSpriteAnimActive(graphicElement, (v0 / 3) * 3 + param1);
-    sub_02021EC4(graphicElement, param2);
+    GraphicElementData_SetExplicitPaletteWithOffset(graphicElement, param2);
 }
 
 static void sub_0203B5B4 (FieldMenu * menu, u16 param1, u16 param2)
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index bcaa380ad0..ffceb927ae 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -827,7 +827,7 @@ static void ov5_021DE67C(GraphicElementData *param0, void *param1, u32 param2)
 {
     NNSG2dImagePaletteProxy *v0;
 
-    v0 = sub_02021F9C(param0);
+    v0 = GraphicElementData_GetPaletteProxy(param0);
 
     DC_FlushRange(param1, param2);
     GX_LoadOBJPltt(param1, NNS_G2dGetImagePaletteLocation(v0, NNS_G2D_VRAM_TYPE_2DMAIN), param2);
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index 844a67d299..e71d750215 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -702,8 +702,8 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         for (i = 0; i < 2; i++) {
             trainerEffect->pokeballSprites[i] = ov5_021DE62C(
                 &trainerEffect->unk_48, &trainerEffect->unk_1E8, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            sub_02021CAC(trainerEffect->pokeballSprites[i], 0);
-            sub_02021F58(trainerEffect->pokeballSprites[i], i * 2);
+            GraphicElementData_SetDrawFlag(trainerEffect->pokeballSprites[i], 0);
+            GraphicElementData_SetPriority(trainerEffect->pokeballSprites[i], i * 2);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -733,11 +733,11 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         );
 
         for (i = 0; i < 2; i++) {
-            sub_02021CAC(
+            GraphicElementData_SetDrawFlag(
                 trainerEffect->pokeballSprites[i], 1);
-            sub_02021CF8(
+            GraphicElementData_SetAffineOverwriteMode(
                 trainerEffect->pokeballSprites[i], 2);
-            sub_02021C70(
+            GraphicElementData_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
@@ -754,14 +754,14 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         LinearInterpolationTaskS32_Update(&trainerEffect->pokeballRotation);
 
         for (i = 0; i < 2; i++) {
-            sub_02021C70(
+            GraphicElementData_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & trainerEffect->pokeballRotation.currentValue);
 
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & (trainerEffect->pokeballRotation.currentValue - 0x100));
 
         if (done == TRUE) {
@@ -784,9 +784,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         v3 = Camera_GetDistance(trainerEffect->camera);
         QuadraticInterpolationTaskFX32_Init(&trainerEffect->unk_228, v3, v3 + (-FX32_CONST(500)), (-FX32_CONST(10)), 6);
 
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & 0);
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & 0);
 
         encEffect->state++;
@@ -799,9 +799,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             VecFx32 v7 = VecFx32_FromXYZ((128 * FX32_ONE) - trainerEffect->unk_2C.currentValue, (96 * FX32_ONE), 0);
             VecFx32 v8 = VecFx32_FromXYZ((128 * FX32_ONE) + trainerEffect->unk_2C.currentValue, (96 * FX32_ONE), 0);
 
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 trainerEffect->pokeballSprites[0], &v7);
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 trainerEffect->pokeballSprites[1], &v8);
         }
 
@@ -868,8 +868,8 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             for (v4 = 0; v4 < 2; v4++) {
                 v1->unk_200[v4] = ov5_021DE62C(
                     &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), 0, 0, 0);
-                sub_02021CAC(v1->unk_200[v4], 0);
-                sub_02021CF8(v1->unk_200[v4], 2);
+                GraphicElementData_SetDrawFlag(v1->unk_200[v4], 0);
+                GraphicElementData_SetAffineOverwriteMode(v1->unk_200[v4], 2);
             }
         }
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -892,18 +892,18 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
 
     case 3:
         LinearInterpolationTaskFX32_Init(&v1->unk_00, (-192 * FX32_ONE), (192 * FX32_ONE), 8);
-        sub_02021CAC(
+        GraphicElementData_SetDrawFlag(
             v1->unk_200[0], 1);
-        sub_02021CAC(
+        GraphicElementData_SetDrawFlag(
             v1->unk_200[1], 1);
 
         {
             VecFx32 v5 = VecFx32_FromXYZ((128 * FX32_ONE) - v1->unk_00.currentValue, (64 * FX32_ONE), 0);
             VecFx32 v6 = VecFx32_FromXYZ((128 * FX32_ONE) + v1->unk_00.currentValue, (128 * FX32_ONE), 0);
 
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 v1->unk_200[0], &v5);
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 v1->unk_200[1], &v6);
         }
 
@@ -919,16 +919,16 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             VecFx32 v7 = VecFx32_FromXYZ((128 * FX32_ONE) - v1->unk_00.currentValue, (64 * FX32_ONE), 0);
             VecFx32 v8 = VecFx32_FromXYZ((128 * FX32_ONE) + v1->unk_00.currentValue, (128 * FX32_ONE), 0);
 
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 v1->unk_200[0], &v7);
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 v1->unk_200[1], &v8);
         }
 
         LinearInterpolationTaskS32_Update(&v1->unk_14);
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             v1->unk_200[0], v1->unk_14.currentValue);
-        sub_02021C94(
+        GraphicElementData_SetAffineZRotation(
             v1->unk_200[1], -v1->unk_14.currentValue);
 
         if (v2 == 1) {
@@ -1013,8 +1013,8 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         for (v5 = 0; v5 < 2; v5++) {
             v1->unk_224[v5] = ov5_021DE62C(
                 &v1->unk_50, &v1->unk_1F0, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            sub_02021CAC(v1->unk_224[v5], 0);
-            sub_02021F58(v1->unk_224[v5], v5);
+            GraphicElementData_SetDrawFlag(v1->unk_224[v5], 0);
+            GraphicElementData_SetPriority(v1->unk_224[v5], v5);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1047,10 +1047,10 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_18.currentValue, 16 - v1->unk_18.currentValue);
 
         for (v5 = 0; v5 < 2; v5++) {
-            sub_02021CAC(
+            GraphicElementData_SetDrawFlag(
                 v1->unk_224[v5], 1);
 
-            sub_02021CF8(
+            GraphicElementData_SetAffineOverwriteMode(
                 v1->unk_224[v5], 2);
             sub_02021FE0(v1->unk_224[v5], GX_OAM_MODE_XLU);
         }
@@ -1068,11 +1068,11 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         v3 = LinearInterpolationTaskS32_Update(&v1->unk_2C);
 
         if (v3 == 0) {
-            sub_02021C94(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
-            sub_02021C94(v1->unk_224[1], 0xffff & v6);
+            GraphicElementData_SetAffineZRotation(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
+            GraphicElementData_SetAffineZRotation(v1->unk_224[1], 0xffff & v6);
         } else {
-            sub_02021C94(v1->unk_224[0], 0);
-            sub_02021C94(v1->unk_224[1], 0);
+            GraphicElementData_SetAffineZRotation(v1->unk_224[0], 0);
+            GraphicElementData_SetAffineZRotation(v1->unk_224[1], 0);
         }
 
         if (v2 == 1) {
@@ -1095,7 +1095,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
             VecFx32 v7 = VecFx32_FromXYZ(v1->unk_00.currentValue, v1->unk_00.currentValue, v1->unk_00.currentValue);
 
             for (v5 = 0; v5 < 2; v5++) {
-                sub_02021C70(
+                GraphicElementData_SetAffineScale(
                     v1->unk_224[v5], &v7);
             }
         }
@@ -1113,7 +1113,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
             VecFx32 v8 = VecFx32_FromXYZ(v1->unk_00.currentValue, v1->unk_00.currentValue, v1->unk_00.currentValue);
 
             for (v5 = 0; v5 < 2; v5++) {
-                sub_02021C70(
+                GraphicElementData_SetAffineScale(
                     v1->unk_224[v5], &v8);
             }
         }
@@ -1184,8 +1184,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 3; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, 0, 0, 0);
-            sub_02021CAC(v1->unk_1D4[v3], 0);
-            sub_02021CF8(v1->unk_1D4[v3], 2);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
+            GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
 
             v1->unk_258[v3] = ov5_021DE6A4(4);
         }
@@ -1246,8 +1246,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
 
         v4 = VecFx32_FromXYZ(
             43 * FX32_ONE, 231 * FX32_ONE, 0);
-        sub_02021C50(v1->unk_1D4[0], &v4);
-        sub_02021CAC(v1->unk_1D4[0], 1);
+        GraphicElementData_SetPosition(v1->unk_1D4[0], &v4);
+        GraphicElementData_SetDrawFlag(v1->unk_1D4[0], 1);
         v1->unk_264[0] = 1;
         v0->state++;
         v1->unk_2A0 = 4;
@@ -1267,8 +1267,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         ov5_021DE6C4(v1->unk_258[1], 215, 215, 312, 0, 6, v1->unk_270, 86, 64, 15);
         v4 = VecFx32_FromXYZ(
             215 * FX32_ONE, 231 * FX32_ONE, 1);
-        sub_02021C50(v1->unk_1D4[1], &v4);
-        sub_02021CAC(v1->unk_1D4[1], 1);
+        GraphicElementData_SetPosition(v1->unk_1D4[1], &v4);
+        GraphicElementData_SetDrawFlag(v1->unk_1D4[1], 1);
         v1->unk_264[1] = 1;
         v0->state++;
         v1->unk_2A0 = 2;
@@ -1288,8 +1288,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         ov5_021DE6C4(v1->unk_258[2], 129, 129, 312, 0, 6, v1->unk_270, 86, 64, 15);
         v4 = VecFx32_FromXYZ(
             129 * FX32_ONE, 231 * FX32_ONE, 2);
-        sub_02021C50(v1->unk_1D4[2], &v4);
-        sub_02021CAC(v1->unk_1D4[2], 1);
+        GraphicElementData_SetPosition(v1->unk_1D4[2], &v4);
+        GraphicElementData_SetDrawFlag(v1->unk_1D4[2], 1);
         v1->unk_264[2] = 1;
 
         v0->state++;
@@ -1353,12 +1353,12 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
             LinearInterpolationTaskS32_Update(&v1->unk_1E0[v3]);
             LinearInterpolationTaskS32_Update(&v1->unk_21C[v3]);
 
-            sub_02021C94(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
+            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
 
-            v7 = sub_02021D28(v1->unk_1D4[v3]);
+            v7 = GraphicElementData_GetPosition(v1->unk_1D4[v3]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v3].currentValue * FX32_ONE;
-            sub_02021C50(v1->unk_1D4[v3], &v8);
+            GraphicElementData_SetPosition(v1->unk_1D4[v3], &v8);
         }
     }
 
@@ -1392,7 +1392,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
 
         v1->unk_230 = ov5_021DE62C(
             &v1->unk_5C, &v1->unk_1FC, (128 * FX32_ONE), (-32 * FX32_ONE), 0, 0);
-        sub_02021CAC(v1->unk_230, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_230, 0);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1413,7 +1413,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
 
     case 3:
         QuadraticInterpolationTaskFX32_Init(&v1->unk_00, 0, (256 * FX32_ONE), (2 * FX32_ONE), 12);
-        sub_02021CAC(
+        GraphicElementData_SetDrawFlag(
             v1->unk_230, 1);
 
         QuadraticInterpolationTaskFX32_Init(&v1->unk_18, (FX32_CONST(0.10f)), (FX32_CONST(2.0f)), (FX32_CONST(0.0f)), 12);
@@ -1421,7 +1421,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
         QuadraticInterpolationTaskFX32_Init(&v1->unk_30, (FX32_CONST(0.10f)), (FX32_CONST(2.0f)), (FX32_CONST(0.0f)), 12);
 
         v4 = VecFx32_FromXYZ(v1->unk_18.currentValue, v1->unk_30.currentValue, 0);
-        sub_02021C80(v1->unk_230, &v4, 2);
+        GraphicElementData_SetAffineScaleEx(v1->unk_230, &v4, 2);
 
         LinearInterpolationTaskS32_Init(&v1->unk_48, 0, (0xffff * 1), 12);
         v0->state++;
@@ -1432,19 +1432,19 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
         {
             VecFx32 v5 = VecFx32_FromXYZ((128 * FX32_ONE), (-32 * FX32_ONE) + (v1->unk_00.currentValue), 0);
 
-            sub_02021C50(
+            GraphicElementData_SetPosition(
                 v1->unk_230, &v5);
         }
         QuadraticInterpolationTaskFX32_Update(&v1->unk_18);
         QuadraticInterpolationTaskFX32_Update(&v1->unk_30);
         v4 = VecFx32_FromXYZ(v1->unk_18.currentValue, v1->unk_30.currentValue, 0);
-        sub_02021C70(v1->unk_230, &v4);
+        GraphicElementData_SetAffineScale(v1->unk_230, &v4);
 
         LinearInterpolationTaskS32_Update(&v1->unk_48);
-        sub_02021C94(v1->unk_230, v1->unk_48.currentValue);
+        GraphicElementData_SetAffineZRotation(v1->unk_230, v1->unk_48.currentValue);
 
         if (v2 == 1) {
-            sub_02021CAC(
+            GraphicElementData_SetDrawFlag(
                 v1->unk_230, 0);
             v0->state++;
         }
@@ -1519,7 +1519,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         for (v4 = 0; v4 < 3; v4++) {
             v1->unk_1D4[v4] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, -32, 0, 0);
-            sub_02021CAC(v1->unk_1D4[v4], 0);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v4], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1565,12 +1565,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[0], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             128 * FX32_ONE, -32 * FX32_ONE, 0);
-        sub_02021C50(v1->unk_1D4[0], &v2);
-        sub_02021CAC(
+        GraphicElementData_SetPosition(v1->unk_1D4[0], &v2);
+        GraphicElementData_SetDrawFlag(
             v1->unk_1D4[0], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[0], 0, (0xffff * 1), 5);
-        sub_02021CF8(v1->unk_1D4[0], 2);
+        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[0], 2);
 
         v1->unk_258[0] = 1;
         v0->state++;
@@ -1587,13 +1587,13 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[1], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             208 * FX32_ONE, -32 * FX32_ONE, 0);
-        sub_02021C50(v1->unk_1D4[1], &v2);
-        sub_02021CAC(
+        GraphicElementData_SetPosition(v1->unk_1D4[1], &v2);
+        GraphicElementData_SetDrawFlag(
             v1->unk_1D4[1], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[1], 0, (0xffff * -1), 5);
 
-        sub_02021CF8(v1->unk_1D4[1], 2);
+        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[1], 2);
         v1->unk_258[1] = 1;
         v0->state++;
         v1->unk_288 = 3;
@@ -1609,12 +1609,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[2], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             48 * FX32_ONE, -32 * FX32_ONE, 0);
-        sub_02021C50(v1->unk_1D4[2], &v2);
-        sub_02021CAC(
+        GraphicElementData_SetPosition(v1->unk_1D4[2], &v2);
+        GraphicElementData_SetDrawFlag(
             v1->unk_1D4[2], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[2], 0, (0xffff * 1), 5);
-        sub_02021CF8(v1->unk_1D4[2], 2);
+        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[2], 2);
 
         v1->unk_258[2] = 1;
         v0->state++;
@@ -1624,7 +1624,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
 
         if ((v1->unk_258[0] == 0) && (v1->unk_258[1] == 0) && (v1->unk_258[2] == 0)) {
             for (v4 = 0; v4 < 3; v4++) {
-                sub_02021CAC(
+                GraphicElementData_SetDrawFlag(
                     v1->unk_1D4[v4], 0);
             }
 
@@ -1694,11 +1694,11 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
                 v1->unk_258[v4] = 0;
             }
 
-            v7 = sub_02021D28(v1->unk_1D4[v4]);
+            v7 = GraphicElementData_GetPosition(v1->unk_1D4[v4]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v4].currentValue * FX32_ONE;
-            sub_02021C50(v1->unk_1D4[v4], &v8);
-            sub_02021C94(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
+            GraphicElementData_SetPosition(v1->unk_1D4[v4], &v8);
+            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
         }
     }
 
@@ -1742,7 +1742,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
 
         v1->unk_200 = ov5_021DE62C(
             &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-        sub_02021CAC(v1->unk_200, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_200, 0);
         sub_02021FE0(v1->unk_200, GX_OAM_MODE_XLU);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
@@ -1766,7 +1766,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_00, 0, 16, 12);
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_00.currentValue, 16 - v1->unk_00.currentValue);
 
-        sub_02021CAC(
+        GraphicElementData_SetDrawFlag(
             v1->unk_200, 1);
         v0->state++;
         break;
@@ -1786,12 +1786,12 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
     case 5:
         QuadraticInterpolationTaskFX32_Init(&v1->unk_14, (FX32_CONST(1.0f)), (FX32_CONST(0.1f)), 1, 6);
 
-        sub_02021CF8(
+        GraphicElementData_SetAffineOverwriteMode(
             v1->unk_200, 2);
         {
             VecFx32 v3 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            sub_02021C70(
+            GraphicElementData_SetAffineScale(
                 v1->unk_200, &v3);
         }
 
@@ -1805,7 +1805,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
         {
             VecFx32 v4 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            sub_02021C70(
+            GraphicElementData_SetAffineScale(
                 v1->unk_200, &v4);
         }
 
@@ -1858,7 +1858,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 4; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            sub_02021CAC(v1->unk_1D4[v3], 0);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1884,7 +1884,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         QuadraticInterpolationTaskFX32_Init(&v1->unk_1E4[1], 0, (160 * FX32_ONE), (FX32_CONST(0.1f)), 4);
 
         for (v3 = 0; v3 < 4; v3++) {
-            sub_02021CAC(v1->unk_1D4[v3], 1);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 1);
         }
 
         v0->state++;
@@ -1897,19 +1897,19 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) - v1->unk_1E4[0].currentValue, 0);
-        sub_02021C50(v1->unk_1D4[0], &v4);
+        GraphicElementData_SetPosition(v1->unk_1D4[0], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) + v1->unk_1E4[0].currentValue, 0);
-        sub_02021C50(v1->unk_1D4[1], &v4);
+        GraphicElementData_SetPosition(v1->unk_1D4[1], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) - v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        sub_02021C50(v1->unk_1D4[2], &v4);
+        GraphicElementData_SetPosition(v1->unk_1D4[2], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) + v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        sub_02021C50(v1->unk_1D4[3], &v4);
+        GraphicElementData_SetPosition(v1->unk_1D4[3], &v4);
 
         if (v2 == 1) {
             v0->state++;
@@ -2019,7 +2019,7 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 6; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, 0, 0, 0);
-            sub_02021CAC(v1->unk_1D4[v3], 0);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -2054,13 +2054,13 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
 
             LinearInterpolationTaskS32_Init(&v1->unk_39C[v1->unk_42C], 0, Unk_ov5_021F9E94[v1->unk_42C][7], 8);
 
-            sub_02021CAC(v1->unk_1D4[v1->unk_42C], 1);
+            GraphicElementData_SetDrawFlag(v1->unk_1D4[v1->unk_42C], 1);
             v4 = VecFx32_FromXYZ(
                 Unk_ov5_021F9E94[v1->unk_42C][0], Unk_ov5_021F9E94[v1->unk_42C][3], 0);
-            sub_02021C50(v1->unk_1D4[v1->unk_42C], &v4);
+            GraphicElementData_SetPosition(v1->unk_1D4[v1->unk_42C], &v4);
             v5 = VecFx32_FromXYZ(
                 (FX32_CONST(2.0f)), (FX32_CONST(2.0f)), 0);
-            sub_02021C80(v1->unk_1D4[v1->unk_42C], &v5, 2);
+            GraphicElementData_SetAffineScaleEx(v1->unk_1D4[v1->unk_42C], &v5, 2);
 
             v1->unk_414[v1->unk_42C] = 1;
 
@@ -2127,16 +2127,16 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
 
             if (v2) {
                 v1->unk_414[v3] = 0;
-                sub_02021CAC(v1->unk_1D4[v3], 0);
+                GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
             }
 
             v4 = VecFx32_FromXYZ(
                 v1->unk_27C[v3].currentValue, v1->unk_30C[v3].currentValue, 0);
-            sub_02021C50(v1->unk_1D4[v3], &v4);
+            GraphicElementData_SetPosition(v1->unk_1D4[v3], &v4);
             v5 = VecFx32_FromXYZ(
                 v1->unk_1EC[v3].currentValue, v1->unk_1EC[v3].currentValue, 0);
-            sub_02021C70(v1->unk_1D4[v3], &v5);
-            sub_02021C94(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
+            GraphicElementData_SetAffineScale(v1->unk_1D4[v3], &v5);
+            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
         }
     }
 
@@ -2164,9 +2164,9 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
         v1->unk_1DC = ov5_021DE62C(
             &v1->unk_08, &v1->unk_1A8, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-        sub_02021CAC(v1->unk_1DC, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_1DC, 0);
         sub_02021FE0(v1->unk_1DC, GX_OAM_MODE_XLU);
-        sub_02021E80(v1->unk_1DC, 1);
+        GraphicElementData_SetExplicitPriority(v1->unk_1DC, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_04 = ov5_021DEBEC(4);
@@ -2201,7 +2201,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
     case 3:
         LinearInterpolationTaskS32_Init(&v1->unk_1F4, 0, 16, 15);
-        sub_02021CAC(v1->unk_1DC, 1);
+        GraphicElementData_SetDrawFlag(v1->unk_1DC, 1);
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_1F4.currentValue, 16 - v1->unk_1F4.currentValue);
         v0->state++;
         break;
@@ -2839,10 +2839,10 @@ static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov5_021DE62C(
             param1, param2, param3, param4, 0, 0);
-        sub_02021CAC(param0->unk_04[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
 
         if (v0 != 3) {
-            sub_02021CF8(param0->unk_04[v0], 2);
+            GraphicElementData_SetAffineOverwriteMode(param0->unk_04[v0], 2);
             SpriteActor_SetSpriteAnimActive(param0->unk_04[v0], 1);
 
             LinearInterpolationTaskFX32_Init(&param0->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
@@ -2883,8 +2883,8 @@ static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0)
 
         v3 = VecFx32_FromXYZ(
             param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue);
-        sub_02021C70(param0->unk_04[v0], &v3);
-        sub_02021CAC(param0->unk_04[v0], 1);
+        GraphicElementData_SetAffineScale(param0->unk_04[v0], &v3);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 1);
 
         if (v1 == 0) {
             v2 = 0;
@@ -2951,7 +2951,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 
         v0->unk_24C = ov5_021DE62C(
             &v0->unk_44, &v0->unk_1E4[0], (272 * FX32_ONE), (66 * FX32_ONE), 0, 0);
-        sub_02021CAC(v0->unk_24C, 0);
+        GraphicElementData_SetDrawFlag(v0->unk_24C, 0);
         ov5_021E5128(&v0->unk_250, &v0->unk_44, &v0->unk_1E4[1], (FX32_CONST(72)), (FX32_CONST(74)), heapID);
 
         ov5_021DE5D0(v0->unk_24C, heapID, param->trainerClass, 14, (GX_RGB(0, 0, 0)));
@@ -3020,12 +3020,12 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
     case 6:
 
         QuadraticInterpolationTaskFX32_Init(&v0->unk_00, (272 * FX32_ONE), param->endX, (-64 * FX32_ONE), 4);
-        sub_02021CAC(v0->unk_24C, 1);
-        sub_02021E80(v0->unk_24C, 0);
+        GraphicElementData_SetDrawFlag(v0->unk_24C, 1);
+        GraphicElementData_SetExplicitPriority(v0->unk_24C, 0);
 
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (66 * FX32_ONE), 0);
-        sub_02021C50(v0->unk_24C, &v3);
+        GraphicElementData_SetPosition(v0->unk_24C, &v3);
 
         encEffect->state++;
         break;
@@ -3035,7 +3035,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
         v1 = QuadraticInterpolationTaskFX32_Update(&v0->unk_00);
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (66 * FX32_ONE), 0);
-        sub_02021C50(v0->unk_24C, &v3);
+        GraphicElementData_SetPosition(v0->unk_24C, &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3291,9 +3291,9 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             v0->unk_2CC[v5] = ov5_021DE62C(
                 &v0->unk_5C, v7, 0, 0, 0, 0);
-            sub_02021CAC(v0->unk_2CC[v5], 0);
+            GraphicElementData_SetDrawFlag(v0->unk_2CC[v5], 0);
             SpriteActor_SetSpriteAnimActive(v0->unk_2CC[v5], v8);
-            sub_02021E80(v0->unk_2CC[v5], 1);
+            GraphicElementData_SetExplicitPriority(v0->unk_2CC[v5], 1);
         }
 
         if (v0->unk_368) {
@@ -3347,22 +3347,22 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         QuadraticInterpolationTaskFX32_Init(&v0->unk_00, (-128 * FX32_ONE), (56 * FX32_ONE), (80 * FX32_ONE), 6);
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (92 * FX32_ONE), 0);
-        sub_02021C50(v0->unk_2CC[0], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[2], &v3);
-        sub_02021CAC(v0->unk_2CC[0], 1);
-        sub_02021CAC(v0->unk_2CC[2], 1);
+        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
+        GraphicElementData_SetDrawFlag(v0->unk_2CC[0], 1);
+        GraphicElementData_SetDrawFlag(v0->unk_2CC[2], 1);
 
         QuadraticInterpolationTaskFX32_Init(&v0->unk_30, (384 * FX32_ONE), (200 * FX32_ONE), (-80 * FX32_ONE), 6);
         v3 = VecFx32_FromXYZ(
             v0->unk_30.currentValue, (92 * FX32_ONE), 0);
-        sub_02021C50(v0->unk_2CC[1], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[3], &v3);
-        sub_02021CAC(v0->unk_2CC[1], 1);
-        sub_02021CAC(v0->unk_2CC[3], 1);
+        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
+        GraphicElementData_SetDrawFlag(v0->unk_2CC[1], 1);
+        GraphicElementData_SetDrawFlag(v0->unk_2CC[3], 1);
 
         {
             Strbuf* v9;
@@ -3401,19 +3401,19 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (92 * FX32_ONE), 0);
         v0->unk_2DC = v3;
-        sub_02021C50(v0->unk_2CC[0], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[2], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
 
         v1 = QuadraticInterpolationTaskFX32_Update(&v0->unk_30);
         v3 = VecFx32_FromXYZ(
             v0->unk_30.currentValue, (92 * FX32_ONE), 0);
         v0->unk_2E8 = v3;
-        sub_02021C50(v0->unk_2CC[1], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[3], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3445,10 +3445,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             ov5_021DE5D0(v0->unk_2CC[1], heapID, param->trainerClass, 0, (GX_RGB(0, 0, 0)));
 
-            sub_02021CC8(v0->unk_2CC[2], 1);
-            sub_02021CE4(v0->unk_2CC[2], FX32_ONE * 2);
-            sub_02021CC8(v0->unk_2CC[3], 1);
-            sub_02021CE4(v0->unk_2CC[3], FX32_ONE * 2);
+            GraphicElementData_SetAnimateFlag(v0->unk_2CC[2], 1);
+            GraphicElementData_SetAnimSpeed(v0->unk_2CC[2], FX32_ONE * 2);
+            GraphicElementData_SetAnimateFlag(v0->unk_2CC[3], 1);
+            GraphicElementData_SetAnimSpeed(v0->unk_2CC[3], FX32_ONE * 2);
 
             ov5_021DF0CC(encEffect->narc, 108);
 
@@ -3512,10 +3512,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2DC = v3;
         }
 
-        sub_02021C50(v0->unk_2CC[0], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[2], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
 
         if (((encEffect->effectComplete / 2) % 2) == 0) {
             v3 = VecFx32_FromXYZ(
@@ -3529,10 +3529,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2E8 = v3;
         }
 
-        sub_02021C50(v0->unk_2CC[1], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[3], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1) {
             encEffect->state++;
@@ -3553,17 +3553,17 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
         v3 = VecFx32_FromXYZ(
             v0->unk_2DC.x - v0->unk_00.currentValue, v0->unk_2DC.y - v0->unk_18.currentValue, 0);
-        sub_02021C50(v0->unk_2CC[0], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[2], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
 
         v3 = VecFx32_FromXYZ(
             v0->unk_2E8.x + v0->unk_00.currentValue, v0->unk_2E8.y + v0->unk_18.currentValue, 0);
-        sub_02021C50(v0->unk_2CC[1], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        sub_02021C50(v0->unk_2CC[3], &v3);
+        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
 
         if (ScreenWipe_Done()) {
             encEffect->state++;
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index f466ebe532..eb47df2c3f 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -123,7 +123,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     GF_ASSERT(v1);
 
     SpriteActor_SetSpriteAnimActive(v1, param1->unk_0A);
-    sub_02021EC4(v1, param1->unk_10);
+    GraphicElementData_SetExplicitPaletteWithOffset(v1, param1->unk_10);
 
     return v1;
 }
@@ -388,9 +388,9 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     v2->unk_00 = GraphicElementManager_AddElementEx(&v3);
 
     if (v2->unk_00 != NULL) {
-        v1 = sub_02021EE8(v2->unk_00);
+        v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
         SpriteActor_SetSpriteAnimActive(v2->unk_00, param1->animIdx);
-        sub_02021E90(v2->unk_00, v1 + param1->plttIdx);
+        GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param1->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 181073595c..6bdb3c86ea 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -869,7 +869,7 @@ static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1)
         }
     }
 
-    sub_02021C50(param0, param1);
+    GraphicElementData_SetPosition(param0, param1);
 }
 
 UnkStruct_ov5_021D6594 * ov5_021D6364 (FieldSystem * fieldSystem)
@@ -1478,7 +1478,7 @@ static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0)
 
     for (v0 = 0; v0 < 48; v0++) {
         param0->unk_48[v0].unk_04 = GraphicElementManager_AddElementEx(&param0->unk_08->unk_10);
-        sub_02021CAC(param0->unk_48[v0].unk_04, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_48[v0].unk_04, 0);
         GF_ASSERT(param0->unk_48[v0].unk_04);
     }
 }
@@ -1589,7 +1589,7 @@ static UnkStruct_ov5_021D6FA8 * ov5_021D6F00 (UnkStruct_ov5_021DB4B8 * param0, i
     }
 
     GF_ASSERT(v0->unk_04);
-    sub_02021CAC(v0->unk_04, 1);
+    GraphicElementData_SetDrawFlag(v0->unk_04, 1);
 
     return v0;
 }
@@ -1613,7 +1613,7 @@ static void ov5_021D6FA8 (UnkStruct_ov5_021D6FA8 * param0)
     param0->unk_38->unk_34 = param0->unk_34;
     param0->unk_34->unk_38 = param0->unk_38;
 
-    sub_02021CAC(param0->unk_04, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
     ov5_021D6EF0(param0);
 
     v0 = param0->unk_04;
@@ -1659,7 +1659,7 @@ static void ov5_021D700C (UnkStruct_ov5_021DB4B8 * param0)
 
 static VecFx32 ov5_021D7010 (UnkStruct_ov5_021D6FA8 * param0)
 {
-    const VecFx32 * v0 = sub_02021D28(param0->unk_04);
+    const VecFx32 * v0 = GraphicElementData_GetPosition(param0->unk_04);
     return *v0;
 }
 
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 441d1a8228..af8aec346b 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -222,7 +222,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
 
         param0->unk_1C8 = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_1C8, 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_1C8, 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C8, 0);
     }
 }
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 18104e5a30..1b57865a18 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -565,7 +565,7 @@ static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const
 
 static void ov6_022437C8 (GraphicElementData * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = sub_02021D28(param0);
+    const VecFx32 * v0 = GraphicElementData_GetPosition(param0);
     *param1 = *v0;
 }
 
@@ -578,10 +578,10 @@ static GraphicElementData * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
 
     v0 = ov6_02243740(param0, &v1, 0, 0, 0, 2, 0, 132);
 
-    sub_02021CF8(v0, 2);
-    sub_02021C60(v0, &v2);
-    sub_02021C70(v0, &v3);
-    sub_02021C94(v0, sub_0201D2A4(0));
+    GraphicElementData_SetAffineOverwriteMode(v0, 2);
+    GraphicElementData_SetAffineTranslation(v0, &v2);
+    GraphicElementData_SetAffineScale(v0, &v3);
+    GraphicElementData_SetAffineZRotation(v0, sub_0201D2A4(0));
 
     return v0;
 }
@@ -598,7 +598,7 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
 
     v1 = ov6_02243740(param0, &v0, 2, v2, 2, 1, 0, 131);
 
-    sub_02021CAC(v1, 0);
+    GraphicElementData_SetDrawFlag(v1, 0);
     SpriteActor_SetSpriteAnimActive(v1, 6);
 
     return v1;
@@ -684,7 +684,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C = {
 static int ov6_02243940 (UnkStruct_ov6_02249110 * param0)
 {
     param0->unk_02 = 0;
-    sub_02021CAC(param0->unk_68, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_68, 0);
     return 0;
 }
 
@@ -716,11 +716,11 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
     v0.x = v2->unk_08.x + v2->unk_14.x;
     v0.y = v2->unk_08.y + v2->unk_14.y;
 
-    sub_02021C50(v2->unk_68, &v0);
-    sub_02021C70(v2->unk_68, &v1);
-    sub_02021C94(v2->unk_68, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    sub_02021F58(v2->unk_68, 132);
-    sub_02021CAC(v2->unk_68, 1);
+    GraphicElementData_SetPosition(v2->unk_68, &v0);
+    GraphicElementData_SetAffineScale(v2->unk_68, &v1);
+    GraphicElementData_SetAffineZRotation(v2->unk_68, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    GraphicElementData_SetPriority(v2->unk_68, 132);
+    GraphicElementData_SetDrawFlag(v2->unk_68, 1);
 
     v2->unk_6C = ov6_02245B4C(v2->unk_58.unk_00, v2->unk_58.unk_08);
     v2->unk_70 = ov5_021F0EB0(v2->unk_58.fieldSystem, 4);
@@ -734,10 +734,10 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
 
         v3 = v2->unk_58.unk_08;
 
-        sub_02021CF8(v3, 2);
-        sub_02021C60(v3, &v4);
-        sub_02021C70(v3, &v5);
-        sub_02021C94(v3, sub_0201D2A4(0));
+        GraphicElementData_SetAffineOverwriteMode(v3, 2);
+        GraphicElementData_SetAffineTranslation(v3, &v4);
+        GraphicElementData_SetAffineScale(v3, &v5);
+        GraphicElementData_SetAffineZRotation(v3, sub_0201D2A4(0));
         SpriteActor_SetSpriteAnimActive(v3, 2);
     }
 
@@ -783,15 +783,15 @@ static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
-    sub_02021C70(v2, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v2, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
     v0.y -= (FX32_ONE * 18);
-    sub_02021C50(v2, &v0);
+    GraphicElementData_SetPosition(v2, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -837,7 +837,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
     }
 
     param0->unk_38 += 0x2000;
-    sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
     param0->unk_2C.x += param0->unk_50;
 
     if (param0->unk_2C.x > 0x1000) {
@@ -850,12 +850,12 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y - param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 
     if (((v0.y) / FX32_ONE) <= -16) {
         param0->unk_01++;
@@ -866,7 +866,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
 
 static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0)
 {
-    sub_02021CAC(param0->unk_68, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_68, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1);
 
     param0->unk_04 = 0;
@@ -897,12 +897,12 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
         param0->unk_48 = (FX32_ONE * 128);
         param0->unk_4C = 0x2000;
 
-        sub_02021C50(param0->unk_68, &v0);
-        sub_02021C70(param0->unk_68, &v1);
-        sub_02021C94(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
-        sub_02021CAC(param0->unk_68, 1);
+        GraphicElementData_SetPosition(param0->unk_68, &v0);
+        GraphicElementData_SetAffineScale(param0->unk_68, &v1);
+        GraphicElementData_SetAffineZRotation(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+        GraphicElementData_SetDrawFlag(param0->unk_68, 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 6);
-        sub_02021CC8(param0->unk_58.unk_08, 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_58.unk_08, 1);
     }
 
     param0->unk_01++;
@@ -943,22 +943,22 @@ static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x400;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) > 60) {
         param0->unk_38 = (FX32_ONE * 60);
     }
 
-    sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 
     if (param0->unk_48 <= 0) {
-        sub_02021CAC(v1, 0);
+        GraphicElementData_SetDrawFlag(v1, 0);
         param0->unk_01++;
     }
 
@@ -975,7 +975,7 @@ static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0)
     }
 
     if (param0->unk_04 == 10) {
-        sub_02021CAC(param0->unk_58.unk_08, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_58.unk_08, 0);
     }
 
     if ((param0->unk_04 > 15) && (ov5_021F0EF0(param0->unk_70) == 1)) {
@@ -1207,7 +1207,7 @@ static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0->unk_24C);
+    v0 = GraphicElementData_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
@@ -1216,7 +1216,7 @@ static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0)
         param0->unk_00++;
     }
 
-    sub_02021C50(param0->unk_24C, &v1);
+    GraphicElementData_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1236,11 +1236,11 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
         }
     }
 
-    v0 = sub_02021D28(param0->unk_24C);
+    v0 = GraphicElementData_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    sub_02021C50(param0->unk_24C, &v1);
+    GraphicElementData_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1268,11 +1268,11 @@ static int ov6_022442A4 (UnkStruct_ov6_02243FFC * param0)
         param0->unk_58 = (FX32_ONE * -64);
     }
 
-    v0 = sub_02021D28(param0->unk_24C);
+    v0 = GraphicElementData_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    sub_02021C50(param0->unk_24C, &v1);
+    GraphicElementData_SetPosition(param0->unk_24C, &v1);
 
     if (v1.x <= (FX32_ONE * -40)) {
         param0->unk_54 = 0x1000;
@@ -1887,7 +1887,7 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
 
     v0 = ov6_02244C20(param0, param1, 2, v1, 2, 1, 0, 131);
 
-    sub_02021CAC(v0, 0);
+    GraphicElementData_SetDrawFlag(v0, 0);
     SpriteActor_SetSpriteAnimActive(v0, 6);
 
     return v0;
@@ -1895,8 +1895,8 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
 
 static void ov6_02244D34 (GraphicElementData * param0)
 {
-    sub_02021CC8(param0, 1);
-    sub_02021CE4(param0, FX32_ONE);
+    GraphicElementData_SetAnimateFlag(param0, 1);
+    GraphicElementData_SetAnimSpeed(param0, FX32_ONE);
 }
 
 static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
@@ -1907,10 +1907,10 @@ static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const
 
     v0 = ov6_02244C20(param0, param1, 0, 0, 0, 0xffffffff, 0, param2);
 
-    sub_02021CF8(v0, 2);
-    sub_02021C60(v0, &v1);
-    sub_02021C70(v0, &v2);
-    sub_02021C94(v0, sub_0201D2A4(0));
+    GraphicElementData_SetAffineOverwriteMode(v0, 2);
+    GraphicElementData_SetAffineTranslation(v0, &v1);
+    GraphicElementData_SetAffineScale(v0, &v2);
+    GraphicElementData_SetAffineZRotation(v0, sub_0201D2A4(0));
 
     return v0;
 }
@@ -2247,7 +2247,7 @@ static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
 
     v1->unk_08 = ov6_02244CD4(v1->unk_0C.unk_08, &v0, v1->unk_0C.unk_00, v1->unk_04);
-    sub_02021CAC(v1->unk_08, 0);
+    GraphicElementData_SetDrawFlag(v1->unk_08, 0);
 
     return 1;
 }
@@ -2269,7 +2269,7 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v0.x %= (FX32_ONE * 512);
 
     sub_020715D4(param0, &v0);
-    sub_02021C50(v1->unk_08, &v0);
+    GraphicElementData_SetPosition(v1->unk_08, &v0);
 
     if (v1->unk_0C.unk_04 == 1) {
         UnkStruct_ov6_02243FFC * v2 = v1->unk_0C.unk_08;
@@ -2282,9 +2282,9 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
                 v3 = 1;
             }
 
-            sub_02021CAC(v1->unk_08, v3);
+            GraphicElementData_SetDrawFlag(v1->unk_08, v3);
         } else if (v2->unk_14 == 1) {
-            sub_02021CAC(v1->unk_08, 0);
+            GraphicElementData_SetDrawFlag(v1->unk_08, 0);
         }
     }
 }
@@ -2383,7 +2383,7 @@ static int(*const * const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *) = {
 static int ov6_0224550C (UnkStruct_ov6_02249198 * param0)
 {
     param0->unk_02 = 0;
-    sub_02021CAC(param0->unk_58, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_58, 0);
     return 0;
 }
 
@@ -2409,10 +2409,10 @@ static void ov6_0224551C (UnkStruct_ov6_02243FFC * param0)
     v2->unk_48 = 0;
     v2->unk_4C = 0x2000;
 
-    sub_02021C50(v2->unk_58, &v0);
-    sub_02021C70(v2->unk_58, &v1);
-    sub_02021C94(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    sub_02021CAC(v2->unk_58, 1);
+    GraphicElementData_SetPosition(v2->unk_58, &v0);
+    GraphicElementData_SetAffineScale(v2->unk_58, &v1);
+    GraphicElementData_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    GraphicElementData_SetDrawFlag(v2->unk_58, 1);
 }
 
 static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0)
@@ -2445,22 +2445,22 @@ static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 -= 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) < 0) {
         param0->unk_38 = 0;
     }
 
-    sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 
     if (v0.y < (FX32_ONE * -64)) {
-        sub_02021CAC(v1, 0);
+        GraphicElementData_SetDrawFlag(v1, 0);
         param0->unk_02 = 2;
         param0->unk_01++;
     }
@@ -2502,10 +2502,10 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
     v0.x = v2->unk_08.x + v2->unk_14.x;
     v0.y = v2->unk_08.y + v2->unk_14.y;
 
-    sub_02021C50(v2->unk_58, &v0);
-    sub_02021C70(v2->unk_58, &v1);
-    sub_02021C94(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    sub_02021CAC(v2->unk_58, 1);
+    GraphicElementData_SetPosition(v2->unk_58, &v0);
+    GraphicElementData_SetAffineScale(v2->unk_58, &v1);
+    GraphicElementData_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    GraphicElementData_SetDrawFlag(v2->unk_58, 1);
 
     v2->unk_60 = ov6_02245B4C(param0->unk_244, param0->unk_248);
     param0->unk_1C = 1;
@@ -2520,10 +2520,10 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
 
         v3 = v2->unk_5C.unk_00->unk_248;
 
-        sub_02021CF8(v3, 2);
-        sub_02021C60(v3, &v4);
-        sub_02021C70(v3, &v5);
-        sub_02021C94(v3, sub_0201D2A4(0));
+        GraphicElementData_SetAffineOverwriteMode(v3, 2);
+        GraphicElementData_SetAffineTranslation(v3, &v4);
+        GraphicElementData_SetAffineScale(v3, &v5);
+        GraphicElementData_SetAffineZRotation(v3, sub_0201D2A4(0));
     }
 }
 
@@ -2565,19 +2565,19 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x1800;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x8000;
 
     if (((param0->unk_38) / FX32_ONE) > 360) {
         param0->unk_38 = (FX32_ONE * 360);
     }
 
-    sub_02021C94(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -2592,7 +2592,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
 
     {
         GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 * v3 = sub_02021D2C(v2);
+        const VecFx32 * v3 = GraphicElementData_GetAffineScale(v2);
         VecFx32 v4 = *v3;
 
         v4.x += 0x80;
@@ -2607,7 +2607,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
             v4.y = 0x1400;
         }
 
-        sub_02021C70(v2, &v4);
+        GraphicElementData_SetAffineScale(v2, &v4);
     }
 
     return 0;
@@ -2621,10 +2621,10 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 
     {
         fx32 v1, v2;
-        const VecFx32 * v3 = sub_02021D28(v0);
+        const VecFx32 * v3 = GraphicElementData_GetPosition(v0);
 
         v1 = v3->y;
-        v3 = sub_02021D28(param0->unk_58);
+        v3 = GraphicElementData_GetPosition(param0->unk_58);
         v2 = v3->y;
 
         param0->unk_54 = v1 - v2;
@@ -2674,23 +2674,23 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x2000;
     }
 
-    sub_02021C70(v1, &param0->unk_2C);
+    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 
     {
         GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 * v3 = sub_02021D2C(v2);
+        const VecFx32 * v3 = GraphicElementData_GetAffineScale(v2);
         VecFx32 v4 = v0;
         VecFx32 v5 = *v3;
 
         param0->unk_54 -= 0x1000;
 
         v4.y += param0->unk_54;
-        sub_02021C50(v2, &v4);
+        GraphicElementData_SetPosition(v2, &v4);
         v5.x += 0x100;
 
         if (v5.x > 0x2000) {
@@ -2703,7 +2703,7 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
             v5.y = 0x2000;
         }
 
-        sub_02021C70(v2, &v5);
+        GraphicElementData_SetAffineScale(v2, &v5);
     }
 
     if (((v0.y) / FX32_ONE) >= 240) {
@@ -2755,7 +2755,7 @@ static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0)
     v2->unk_0C = 0;
     v2->unk_08 = 0;
     v2->unk_10.x = 0; v2->unk_10.y = 0; v2->unk_10.z = 0;
-    v1 = sub_02021D28(v2->unk_20);
+    v1 = GraphicElementData_GetPosition(v2->unk_20);
     v0 = *v1;
 
     sub_020715D4(param0, &v0);
@@ -2821,7 +2821,7 @@ static void ov6_02245C18 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245
         param1->unk_10.y = Unk_ov6_022492A8[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        sub_02021C50(param1->unk_20, &v0);
+        GraphicElementData_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 12) {
@@ -2841,7 +2841,7 @@ static void ov6_02245C64 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245
         param1->unk_10.y = Unk_ov6_022491FC[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        sub_02021C50(param1->unk_20, &v0);
+        GraphicElementData_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 4) {
@@ -2980,7 +2980,7 @@ static int ov6_02245D60 (UnkStruct_ov6_02249270 * param0)
 static int ov6_02245EA4 (UnkStruct_ov6_02249270 * param0)
 {
     param0->unk_1D0 = ov6_02243848(&param0->unk_18, param0->unk_0C);
-    sub_02021CAC(param0->unk_1D0, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_1D0, 1);
 
     param0->unk_1D8 = ov6_02243888(param0->fieldSystem, param0->unk_1D4, &param0->unk_18, param0->unk_1D0);
     ov6_02243950(param0->unk_1D8);
@@ -3062,19 +3062,19 @@ static void ov6_02245F94 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     const VecFx32 * v3;
     UnkStruct_ov6_02245F80 * v4 = param1;
 
-    v3 = sub_02021D28(v4->unk_00);
+    v3 = GraphicElementData_GetPosition(v4->unk_00);
     v0 = v3->y;
     v1 = v4->unk_04->unk_4C;
     v2 = v4->unk_04->unk_50;
 
     if (v4->unk_04->unk_1C == 0) {
         if (((v0 - (FX32_ONE * 8)) >= v1) && ((v0 + (FX32_ONE * 8)) <= v2)) {
-            sub_02021CAC(v4->unk_00, 1);
+            GraphicElementData_SetDrawFlag(v4->unk_00, 1);
         } else {
-            sub_02021CAC(v4->unk_00, 0);
+            GraphicElementData_SetDrawFlag(v4->unk_00, 0);
         }
     } else {
-        sub_02021CAC(v4->unk_00, 1);
+        GraphicElementData_SetDrawFlag(v4->unk_00, 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 24b381ec4b..d89d62e6f9 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -659,7 +659,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
         param0->unk_158[v0] = GraphicElementManager_AddElement(&v3);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_158[v0], v0);
-        sub_02021CC8(param0->unk_158[v0], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_158[v0], 1);
     }
 }
 
@@ -725,8 +725,8 @@ static void ov7_0224CA0C (UnkStruct_ov7_0224C768 * param0)
 
 static void ov7_0224CA34 (UnkStruct_ov7_0224C768 * param0)
 {
-    sub_02021CAC(param0->unk_158[0], 0);
-    sub_02021CAC(param0->unk_158[1], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_158[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_158[1], 0);
 }
 
 static void ov7_0224CA54 (CellActorResourceData * param0, UnkStruct_ov7_0224C768 * param1, u32 param2)
@@ -763,15 +763,15 @@ static void ov7_0224CB70 (UnkStruct_ov7_0224C768 * param0)
     sub_020014DC(param0->unk_08, &v0, NULL);
 
     if ((v0 <= 0)) {
-        sub_02021CAC(param0->unk_158[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_158[0], 0);
     } else {
-        sub_02021CAC(param0->unk_158[0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_158[0], 1);
     }
 
     if (v0 >= (param0->unk_120 - 7)) {
-        sub_02021CAC(param0->unk_158[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_158[1], 0);
     } else {
-        sub_02021CAC(param0->unk_158[1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_158[1], 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index ec57e7800d..96921b94ac 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -703,17 +703,17 @@ static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2)
         sub_020014DC(param0, &v5, &v6);
 
         if (v5 == 0) {
-            sub_02021CAC(v0->unk_25C[0], 0);
+            GraphicElementData_SetDrawFlag(v0->unk_25C[0], 0);
         } else {
-            sub_02021CAC(v0->unk_25C[0], 1);
+            GraphicElementData_SetDrawFlag(v0->unk_25C[0], 1);
         }
 
         v4 = sub_02001504(param0, 2);
 
         if ((v4 > 7) && (v4 > v5 + 7)) {
-            sub_02021CAC(v0->unk_25C[1], 1);
+            GraphicElementData_SetDrawFlag(v0->unk_25C[1], 1);
         } else {
-            sub_02021CAC(v0->unk_25C[1], 0);
+            GraphicElementData_SetDrawFlag(v0->unk_25C[1], 0);
         }
     }
     sub_0201A9A4(&v0->unk_08[1]);
@@ -850,11 +850,11 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0)
         Strbuf* v3;
         u32 v4;
 
-        param0->unk_26C[0] = (u16)sub_02021D34(param0->unk_25C[0]);
-        param0->unk_26C[1] = (u16)sub_02021D34(param0->unk_25C[1]);
+        param0->unk_26C[0] = (u16)GraphicElementData_GetDrawFlag(param0->unk_25C[0]);
+        param0->unk_26C[1] = (u16)GraphicElementData_GetDrawFlag(param0->unk_25C[1]);
 
-        sub_02021CAC(param0->unk_25C[0], 0);
-        sub_02021CAC(param0->unk_25C[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], 0);
 
         ov7_0224EC10(param0, 1);
 
@@ -926,8 +926,8 @@ static u8 ov7_0224DE94 (UnkStruct_ov7_0224D008 * param0)
     ov7_0224DED4(param0);
     ov7_0224E28C(param0, 0);
 
-    sub_02021CAC(param0->unk_25C[0], 1);
-    sub_02021CAC(param0->unk_25C[1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_25C[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_25C[1], 1);
 
     return 6;
 }
@@ -971,8 +971,8 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-        sub_02021CAC(param0->unk_25C[0], 0);
-        sub_02021CAC(param0->unk_25C[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], 0);
         Window_Clear(&param0->unk_08[4], 1);
         Window_Clear(&param0->unk_08[3], 1);
         BGL_FillWindow(&param0->unk_08[5], 15);
@@ -988,8 +988,8 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0)
 
         ov7_0224EB38(param0, 0);
 
-        sub_02021CAC(param0->unk_25C[0], param0->unk_26C[0]);
-        sub_02021CAC(param0->unk_25C[1], param0->unk_26C[1]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
 
         ov7_0224EC10(param0, 0);
 
@@ -1169,8 +1169,8 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0)
     case 0xfffffffe:
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        sub_02021CAC(param0->unk_25C[0], param0->unk_26C[0]);
-        sub_02021CAC(param0->unk_25C[1], param0->unk_26C[1]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
         return 4;
@@ -1249,8 +1249,8 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0)
 
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        sub_02021CAC(param0->unk_25C[0], param0->unk_26C[0]);
-        sub_02021CAC(param0->unk_25C[1], param0->unk_26C[1]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
 
@@ -1269,8 +1269,8 @@ static u8 ov7_0224E7C8 (UnkStruct_ov7_0224D008 * param0)
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        sub_02021CAC(param0->unk_25C[0], param0->unk_26C[0]);
-        sub_02021CAC(param0->unk_25C[1], param0->unk_26C[1]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
 
@@ -1504,7 +1504,7 @@ static void ov7_0224EB7C (UnkStruct_ov7_0224D008 * param0, u16 param1)
     UnkStruct_02009DC8 * v0;
 
     if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3)) {
-        sub_02021CAC(param0->unk_25C[3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_25C[3], 0);
         return;
     }
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 4b175c6674..f3c5f1c52a 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2819,7 +2819,7 @@ static int ov9_0224B23C (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v1 = &Unk_ov9_02251EC8[v3->unk_08.unk_04.unk_00];
     v3->unk_40 = ov9_0224B130(v3->unk_08.unk_34, &v0, v1->unk_00, v1->unk_01, v1->unk_02, v1->unk_03, 3, 0xffff);
 
-    sub_02021C80(v3->unk_40, &v3->unk_08.unk_04.unk_24, 2);
+    GraphicElementData_SetAffineScaleEx(v3->unk_40, &v3->unk_08.unk_04.unk_24, 2);
     return 1;
 }
 
@@ -2863,8 +2863,8 @@ static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v3.y += ((FX32_ONE * -512)) + (sub_0201D15C(((v4->unk_00) / FX32_ONE)) * v4->unk_08.unk_04.unk_10);
 
     sub_020715D4(param0, &v3);
-    sub_02021C50(v4->unk_40, &v3);
-    sub_02021C94(v4->unk_40, sub_0201D2A4(((v0) / FX32_ONE)));
+    GraphicElementData_SetPosition(v4->unk_40, &v3);
+    GraphicElementData_SetAffineZRotation(v4->unk_40, sub_0201D2A4(((v0) / FX32_ONE)));
 }
 
 static void ov9_0224B3A4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c
index 3a66d3ca7e..3f478eb283 100644
--- a/src/overlay012/ov12_0221FC20.c
+++ b/src/overlay012/ov12_0221FC20.c
@@ -2240,7 +2240,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0)
         NNSG2dImagePaletteProxy * v19;
         int v20;
 
-        v19 = sub_02021F9C(v1->unk_00);
+        v19 = GraphicElementData_GetPaletteProxy(v1->unk_00);
         v20 = sub_0201FAB4(v19, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteSys_LoadPalette(param0->unk_C4, v8, v9, param0->unk_00, 2, 0x20, v20 * 16);
@@ -4332,7 +4332,7 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int
                     NNSG2dImagePaletteProxy * v18;
                     int v19;
 
-                    v18 = sub_02021F9C(v10->unk_00);
+                    v18 = GraphicElementData_GetPaletteProxy(v10->unk_00);
                     v19 = sub_0201FAB4(v18, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                     PaletteSys_LoadPalette(v2->unk_08.unk_08, v6, v7, v2->unk_00, 2, 0x20, v19 * 16);
diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c
index 61431efb19..9bbb71b9e8 100644
--- a/src/overlay012/ov12_02225864.c
+++ b/src/overlay012/ov12_02225864.c
@@ -150,7 +150,7 @@ s16 ov12_022258E0 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2)
 
 u8 ov12_02225950 (CellActorData * param0)
 {
-    return sub_0201FAB4(sub_02021F9C(param0->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+    return sub_0201FAB4(GraphicElementData_GetPaletteProxy(param0->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 }
 
 int ov12_02225964 (UnkStruct_ov12_0221FCDC * param0, int param1)
diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c
index f3733a4c53..e1eb8dc79c 100644
--- a/src/overlay012/ov12_02226B84.c
+++ b/src/overlay012/ov12_02226B84.c
@@ -2422,7 +2422,7 @@ void ov12_022291AC (UnkStruct_ov12_0221FCDC * param0)
 
         ov12_02235D74(param0, v3, &(v1->unk_1C), &v0);
 
-        v2 = sub_0201FAB4(sub_02021F9C(v1->unk_1C.unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_1C.unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v1->unk_30 = ov12_02226870(v1->unk_00.unk_18, ov12_0221FDE4(param0), 2, v2 * 16, 16, v4, v5, v6, v7, v8, 1100);
     }
 
diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c
index bee91ce6f1..4c12213c19 100644
--- a/src/overlay012/ov12_0222AC70.c
+++ b/src/overlay012/ov12_0222AC70.c
@@ -737,10 +737,10 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0)
             sub_0200D460(v0->unk_18[2], v4);
             sub_0200D460(v0->unk_18[3], v4);
 
-            v2 = sub_0201FAB4(sub_02021F9C(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
 
-            v2 = sub_0201FAB4(sub_02021F9C(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
         } else {
             sub_0200D474(v0->unk_18[0], 20);
@@ -756,10 +756,10 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0)
             sub_0200D460(v0->unk_18[2], v4);
             sub_0200D460(v0->unk_18[3], v4);
 
-            v2 = sub_0201FAB4(sub_02021F9C(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
 
-            v2 = sub_0201FAB4(sub_02021F9C(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
         }
     }
@@ -1142,7 +1142,7 @@ void ov12_0222C0C0 (UnkStruct_ov12_0221FCDC * param0)
         int v2 = ov12_02223334(v0->unk_04, ov12_02220240(v0->unk_04));
         int v3 = ov12_02223344(v0->unk_04, ov12_02220240(v0->unk_04));
 
-        v1 = sub_0201FAB4(sub_02021F9C(v0->unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v1 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         sub_02003B08(ov12_0222332C(v0->unk_04), v3, v2, ov12_0221FDE4(param0), 2, 0x20, v1 * 16, 256, 256, 256);
     }
 
diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c
index 5fb695b671..1e67e366f4 100644
--- a/src/overlay012/ov12_0222E91C.c
+++ b/src/overlay012/ov12_0222E91C.c
@@ -175,14 +175,14 @@ void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0)
 
         v1 = v0->unk_1C.unk_0C;
         sub_0200D460(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = sub_0201FAB4(sub_02021F9C(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
         SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
 
         v1 = v0->unk_30;
         sub_0200D460(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = sub_0201FAB4(sub_02021F9C(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
         SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
@@ -362,7 +362,7 @@ static void ov12_0222EE50 (SysTask * param0, void * param1)
             ov12_02226858(v0->unk_38[0]);
             ov12_02226858(v0->unk_38[1]);
 
-            v1 = sub_0201FAB4(sub_02021F9C(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v1 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
             v0->unk_38[1] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(v0->unk_00.unk_04), 2, v1 * 16, 16, 0, 1, 15, 0, 0xFFFFFF, 1100);
             v0->unk_00.unk_00++;
@@ -425,10 +425,10 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0)
     {
         int v6;
 
-        v6 = sub_0201FAB4(sub_02021F9C(v0->unk_1C[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v0->unk_38[0] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(param0), 2, v6 * 16, 16, 0, 1, 0, 15, 0xFFFFFF, 1100);
 
-        v6 = sub_0201FAB4(sub_02021F9C(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v0->unk_38[1] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(param0), 2, v6 * 16, 16, 0, 1, 0, 15, 0xFFFFFF, 1100);
     }
 
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index e6d7424bfb..37549e022e 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -977,7 +977,7 @@ BOOL ov17_0224AD70 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2)
 
     sub_0200D364(v0, param2);
     sub_0200D500(v0, v5, v6, (256 * FX32_ONE));
-    sub_02021CC8(v0->unk_00, 1);
+    GraphicElementData_SetAnimateFlag(v0->unk_00, 1);
     SpriteActor_UpdateObject(v0->unk_00);
 
     v1 = sub_02094E98(param0->unk_00);
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index 67a9442245..d3b99ca214 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -420,7 +420,7 @@ void ov17_02250DB0 (UnkStruct_ov17_0224FCA0 * param0)
         param0->unk_10.unk_128[v2] = SpriteActor_LoadResources(param0->unk_10.unk_18, param0->unk_10.unk_1C, &v0);
 
         sub_0200D364(param0->unk_10.unk_128[v2], 1);
-        sub_02021F24(param0->unk_10.unk_128[v2]->unk_00, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10.unk_128[v2]->unk_00, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
         sub_0200D330(param0->unk_10.unk_128[v2]);
     }
 
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index cb778525d2..5f4b2590ee 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -1960,8 +1960,8 @@ GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorRes
     }
 
     if (v1) {
-        sub_02021CC8(v1, 1);
-        sub_02021CE4(v1, (FX32_ONE * (2 / 2)));
+        GraphicElementData_SetAnimateFlag(v1, 1);
+        GraphicElementData_SetAnimSpeed(v1, (FX32_ONE * (2 / 2)));
     }
 
     return v1;
@@ -1971,7 +1971,7 @@ void ov19_021D78AC (GraphicElementData * param0, u32 param1)
 {
     OSIntrMode v0 = OS_DisableInterrupts();
 
-    sub_02021F58(param0, param1);
+    GraphicElementData_SetPriority(param0, param1);
     OS_RestoreInterrupts(v0);
 }
 
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index 2860015f63..a3caa522cf 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -686,9 +686,9 @@ static void ov19_021D865C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(sub_02021D28(param1->unk_00));
+                v0 = *(GraphicElementData_GetPosition(param1->unk_00));
                 v0.x = param0->unk_68[param2][v1];
-                sub_02021C50(param1->unk_00, &v0);
+                GraphicElementData_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -704,9 +704,9 @@ static void ov19_021D86B4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(sub_02021D28(param1->unk_00));
+                v0 = *(GraphicElementData_GetPosition(param1->unk_00));
                 v0.x = param0->unk_38[param2][v1];
-                sub_02021C50(param1->unk_00, &v0);
+                GraphicElementData_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -728,7 +728,7 @@ static void ov19_021D870C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
             v0.x = (112 + param0->unk_585C + v1 * 24) * FX32_ONE;
 
             if (param1->unk_00 != NULL) {
-                sub_02021C50(param1->unk_00, &v0);
+                GraphicElementData_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index ba9635483d..089f2883a9 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -127,7 +127,7 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
     }
 
     SpriteActor_SetSpriteAnimActive(param0->unk_08, 5);
-    sub_02021E80(param0->unk_08, 2);
+    GraphicElementData_SetExplicitPriority(param0->unk_08, 2);
 
     v1 = ov19_021D5E10(param0->unk_790);
 
@@ -140,7 +140,7 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
     }
 
     if (v1 != 0) {
-        sub_02021CAC(param0->unk_08, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_08, 0);
     }
 
     if (v2 != 3) {
@@ -178,12 +178,12 @@ static void ov19_021D8E00 (UnkStruct_ov19_021D8E00 * param0)
     VecFx32 v0;
     s32 v1, v2;
 
-    v0 = *sub_02021D28(param0->unk_04);
+    v0 = *GraphicElementData_GetPosition(param0->unk_04);
     v1 = (v0.x >> FX32_SHIFT) - 0;
     v2 = (v0.y >> FX32_SHIFT) - -4;
 
     ov19_021DA3CC(param0->unk_48, param0->unk_4C, 1);
-    ov19_021DA428(param0->unk_48, ov19_021D5E9C(param0->unk_790), v1, v2, sub_02021E88(param0->unk_04), 2, 1240, param0->unk_4C);
+    ov19_021DA428(param0->unk_48, ov19_021D5E9C(param0->unk_790), v1, v2, GraphicElementData_GetExplicitPriority(param0->unk_04), 2, 1240, param0->unk_4C);
 
     param0->unk_664[0].unk_00 = (0 * FX32_ONE);
     param0->unk_664[0].unk_04 = (-4 * FX32_ONE);
@@ -263,7 +263,7 @@ void ov19_021D8F60 (UnkStruct_ov19_021D8E00 * param0)
     ov19_021D8EE0(param0, &v0, &v1);
 
     if (param0->unk_786 != 0) {
-        sub_02021CAC(param0->unk_08, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_08, 0);
     }
 
     param0->unk_774 = param0->unk_764 << FX32_SHIFT;
@@ -366,7 +366,7 @@ static void ov19_021D9088 (SysTask * param0, void * param1)
     v0->unk_78B = ov19_021D5E2C(v0->unk_790);
 
     if (v0->unk_786 == 0) {
-        sub_02021CAC(v0->unk_08, 1);
+        GraphicElementData_SetDrawFlag(v0->unk_08, 1);
     }
 
     if (v0->unk_786 != 2) {
@@ -401,7 +401,7 @@ BOOL ov19_021D9278 (UnkStruct_ov19_021D8E00 * param0)
 static void ov19_021D928C (SysTask * param0, void * param1)
 {
     UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    VecFx32 v1 = *(sub_02021D28(v0->unk_04));
+    VecFx32 v1 = *(GraphicElementData_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -463,7 +463,7 @@ BOOL ov19_021D939C (UnkStruct_ov19_021D8E00 * param0)
 static void ov19_021D93D0 (SysTask * param0, void * param1)
 {
     UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    VecFx32 v1 = *(sub_02021D28(v0->unk_04));
+    VecFx32 v1 = *(GraphicElementData_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -514,11 +514,11 @@ void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
     param0->unk_788 = 0;
 
     v1 = ov19_021DA224(param0);
-    v0 = *(sub_02021D28(v1));
-    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, sub_02021F74(v1));
+    v0 = *(GraphicElementData_GetPosition(v1));
+    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, GraphicElementData_GetPriority(v1));
 
-    v0 = *(sub_02021D28(param0->unk_4C->unk_00));
-    ov19_021D9554(param0, v1, v0.y, -1, sub_02021F74(param0->unk_4C->unk_00));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_4C->unk_00));
+    ov19_021D9554(param0, v1, v0.y, -1, GraphicElementData_GetPriority(param0->unk_4C->unk_00));
 
     param0->unk_784 = 0;
 }
@@ -541,7 +541,7 @@ static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, GraphicElementData
     if (v0) {
         VecFx32 v1;
 
-        v1 = *sub_02021D28(param1);
+        v1 = *GraphicElementData_GetPosition(param1);
 
         v0->unk_00 = param1;
         v0->unk_04 = 12;
@@ -581,7 +581,7 @@ static void ov19_021D9600 (SysTask * param0, void * param1)
     UnkStruct_ov19_021D9554 * v0 = (UnkStruct_ov19_021D9554 *)param1;
     VecFx32 v1;
 
-    v1 = *sub_02021D28(v0->unk_00);
+    v1 = *GraphicElementData_GetPosition(v0->unk_00);
 
     if (v0->unk_04) {
         fx32 v2;
@@ -598,12 +598,12 @@ static void ov19_021D9600 (SysTask * param0, void * param1)
         v2 = v0->unk_24 * sub_0201D15C(v0->unk_18 >> FX32_SHIFT);
         v1.x = v0->unk_14 + v2;
 
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
     } else {
         v1.x = v0->unk_14;
         v1.y = v0->unk_10;
 
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
         ov19_021D79B8(param1, ov19_021D95F4, v0->unk_28);
         SysTask_Done(param0);
     }
@@ -617,7 +617,7 @@ void ov19_021D9690 (UnkStruct_ov19_021D8E00 * param0)
         SpriteActor_SetSpriteAnimActive(param0->unk_04, 3);
     }
 
-    v0 = *sub_02021D28(param0->unk_04);
+    v0 = *GraphicElementData_GetPosition(param0->unk_04);
     v0.y += (-2 * FX32_ONE);
 
     ov19_021D9E04(param0, &v0);
@@ -642,7 +642,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
     switch (v0->unk_784) {
     case 0:
         if (++(v0->unk_787) >= 4) {
-            VecFx32 v1 = *sub_02021D28(v0->unk_04);
+            VecFx32 v1 = *GraphicElementData_GetPosition(v0->unk_04);
 
             v0->unk_770 = (v1.y >> FX32_SHIFT) + 6;
             v0->unk_780 = (6 * FX32_ONE) / 2;
@@ -657,7 +657,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
         break;
     case 1:
     {
-        VecFx32 v2 = *sub_02021D28(v0->unk_04);
+        VecFx32 v2 = *GraphicElementData_GetPosition(v0->unk_04);
 
         if (v0->unk_787) {
             v2.y += v0->unk_780;
@@ -676,7 +676,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
 
 void ov19_021D97FC (UnkStruct_ov19_021D8E00 * param0)
 {
-    VecFx32 v0 = *sub_02021D28(param0->unk_04);
+    VecFx32 v0 = *GraphicElementData_GetPosition(param0->unk_04);
 
     param0->unk_770 = (v0.y >> FX32_SHIFT) + -4;
     param0->unk_780 = (-4 * FX32_ONE) / 4;
@@ -709,7 +709,7 @@ static void ov19_021D9894 (SysTask * param0, void * param1)
     VecFx32 v1;
 
     v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    v1 = *sub_02021D28(v0->unk_04);
+    v1 = *GraphicElementData_GetPosition(v0->unk_04);
 
     if (v0->unk_787) {
         v1.y += v0->unk_780;
@@ -777,10 +777,10 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0)
 {
-    sub_02021E80(param0->unk_04, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_04, 1);
 
     if (param0->unk_78C) {
-        sub_02021E80(param0->unk_4C->unk_00, 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_4C->unk_00, 1);
     }
 
     if (param0->unk_78D) {
@@ -790,10 +790,10 @@ void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D9A2C (UnkStruct_ov19_021D8E00 * param0)
 {
-    sub_02021E80(param0->unk_04, 2);
+    GraphicElementData_SetExplicitPriority(param0->unk_04, 2);
 
     if (param0->unk_78C) {
-        sub_02021E80(param0->unk_4C->unk_00, 2);
+        GraphicElementData_SetExplicitPriority(param0->unk_4C->unk_00, 2);
     }
 
     if (param0->unk_78D) {
@@ -830,9 +830,9 @@ void ov19_021D9AB0 (UnkStruct_ov19_021D8E00 * param0, u32 param1)
 void ov19_021D9AEC (UnkStruct_ov19_021D8E00 * param0)
 {
     if (ov19_021D5EE0(param0->unk_790)) {
-        sub_02021E90(param0->unk_04, 1);
+        GraphicElementData_SetExplicitPalette(param0->unk_04, 1);
     } else {
-        sub_02021E90(param0->unk_04, 0);
+        GraphicElementData_SetExplicitPalette(param0->unk_04, 0);
     }
 }
 
@@ -843,7 +843,7 @@ void ov19_021D9B10 (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D9B1C (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
 {
-    *param1 = *(sub_02021D28(param0->unk_04));
+    *param1 = *(GraphicElementData_GetPosition(param0->unk_04));
 }
 
 void ov19_021D9B34 (UnkStruct_ov19_021D8E00 * param0)
@@ -999,7 +999,7 @@ static void ov19_021D9D48 (s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov
 
 static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
 {
-    sub_02021C50(param0->unk_04, param1);
+    GraphicElementData_SetPosition(param0->unk_04, param1);
 
     if (param0->unk_78C) {
         VecFx32 v0;
@@ -1010,7 +1010,7 @@ static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
         for (v1 = 0; v1 < param0->unk_754; v1++) {
             v0.x = param1->x + param0->unk_664[v1].unk_00;
             v0.y = param1->y - param0->unk_664[v1].unk_04;
-            sub_02021C50(param0->unk_4C[v1].unk_00, &v0);
+            GraphicElementData_SetPosition(param0->unk_4C[v1].unk_00, &v0);
         }
     }
 
@@ -1022,7 +1022,7 @@ static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
         VecFx32 v2 = *param1;
 
         v2.y += (24 << FX32_SHIFT);
-        sub_02021C50(param0->unk_08, &v2);
+        GraphicElementData_SetPosition(param0->unk_08, &v2);
     }
 }
 
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 004b25adb2..180313e6da 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -154,7 +154,7 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 p
 
     GF_ASSERT(param7->unk_00 != NULL);
 
-    sub_02021E90(param7->unk_00, 2 + param7->unk_2C);
+    GraphicElementData_SetExplicitPalette(param7->unk_00, 2 + param7->unk_2C);
     ov19_021DA63C(param0, param7, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v5);
 }
@@ -190,7 +190,7 @@ void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 p
 
     GF_ASSERT(param10->unk_00 != NULL);
 
-    sub_02021E90(param10->unk_00, 2 + param10->unk_2C);
+    GraphicElementData_SetExplicitPalette(param10->unk_00, 2 + param10->unk_2C);
     ov19_021DA63C(param0, param10, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v2);
 }
@@ -270,16 +270,16 @@ void ov19_021DA754 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 
         NNS_G2dLoadImage1DMapping(v0, param2 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param1->unk_04));
 
-        sub_02021F7C(param1->unk_00, &(param1->unk_04));
+        GraphicElementData_SetImageProxy(param1->unk_00, &(param1->unk_04));
     }
 }
 
 void ov19_021DA7B8 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2)
 {
     if ((param2 == 1) || (param2 == 2)) {
-        sub_02021CF8(param1->unk_00, 1);
+        GraphicElementData_SetAffineOverwriteMode(param1->unk_00, 1);
     } else {
-        sub_02021CF8(param1->unk_00, 0);
+        GraphicElementData_SetAffineOverwriteMode(param1->unk_00, 0);
     }
 
     SpriteActor_SetSpriteAnimActive(param1->unk_00, param2);
@@ -294,7 +294,7 @@ void ov19_021DA7F4 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 {
     u32 v0 = ((param2) ? 6 : 2) + param1->unk_2C;
 
-    sub_02021E90(param1->unk_00, v0);
+    GraphicElementData_SetExplicitPalette(param1->unk_00, v0);
 }
 
 NNSG2dCellDataBank * ov19_021DA80C (UnkStruct_ov19_021DA384 * param0)
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index 82732cda44..46d4e25c6e 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -41,7 +41,7 @@ void ov19_021DA864 (UnkStruct_ov19_021DA8D8 * param0, NARC * param1)
     sub_0200718C(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1256 * 0x20, 10, &(param0->unk_18));
     ov19_021D783C(&v0, &(param0->unk_18), ov19_021D77D0(param0->unk_44), param0->unk_10, param0->unk_14, 2);
     param0->unk_04 = ov19_021D785C(param0->unk_00, &v0, 183 + ov19_021D7820(param0->unk_44), 176, 44, NNS_G2D_VRAM_TYPE_2DMAIN);
-    sub_02021E90(param0->unk_04, 1);
+    GraphicElementData_SetExplicitPalette(param0->unk_04, 1);
 }
 
 void ov19_021DA8D8 (UnkStruct_ov19_021DA8D8 * param0)
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 4a86b8cdc0..60dc56805d 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -234,7 +234,7 @@ static void ov19_021DAB44 (UnkStruct_ov19_021DA9E0 * param0)
         param0->unk_3C[v4] = ov19_021D785C(param0->unk_0C, &v1, 24 + 36 * v4, 176, 46, NNS_G2D_VRAM_TYPE_2DMAIN);
         GF_ASSERT(param0->unk_3C[v4] != NULL);
 
-        sub_02021CAC(param0->unk_3C[v4], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[v4], 0);
     }
 
     NNS_G2dInitImageProxy(&v0);
@@ -355,12 +355,12 @@ static void ov19_021DADCC (UnkStruct_ov19_021DA9E0 * param0, fx32 param1)
     VecFx32 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = *sub_02021D28(param0->unk_3C[v0]);
+        v1 = *GraphicElementData_GetPosition(param0->unk_3C[v0]);
         v1.y -= param1;
 
-        sub_02021C50(param0->unk_3C[v0], &v1);
+        GraphicElementData_SetPosition(param0->unk_3C[v0], &v1);
 
-        if ((v0 == 0) && sub_02021D34(param0->unk_3C[v0])) {
+        if ((v0 == 0) && GraphicElementData_GetDrawFlag(param0->unk_3C[v0])) {
             u32 v2, v3;
 
             v2 = v1.x >> FX32_SHIFT;
@@ -374,7 +374,7 @@ static void ov19_021DAE10 (UnkStruct_ov19_021DA9E0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021CAC(param0->unk_3C[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -425,23 +425,23 @@ static void ov19_021DAE60 (Window * param0, UnkStruct_ov19_021DA9E0 * param1, u3
 
         sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10);
 
-        v2 = *sub_02021D28(param1->unk_3C[0]);
+        v2 = *GraphicElementData_GetPosition(param1->unk_3C[0]);
         v2.y = (176 + (16 * param3)) << FX32_SHIFT;
 
-        sub_02021C50(param1->unk_3C[0], &v2);
-        sub_02021E90(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C));
-        sub_02021CAC(param1->unk_3C[0], 1);
+        GraphicElementData_SetPosition(param1->unk_3C[0], &v2);
+        GraphicElementData_SetExplicitPalette(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C));
+        GraphicElementData_SetDrawFlag(param1->unk_3C[0], 1);
 
         if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) {
             sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10);
 
             v2.x += (36 << FX32_SHIFT);
 
-            sub_02021C50(param1->unk_3C[1], &v2);
-            sub_02021E90(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D));
-            sub_02021CAC(param1->unk_3C[1], 1);
+            GraphicElementData_SetPosition(param1->unk_3C[1], &v2);
+            GraphicElementData_SetExplicitPalette(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D));
+            GraphicElementData_SetDrawFlag(param1->unk_3C[1], 1);
         } else {
-            sub_02021CAC(param1->unk_3C[1], 0);
+            GraphicElementData_SetDrawFlag(param1->unk_3C[1], 0);
         }
     }
         return;
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index 5dd73ac217..54b198c989 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -370,9 +370,9 @@ static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0)
 
         GF_ASSERT(param0->unk_48[v4] != NULL);
 
-        sub_02021CAC(param0->unk_48[v4], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_48[v4], 0);
         VEC_Set(&v3, FX32_CONST(32 + v4 * 32), FX32_CONST(88), 0);
-        sub_02021C50(param0->unk_48[v4], &v3);
+        GraphicElementData_SetPosition(param0->unk_48[v4], &v3);
         ov19_021DBD68(param0, v5);
 
         if (++v5 >= 18) {
@@ -405,7 +405,7 @@ static void ov19_021DBF18 (UnkStruct_ov19_021DBA9C * param0)
 
     for (v1 = 0; v1 < 7; v1++) {
         ov19_021DBD9C(param0, v1, v0);
-        sub_02021CAC(param0->unk_48[v1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_48[v1], 1);
 
         if (++v0 >= 18) {
             v0 = 0;
@@ -720,7 +720,7 @@ static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1)
         param0->unk_90 = ov19_021D785C(param0->unk_08, &v0, 18, 224, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         if (param0->unk_90) {
-            sub_02021E90(param0->unk_90, 6);
+            GraphicElementData_SetExplicitPalette(param0->unk_90, 6);
         }
 
         Heap_FreeToHeap(v4);
@@ -736,7 +736,7 @@ static void ov19_021DC5B8 (UnkStruct_ov19_021DBA9C * param0, fx32 param1)
         v0.y = param1;
         v0.z = 0;
 
-        sub_02021C50(param0->unk_90, &v0);
+        GraphicElementData_SetPosition(param0->unk_90, &v0);
     }
 }
 
diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c
index 8fee43063e..29d29ca866 100644
--- a/src/overlay019/ov19_021DC5F0.c
+++ b/src/overlay019/ov19_021DC5F0.c
@@ -224,7 +224,7 @@ static void ov19_021DC8E8 (SysTask * param0, void * param1)
 
     for (v3 = 0; v3 < v4; v3++) {
         if (v0->unk_3C[v2].unk_00 != NULL) {
-            sub_02021C50(v0->unk_3C[v2].unk_00, v1);
+            GraphicElementData_SetPosition(v0->unk_3C[v2].unk_00, v1);
         }
 
         v2++;
@@ -249,7 +249,7 @@ void ov19_021DC96C (UnkStruct_ov19_021DC680 * param0)
     if (param0->unk_28 > v0) {
         VecFx32 v1;
 
-        v1 = *sub_02021D28(param0->unk_3C[v0].unk_00);
+        v1 = *GraphicElementData_GetPosition(param0->unk_3C[v0].unk_00);
         param0->unk_20 = (((Unk_ov19_021E0234[v0].unk_00 + param0->unk_34) << FX32_SHIFT) - v1.x) / 8;
         param0->unk_24 = ((Unk_ov19_021E0234[v0].unk_02 << FX32_SHIFT) - v1.y) / 8;
         param0->unk_2A = 0;
@@ -272,7 +272,7 @@ static void ov19_021DCA18 (SysTask * param0, void * param1)
     BOOL v2;
 
     v0 = (UnkStruct_ov19_021DC680 *)param1;
-    v1 = *sub_02021D28(v0->unk_3C[v0->unk_28].unk_00);
+    v1 = *GraphicElementData_GetPosition(v0->unk_3C[v0->unk_28].unk_00);
 
     if (++(v0->unk_2A) >= 8) {
         v1.x = (Unk_ov19_021E0234[v0->unk_28].unk_00 + v0->unk_34) << FX32_SHIFT;
@@ -284,7 +284,7 @@ static void ov19_021DCA18 (SysTask * param0, void * param1)
         v2 = 0;
     }
 
-    sub_02021C50(v0->unk_3C[v0->unk_28].unk_00, &v1);
+    GraphicElementData_SetPosition(v0->unk_3C[v0->unk_28].unk_00, &v1);
 
     if (v2) {
         v0->unk_2C = 0;
@@ -400,7 +400,7 @@ void ov19_021DCC80 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    sub_02021E80(v2->unk_00, 1);
+    GraphicElementData_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -418,7 +418,7 @@ void ov19_021DCCD4 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    sub_02021E80(v2->unk_00, 1);
+    GraphicElementData_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -493,17 +493,17 @@ static void ov19_021DCE50 (UnkStruct_ov19_021DC680 * param0, fx32 param1)
 
     for (v1 = 0; v1 < 6; v1++) {
         if (param0->unk_3C[v1].unk_00 != NULL) {
-            v0 = *sub_02021D28(param0->unk_3C[v1].unk_00);
+            v0 = *GraphicElementData_GetPosition(param0->unk_3C[v1].unk_00);
             v0.y += param1;
-            sub_02021C50(param0->unk_3C[v1].unk_00, &v0);
+            GraphicElementData_SetPosition(param0->unk_3C[v1].unk_00, &v0);
 
             if (param1 < 0) {
                 if (v0.y < 851968) {
-                    sub_02021CAC(param0->unk_3C[v1].unk_00, 1);
+                    GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, 1);
                 }
             } else {
                 if (v0.y >= 851968) {
-                    sub_02021CAC(param0->unk_3C[v1].unk_00, 0);
+                    GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, 0);
                 }
             }
         } else {
@@ -523,7 +523,7 @@ static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1)
     for (v1 = 0; v1 < v2; v1++) {
         v0 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, v1);
         ov19_021DA428(param0->unk_38, (BoxPokemon *)v0, Unk_ov19_021E0234[v1].unk_00 + param0->unk_34, Unk_ov19_021E0234[v1].unk_02 + v3, 1, 4 + v1, 1048 + 32 * v1, &param0->unk_3C[v1]);
-        sub_02021CAC(param0->unk_3C[v1].unk_00, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, param1);
     }
 }
 
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index bb2ac27da3..6be7864e0e 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -457,7 +457,7 @@ static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1)
     param0->unk_2C = ov19_021D785C(param0->unk_0C, &v0, 0, 568, 49, NNS_G2D_VRAM_TYPE_2DSUB);
     param0->unk_30 = ov19_021D785C(param0->unk_0C, &v0, 256, 568, 49, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    sub_02021D0C(param0->unk_30, 1);
+    GraphicElementData_SetFlipMode(param0->unk_30, 1);
 
     if (ov19_021D5E08(param0->unk_04) == 3) {
         SpriteActor_SetSpriteAnimActive(param0->unk_30, 1);
@@ -985,7 +985,7 @@ static void ov19_021DDA9C (SysTask * param0, void * param1)
         v1.x = Unk_ov19_021E028C[v2].x << FX32_SHIFT;
         v1.y = Unk_ov19_021E028C[v2].y << FX32_SHIFT;
         v1.z = 0;
-        sub_02021C50(v0->unk_04, &v1);
+        GraphicElementData_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -993,7 +993,7 @@ static void ov19_021DDA9C (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        sub_02021C50(v0->unk_04, &v1);
+        GraphicElementData_SetPosition(v0->unk_04, &v1);
         ov19_021DDBD0(param0, v0);
     }
 }
@@ -1018,7 +1018,7 @@ static void ov19_021DDB20 (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v2].y << FX32_SHIFT;
         v1.z = 0;
 
-        sub_02021C50(v0->unk_04, &v1);
+        GraphicElementData_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -1026,7 +1026,7 @@ static void ov19_021DDB20 (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        sub_02021C50(v0->unk_04, &v1);
+        GraphicElementData_SetPosition(v0->unk_04, &v1);
 
         if (v0->unk_18) {
             v0->unk_14 = v0->unk_28;
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index d1a9c88fbb..3645493475 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -123,9 +123,9 @@ static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0)
 
                 param0->unk_1C[v5] = ov19_021D785C(param0->unk_10, &v0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-                sub_02021E90(param0->unk_1C[v5], Unk_ov19_021E04CC[v5].unk_04);
-                sub_02021CAC(param0->unk_1C[v5], 0);
-                sub_02021CF8(param0->unk_1C[v5], 1);
+                GraphicElementData_SetExplicitPalette(param0->unk_1C[v5], Unk_ov19_021E04CC[v5].unk_04);
+                GraphicElementData_SetDrawFlag(param0->unk_1C[v5], 0);
+                GraphicElementData_SetAffineOverwriteMode(param0->unk_1C[v5], 1);
 
                 param0->unk_28[v5] = 0;
             }
@@ -204,7 +204,7 @@ static void ov19_021DE59C (UnkStruct_ov19_021DE3E8 * param0)
 
         ov19_021DE718(param0, v1, v0);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C[v1], 6);
-        sub_02021CAC(param0->unk_1C[v1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1C[v1], 1);
     }
 }
 
@@ -230,13 +230,13 @@ static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0)
 
         sub_02006EC0(16, Item_FileID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10);
         sub_02006E84(16, Item_FileID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10);
-        sub_02021E80(param0->unk_1C[v3], v2);
+        GraphicElementData_SetExplicitPriority(param0->unk_1C[v3], v2);
 
         ov19_021D78AC(param0->unk_1C[v3], 2);
 
-        sub_02021C50(param0->unk_1C[v3], &v1);
+        GraphicElementData_SetPosition(param0->unk_1C[v3], &v1);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3], 0);
-        sub_02021CAC(param0->unk_1C[v3], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1C[v3], 1);
     }
 }
 
@@ -271,10 +271,10 @@ static void ov19_021DE718 (UnkStruct_ov19_021DE3E8 * param0, int param1, int par
 
         sub_02006EC0(16, Item_FileID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10);
         sub_02006E84(16, Item_FileID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10);
-        sub_02021E80(param0->unk_1C[param1], v1);
+        GraphicElementData_SetExplicitPriority(param0->unk_1C[param1], v1);
 
         ov19_021D78AC(param0->unk_1C[param1], 3);
-        sub_02021C50(param0->unk_1C[param1], &v0);
+        GraphicElementData_SetPosition(param0->unk_1C[param1], &v0);
     }
 }
 
@@ -298,7 +298,7 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0)
             if (v0 >= 0) {
                 ov19_021DE718(param0, v0, v1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 1);
-                sub_02021CAC(param0->unk_1C[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_1C[v0], 1);
             }
         }
     }
@@ -338,7 +338,7 @@ static void ov19_021DE858 (UnkStruct_ov19_021DE3E8 * param0, int param1, const V
     if (v0) {
         v0->unk_00 = param0;
         v0->unk_04 = param0->unk_1C[param1];
-        v0->unk_08 = *(sub_02021D28(v0->unk_04));
+        v0->unk_08 = *(GraphicElementData_GetPosition(v0->unk_04));
         v0->unk_14 = *param2;
         v0->unk_20 = (v0->unk_14.x - v0->unk_08.x) / param4;
         v0->unk_24 = (v0->unk_14.y - v0->unk_08.y) / param4;
@@ -363,10 +363,10 @@ static void ov19_021DE8E0 (SysTask * param0, void * param1)
         if (v0->unk_2C) {
             v0->unk_08.x += v0->unk_20;
             v0->unk_08.y += v0->unk_24;
-            sub_02021C50(v0->unk_04, &v0->unk_08);
+            GraphicElementData_SetPosition(v0->unk_04, &v0->unk_08);
             v0->unk_2C--;
         } else {
-            sub_02021C50(v0->unk_04, &v0->unk_14);
+            GraphicElementData_SetPosition(v0->unk_04, &v0->unk_14);
             v0->unk_30++;
         }
         break;
@@ -539,7 +539,7 @@ void ov19_021DEB9C (UnkStruct_ov19_021DE3E8 * param0, const VecFx32 * param1)
             v1.x += (0 << FX32_SHIFT);
             v1.y += (8 << FX32_SHIFT);
 
-            sub_02021C50(param0->unk_1C[v0], &v1);
+            GraphicElementData_SetPosition(param0->unk_1C[v0], &v1);
         }
     }
 }
@@ -550,7 +550,7 @@ void ov19_021DEBDC (UnkStruct_ov19_021DE3E8 * param0, u32 param1)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            sub_02021E80(param0->unk_1C[v0], param1);
+            GraphicElementData_SetExplicitPriority(param0->unk_1C[v0], param1);
         }
     }
 }
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 614c86b3b3..6df503d0a3 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -418,10 +418,10 @@ static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1)
         for (v5 = 0; v5 < 5; v5++) {
             v6.x = v0[v5].unk_00 + (((v0[v5].unk_08 - v0[v5].unk_00) / 256) * (int)(*v7));
             v6.y = v0[v5].unk_04 + (((v0[v5].unk_0C - v0[v5].unk_04) / 256) * (int)(*v7));
-            sub_02021C50(param0->unk_34[param1][v5], &v6);
+            GraphicElementData_SetPosition(param0->unk_34[param1][v5], &v6);
             ov19_021D78AC(param0->unk_34[param1][v5], 0);
             ov19_021D78AC(param0->unk_34[param1 ^ 1][v5], 1);
-            sub_02021CAC(param0->unk_34[param1][v5], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_34[param1][v5], 1);
             v7++;
         }
     } else {
@@ -437,7 +437,7 @@ static void ov19_021DF250 (UnkStruct_ov19_021DEC04 * param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        sub_02021CAC(param0->unk_34[param1][v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_34[param1][v0], 0);
     }
 }
 
@@ -606,21 +606,21 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1)
     for (v4 = 0; v4 < 2; v4++) {
         param0->unk_28[v4] = ov19_021D785C(param0->unk_10, &v2, v0[v4].unk_00, v0[v4].unk_02, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-        sub_02021E90(param0->unk_28[v4], v4);
+        GraphicElementData_SetExplicitPalette(param0->unk_28[v4], v4);
         SpriteActor_SetSpriteAnimActive(param0->unk_28[v4], 0);
 
         for (v5 = 0; v5 < 5; v5++) {
             param0->unk_34[v4][v5] = ov19_021D785C(param0->unk_10, &v2, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB);
             SpriteActor_SetSpriteAnimActive(param0->unk_34[v4][v5], 5 + v4);
-            sub_02021E90(param0->unk_34[v4][v5], v4);
-            sub_02021CAC(param0->unk_34[v4][v5], 0);
+            GraphicElementData_SetExplicitPalette(param0->unk_34[v4][v5], v4);
+            GraphicElementData_SetDrawFlag(param0->unk_34[v4][v5], 0);
         }
     }
 
-    sub_02021D0C(param0->unk_28[1], 1);
+    GraphicElementData_SetFlipMode(param0->unk_28[1], 1);
     param0->unk_30 = ov19_021D785C(param0->unk_10, &v2, 128, 176 + 384, 0, NNS_G2D_VRAM_TYPE_2DSUB);
     SpriteActor_SetSpriteAnimActive(param0->unk_30, 3);
-    sub_02021E90(param0->unk_30, 2);
+    GraphicElementData_SetExplicitPalette(param0->unk_30, 2);
     param0->unk_380 = SysTask_Start(ov19_021DF930, param0, 1);
 
     ov19_021DF730(param0, v3);
@@ -647,7 +647,7 @@ static void ov19_021DF730 (UnkStruct_ov19_021DEC04 * param0, u32 param1)
         NNS_G2dSetImageLocation(&v1, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_18[v3]);
         v1.attr.mappingType = GXS_GetOBJVRamModeChar();
         param0->unk_20[v3] = ov19_021D785C(param0->unk_10, &v2, v0[v3].unk_00, v0[v3].unk_02, 1 - v3, NNS_G2D_VRAM_TYPE_2DSUB);
-        sub_02021CAC(param0->unk_20[v3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_20[v3], 0);
     }
 }
 
@@ -690,10 +690,10 @@ static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0)
         DC_FlushRange(v4->pRawData, (4 * 4) * 0x20);
         GXS_LoadOBJ(v4->pRawData, param0->unk_18[v0], (4 * 4) * 0x20);
 
-        sub_02021E90(v2, v5);
-        sub_02021CAC(v2, 1);
+        GraphicElementData_SetExplicitPalette(v2, v5);
+        GraphicElementData_SetDrawFlag(v2, 1);
     } else {
-        sub_02021CAC(v2, 0);
+        GraphicElementData_SetDrawFlag(v2, 0);
     }
 }
 
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index 1e63dbd407..ad63274553 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -1003,8 +1003,8 @@ GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorR
     OS_RestoreInterrupts(v2);
 
     if (v1) {
-        sub_02021CC8(v1, 1);
-        sub_02021CE4(v1, ((FX32_ONE * 2) / 2));
+        GraphicElementData_SetAnimateFlag(v1, 1);
+        GraphicElementData_SetAnimSpeed(v1, ((FX32_ONE * 2) / 2));
     }
 
     return v1;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index c033cef019..09560d5257 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -235,8 +235,8 @@ static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0)
     SpriteActor_SetSpriteAnimActive(param0->unk_44, 12);
 
     if (ov20_021D1F84(param0->unk_04) != 2) {
-        sub_02021CAC(param0->unk_44, 0);
-        sub_02021CAC(param0->unk_40, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_44, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_40, 0);
     }
 }
 
@@ -475,23 +475,23 @@ void ov20_021D3690 (UnkStruct_ov20_021D30F8 * param0)
 
 void ov20_021D369C (UnkStruct_ov20_021D30F8 * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_3C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_3C, param1);
     ov20_021D375C(param0, 1);
 }
 
 void ov20_021D36B0 (UnkStruct_ov20_021D30F8 * param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        sub_02021CAC(param0->unk_40, 0);
-        sub_02021CAC(param0->unk_44, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_40, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_44, 0);
     }
 }
 
 void ov20_021D36D0 (UnkStruct_ov20_021D30F8 * param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        sub_02021CAC(param0->unk_40, 1);
-        sub_02021CAC(param0->unk_44, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_40, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_44, 1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_40, 13);
         SpriteActor_SetSpriteAnimActive(param0->unk_44, 12);
@@ -514,10 +514,10 @@ void ov20_021D3700 (UnkStruct_ov20_021D30F8 * param0, int param1)
         v0.y = 24 * FX32_ONE;
         v0.z = 0;
 
-        sub_02021C50(param0->unk_3C, &v0);
+        GraphicElementData_SetPosition(param0->unk_3C, &v0);
     }
 
-    sub_02021C50(param0->unk_3C, &v0);
+    GraphicElementData_SetPosition(param0->unk_3C, &v0);
     ov20_021D375C(param0, 1);
 }
 
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index e9a192c823..db8dd16c63 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -104,7 +104,7 @@ static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0)
     param0->unk_0C = ov20_021D2E50(param0->unk_00, &v0, 64, 56, 5, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2);
-    sub_02021CAC(param0->unk_0C, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_0C, 0);
 }
 
 void ov20_021D39BC (UnkStruct_ov20_021D3980 * param0)
@@ -119,12 +119,12 @@ void ov20_021D39C8 (UnkStruct_ov20_021D3980 * param0)
 
 void ov20_021D39D4 (UnkStruct_ov20_021D3980 * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_0C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
 }
 
 BOOL ov20_021D39E0 (UnkStruct_ov20_021D3980 * param0)
 {
-    return sub_02021D34(param0->unk_0C);
+    return GraphicElementData_GetDrawFlag(param0->unk_0C);
 }
 
 void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1)
@@ -145,7 +145,7 @@ void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1)
         break;
     }
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2);
 }
 
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index c1ae65811e..22c1b85d2e 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -235,12 +235,12 @@ static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0)
     ov20_021D2E0C(param0->unk_00, &v0, 0, 1);
     param0->unk_5C = ov20_021D2E50(param0->unk_00, &v0, 48, 54, 2, NNS_G2D_VRAM_TYPE_2DMAIN);
     SpriteActor_SetSpriteAnimActive(param0->unk_5C, 4);
-    sub_02021CAC(param0->unk_5C, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5C, 0);
 }
 
 void ov20_021D3E48 (UnkStruct_ov20_021D3E0C * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_5C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_5C, param1);
 
     if (param1) {
         if (ov20_021D1F94(param0->unk_04) == 0) {
@@ -282,7 +282,7 @@ void ov20_021D3E74 (UnkStruct_ov20_021D3E0C * param0, u32 param1)
     v0.x *= FX32_ONE;
     v0.y *= FX32_ONE;
 
-    sub_02021C50(param0->unk_5C, &v0);
+    GraphicElementData_SetPosition(param0->unk_5C, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_5C, v2);
 }
 
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index f87cba9865..77529c76fa 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -121,15 +121,15 @@ static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0)
     param0->unk_30 = ov20_021D2E50(param0->unk_00, &v0, 72, 56, 3, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_30, 8);
-    sub_02021CAC(param0->unk_30, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_30, 0);
 
     param0->unk_34 = ov20_021D2E50(param0->unk_00, &v0, 240, 64, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
     SpriteActor_SetSpriteAnimActive(param0->unk_34, 11);
-    sub_02021CAC(param0->unk_34, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_34, 0);
 
     param0->unk_38 = ov20_021D2E50(param0->unk_00, &v0, 240, 144, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
     SpriteActor_SetSpriteAnimActive(param0->unk_38, 10);
-    sub_02021CAC(param0->unk_38, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_38, 0);
 }
 
 void ov20_021D4294 (UnkStruct_ov20_021D4210 * param0)
@@ -216,14 +216,14 @@ BOOL ov20_021D43D8 (UnkStruct_ov20_021D4210 * param0)
 
 void ov20_021D4440 (UnkStruct_ov20_021D4210 * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_30, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_30, param1);
 
     if (param1) {
-        sub_02021CAC(param0->unk_34, ov20_021D204C(param0->unk_04));
-        sub_02021CAC(param0->unk_38, ov20_021D2060(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
     } else {
-        sub_02021CAC(param0->unk_34, 0);
-        sub_02021CAC(param0->unk_38, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_38, 0);
     }
 }
 
@@ -239,7 +239,7 @@ void ov20_021D4480 (UnkStruct_ov20_021D4210 * param0, u32 param1)
     v0.y = (56 + 24 * v2) * FX32_ONE;
     v0.z = 0;
 
-    sub_02021C50(param0->unk_30, &v0);
+    GraphicElementData_SetPosition(param0->unk_30, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_30, 8);
 }
 
@@ -287,8 +287,8 @@ void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1)
 BOOL ov20_021D4578 (UnkStruct_ov20_021D4210 * param0)
 {
     if (ov20_021D4E8C(&param0->unk_60)) {
-        sub_02021CAC(param0->unk_34, ov20_021D204C(param0->unk_04));
-        sub_02021CAC(param0->unk_38, ov20_021D2060(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
         return 1;
     }
 
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index 5976b2084c..96d63d5244 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -313,11 +313,11 @@ static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1)
 
     param0->unk_14 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 56, 0, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_14, 0);
-    sub_02021CAC(param0->unk_14, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_14, 0);
 
     param0->unk_18 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 136, 0, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_18, 2);
-    sub_02021CAC(param0->unk_18, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_18, 0);
 }
 
 static void ov20_021D4AD4 (UnkStruct_ov20_021D4AD4 * param0)
@@ -373,8 +373,8 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v2 = GraphicElementManager_AddElement(&v1);
 
     if (v2) {
-        sub_02021CC8(v2, 1);
-        sub_02021CE4(v2, ((FX32_ONE * 2) / 2));
+        GraphicElementData_SetAnimateFlag(v2, 1);
+        GraphicElementData_SetAnimSpeed(v2, ((FX32_ONE * 2) / 2));
     }
 
     return v2;
@@ -461,11 +461,11 @@ static void ov20_021D4C40 (SysTask * param0, void * param1)
 void ov20_021D4DBC (UnkStruct_ov20_021D4AD4 * param0, BOOL param1)
 {
     if (param1) {
-        sub_02021CAC(param0->unk_14, ov20_021D204C(param0->unk_04));
-        sub_02021CAC(param0->unk_18, ov20_021D2060(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04));
+        GraphicElementData_SetDrawFlag(param0->unk_18, ov20_021D2060(param0->unk_04));
     } else {
-        sub_02021CAC(param0->unk_14, 0);
-        sub_02021CAC(param0->unk_18, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_18, 0);
     }
 }
 
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 3269a641bd..085105d324 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -736,17 +736,17 @@ void ov21_021D1778 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3
     v5.x = param4;
     v5.y = param5;
 
-    sub_02021C50(v0, &v5);
-    sub_02021CAC(v0, 1);
+    GraphicElementData_SetPosition(v0, &v5);
+    GraphicElementData_SetDrawFlag(v0, 1);
 
     if (v6->unk_04 == 2) {
         v5.x = param4 + (-54 * FX32_ONE);
         v5.y = param5;
 
-        sub_02021C50(v1, &v5);
-        sub_02021CAC(v1, 1);
+        GraphicElementData_SetPosition(v1, &v5);
+        GraphicElementData_SetDrawFlag(v1, 1);
     } else {
-        sub_02021CAC(v1, 0);
+        GraphicElementData_SetDrawFlag(v1, 0);
     }
 
     v4 = ov21_021D2344(param0, 1);
@@ -780,9 +780,9 @@ void ov21_021D1858 (UnkStruct_ov21_021D22F8 * param0, int param1, int param2)
     v0.x = param1 << FX32_SHIFT;
     v0.y = param2 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_00, &v0);
+    GraphicElementData_SetPosition(param0->unk_00, &v0);
     v0.x += (-54 * FX32_ONE);
-    sub_02021C50(param0->unk_04, &v0);
+    GraphicElementData_SetPosition(param0->unk_04, &v0);
 
     if (param0->unk_08->unk_00) {
         sub_02012938(param0->unk_08->unk_00);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 999e39f5cd..5ff661f0c5 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -274,19 +274,19 @@ void ov21_021D2360 (const UnkStruct_ov21_021D13FC * param0, GXOamMode param1)
 
 void ov21_021D238C (const UnkStruct_ov21_021D13FC * param0, int param1)
 {
-    sub_02021E80(param0->unk_1B0.unk_00, param1);
-    sub_02021E80(param0->unk_1B0.unk_04, param1);
+    GraphicElementData_SetExplicitPriority(param0->unk_1B0.unk_00, param1);
+    GraphicElementData_SetExplicitPriority(param0->unk_1B0.unk_04, param1);
     sub_02012A00(param0->unk_1B0.unk_08->unk_00, param1);
 }
 
 void ov21_021D23C0 (const UnkStruct_ov21_021D13FC * param0, BOOL param1)
 {
     if (param0->unk_1B0.unk_00) {
-        sub_02021CAC(param0->unk_1B0.unk_00, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_00, param1);
     }
 
     if (param0->unk_1B0.unk_04) {
-        sub_02021CAC(param0->unk_1B0.unk_04, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_04, param1);
     }
 
     if (param0->unk_1B0.unk_08->unk_00) {
@@ -397,13 +397,13 @@ void ov21_021D2584 (UnkStruct_ov21_021D2584 * param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021CAC(param0->unk_00[v0], param1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[v0], param1);
     }
 }
 
 BOOL ov21_021D25A0 (UnkStruct_ov21_021D2584 * param0)
 {
-    return sub_02021D34(param0->unk_00[0]);
+    return GraphicElementData_GetDrawFlag(param0->unk_00[0]);
 }
 
 void ov21_021D25AC (UnkStruct_ov21_021D2584 * param0, BOOL param1)
@@ -874,15 +874,15 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 
     param0->unk_1B0.unk_00 = GraphicElementManager_AddElement(&v1);
 
-    sub_02021CAC(param0->unk_1B0.unk_00, 0);
-    sub_02021F58(param0->unk_1B0.unk_00, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_00, 0);
+    GraphicElementData_SetPriority(param0->unk_1B0.unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
     param0->unk_1B0.unk_04 = GraphicElementManager_AddElement(&v1);
 
-    sub_02021CAC(param0->unk_1B0.unk_04, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_1B0.unk_04, 1);
 
     param0->unk_1B0.unk_08 = NULL;
@@ -921,15 +921,15 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
 
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
-    sub_02021CAC(param0->unk_00, 0);
-    sub_02021F58(param0->unk_00, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
+    GraphicElementData_SetPriority(param0->unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
     param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
-    sub_02021CAC(param0->unk_04, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
 
     param0->unk_08 = NULL;
@@ -954,11 +954,11 @@ void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0)
 void ov21_021D2E44 (UnkStruct_ov21_021D22F8 * param0, BOOL param1)
 {
     if (param0->unk_00) {
-        sub_02021CAC(param0->unk_00, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_00, param1);
     }
 
     if (param0->unk_04) {
-        sub_02021CAC(param0->unk_04, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_04, param1);
     }
 
     if (param0->unk_08->unk_00) {
@@ -1089,7 +1089,7 @@ static void ov21_021D30D8 (UnkStruct_ov21_021D2584 * param0, int param1, int par
         v0.x = v1 << FX32_SHIFT;
         v0.y = (v2 << FX32_SHIFT) + (192 << FX32_SHIFT);
 
-        sub_02021C50(param0->unk_00[v3], &v0);
+        GraphicElementData_SetPosition(param0->unk_00[v3], &v0);
     }
 }
 
diff --git a/src/overlay021/ov21_021D57B4.c b/src/overlay021/ov21_021D57B4.c
index e39398b968..9d4675366e 100644
--- a/src/overlay021/ov21_021D57B4.c
+++ b/src/overlay021/ov21_021D57B4.c
@@ -140,7 +140,7 @@ void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int par
     v0.x <<= FX32_SHIFT;
     v0.y <<= FX32_SHIFT;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
         SpriteActor_SetSpriteAnimActive(param0, param7);
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 28929a8539..c80befb5e3 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -867,7 +867,7 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
 
     param0->unk_7C = GraphicElementManager_AddElement(&v0);
 
-    sub_02021CAC(param0->unk_7C, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_7C, 0);
     sub_02021FE0(param0->unk_7C, GX_OAM_MODE_XLU);
 }
 
@@ -937,14 +937,14 @@ static void ov21_021D68C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
         ov21_021D217C(param1, 0);
 
         if (param0->unk_7C) {
-            sub_02021CAC(param0->unk_7C, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_7C, 1);
         }
     } else {
         ov21_021D1890(param1, param2->unk_04, v2->unk_00, 2, 56, 80);
         ov21_021D217C(param1, 1);
 
         if (param0->unk_7C) {
-            sub_02021CAC(param0->unk_7C, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_7C, 0);
         }
     }
 }
@@ -1006,7 +1006,7 @@ static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
         v1.x = ov21_021D6BF8(Unk_ov21_021E9D14[v3], Unk_ov21_021E9D14[v4], (64 * 10), (64 * 10) - param1->unk_0C);
         v1.y = ov21_021D6BF8(Unk_ov21_021E9D40[v3], Unk_ov21_021E9D40[v4], (64 * 10), (64 * 10) - param1->unk_0C);
 
-        sub_02021C50(param0->unk_00[v0], &v1);
+        GraphicElementData_SetPosition(param0->unk_00[v0], &v1);
 
         v5 = 4 - v2;
 
@@ -1022,15 +1022,15 @@ static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
 
         v6 += 32;
 
-        sub_02021F58(param0->unk_00[v0], v6);
+        GraphicElementData_SetPriority(param0->unk_00[v0], v6);
 
         if (v2 == 4) {
-            sub_02021F24(param0->unk_00[v0], 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 0);
         } else {
             if (7 + (v5 - 1) < 9) {
-                sub_02021F24(param0->unk_00[v0], 7 + (v5 - 1));
+                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 7 + (v5 - 1));
             } else {
-                sub_02021F24(param0->unk_00[v0], 9);
+                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 9);
             }
         }
 
@@ -1058,9 +1058,9 @@ static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
         v0 %= 9;
 
         if ((v1 + 4) >= v2) {
-            sub_02021CAC(param0->unk_00[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
         } else {
-            sub_02021CAC(param0->unk_00[v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_00[v0], 1);
         }
     } else {
         if (param1->unk_08 == 2) {
@@ -1073,9 +1073,9 @@ static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
             v0 = param0->unk_24;
 
             if ((v1 - 4) < 0) {
-                sub_02021CAC(param0->unk_00[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
             } else {
-                sub_02021CAC(param0->unk_00[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_00[v0], 1);
             }
         } else {
             ov21_021D6ED0(param0, param1);
@@ -1119,22 +1119,22 @@ static void ov21_021D6AE4 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
             }
         }
 
-        sub_02021CAC(param0->unk_50[v3], v4);
+        GraphicElementData_SetDrawFlag(param0->unk_50[v3], v4);
 
         if (v4) {
-            v0 = sub_02021D28(param0->unk_00[v3]);
+            v0 = GraphicElementData_GetPosition(param0->unk_00[v3]);
 
             v1.x = v0->x + (-54 * FX32_ONE);
             v1.y = v0->y;
 
-            sub_02021C50(param0->unk_50[v3], &v1);
+            GraphicElementData_SetPosition(param0->unk_50[v3], &v1);
 
-            v10 = sub_02021F48(param0->unk_00[v3]);
-            sub_02021EF0(param0->unk_50[v3], v10);
+            v10 = GraphicElementData_GetExplicitPaletteOffset(param0->unk_00[v3]);
+            GraphicElementData_SetExplicitPaletteOffset(param0->unk_50[v3], v10);
 
-            v9 = sub_02021F74(param0->unk_00[v3]);
+            v9 = GraphicElementData_GetPriority(param0->unk_00[v3]);
             v9--;
-            sub_02021F58(param0->unk_50[v3], v9);
+            GraphicElementData_SetPriority(param0->unk_50[v3], v9);
         }
     }
 }
@@ -1154,7 +1154,7 @@ static void ov21_021D6BB0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
     v0.y += (58 * FX32_ONE);
     v0.x = (248 * FX32_ONE);
 
-    sub_02021C50(param0->unk_74, &v0);
+    GraphicElementData_SetPosition(param0->unk_74, &v0);
 }
 
 static fx32 ov21_021D6BF8 (fx32 param0, fx32 param1, int param2, int param3)
@@ -1190,11 +1190,11 @@ static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
             ov21_021D6CA4(param0->unk_00[v4], &v1, &v2);
             sub_020128C4(param0->unk_28[v4]->unk_00, v1, v2);
 
-            v5 = sub_02021F74(param0->unk_00[v4]);
+            v5 = GraphicElementData_GetPriority(param0->unk_00[v4]);
             v5--;
             sub_02012A30(param0->unk_28[v4]->unk_00, v5);
 
-            v6 = sub_02021F48(param0->unk_00[v4]);
+            v6 = GraphicElementData_GetExplicitPaletteOffset(param0->unk_00[v4]);
             sub_02012A90(param0->unk_28[v4]->unk_00, v6);
         }
 
@@ -1206,7 +1206,7 @@ static void ov21_021D6CA4 (GraphicElementData * param0, int * param1, int * para
 {
     const VecFx32 * v0;
 
-    v0 = sub_02021D28(param0);
+    v0 = GraphicElementData_GetPosition(param0);
 
     *param1 = v0->x >> FX32_SHIFT;
     *param2 = v0->y >> FX32_SHIFT;
@@ -1343,9 +1343,9 @@ static void ov21_021D6ED0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
 
     for (v2 = 0; v2 < 9; v2++) {
         if ((v0 >= 0) && (v0 < v4)) {
-            sub_02021CAC(param0->unk_00[v1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_00[v1], 1);
         } else {
-            sub_02021CAC(param0->unk_00[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_00[v1], 0);
         }
 
         v1 = (v1 + 1) % 9;
@@ -1516,7 +1516,7 @@ static void ov21_021D7160 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     int v1;
 
     v1 = (param0->unk_24 + 4) % 9;
-    v0 = sub_02021D28(param0->unk_00[v1]);
+    v0 = GraphicElementData_GetPosition(param0->unk_00[v1]);
 
     ov21_021D1778(param1, param2->unk_04, param3, ov21_021D375C(param2->unk_04), v0->x, v0->y);
     ov21_021D238C(param1, 0);
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index ac0533fd51..e328873fa6 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -616,7 +616,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2);
 
     if (param2->unk_1C->unk_04->unk_1740 == 1) {
-        sub_02021CAC(param0->unk_00[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[0], 0);
     }
 
     v1.position.x = 48 << FX32_SHIFT;
@@ -628,7 +628,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
 
     if ((ov21_021D36A4(param2->unk_1C->unk_04, 1) == 0) || (param2->unk_1C->unk_04->unk_1740 == 1)) {
-        sub_02021CAC(param0->unk_00[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[1], 0);
     }
 
     v1.position.x = 48 << FX32_SHIFT;
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 1b6ec10fe1..5f1d0213d7 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -669,9 +669,9 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     param0->unk_58 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_58, 17);
-    sub_02021CAC(param0->unk_58, 0);
-    sub_02021CF8(param0->unk_58, 1);
-    sub_02021E80(param0->unk_58, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_58, 0);
+    GraphicElementData_SetAffineOverwriteMode(param0->unk_58, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_58, 0);
 }
 
 static void ov21_021D8DC0 (UnkStruct_ov21_021D9320 * param0)
@@ -986,9 +986,9 @@ static void ov21_021D9240 (UnkStruct_ov21_021D879C * param0, int param1, int par
 static void ov21_021D924C (UnkStruct_ov21_021D9320 * param0, int param1)
 {
     if (param1 == 0) {
-        sub_02021CAC(param0->unk_20, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_20, 0);
     } else {
-        sub_02021CAC(param0->unk_20, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_20, 1);
 
         switch (param1) {
         case 1:
@@ -1060,10 +1060,10 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     int v1;
 
     if (param2->unk_34 == 32) {
-        sub_02021CAC(param0->unk_58, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_58, 1);
         ov21_021D93F4(param1, param3);
     } else if (param2->unk_34 == 0) {
-        sub_02021CAC(param0->unk_58, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_58, 0);
         BGL_FillWindow(&param1->unk_00->unk_04, 0);
         sub_0201A9A4(&param1->unk_00->unk_04);
     }
@@ -1072,7 +1072,7 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     v0 = (((180 * 0xffff) / 360)) * v1;
     v0 = v0 / 4;
 
-    sub_02021C94(param0->unk_58, (u16)v0);
+    GraphicElementData_SetAffineZRotation(param0->unk_58, (u16)v0);
 }
 
 static void ov21_021D93F4 (UnkStruct_ov21_021D879C * param0, int param1)
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 2b212bc1df..ffdf7cfa62 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -2665,7 +2665,7 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
                 SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 7);
                 break;
             case 14:
-                sub_02021CAC(param0->unk_A8[(v3 * 3) + v4], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             }
         }
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index bfc383c4b1..e83d0fff46 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -605,7 +605,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 
     for (v3 = 0; v3 < (22 * 2); v3++) {
         param0->unk_04[v3] = GraphicElementManager_AddElement(&v1);
-        sub_02021CAC(param0->unk_04[v3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v3], 0);
         sub_02021FE0(param0->unk_04[v3], GX_OAM_MODE_XLU);
     }
 }
@@ -896,7 +896,7 @@ static void ov21_021DD8B4 (UnkStruct_ov21_021DD420 * param0)
     memset(param0->unk_470, 0, sizeof(u8) * (30 * 30));
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        sub_02021CAC(param0->unk_04[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
     }
 
     param0->unk_C4 = 0;
@@ -1107,10 +1107,10 @@ static void ov21_021DD964 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 static void ov21_021DD9E8 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DDABC * param1)
 {
     if ((param0->unk_834 <= 0) && (param0->unk_838 <= 0) && (param0->unk_83C <= 0) && (param0->unk_840 <= 0)) {
-        sub_02021CAC(param0->unk_C8, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_C8, 1);
         sub_020129D0(param0->unk_CC->unk_00, 1);
     } else {
-        sub_02021CAC(param0->unk_C8, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_C8, 0);
         sub_020129D0(param0->unk_CC->unk_00, 0);
     }
 }
@@ -1193,7 +1193,7 @@ static void ov21_021DDB8C (UnkStruct_ov21_021DD420 * param0)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        sub_02021CAC(param0->unk_04[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
     }
 }
 
@@ -1205,7 +1205,7 @@ static void ov21_021DDBCC (UnkStruct_ov21_021DD420 * param0)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 1);
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        sub_02021CAC(param0->unk_04[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
     }
 }
 
@@ -1220,7 +1220,7 @@ static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0)
 
         if (param0->unk_810 == 0) {
             for (v2 = 0; v2 < param0->unk_C4; v2++) {
-                sub_02021CAC(param0->unk_04[v2], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_04[v2], 1);
             }
 
             param0->unk_810 = 1;
@@ -1248,7 +1248,7 @@ static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0)
             GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
         } else {
             for (v2 = 0; v2 < param0->unk_C4; v2++) {
-                sub_02021CAC(param0->unk_04[v2], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_04[v2], 0);
             }
         }
     }
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index bf45cd1e9e..20ad425513 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -594,7 +594,7 @@ static void ov21_021DE49C (UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov2
     v0.y = param2->unk_04 << FX32_SHIFT;
     v0.y += (192 << FX32_SHIFT);
 
-    sub_02021C50(param0->unk_00, &v0);
+    GraphicElementData_SetPosition(param0->unk_00, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_00, ov21_021DCA28(param1->unk_00));
 }
 
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index f5785f93f0..350f72798c 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -593,11 +593,11 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
     param0->unk_BC = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_BC, 1);
-    sub_02021CC8(param0->unk_BC, 1);
-    sub_02021E80(param0->unk_BC, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_BC, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_BC, 0);
 
     if (param2->unk_10 <= 1) {
-        sub_02021CAC(param0->unk_BC, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_BC, 0);
     }
 }
 
@@ -745,7 +745,7 @@ static BOOL ov21_021E015C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
     v1.x = param0->unk_28[param2].unk_00 << FX32_SHIFT;
     v1.y = (param0->unk_28[param2].unk_04 + 8) << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_00[v2], &v1);
+    GraphicElementData_SetPosition(param0->unk_00[v2], &v1);
 
     return v0;
 }
@@ -1322,7 +1322,7 @@ static void ov21_021E0BF8 (UnkStruct_ov21_021DFFF8 * param0)
 
 static void ov21_021E0C10 (UnkStruct_ov21_021DFFF8 * param0)
 {
-    sub_02021CAC(param0->unk_BC, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_BC, 0);
 
     param0->unk_C0 = (16 + 8);
     param0->unk_C4 = 1;
@@ -1334,7 +1334,7 @@ static void ov21_021E0C30 (UnkStruct_ov21_021DFFF8 * param0)
         param0->unk_C0--;
 
         if (param0->unk_C0 <= 0) {
-            sub_02021CAC(param0->unk_BC, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_BC, 1);
             param0->unk_C4 = 0;
         }
     }
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 392e414a83..41bf456520 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -1088,39 +1088,39 @@ static void ov21_021E28A8 (UnkStruct_ov21_021E1E74 * param0)
 static void ov21_021E28D0 (UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov21_021E1E74 * param1)
 {
     if ((param1->unk_38 & 1) == 0) {
-        sub_02021CAC(param0->unk_00[2], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[2], 0);
     } else {
-        sub_02021CAC(param0->unk_00[2], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[2], 1);
     }
 
     if ((param1->unk_38 & 2) == 0) {
-        sub_02021CAC(param0->unk_00[3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[3], 0);
     } else {
-        sub_02021CAC(param0->unk_00[3], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[3], 1);
     }
 
     if ((param1->unk_38 & 4) == 0) {
-        sub_02021CAC(param0->unk_00[4], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[4], 0);
     } else {
-        sub_02021CAC(param0->unk_00[4], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[4], 1);
     }
 
     if ((param1->unk_38 & 8) == 0) {
-        sub_02021CAC(param0->unk_00[5], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[5], 0);
     } else {
-        sub_02021CAC(param0->unk_00[5], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[5], 1);
     }
 
     if ((param1->unk_38 & 16) == 0) {
-        sub_02021CAC(param0->unk_00[6], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[6], 0);
     } else {
-        sub_02021CAC(param0->unk_00[6], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[6], 1);
     }
 
     if ((param1->unk_38 & 32) == 0) {
-        sub_02021CAC(param0->unk_00[7], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[7], 0);
     } else {
-        sub_02021CAC(param0->unk_00[7], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[7], 1);
     }
 }
 
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 1fc728fe0a..78426e60c7 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1604,6 +1604,6 @@ static void ov21_021E3FC0 (UnkStruct_ov21_021E326C * param0, int param1, int par
 static void ov21_021E3FE4 (UnkStruct_ov21_021E3900 * param0, const UnkStruct_ov21_021E342C * param1)
 {
     if (ov21_021D3954(param1->unk_08) == 0) {
-        sub_02021CAC(param0->unk_00[4], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[4], 0);
     }
 }
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index 747c2bdee1..f3cbfb92da 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -755,8 +755,8 @@ static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1)
     v1.y = 96 << FX32_SHIFT;
 
     for (v0 = 0; v0 < 9; v0++) {
-        sub_02021C50(param0->unk_00[v0].unk_00, &v1);
-        sub_02021CAC(param0->unk_00[v0].unk_00, 0);
+        GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
 
         v1.y += -8 << FX32_SHIFT;
 
@@ -765,8 +765,8 @@ static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1)
 
     v1.y = 96 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_48.unk_00, &v1);
-    sub_02021CAC(param0->unk_48.unk_00, 0);
+    GraphicElementData_SetPosition(param0->unk_48.unk_00, &v1);
+    GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 0);
 }
 
 static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
@@ -775,17 +775,17 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
     int v1 = 0;
 
     for (v0 = 0; v0 < param1; v0++) {
-        sub_02021CAC(param0->unk_00[v0].unk_00, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 1);
         param0->unk_00[v0].unk_04 = 2 * (v0 + 1);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        if (sub_02021D34(param0->unk_00[v0].unk_00)) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0].unk_00)) {
             if ((param0->unk_00[v0].unk_04 - 1) > 0) {
                 param0->unk_00[v0].unk_04--;
                 v1 = v0 + 1;
             } else {
-                sub_02021CAC(param0->unk_00[v0].unk_00, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
             }
         }
     }
@@ -795,7 +795,7 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
         param0->unk_48.unk_08 = 16;
 
         if (param0->unk_48.unk_04 < v1) {
-            sub_02021CAC(param0->unk_48.unk_00, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 1);
         }
 
         param0->unk_48.unk_04 = v1;
@@ -809,7 +809,7 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
             param0->unk_48.unk_08--;
         }
     } else {
-        sub_02021CAC(param0->unk_48.unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 0);
     }
 }
 
@@ -818,11 +818,11 @@ static void ov21_021E4C38 (GraphicElementData * param0, int param1)
     VecFx32 v0;
     const VecFx32 * v1;
 
-    v1 = sub_02021D28(param0);
+    v1 = GraphicElementData_GetPosition(param0);
     v0 = *v1;
     v0.y = (96 + (-8 * param1)) << FX32_SHIFT;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void ov21_021E4C68 (UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1)
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index a3c3b4912c..60033ee2f7 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -864,8 +864,8 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     param0->unk_3C = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_3C, 4);
-    sub_02021CC8(param0->unk_3C, 1);
-    sub_02021CE4(param0->unk_3C, (FX32_ONE * 2));
+    GraphicElementData_SetAnimateFlag(param0->unk_3C, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_3C, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_3C, 8);
 
     v1.position.x = 51 << FX32_SHIFT;
@@ -875,7 +875,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00, 1);
-    sub_02021CF8(param0->unk_00, 1);
+    GraphicElementData_SetAffineOverwriteMode(param0->unk_00, 1);
 
     v1.position.x = 180 << FX32_SHIFT;
     v1.position.y = 131 << FX32_SHIFT;
@@ -884,8 +884,8 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_04, 3);
-    sub_02021CC8(param0->unk_04, 1);
-    sub_02021CE4(param0->unk_04, (FX32_ONE * 2));
+    GraphicElementData_SetAnimateFlag(param0->unk_04, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_04, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_04, 5);
 
     param0->unk_08.unk_00 = 3;
@@ -901,8 +901,8 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_20, 6);
-    sub_02021CC8(param0->unk_20, 1);
-    sub_02021CE4(param0->unk_20, (FX32_ONE * 2));
+    GraphicElementData_SetAnimateFlag(param0->unk_20, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_20, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_20, 5);
 
     param0->unk_24.unk_00 = 6;
@@ -1107,7 +1107,7 @@ static void ov21_021E5AD8 (UnkStruct_ov21_021E51DC * param0)
 
 static void ov21_021E5B50 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1)
 {
-    sub_02021C94(param0->unk_00, sub_0201D580(14, param1->unk_5C));
+    GraphicElementData_SetAffineZRotation(param0->unk_00, sub_0201D580(14, param1->unk_5C));
 }
 
 static void ov21_021E5B6C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E51DC * param2)
@@ -1188,13 +1188,13 @@ static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
     case 2:
         if (v0 > param1->unk_14) {
             SpriteActor_SetAnimFrame(param0, param1->unk_14);
-            sub_02021CE4(param0, 0);
+            GraphicElementData_SetAnimSpeed(param0, 0);
         }
         break;
     case 1:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        sub_02021CE4(param0, (FX32_ONE * 2));
+        GraphicElementData_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
@@ -1228,12 +1228,12 @@ static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         break;
     case 2:
         SpriteActor_SetAnimFrame(param0, param1->unk_14);
-        sub_02021CE4(param0, 0);
+        GraphicElementData_SetAnimSpeed(param0, 0);
         break;
     case 3:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        sub_02021CE4(param0, (FX32_ONE * 2));
+        GraphicElementData_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index a97665797b..1de4bf8f2e 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -552,7 +552,7 @@ static void ov21_021E6860 (GraphicElementData * param0, short param1)
     v0.x = 168 << FX32_SHIFT;
     v0.y = (88 + param1) << FX32_SHIFT;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void ov21_021E687C (Sprite * param0, short param1)
@@ -567,7 +567,7 @@ static void ov21_021E688C (GraphicElementData * param0, short param1)
     v0.x = FX_Div(0x100 << FX32_SHIFT, param1 << FX32_SHIFT);
     v0.y = v0.x;
 
-    sub_02021C80(param0, &v0, 2);
+    GraphicElementData_SetAffineScaleEx(param0, &v0, 2);
 }
 
 static void ov21_021E68B0 (Sprite * param0, short param1)
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index 78e9cde839..de510a9b0c 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -661,7 +661,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     param0->unk_08 = GraphicElementManager_AddElement(&v1);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_08, 1);
-    sub_02021E80(param0->unk_08, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_08, 1);
 
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
@@ -686,7 +686,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.y = 64 << FX32_SHIFT;
 
     param0->unk_04 = GraphicElementManager_AddElement(&v1);
-    sub_02021EC4(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
+    GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
 }
 
 static void ov21_021E7CCC (UnkStruct_ov21_021E7714 * param0)
@@ -922,16 +922,16 @@ static void ov21_021E80D4 (UnkStruct_02015214 * param0, GraphicElementData * par
     v2.x = (128 << FX32_SHIFT) + v0;
     v2.y = (64 << FX32_SHIFT) + v1;
 
-    sub_02021C50(param3, &v2);
+    GraphicElementData_SetPosition(param3, &v2);
     v2.y += 24 << FX32_SHIFT;
-    sub_02021C50(param1, &v2);
+    GraphicElementData_SetPosition(param1, &v2);
 
     v2.x = (128 << FX32_SHIFT) - v0;
     v2.y = (64 << FX32_SHIFT) - v1;
 
-    sub_02021C50(param4, &v2);
+    GraphicElementData_SetPosition(param4, &v2);
     v2.y += 24 << FX32_SHIFT;
-    sub_02021C50(param2, &v2);
+    GraphicElementData_SetPosition(param2, &v2);
 }
 
 static void ov21_021E8188 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, u16 param2, u16 param3, int param4)
@@ -997,7 +997,7 @@ static void ov21_021E8258 (UnkStruct_ov21_021E7714 * param0, s16 param1, int par
 
     param0->unk_98.unk_10 = (-param1 / 1) * 2;
 
-    v0 = sub_02021D28(param0->unk_98.unk_00);
+    v0 = GraphicElementData_GetPosition(param0->unk_98.unk_00);
 
     param0->unk_98.unk_04 = v0->x;
     param0->unk_98.unk_08 = v0->y;
@@ -1023,7 +1023,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         v2.x = v0->unk_04;
         v2.y = v0->unk_08 + (v1 << FX32_SHIFT);
 
-        sub_02021C50(v0->unk_00, &v2);
+        GraphicElementData_SetPosition(v0->unk_00, &v2);
 
         if (v0->unk_14 >= v0->unk_10) {
             v0->unk_14 = 0;
@@ -1035,7 +1035,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         if (v0->unk_14 == 0) {
             v2.x = v0->unk_04 + (2 * FX32_ONE);
             v2.y = v0->unk_08;
-            sub_02021C50(v0->unk_00, &v2);
+            GraphicElementData_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1049,7 +1049,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         if (v0->unk_14 == 0) {
             v2.x = v0->unk_04 - (2 * FX32_ONE);
             v2.y = v0->unk_08;
-            sub_02021C50(v0->unk_00, &v2);
+            GraphicElementData_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1068,7 +1068,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
     case 3:
         v2.x = v0->unk_04;
         v2.y = v0->unk_08;
-        sub_02021C50(v0->unk_00, &v2);
+        GraphicElementData_SetPosition(v0->unk_00, &v2);
         SysTask_Done(param0);
         *v0->unk_1C = 1;
         break;
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index 62474a7494..de6c343899 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -545,11 +545,11 @@ static void ov22_0225A3DC (UnkStruct_ov22_02259C58 * param0, int param1, int par
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0->unk_00);
+    v0 = GraphicElementData_GetPosition(param0->unk_00);
     v1 = *v0;
     v1.x += param1 << FX32_SHIFT;
     v1.y += param2 << FX32_SHIFT;
-    sub_02021C50(param0->unk_00, &v1);
+    GraphicElementData_SetPosition(param0->unk_00, &v1);
 }
 
 static void ov22_0225A418 (UnkStruct_ov22_0225A154 * param0, int param1, int param2)
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 0670a6d1e6..f89bd2cea2 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -319,7 +319,7 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag
             SpriteActor_SetSpriteAnimActive(param0->unk_10[(v2 * 10) + v3], 1);
 
             if (((v2 * 10) + v3) >= param3) {
-                sub_02021CAC(param0->unk_10[(v2 * 10) + v3], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
             }
         }
     }
@@ -490,7 +490,7 @@ static void ov22_0225ACE4 (UnkStruct_ov22_0225AB54 * param0)
 
         if (param0->unk_90 == 0) {
             if (param0->unk_1C <= 10) {
-                sub_02021EC4(param0->unk_10[v0], 1);
+                GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_10[v0], 1);
 
                 if (v0 == 2 - 1) {
                     param0->unk_90 = 1;
@@ -548,7 +548,7 @@ static void ov22_0225ADC0 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_ov22_0225
 
     for (v0 = 0; v0 < 2; v0++) {
         param1->unk_04[v0] = param0->unk_10[v0];
-        sub_02021CF8(param1->unk_04[v0], 2);
+        GraphicElementData_SetAffineOverwriteMode(param1->unk_04[v0], 2);
         v4.x = 103 + (v0 * 24);
         v4.x *= FX32_ONE;
         param1->unk_0C[v0] = v4;
@@ -594,19 +594,19 @@ static void ov22_0225AE9C (UnkStruct_ov22_0225AE9C * param0)
     v0.y = param0->unk_24.unk_00;
     v0.z = param0->unk_24.unk_00;
 
-    sub_02021C70(param0->unk_04[0], &v0);
-    sub_02021C70(param0->unk_04[1], &v0);
+    GraphicElementData_SetAffineScale(param0->unk_04[0], &v0);
+    GraphicElementData_SetAffineScale(param0->unk_04[1], &v0);
 
     v1 = param0->unk_0C[0];
     v1.x -= param0->unk_38.unk_00;
     v1.y -= param0->unk_4C.unk_00;
 
-    sub_02021C50(param0->unk_04[0], &v1);
+    GraphicElementData_SetPosition(param0->unk_04[0], &v1);
 
     v1 = param0->unk_0C[1];
     v1.y -= param0->unk_4C.unk_00;
 
-    sub_02021C50(param0->unk_04[1], &v1);
+    GraphicElementData_SetPosition(param0->unk_04[1], &v1);
 
     if (v2) {
         param0->unk_00 = 0;
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index 0bb863df2b..f6e43d8027 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -228,7 +228,7 @@ static void ov22_0225B964 (UnkStruct_ov22_0225B85C * param0)
 
     param0->unk_1FC = ov22_022551E4(&param0->unk_14, 1000, 0, 144, 100, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    sub_02021E80(param0->unk_1FC, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_1FC, 1);
 }
 
 static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0)
@@ -291,7 +291,7 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0)
     v0.x = 48 << FX32_SHIFT;
     v0.y = 144 << FX32_SHIFT;
     v0.z = 0;
-    sub_02021C50(param0->unk_1FC, &v0);
+    GraphicElementData_SetPosition(param0->unk_1FC, &v0);
 
     v7 = Strbuf_Init(12, 13);
     sub_0202A1A0(param0->unk_00, v7);
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index e49016e814..b616ade9ed 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -1284,19 +1284,19 @@ static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOO
         Sound_PlayEffect(1699);
     }
 
-    sub_02021CC8(Unk_ov23_02257740->unk_24C[0], 1);
-    sub_02021CC8(Unk_ov23_02257740->unk_24C[3], 1);
+    GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[0], 1);
+    GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[3], 1);
 
     v3.x = FX32_ONE * (param0 + 8);
     v3.y = FX32_ONE * (param1 + 8);
 
-    sub_02021C50(Unk_ov23_02257740->unk_24C[0], &v3);
-    sub_02021C50(Unk_ov23_02257740->unk_24C[3], &v3);
+    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[0], &v3);
+    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
 
     if (param4) {
         SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[4], 5);
-        sub_02021CC8(Unk_ov23_02257740->unk_24C[4], 1);
-        sub_02021C50(Unk_ov23_02257740->unk_24C[4], &v3);
+        GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[4], 1);
+        GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[4], &v3);
     }
 }
 
@@ -1642,7 +1642,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
             int v3;
 
             for (v3 = 0; v3 < 8; v3++) {
-                sub_02021CAC(Unk_ov23_02257740->unk_24C[v3], 0);
+                GraphicElementData_SetDrawFlag(Unk_ov23_02257740->unk_24C[v3], 0);
             }
 
             v0->unk_00 = 25;
@@ -2014,7 +2014,7 @@ static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0)
                 v4.y = FX32_ONE * v2;
 
                 SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
-                sub_02021C50(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
+                GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
             }
         }
     }
@@ -2380,12 +2380,12 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
 
         if (2 == param3) {
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[2], 6);
-            sub_02021CC8(Unk_ov23_02257740->unk_24C[2], 1);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 80;
 
-            sub_02021C50(Unk_ov23_02257740->unk_24C[2], &v0);
+            GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     case 1:
@@ -2399,12 +2399,12 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
 
         if (2 == param3) {
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[2], 7);
-            sub_02021CC8(Unk_ov23_02257740->unk_24C[2], 1);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 152;
 
-            sub_02021C50(Unk_ov23_02257740->unk_24C[2], &v0);
+            GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     }
@@ -2667,7 +2667,7 @@ static void ov23_02240B84 (BGL * param0)
     v3.x -= Unk_ov23_02257740->unk_A2D * FX32_ONE;
     v3.y -= Unk_ov23_02257740->unk_A2E * FX32_ONE;
 
-    sub_02021C50(Unk_ov23_02257740->unk_24C[1], &v3);
+    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3);
 }
 
 static void ov23_02240C94 (BGL * param0)
@@ -2839,12 +2839,12 @@ static void ov23_0224108C (void)
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
                 Unk_ov23_02257740->unk_24C[v1] = GraphicElementManager_AddElementEx(&v2);
-                sub_02021CC8(Unk_ov23_02257740->unk_24C[v1], 1);
+                GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v1], 1);
             }
         }
 
         Unk_ov23_02257740->unk_24C[v0] = GraphicElementManager_AddElementEx(&v2);
-        sub_02021CC8(Unk_ov23_02257740->unk_24C[v0], 1);
+        GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v0], 1);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 2851d4ce57..2742c022e6 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3337,9 +3337,9 @@ static void ov23_0224644C (int param0)
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
-            sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 0);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            sub_02021E80(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3377,7 +3377,7 @@ static void ov23_02246574 (int param0, UnkStruct_ov23_02245ED4 * param1, int par
         v3.x = FX32_ONE * (v6) + v4;
         v3.y = FX32_ONE * (v7) + v5;
 
-        sub_02021C50(Unk_ov23_02257764->unk_25C[param0], &v3);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3686,12 +3686,12 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
-            sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
-            sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], v1 * 4);
             sub_02021FE0(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
-            sub_02021E80(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3712,7 +3712,7 @@ static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1)
         v3.x = param1->unk_44[param0].unk_00;
         v3.y = param1->unk_44[param0].unk_04;
 
-        sub_02021C50(Unk_ov23_02257764->unk_25C[param0], &v3);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
         param1->unk_134[param0] += 0x250 + param0 * 100;
 
         v5 = FX_SinIdx(param1->unk_134[param0]) + FX32_ONE;
@@ -3721,7 +3721,7 @@ static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1)
         v3.y = FX32_ONE - v4;
         v3.z = FX32_ONE - v4;
 
-        sub_02021C70(Unk_ov23_02257764->unk_25C[param0], &v3);
+        GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3865,11 +3865,11 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
-            sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
-            sub_02021CAC(Unk_ov23_02257764->unk_25C[v1], 0);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            sub_02021F58(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
-            sub_02021E80(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetPriority(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
+            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3884,7 +3884,7 @@ static void ov23_0224730C (UnkStruct_ov23_022471D8 * param0, int param1, int par
     param0->unk_44[param1] = param3;
     param0->unk_BC[param1] = param5;
 
-    sub_02021CAC(Unk_ov23_02257764->unk_25C[param1], 1);
+    GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[param1], 1);
 }
 
 static void ov23_0224733C (UnkStruct_ov23_022471D8 * param0, int param1)
@@ -3927,10 +3927,10 @@ static void ov23_022474D4 (UnkStruct_ov23_022471D8 * param0)
             v1.x = param0->unk_08[v0] * FX32_ONE;
             v1.y = param0->unk_44[v0] * FX32_ONE;
 
-            sub_02021C50(Unk_ov23_02257764->unk_25C[v0], &v1);
+            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v1);
 
             if (param0->unk_44[v0] > (param0->unk_120 + 35)) {
-                sub_02021CAC(Unk_ov23_02257764->unk_25C[v0], 0);
+                GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 0);
                 param0->unk_80[v0] = 0;
             }
         }
@@ -3967,8 +3967,8 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         v11.x = 128 * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        sub_02021C50(Unk_ov23_02257764->unk_25C[0], &v11);
-        sub_02021CAC(Unk_ov23_02257764->unk_25C[0], 1);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 1);
 
         if (param1->unk_120 > 65) {
             param1->unk_125 = 3;
@@ -4028,7 +4028,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        sub_02021C50(Unk_ov23_02257764->unk_25C[0], &v11);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 4:
         if (param1->unk_124 == 0) {
@@ -4052,7 +4052,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
 
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
-        sub_02021C50(Unk_ov23_02257764->unk_25C[0], &v11);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 5:
         if (param1->unk_124 == 0) {
@@ -4065,8 +4065,8 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
                 v11.x = (70 + 12 * v0) * FX32_ONE;
                 v11.y = (param1->unk_120 + 39 + v0 % 2) * FX32_ONE;
 
-                sub_02021C50(Unk_ov23_02257764->unk_25C[v0], &v11);
-                sub_02021CAC(Unk_ov23_02257764->unk_25C[v0], 1);
+                GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v11);
+                GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
             }
 
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[10], 1);
@@ -4074,15 +4074,15 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             v11.x = 100 * FX32_ONE;
             v11.y = (param1->unk_120 + 21) * FX32_ONE;
 
-            sub_02021C50(Unk_ov23_02257764->unk_25C[10], &v11);
-            sub_02021CAC(Unk_ov23_02257764->unk_25C[10], 1);
+            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[10], &v11);
+            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[10], 1);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[11], 1);
 
             v11.x = 122 * FX32_ONE;
             v11.y = param1->unk_120 * FX32_ONE;
 
-            sub_02021C50(Unk_ov23_02257764->unk_25C[11], &v11);
-            sub_02021CAC(Unk_ov23_02257764->unk_25C[11], 1);
+            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[11], &v11);
+            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[11], 1);
         }
 
         param1->unk_124++;
@@ -4090,7 +4090,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         v11.x = (128 - (10 / 2) + (LCRNG_Next() % 10)) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        sub_02021C50(Unk_ov23_02257764->unk_25C[0], &v11);
+        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         param1->unk_120 += 1;
 
         if (param1->unk_124 % 8) {
@@ -4107,7 +4107,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             param1->unk_114 = NULL;
         }
 
-        sub_02021CAC(Unk_ov23_02257764->unk_25C[0], 0);
+        GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 0);
         return 1;
     }
 
@@ -4333,11 +4333,11 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
-            sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
+            GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
             SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
-            sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            sub_02021E80(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -4424,7 +4424,7 @@ static BOOL ov23_02247F4C (BGL * param0, UnkStruct_ov23_02247E38 * param1)
         v11.y = FX32_ONE * v4;
         v11.z = FX32_ONE * v4;
 
-        sub_02021C70(Unk_ov23_02257764->unk_25C[0], &v11);
+        GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
         sub_02021DCC(Unk_ov23_02257764->unk_25C[0], v1);
         break;
     case 2:
@@ -4726,12 +4726,12 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
     v2.x = param1->unk_28 * FX32_ONE;
     v2.y = param1->unk_2C * FX32_ONE;
 
-    sub_02021C50(Unk_ov23_02257764->unk_25C[0], &v2);
+    GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v2);
 
     v2.x = (param1->unk_30 * FX32_ONE) / 10;
     v2.y = v2.z = v2.x;
 
-    sub_02021C70(Unk_ov23_02257764->unk_25C[0], &v2);
+    GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
     sub_02021FE0(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
 
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_OBJ, GX_BLEND_PLANEMASK_BG0, 16 - (param1->unk_30 / 2), 16);
@@ -4750,7 +4750,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
             v2.x = v3 * FX32_ONE;
             v2.y = v4 * FX32_ONE;
 
-            sub_02021C50(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
+            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
         }
     }
 
@@ -4794,7 +4794,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             if (v1 == 0) {
-                sub_02021CF8(Unk_ov23_02257764->unk_25C[v1], 2);
+                GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
                 SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
             } else if (v1 < 9) {
                 SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 1);
@@ -4802,7 +4802,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
                 SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
             }
 
-            sub_02021CC8(Unk_ov23_02257764->unk_25C[v1], 1);
+            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
         }
     }
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 853ff90d4b..64922c040c 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -127,8 +127,8 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
                 v0->unk_390[v2] = GraphicElementManager_AddElementEx(&v3);
-                sub_02021CC8(v0->unk_390[v2], 1);
-                sub_02021CAC(v0->unk_390[v2], 0);
+                GraphicElementData_SetAnimateFlag(v0->unk_390[v2], 1);
+                GraphicElementData_SetDrawFlag(v0->unk_390[v2], 0);
 
                 if (v2 == 0) {
                     SpriteActor_SetSpriteAnimActive(v0->unk_390[v2], 1);
@@ -137,8 +137,8 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
 
             for (v2 = 0; v2 < 16 + 1; v2++) {
                 v0->unk_3B0[v2] = GraphicElementManager_AddElementEx(&v3);
-                sub_02021CC8(v0->unk_3B0[v2], 1);
-                sub_02021CAC(v0->unk_3B0[v2], 0);
+                GraphicElementData_SetAnimateFlag(v0->unk_3B0[v2], 1);
+                GraphicElementData_SetDrawFlag(v0->unk_3B0[v2], 0);
                 SpriteActor_SetSpriteAnimActive(v0->unk_3B0[v2], 2);
             }
         }
@@ -265,10 +265,10 @@ static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[])
             v1.y = ((8 + 1) + ((((8 + 1) + 8 * 16) - (8 + 1)) * param0[v0][1]) / (32 * 13)) * FX32_ONE + (192 << FX32_SHIFT);
             v1.z = FX32_ONE;
 
-            sub_02021C50(param1[v0], &v1);
-            sub_02021CAC(param1[v0], 1);
+            GraphicElementData_SetPosition(param1[v0], &v1);
+            GraphicElementData_SetDrawFlag(param1[v0], 1);
         } else {
-            sub_02021CAC(param1[v0], 0);
+            GraphicElementData_SetDrawFlag(param1[v0], 0);
         }
     }
 }
@@ -306,18 +306,18 @@ static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
             v1.y = ((8 + 1) + ((((8 + 1) + 8 * 16) - (8 + 1)) * param0[v0][1]) / (32 * 13)) * FX32_ONE + (192 << FX32_SHIFT);
             v1.z = FX32_ONE;
 
-            sub_02021C50(param1[v0], &v1);
+            GraphicElementData_SetPosition(param1[v0], &v1);
 
             if (param0[v0][2] != param0[v0][3]) {
                 if (param0[v0][2] != 0) {
                     SpriteActor_SetSpriteAnimActive(param1[v0], param0[v0][2]);
-                    sub_02021CAC(param1[v0], 1);
+                    GraphicElementData_SetDrawFlag(param1[v0], 1);
                 } else {
-                    sub_02021CAC(param1[v0], 0);
+                    GraphicElementData_SetDrawFlag(param1[v0], 0);
                 }
             }
         } else {
-            sub_02021CAC(param1[v0], 0);
+            GraphicElementData_SetDrawFlag(param1[v0], 0);
         }
 
         param0[v0][3] = param0[v0][2];
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index d3ce8e56f0..490567fc80 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -220,7 +220,7 @@ static void ov23_0224F294 (UnkStruct_ov23_02250CD4 * param0, u8 * param1, u32 pa
 
         {
             VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE};
-            sub_02021C80(param0->unk_23C[1 + v1]->unk_00, &v4, 1);
+            GraphicElementData_SetAffineScaleEx(param0->unk_23C[1 + v1]->unk_00, &v4, 1);
         }
     }
 
@@ -253,10 +253,10 @@ static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1)
 {
     VecFx32 v0;
 
-    v0 = *(sub_02021D28(param0));
+    v0 = *(GraphicElementData_GetPosition(param0));
     v0.y = (20 + 24 * param1) * FX32_ONE;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2)
@@ -264,7 +264,7 @@ static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2)
     u32 v0 = sub_02021E24(param0);
 
     SpriteActor_SetSpriteAnimActive(param0, (v0 / 3) * 3 + param1);
-    sub_02021EC4(param0, param2);
+    GraphicElementData_SetExplicitPaletteWithOffset(param0, param2);
 }
 
 static void ov23_0224F52C (UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2)
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 9f61c5db17..4a296449d0 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -437,7 +437,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
 
             param0->unk_1FC[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_1FC[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_1FC[v0], v0);
         }
     }
@@ -539,7 +539,7 @@ static void ov56_02256994 (GraphicElementData * param0, int param1)
     v0.y = FX32_CONST(param1) + (192 << FX32_SHIFT);
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0)
@@ -551,7 +551,7 @@ static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0)
         param0->unk_2D8.unk_04 = param0->unk_2D8.unk_00 - 3;
     }
 
-    sub_02021CAC(param0->unk_1FC[2], param0->unk_2D8.unk_06);
+    GraphicElementData_SetDrawFlag(param0->unk_1FC[2], param0->unk_2D8.unk_06);
 
     if (param0->unk_2D8.unk_06) {
         if (ov56_02257184(param0) == 1) {
@@ -988,13 +988,13 @@ static void ov56_022571D0 (UnkStruct_ov56_02256468 * param0)
 
         if (param0->unk_2F4[v0] == 1) {
             if (v1 >= 1) {
-                sub_02021CC8(param0->unk_1FC[v0], 0);
+                GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 0);
             }
 
             param0->unk_2F4[v0] = 0;
         } else {
-            if (sub_02021D3C(param0->unk_1FC[v0]) == 0) {
-                sub_02021CC8(param0->unk_1FC[v0], 1);
+            if (GraphicElementData_GetAnimateFlag(param0->unk_1FC[v0]) == 0) {
+                GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 1);
                 SpriteActor_SetAnimFrame(param0->unk_1FC[v0], 1 + 1);
             }
         }
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 1b3e36ab2d..b551980bc4 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -696,9 +696,9 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
 
             param0->unk_23C[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_23C[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_23C[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_23C[v0], v0);
-            sub_02021CAC(param0->unk_23C[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 0);
         }
 
         for (v0 = 0; v0 < 9 + 3; v0++) {
@@ -708,11 +708,11 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
 
             param0->unk_2AC[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_2AC[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_2AC[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
 
             if (v0 >= 8) {
-                sub_02021E80(param0->unk_2AC[v0], 2);
+                GraphicElementData_SetExplicitPriority(param0->unk_2AC[v0], 2);
             }
         }
 
@@ -724,10 +724,10 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
 
             param0->unk_274[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_274[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_274[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_274[v0], v0);
-            sub_02021F58(param0->unk_274[v0], 1);
-            sub_02021CAC(param0->unk_274[v0], 0);
+            GraphicElementData_SetPriority(param0->unk_274[v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_274[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -781,7 +781,7 @@ static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8);
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov58_021D2EB8[] = {
@@ -885,11 +885,11 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
     }
 
     v1 = sub_02022644(Unk_ov58_021D2DDC);
-    sub_02021CAC(param0->unk_23C[CommSys_CurNetId()], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
 
     if (v1 != 0xffffffff) {
         ov58_021D1A10(param0->unk_23C[CommSys_CurNetId()], gCoreSys.touchX, gCoreSys.touchY);
-        sub_02021CAC(param0->unk_23C[CommSys_CurNetId()], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
     }
 
     {
@@ -1576,10 +1576,10 @@ static void ov58_021D2820 (UnkStruct_02095EAC * param0)
     for (v0 = 0; v0 < 5; v0++) {
         if (v0 != CommSys_CurNetId()) {
             if ((v1[v0].unk_08_3 != 0) && (CommInfo_TrainerInfo(v0) != NULL)) {
-                sub_02021CAC(param0->unk_23C[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 1);
                 ov58_021D1A10(param0->unk_23C[v0], v1[v0].unk_00[v1[v0].unk_08_3 - 1], v1[v0].unk_04[v1[v0].unk_08_3 - 1]);
             } else {
-                sub_02021CAC(param0->unk_23C[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 0);
             }
         }
     }
@@ -1633,9 +1633,9 @@ static void ov58_021D28E4 (Window * param0, int param1, u32 param2, UnkStruct_02
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param3->unk_398[v0][0] == NULL) {
-            sub_02021CAC(param3->unk_274[v0], 0);
+            GraphicElementData_SetDrawFlag(param3->unk_274[v0], 0);
         } else {
-            sub_02021CAC(param3->unk_274[v0], 1);
+            GraphicElementData_SetDrawFlag(param3->unk_274[v0], 1);
         }
     }
 
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index fb91e81bbf..0114a3d6e2 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -662,8 +662,8 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
 
         param0->unk_28C[0] = GraphicElementManager_AddElementEx(&v1);
 
-        sub_02021CC8(param0->unk_28C[0], 1);
-        sub_02021CAC(param0->unk_28C[0], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_28C[0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_28C[0], 1);
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.position.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
@@ -671,9 +671,9 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
 
             param0->unk_28C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_28C[v0 + 1], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_28C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
-            sub_02021CAC(param0->unk_28C[v0 + 1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1632,7 +1632,7 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0)
                 SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + v0 * 2);
             }
         }
-            sub_02021CAC(param0->unk_28C[v0 + 1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
             param0->unk_3F0[v0] = 2;
             v1 = 1;
             break;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 8d1a7d741f..7c5cbc6d44 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -469,7 +469,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     }
 
     v0->unk_04 = GraphicElementManager_AddElementEx(&v1);
-    sub_02021E80(v0->unk_04, param1->unk_06);
+    GraphicElementData_SetExplicitPriority(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
         SpriteActor_SetSpriteAnimActive(v0->unk_04, 5 + 1);
@@ -503,7 +503,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
 
         v0->unk_08 = GraphicElementManager_AddElementEx(&v1);
 
-        sub_02021E80(v0->unk_08, param1->unk_06);
+        GraphicElementData_SetExplicitPriority(v0->unk_08, param1->unk_06);
     } else {
         v0->unk_08 = NULL;
     }
@@ -534,38 +534,38 @@ void ov63_0222B238 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
     v0.y = param2 << FX32_SHIFT;
     v0.z = 0;
 
-    sub_02021C50(param0->unk_04, &v0);
+    GraphicElementData_SetPosition(param0->unk_04, &v0);
 
     if (param0->unk_08) {
         v0.x += 8 << FX32_SHIFT;
         v0.y += 14 << FX32_SHIFT;
 
-        sub_02021C50(param0->unk_08, &v0);
+        GraphicElementData_SetPosition(param0->unk_08, &v0);
     }
 }
 
 void ov63_0222B278 (UnkStruct_ov63_0222BB38 * param0, u16 param1)
 {
-    sub_02021F58(param0->unk_04, param1);
+    GraphicElementData_SetPriority(param0->unk_04, param1);
 }
 
 u16 ov63_0222B284 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return sub_02021F74(param0->unk_04);
+    return GraphicElementData_GetPriority(param0->unk_04);
 }
 
 void ov63_0222B294 (UnkStruct_ov63_0222BB38 * param0, BOOL param1)
 {
-    sub_02021CAC(param0->unk_04, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_04, param1);
 
     if (param0->unk_08) {
-        sub_02021CAC(param0->unk_08, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_08, param1);
     }
 }
 
 BOOL ov63_0222B2B0 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return sub_02021D34(param0->unk_04);
+    return GraphicElementData_GetDrawFlag(param0->unk_04);
 }
 
 int ov63_0222B2BC (const UnkStruct_ov63_0222BB38 * param0)
@@ -597,7 +597,7 @@ void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
         v0.y = param2 + 14 << FX32_SHIFT;
         v0.z = 0;
 
-        sub_02021C50(param0->unk_08, &v0);
+        GraphicElementData_SetPosition(param0->unk_08, &v0);
     }
 }
 
diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c
index a217a1f9c9..cfe1e34cda 100644
--- a/src/overlay063/ov63_0222CCE4.c
+++ b/src/overlay063/ov63_0222CCE4.c
@@ -248,7 +248,7 @@ u32 ov63_0222D034 (s16 param0, BOOL param1)
 
 u32 ov63_0222D050 (const UnkStruct_ov63_0222CE44 * param0)
 {
-    return sub_02021F48(ov63_0222B234(param0->unk_04));
+    return GraphicElementData_GetExplicitPaletteOffset(ov63_0222B234(param0->unk_04));
 }
 
 void ov63_0222D060 (UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1)
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 34e67c6c0f..54be7b014b 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -1242,8 +1242,8 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
 
         param0->unk_270[v1] = GraphicElementManager_AddElementEx(&v0[v1]);
 
-        sub_02021CC8(param0->unk_270[v1], 1);
-        sub_02021CAC(param0->unk_270[v1], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_270[v1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_270[v1], 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_270[v1], v1);
     }
 }
@@ -1262,7 +1262,7 @@ static void ov64_0222EA28 (UnkStruct_ov64_0222E21C * param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021CAC(param0->unk_270[v0], param1);
+        GraphicElementData_SetDrawFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -1271,7 +1271,7 @@ static void ov64_0222EA48 (UnkStruct_ov64_0222E21C * param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021CC8(param0->unk_270[v0], param1);
+        GraphicElementData_SetAnimateFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -2179,7 +2179,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     add r0, r1, #0
     ldr r0, [r0, r2]
     mov r1, #0
-    bl sub_02021CAC
+    bl GraphicElementData_SetDrawFlag
     add sp, #0x58
     pop {r3, r4, r5, r6, r7, pc}
     nop
@@ -2645,12 +2645,12 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     VecFx32 v0;
     u32 v1;
 
-    sub_02021CAC(param0->unk_104, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_104, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_104, 2);
 
     param0->unk_108 = 0;
 
-    sub_02021CC8(param0->unk_104, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_104, 1);
 
     v1 = param0->unk_04;
 
@@ -2659,7 +2659,7 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     v0.x <<= FX32_SHIFT;
     v0.y <<= FX32_SHIFT;
 
-    sub_02021C50(param0->unk_104, &v0);
+    GraphicElementData_SetPosition(param0->unk_104, &v0);
 
     G2_SetWndOBJInsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2, 0);
     G2_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1);
@@ -2690,8 +2690,8 @@ static void ov64_02230044 (UnkStruct_ov64_0222F0C4 * param0)
 {
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
 
-    sub_02021CAC(param0->unk_104, 0);
-    sub_02021CC8(param0->unk_104, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_104, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_104, 0);
 }
 
 static void ov64_02230074 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, const UnkStruct_ov64_0223221C * param2, u32 param3, u32 param4)
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 2b88e9f95e..6d21f6a16e 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -6789,7 +6789,7 @@ static void ov65_02234D6C (UnkStruct_ov65_0222EBE0 * param0)
 static void ov65_02234DA0 (UnkStruct_ov65_0222EBE0 * param0)
 {
     if (param0->unk_BE0.unk_238 == 2) {
-        sub_02021CAC(param0->unk_BE0.unk_21C[1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1);
         sub_020129D0(param0->unk_BE0.unk_234, 1);
     }
 
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 6372b50a61..b66dcc25ed 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -694,9 +694,9 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     param0->unk_1A0.unk_34 = GraphicElementManager_AddElementEx(&v0);
     param0->unk_1A0.unk_38 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CAC(param0->unk_1A0.unk_34, 0);
-    sub_02021CAC(param0->unk_1A0.unk_38, 0);
-    sub_02021CC8(param0->unk_1A0.unk_34, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_34, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_38, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_1A0.unk_34, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_1A0.unk_38, 1);
 }
 
@@ -719,13 +719,13 @@ static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0)
     v1.x = v0.unk_00 << FX32_SHIFT;
     v1.y = v0.unk_02 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_14.unk_1A0.unk_34, &v1);
-    sub_02021CAC(param0->unk_14.unk_1A0.unk_34, 1);
+    GraphicElementData_SetPosition(param0->unk_14.unk_1A0.unk_34, &v1);
+    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 1);
 }
 
 static void ov65_02235B78 (UnkStruct_ov65_02235130 * param0)
 {
-    sub_02021CAC(param0->unk_14.unk_1A0.unk_34, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 0);
 }
 
 static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222CC3C param1, u32 param2)
@@ -738,14 +738,14 @@ static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222
     v0.x = param1.unk_00 << FX32_SHIFT;
     v0.y = param1.unk_02 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_14.unk_1A0.unk_38, &v0);
-    sub_02021F58(param0->unk_14.unk_1A0.unk_38, param2);
-    sub_02021CAC(param0->unk_14.unk_1A0.unk_38, 1);
+    GraphicElementData_SetPosition(param0->unk_14.unk_1A0.unk_38, &v0);
+    GraphicElementData_SetPriority(param0->unk_14.unk_1A0.unk_38, param2);
+    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235BD8 (UnkStruct_ov65_02235130 * param0)
 {
-    sub_02021CAC(param0->unk_14.unk_1A0.unk_38, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 0);
 }
 
 static BOOL ov65_02235BE8 (UnkStruct_ov65_02235130 * param0)
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 74830b162a..7484845f7a 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -707,7 +707,7 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
         v2.heapID = param3;
 
         param0->unk_14 = GraphicElementManager_AddElement(&v2);
-        sub_02021CAC(param0->unk_14, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
     }
 
     {
@@ -901,13 +901,13 @@ static void ov68_0225D06C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
 
 static void ov68_0225D0F8 (UnkStruct_ov68_0225D0F8 * param0)
 {
-    sub_02021CAC(param0->unk_14, 1);
-    sub_02021C50(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
+    GraphicElementData_SetDrawFlag(param0->unk_14, 1);
+    GraphicElementData_SetPosition(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
 }
 
 static void ov68_0225D11C (UnkStruct_ov68_0225D0F8 * param0)
 {
-    sub_02021CC8(param0->unk_14, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_14, 1);
 }
 
 static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, SaveData * param2, u32 param3)
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index d30ba3cfd5..8779fe182e 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -2671,8 +2671,8 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
 
         param0->unk_3C[v0] = GraphicElementManager_AddElement(&v3);
 
-        sub_02021CC8(param0->unk_3C[v0], 1);
-        sub_02021CE4(param0->unk_3C[v0], FX32_ONE);
+        GraphicElementData_SetAnimateFlag(param0->unk_3C[v0], 1);
+        GraphicElementData_SetAnimSpeed(param0->unk_3C[v0], FX32_ONE);
     }
 
     ov69_0225EBEC(param0);
@@ -2737,7 +2737,7 @@ static void ov69_0225EBEC (UnkStruct_ov69_0225EB60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 12; v0++) {
-        sub_02021CAC(param0->unk_3C[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -2780,7 +2780,7 @@ static BOOL ov69_0225EC70 (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru
     }
 
     ov69_0225ED5C(&param0->unk_00[param1], param2);
-    sub_02021CAC(param0->unk_3C[param0->unk_38[param1]], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 1);
     ov69_0225EEC4(param0, param1);
 
     return 1;
@@ -2798,7 +2798,7 @@ static BOOL ov69_0225ECAC (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru
     ov69_0225EEC4(param0, param1);
 
     if (v0 == 1) {
-        sub_02021CAC(param0->unk_3C[param0->unk_38[param1]], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 0);
     }
 
     return v0;
@@ -2909,7 +2909,7 @@ static void ov69_0225EEC4 (UnkStruct_ov69_0225EB60 * param0, u32 param1)
     ov69_0225ED78(&param0->unk_00[param1], &v0);
 
     v1 = param0->unk_3C[param0->unk_38[param1]];
-    sub_02021C50(v1, &v0);
+    GraphicElementData_SetPosition(v1, &v0);
 }
 
 static u16 ov69_0225EEEC (u32 param0)
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 4458ec765c..17d96d57f0 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1698,8 +1698,8 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
         param0->unk_50[v2] = GraphicElementManager_AddElement(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_50[v2], v2);
-        sub_02021CC8(param0->unk_50[v2], 1);
-        sub_02021CAC(param0->unk_50[v2], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_50[v2], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_50[v2], 0);
     }
 
     param0->unk_3C = 0;
@@ -1834,7 +1834,7 @@ static void ov70_0225EF14 (UnkStruct_ov70_0225EC20 * param0, u16 * param1, u16 *
     param0->unk_3C = 0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021CAC(param0->unk_50[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_50[v0], 0);
     }
 }
 
@@ -1855,23 +1855,23 @@ static void ov70_0225EF70 (UnkStruct_ov70_0225EC20 * param0)
     u16 v0;
 
     if (param0->unk_3C == 0) {
-        sub_02021CAC(param0->unk_50[0], 0);
-        sub_02021CAC(param0->unk_50[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_50[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_50[1], 0);
         return;
     }
 
     sub_020014DC(param0->unk_30, &v0, NULL);
 
     if ((v0 <= 0)) {
-        sub_02021CAC(param0->unk_50[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_50[0], 0);
     } else {
-        sub_02021CAC(param0->unk_50[0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_50[0], 1);
     }
 
     if (v0 >= (param0->unk_3A - 7)) {
-        sub_02021CAC(param0->unk_50[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_50[1], 0);
     } else {
-        sub_02021CAC(param0->unk_50[1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_50[1], 1);
     }
 }
 
@@ -2751,7 +2751,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
         param0->unk_54 = GraphicElementManager_AddElement(&v4);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_54, v1);
-        sub_02021CAC(param0->unk_54, param5);
+        GraphicElementData_SetDrawFlag(param0->unk_54, param5);
     }
 }
 
@@ -3036,7 +3036,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
             param0->unk_7C[v0] = GraphicElementManager_AddElement(&v8);
 
-            sub_02021F24(param0->unk_7C[v0], v10->unk_01);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_7C[v0], v10->unk_01);
         }
     }
 
diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c
index 334cb5de4d..6a35b2dad0 100644
--- a/src/overlay071/ov71_0223B140.c
+++ b/src/overlay071/ov71_0223B140.c
@@ -238,9 +238,9 @@ int ov71_0223B140 (OverlayManager * param0, int * param1)
                 }
 
                 if (v5 == 4 - 1) {
-                    sub_02021CAC(v0->unk_30E4.unk_1C0[8 + v6], 1);
+                    GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[8 + v6], 1);
                 } else if (v5 == 4) {
-                    sub_02021CAC(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
+                    GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
                 }
             }
         }
@@ -280,8 +280,8 @@ int ov71_0223B388 (OverlayManager * param0, int * param1)
                 v0->unk_3350 = 1;
                 v0->unk_3381 = 1;
 
-                sub_02021CAC(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
-                sub_02021CC8(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                GraphicElementData_SetAnimateFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
                 SpriteActor_SetSpriteAnimActive(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
 
                 v0->unk_337E = 0;
@@ -1110,10 +1110,10 @@ static void ov71_0223C1AC (UnkStruct_ov71_0223B620 * param0, const u8 param1)
                 }
 
                 if (v1 == 4 - 1) {
-                    sub_02021CAC(param0->unk_30E4.unk_1C0[8 + param1], 1);
+                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 1);
                 } else if (v1 == 4) {
-                    sub_02021CAC(param0->unk_30E4.unk_1C0[8 + param1], 0);
-                    sub_02021CAC(param0->unk_30E4.unk_1C0[(8 + 8) + param1], 1);
+                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 0);
+                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[(8 + 8) + param1], 1);
                 }
             }
         }
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 5ef40b410f..86a52fb85b 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -129,11 +129,11 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.position.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
             v3.position.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
             param0->unk_1C0[v0] = GraphicElementManager_AddElementEx(&v3);
-            sub_02021CC8(param0->unk_1C0[v0], 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_1C0[v0], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v0], v0);
 
             if (!param1[v0]) {
-                sub_02021CAC(param0->unk_1C0[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_1C0[v0], 0);
             }
         }
 
@@ -145,9 +145,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
-                sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
+                GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 8);
-                sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
 
             v2 += 8;
@@ -157,9 +157,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
-                sub_02021CC8(param0->unk_1C0[v2 + v0], 1);
+                GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
                 SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 9);
-                sub_02021CAC(param0->unk_1C0[v2 + v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
         }
         v2 += 8;
@@ -170,9 +170,9 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.position.y = FX32_ONE * (17 * 8);
             v3.priority = 0;
             param0->unk_1C0[v2] = GraphicElementManager_AddElementEx(&v3);
-            sub_02021CC8(param0->unk_1C0[v2], 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2], 10);
-            sub_02021CAC(param0->unk_1C0[v2], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_1C0[v2], 0);
         }
     }
 }
@@ -208,7 +208,7 @@ void ov71_0223D298 (UnkStruct_ov71_0223D238 * param0, const u8 param1, const u8
     GF_ASSERT(param1 < 8);
     GF_ASSERT(param2 <= 3);
 
-    v0 = sub_02021F9C(param0->unk_1C0[param1]);
+    v0 = GraphicElementData_GetPaletteProxy(param0->unk_1C0[param1]);
     v1 = NNS_G2dGetImagePaletteLocation(v0, NNS_G2D_VRAM_TYPE_2DMAIN);
     v1 += param1 * (16 * 2);
     v3 = param0->unk_244[param1]->pRawData;
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 5e1d1da79e..36dc7c24c8 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -539,12 +539,12 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
 
             param0->unk_2B4[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_2B4[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_2B4[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
-            sub_02021E90(param0->unk_2B4[v0], 0);
+            GraphicElementData_SetExplicitPalette(param0->unk_2B4[v0], 0);
 
             if (v0 == 0) {
-                sub_02021E80(param0->unk_2B4[v0], 2);
+                GraphicElementData_SetExplicitPriority(param0->unk_2B4[v0], 2);
             }
         }
     }
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index e8a288d015..00312317c6 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -600,7 +600,7 @@ void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0)
         v4 = Pokemon_GetValue(v5, MON_DATA_FORM, NULL);
         v3 = PokeIconPaletteIndex(v2, v4, v1);
 
-        sub_02021F24(param0->unk_2FC[v0]->unk_00, v3);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_2FC[v0]->unk_00, v3);
         sub_0200D364(param0->unk_2FC[v0], 1);
     }
 }
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 1ef833190c..8694ef72ab 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -272,8 +272,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[0] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[0], 0);
-        sub_02021CAC(param0->unk_250[0], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_250[0], 0);
 
         ov77_021D54E8(1, param0, 0, &v2, &param0->unk_294[2], 1, NNS_G2D_VRAM_TYPE_2DSUB);
 
@@ -281,8 +281,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
         param0->unk_250[1] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[1], 0);
-        sub_02021CAC(param0->unk_250[1], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_250[1], 0);
 
         ov77_021D54E8(2, param0, 0, &v2, &param0->unk_294[1], 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -290,8 +290,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[2] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[2], 0);
-        sub_02021CAC(param0->unk_250[2], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[2], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_250[2], 0);
 
         ov77_021D54E8(3, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -299,8 +299,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[3] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[3], 1);
-        sub_02021CAC(param0->unk_250[3], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[3], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[3], 0);
 
         ov77_021D54E8(6, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -308,8 +308,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (14 * 8);
         param0->unk_250[10] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[10], 1);
-        sub_02021CAC(param0->unk_250[10], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[10], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[10], 0);
 
         ov77_021D54E8(7, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -317,9 +317,9 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (12 * 8);
         param0->unk_250[11] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[11], 1);
-        sub_02021CAC(param0->unk_250[11], 0);
-        sub_02021CF8(param0->unk_250[11], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[11], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[11], 0);
+        GraphicElementData_SetAffineOverwriteMode(param0->unk_250[11], 1);
 
         ov77_021D54E8(8, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
@@ -327,9 +327,9 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
         param0->unk_250[12] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[12], 1);
-        sub_02021CAC(param0->unk_250[12], 0);
-        sub_02021CF8(param0->unk_250[12], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[12], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[12], 0);
+        GraphicElementData_SetAffineOverwriteMode(param0->unk_250[12], 1);
 
         ov77_021D54E8(9, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -337,13 +337,13 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (0xd * 8);
         param0->unk_250[13] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[13], 1);
-        sub_02021CAC(param0->unk_250[13], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[13], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[13], 0);
 
         param0->unk_250[14] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[14], 1);
-        sub_02021CAC(param0->unk_250[14], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[14], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[14], 0);
 
         ov77_021D54E8(10, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
@@ -351,13 +351,13 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
         v2.position.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
         param0->unk_250[15] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[15], 1);
-        sub_02021CAC(param0->unk_250[15], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[15], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[15], 0);
 
         param0->unk_250[16] = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_250[16], 1);
-        sub_02021CAC(param0->unk_250[16], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_250[16], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_250[16], 0);
 
         for (v0 = 0; v0 < 6; v0++) {
             ov77_021D54E8(4, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -366,8 +366,8 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
             v2.position.y = FX32_ONE * v5[v0];
             param0->unk_250[v3[v0]] = GraphicElementManager_AddElementEx(&v2);
 
-            sub_02021CC8(param0->unk_250[v3[v0]], 1);
-            sub_02021CAC(param0->unk_250[v3[v0]], 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_250[v3[v0]], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_250[v3[v0]], 0);
         }
     }
 }
@@ -385,8 +385,8 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
         for (v0 = 0; v0 < 16; v0++) {
             v3 = ov77_021D6794(param1, v0);
             (*v3) = GraphicElementManager_AddElementEx(&v2);
-            sub_02021CC8(*v3, 0);
-            sub_02021CAC(*v3, 0);
+            GraphicElementData_SetAnimateFlag(*v3, 0);
+            GraphicElementData_SetDrawFlag(*v3, 0);
         }
     }
 }
@@ -398,7 +398,7 @@ void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 
     for (v0 = 0; v0 < 16; v0++) {
         v1 = ov77_021D6794(param1, v0);
-        sub_02021CAC(*v1, 0);
+        GraphicElementData_SetDrawFlag(*v1, 0);
     }
 }
 
@@ -413,29 +413,29 @@ void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0)
 
 void ov77_021D603C (UnkStruct_ov77_021D5564 * param0, const u8 param1, const u8 param2)
 {
-    sub_02021CAC(param0->unk_250[param1], param2);
+    GraphicElementData_SetDrawFlag(param0->unk_250[param1], param2);
 }
 
 void ov77_021D6050 (UnkStruct_ov77_021D5564 * param0, const u8 param1)
 {
-    sub_02021CC8(param0->unk_250[0], param1);
-    sub_02021CC8(param0->unk_250[2], param1);
-    sub_02021CC8(param0->unk_250[1], param1);
+    GraphicElementData_SetAnimateFlag(param0->unk_250[0], param1);
+    GraphicElementData_SetAnimateFlag(param0->unk_250[2], param1);
+    GraphicElementData_SetAnimateFlag(param0->unk_250[1], param1);
 }
 
 void ov77_021D607C (UnkStruct_ov77_021D5564 * param0)
 {
     VecFx32 v0;
 
-    v0 = *sub_02021D28(param0->unk_250[1]);
+    v0 = *GraphicElementData_GetPosition(param0->unk_250[1]);
     v0.x -= 0x200;
 
-    sub_02021C50(param0->unk_250[1], &v0);
+    GraphicElementData_SetPosition(param0->unk_250[1], &v0);
 
-    v0 = *sub_02021D28(param0->unk_250[2]);
+    v0 = *GraphicElementData_GetPosition(param0->unk_250[2]);
     v0.x += 0x200;
 
-    sub_02021C50(param0->unk_250[2], &v0);
+    GraphicElementData_SetPosition(param0->unk_250[2], &v0);
 }
 
 BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -451,29 +451,29 @@ BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1)
     }
 
     if (param1 < (53 * 30 - 15)) {
-        v0 = *sub_02021D28(param0->unk_250[3]);
+        v0 = *GraphicElementData_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (FX32_ONE * ((128 + 48)))) {
             v0.x = (FX32_ONE * ((128 + 48)));
-            sub_02021C50(param0->unk_250[3], &v0);
+            GraphicElementData_SetPosition(param0->unk_250[3], &v0);
             return 1;
         }
 
-        sub_02021C50(param0->unk_250[3], &v0);
+        GraphicElementData_SetPosition(param0->unk_250[3], &v0);
         return 0;
     } else {
-        v0 = *sub_02021D28(param0->unk_250[3]);
+        v0 = *GraphicElementData_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (256 + 64) * FX32_ONE) {
             v0.x = (256 + 64) * FX32_ONE;
-            sub_02021C50(param0->unk_250[3], &v0);
+            GraphicElementData_SetPosition(param0->unk_250[3], &v0);
             ov77_021D603C(param0, 3, 0);
             return 1;
         }
 
-        sub_02021C50(param0->unk_250[3], &v0);
+        GraphicElementData_SetPosition(param0->unk_250[3], &v0);
         return 0;
     }
 }
@@ -491,29 +491,29 @@ BOOL ov77_021D61B8 (UnkStruct_ov77_021D5564 * param0, int param1)
     }
 
     if (param1 < ((53 * 30 - 15))) {
-        v0 = *sub_02021D28(param0->unk_250[10]);
+        v0 = *GraphicElementData_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= (FX32_ONE * ((128 - 48)))) {
             v0.x = (FX32_ONE * ((128 - 48)));
-            sub_02021C50(param0->unk_250[10], &v0);
+            GraphicElementData_SetPosition(param0->unk_250[10], &v0);
             return 1;
         }
 
-        sub_02021C50(param0->unk_250[10], &v0);
+        GraphicElementData_SetPosition(param0->unk_250[10], &v0);
         return 0;
     } else {
-        v0 = *sub_02021D28(param0->unk_250[10]);
+        v0 = *GraphicElementData_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= -64 * FX32_ONE) {
             v0.x = -64 * FX32_ONE;
-            sub_02021C50(param0->unk_250[10], &v0);
+            GraphicElementData_SetPosition(param0->unk_250[10], &v0);
             ov77_021D603C(param0, 10, 0);
             return 1;
         }
 
-        sub_02021C50(param0->unk_250[10], &v0);
+        GraphicElementData_SetPosition(param0->unk_250[10], &v0);
         return 0;
     }
 }
@@ -532,7 +532,7 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v3 = 13;
     }
 
-    v0 = sub_02021D28(param0->unk_250[v2]);
+    v0 = GraphicElementData_GetPosition(param0->unk_250[v2]);
     v1 = *v0;
     v1.x += param1;
 
@@ -540,11 +540,11 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v1.x -= 256 * FX32_ONE;
     }
 
-    sub_02021C50(param0->unk_250[v2], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[v2], &v1);
     v1.x -= 256 * FX32_ONE;
-    sub_02021C50(param0->unk_250[v2 + 1], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[v2 + 1], &v1);
 
-    v0 = sub_02021D28(param0->unk_250[v3]);
+    v0 = GraphicElementData_GetPosition(param0->unk_250[v3]);
     v1 = *v0;
     v1.x -= param1;
 
@@ -552,9 +552,9 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v1.x += 256 * FX32_ONE;
     }
 
-    sub_02021C50(param0->unk_250[v3], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[v3], &v1);
     v1.x += 256 * FX32_ONE;
-    sub_02021C50(param0->unk_250[v3 + 1], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[v3 + 1], &v1);
 }
 
 void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -564,34 +564,34 @@ void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1)
 
     if (param1 == 0) {
         if (gCoreSys.unk_65 == 0) {
-            sub_02021F24(param0->unk_250[13], 0);
-            sub_02021F24(param0->unk_250[14], 0);
-            sub_02021F24(param0->unk_250[15], 1);
-            sub_02021F24(param0->unk_250[16], 1);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 1);
         } else {
-            sub_02021F24(param0->unk_250[13], 1);
-            sub_02021F24(param0->unk_250[14], 1);
-            sub_02021F24(param0->unk_250[15], 0);
-            sub_02021F24(param0->unk_250[16], 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 1);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 1);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 0);
         }
     } else {
-        sub_02021F24(param0->unk_250[13], 2);
-        sub_02021F24(param0->unk_250[14], 2);
-        sub_02021F24(param0->unk_250[15], 2);
-        sub_02021F24(param0->unk_250[16], 2);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 2);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 2);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 2);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 2);
     }
 
-    v0 = sub_02021D28(param0->unk_250[13]);
+    v0 = GraphicElementData_GetPosition(param0->unk_250[13]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    sub_02021C50(param0->unk_250[13], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[13], &v1);
 
-    v0 = sub_02021D28(param0->unk_250[15]);
+    v0 = GraphicElementData_GetPosition(param0->unk_250[15]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    sub_02021C50(param0->unk_250[15], &v1);
+    GraphicElementData_SetPosition(param0->unk_250[15], &v1);
 }
 
 void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -609,24 +609,24 @@ void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1)
         (void)0;
     }
 
-    v0 = sub_02021D30(param0->unk_250[11]);
-    sub_02021C94(param0->unk_250[11], v0 + 0x1c00 + v3);
+    v0 = GraphicElementData_GetAffineZRotation(param0->unk_250[11]);
+    GraphicElementData_SetAffineZRotation(param0->unk_250[11], v0 + 0x1c00 + v3);
 
-    v0 = sub_02021D30(param0->unk_250[12]);
-    sub_02021C94(param0->unk_250[12], v0 - 0x1c00 - v3);
+    v0 = GraphicElementData_GetAffineZRotation(param0->unk_250[12]);
+    GraphicElementData_SetAffineZRotation(param0->unk_250[12], v0 - 0x1c00 - v3);
 
     if (param1 >= (65 * 30 - 15 - 15 - 45 - 15)) {
-        v1 = sub_02021D28(param0->unk_250[11]);
+        v1 = GraphicElementData_GetPosition(param0->unk_250[11]);
         v2 = *v1;
         v2.x += 0x1000;
 
-        sub_02021C50(param0->unk_250[11], &v2);
+        GraphicElementData_SetPosition(param0->unk_250[11], &v2);
 
-        v1 = sub_02021D28(param0->unk_250[12]);
+        v1 = GraphicElementData_GetPosition(param0->unk_250[12]);
         v2 = *v1;
         v2.x -= 0x1000;
 
-        sub_02021C50(param0->unk_250[12], &v2);
+        GraphicElementData_SetPosition(param0->unk_250[12], &v2);
     }
 }
 
@@ -652,28 +652,28 @@ void ov77_021D6530 (UnkStruct_ov77_021D5564 * param0, const int param1)
 
     if (param1 >= (1460 - 15)) {
         for (v0 = 0; v0 < 3; v0++) {
-            v1 = *sub_02021D28(param0->unk_250[v2[v0]]);
+            v1 = *GraphicElementData_GetPosition(param0->unk_250[v2[v0]]);
             v1.x -= Unk_ov77_021D79AC[v0];
             v1.y -= (FX32_ONE * 4);
-            sub_02021C50(param0->unk_250[v2[v0]], &v1);
+            GraphicElementData_SetPosition(param0->unk_250[v2[v0]], &v1);
         }
     }
 
     if (param1 >= (1490 - 15 + 15)) {
         for (v0 = 0; v0 < 1; v0++) {
-            v1 = *sub_02021D28(param0->unk_250[v3[v0]]);
+            v1 = *GraphicElementData_GetPosition(param0->unk_250[v3[v0]]);
             v1.x -= Unk_ov77_021D79A0[v0];
             v1.y -= (FX32_ONE * 3);
-            sub_02021C50(param0->unk_250[v3[v0]], &v1);
+            GraphicElementData_SetPosition(param0->unk_250[v3[v0]], &v1);
         }
     }
 
     if (param1 >= (1510 - 15 + 15)) {
         for (v0 = 0; v0 < 2; v0++) {
-            v1 = *sub_02021D28(param0->unk_250[v4[v0]]);
+            v1 = *GraphicElementData_GetPosition(param0->unk_250[v4[v0]]);
             v1.x -= Unk_ov77_021D79A4[v0];
             v1.y -= (FX32_ONE * 3);
-            sub_02021C50(param0->unk_250[v4[v0]], &v1);
+            GraphicElementData_SetPosition(param0->unk_250[v4[v0]], &v1);
         }
     }
 }
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 7bec85c512..ce9f6309cd 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -251,8 +251,8 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
 
         param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElementEx(&v2);
 
-        sub_02021CC8(param0->unk_1B0[v0].unk_04, 0);
-        sub_02021CAC(param0->unk_1B0[v0].unk_04, 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_1B0[v0].unk_04, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1B0[v0].unk_04, 0);
     }
 }
 
@@ -302,15 +302,15 @@ static void ov77_021D6A44 (UnkStruct_ov77_021D6ADC * param0, const u8 param1, co
         {
             VecFx32 v3;
 
-            v3 = *sub_02021D28(v1->unk_04);
+            v3 = *GraphicElementData_GetPosition(v1->unk_04);
             v3.x = FX32_ONE * (64 + (LCRNG_Next() % 128));
             v3.y = FX32_ONE * (v2 + (LCRNG_Next() % 64));
 
-            sub_02021C50(v1->unk_04, &v3);
+            GraphicElementData_SetPosition(v1->unk_04, &v3);
         }
 
-        sub_02021CC8(v1->unk_04, 1);
-        sub_02021CAC(v1->unk_04, 1);
+        GraphicElementData_SetAnimateFlag(v1->unk_04, 1);
+        GraphicElementData_SetDrawFlag(v1->unk_04, 1);
 
         v1->unk_08 = SysTask_Start(ov77_021D6B48, v1, 20);
     }
@@ -357,10 +357,10 @@ static void ov77_021D6B48 (SysTask * param0, void * param1)
     {
         VecFx32 v1;
 
-        v1 = *sub_02021D28(v0->unk_04);
+        v1 = *GraphicElementData_GetPosition(v0->unk_04);
         v1.y += (FX32_ONE * 3);
 
-        sub_02021C50(v0->unk_04, &v1);
+        GraphicElementData_SetPosition(v0->unk_04, &v1);
     }
 
     v0->unk_01++;
@@ -369,8 +369,8 @@ static void ov77_021D6B48 (SysTask * param0, void * param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        sub_02021CC8(v0->unk_04, 0);
-        sub_02021CAC(v0->unk_04, 0);
+        GraphicElementData_SetAnimateFlag(v0->unk_04, 0);
+        GraphicElementData_SetDrawFlag(v0->unk_04, 0);
     }
 }
 
@@ -393,19 +393,19 @@ static void ov77_021D6BAC (UnkStruct_ov77_021D6734 * param0, const u8 param1, in
         {
             VecFx32 v3;
 
-            v3 = *sub_02021D28(v2->unk_04);
+            v3 = *GraphicElementData_GetPosition(v2->unk_04);
             v3.x = FX32_ONE * ((16 - 6) + (LCRNG_Next() % 224));
             v3.y = FX32_ONE * (192 + (64 - 6) + (LCRNG_Next() % 56));
 
-            sub_02021C50(v2->unk_04, &v3);
+            GraphicElementData_SetPosition(v2->unk_04, &v3);
         }
 
-        sub_02021CC8(v2->unk_04, 1);
+        GraphicElementData_SetAnimateFlag(v2->unk_04, 1);
 
         if (param2 == 0) {
-            sub_02021CAC(v2->unk_04, 1);
+            GraphicElementData_SetDrawFlag(v2->unk_04, 1);
         } else {
-            sub_02021CAC(v2->unk_04, 0);
+            GraphicElementData_SetDrawFlag(v2->unk_04, 0);
         }
 
         v2->unk_08 = SysTask_Start(ov77_021D6C44, v2, 20);
@@ -422,7 +422,7 @@ static void ov77_021D6C44 (SysTask * param0, void * param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        sub_02021CC8(v0->unk_04, 0);
-        sub_02021CAC(v0->unk_04, 0);
+        GraphicElementData_SetAnimateFlag(v0->unk_04, 0);
+        GraphicElementData_SetDrawFlag(v0->unk_04, 0);
     }
 }
diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c
index f71533f0d2..884e1b0c1e 100644
--- a/src/overlay079/ov79_021D0D80.c
+++ b/src/overlay079/ov79_021D0D80.c
@@ -752,12 +752,12 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         param0->unk_1C0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[v0]);
-        sub_02021CAC(param0->unk_1C0[v0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1C0[v0], 1);
     }
 
-    sub_02021CC8(param0->unk_1C0[0], 0);
-    sub_02021CC8(param0->unk_1C0[1], 1);
-    sub_02021CC8(param0->unk_1C0[2], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_1C0[0], 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 1);
 
     for (v0 = 0; v0 < 5; v0++) {
         static const struct {
@@ -772,7 +772,7 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
         param0->unk_1CC[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[3]);
 
-        sub_02021CAC(param0->unk_1CC[v0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_1CC[v0], v0 + 3);
         SpriteActor_SetPositionXY(param0->unk_1CC[v0], v2[v0].unk_00, v2[v0].unk_02);
     }
@@ -791,11 +791,11 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
         param0->unk_1E0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[4]);
 
-        sub_02021CAC(param0->unk_1E0[v0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1E0[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_1E0[v0], v0 * 3);
-        sub_02021CE4(param0->unk_1E0[v0], FX32_CONST(2));
-        sub_02021E90(param0->unk_1E0[v0], v0 + 2);
-        sub_02021CC8(param0->unk_1E0[v0], 0);
+        GraphicElementData_SetAnimSpeed(param0->unk_1E0[v0], FX32_CONST(2));
+        GraphicElementData_SetExplicitPalette(param0->unk_1E0[v0], v0 + 2);
+        GraphicElementData_SetAnimateFlag(param0->unk_1E0[v0], 0);
         SpriteActor_SetPositionXY(param0->unk_1E0[v0], v3[v0].unk_00, v3[v0].unk_02);
     }
 
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 20b3344380..6b17f95398 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -216,13 +216,13 @@ void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2)
     switch (param2) {
     case 0:
         SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3);
-        sub_02021CC8(param0->unk_1E0[param1], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 0);
         sub_0201C04C(
             &param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         break;
     case 1:
         sub_02021DE0(param0->unk_1E0[param1]);
-        sub_02021CC8(param0->unk_1E0[param1], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
@@ -238,7 +238,7 @@ void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2)
         break;
     case 4:
         SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3 + 1);
-        sub_02021CC8(param0->unk_1E0[param1], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
@@ -289,16 +289,16 @@ static void ov79_021D1D20 (UnkStruct_ov79_021D0E1C * param0, UnkStruct_020989DC
 
     if (param1 == NULL) {
         for (v0 = 0; v0 < 5; v0++) {
-            sub_02021CAC(param0->unk_1CC[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
         return;
     }
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_20_val2 & v1) {
-            sub_02021CAC(param0->unk_1CC[v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 1);
         } else {
-            sub_02021CAC(param0->unk_1CC[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
 
         v1 <<= 1;
@@ -330,15 +330,15 @@ static void ov79_021D1D94 (BmpList * param0, u32 param1, u8 param2)
     SpriteActor_SetPositionXY(v0->unk_1C0[0], 105, v3 * 16 + 40);
 
     if (v2 == 0) {
-        sub_02021CAC(v0->unk_1C0[1], 0);
+        GraphicElementData_SetDrawFlag(v0->unk_1C0[1], 0);
     } else {
-        sub_02021CAC(v0->unk_1C0[1], 1);
+        GraphicElementData_SetDrawFlag(v0->unk_1C0[1], 1);
     }
 
     if (v2 < (v0->unk_1C - 6)) {
-        sub_02021CAC(v0->unk_1C0[2], 1);
+        GraphicElementData_SetDrawFlag(v0->unk_1C0[2], 1);
     } else {
-        sub_02021CAC(v0->unk_1C0[2], 0);
+        GraphicElementData_SetDrawFlag(v0->unk_1C0[2], 0);
     }
 
     BGL_WindowColor(&(v0->unk_E8[1]), ((0 << 4) | 0), 0, 0, 10 * 8, 2 * 8);
diff --git a/src/overlay079/ov79_021D20F4.c b/src/overlay079/ov79_021D20F4.c
index 194676880c..661c9f0980 100644
--- a/src/overlay079/ov79_021D20F4.c
+++ b/src/overlay079/ov79_021D20F4.c
@@ -83,12 +83,12 @@ void ov79_021D21F8 (UnkStruct_ov79_021D0E1C * param0)
 void ov79_021D2214 (UnkStruct_ov79_021D0E1C * param0, BOOL param1)
 {
     if (param1 == 0) {
-        sub_02021E90(param0->unk_1C0[0], 0);
-        sub_02021CC8(param0->unk_1C0[1], 1);
-        sub_02021CC8(param0->unk_1C0[2], 1);
+        GraphicElementData_SetExplicitPalette(param0->unk_1C0[0], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 1);
     } else {
-        sub_02021E90(param0->unk_1C0[0], 9);
-        sub_02021CC8(param0->unk_1C0[1], 0);
-        sub_02021CC8(param0->unk_1C0[2], 0);
+        GraphicElementData_SetExplicitPalette(param0->unk_1C0[0], 9);
+        GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 0);
     }
 }
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 2e2a972200..1223602a37 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -656,12 +656,12 @@ static int ov79_021D2A04 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2
     param1->unk_0C.unk_58 = 24;
     param1->unk_0C.unk_54 = 0;
 
-    sub_02021C50(param1->unk_C4, &param1->unk_0C.unk_00);
+    GraphicElementData_SetPosition(param1->unk_C4, &param1->unk_0C.unk_00);
     VEC_Subtract(&param1->unk_0C.unk_00, &param1->unk_0C.unk_0C, &v0);
     ov79_021D2268(&param1->unk_0C.unk_3C, &v0, FX32_CONST(24));
 
-    sub_02021CF8(param1->unk_C4, 1);
-    sub_02021C70(param1->unk_C4, &param1->unk_0C.unk_24);
+    GraphicElementData_SetAffineOverwriteMode(param1->unk_C4, 1);
+    GraphicElementData_SetAffineScale(param1->unk_C4, &param1->unk_0C.unk_24);
 
     ov79_021D29B4(param1, 0, ov79_021D2C50);
     ov79_021D29B4(param1, 1, ov79_021D2D7C);
@@ -775,9 +775,9 @@ static void ov79_021D2C50 (SysTask * param0, void * param1)
     VEC_Subtract(&v2->unk_24, &v2->unk_30, &v3);
 
     ov79_021D2268(&v2->unk_3C, &v3, FX32_CONST(v0->unk_04));
-    sub_02021CAC(v1->unk_C4, 1);
-    sub_02021CF8(v1->unk_C4, 1);
-    sub_02021C70(v1->unk_C4, &v2->unk_24);
+    GraphicElementData_SetDrawFlag(v1->unk_C4, 1);
+    GraphicElementData_SetAffineOverwriteMode(v1->unk_C4, 1);
+    GraphicElementData_SetAffineScale(v1->unk_C4, &v2->unk_24);
     SysTask_SetCallback(param0, ov79_021D2CEC);
 }
 
@@ -791,13 +791,13 @@ static void ov79_021D2CEC (SysTask * param0, void * param1)
     v3.x = v2->unk_24.x - FX_Mul(v2->unk_3C.x, v0->unk_0C);
     v3.y = v2->unk_24.y - FX_Mul(v2->unk_3C.y, v0->unk_0C);
 
-    sub_02021C70(v1->unk_C4, &v3);
+    GraphicElementData_SetAffineScale(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
 
     if (v0->unk_04 == 0) {
-        sub_02021CAC(v1->unk_C4, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_C4, 0);
         ov79_021D29E4(v0);
     }
 }
@@ -822,7 +822,7 @@ static void ov79_021D2D7C (SysTask * param0, void * param1)
     v2->unk_48 = FX_Div(FX32_CONST(180), FX32_CONST(v0->unk_04));
     v2->unk_4C = FX_Div(FX32_CONST(1), FX32_CONST(v0->unk_04));
 
-    sub_02021C50(v1->unk_C4, &v2->unk_00);
+    GraphicElementData_SetPosition(v1->unk_C4, &v2->unk_00);
     SysTask_SetCallback(param0, ov79_021D2E74);
 }
 
@@ -842,7 +842,7 @@ static void ov79_021D2E74 (SysTask * param0, void * param1)
     v5 = FX32_ONE;
     v3.y += FX_Mul(v4, v5);
 
-    sub_02021C50(v1->unk_C4, &v3);
+    GraphicElementData_SetPosition(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index 32665e712f..e03462b261 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -916,15 +916,15 @@ static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0)
 
     v0->unk_100 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[0]);
 
-    sub_02021CAC(v0->unk_100, 0);
-    sub_02021CE4(v0->unk_100, FX32_ONE);
+    GraphicElementData_SetDrawFlag(v0->unk_100, 0);
+    GraphicElementData_SetAnimSpeed(v0->unk_100, FX32_ONE);
     SpriteActor_SetPositionXY(v0->unk_100, 128, 108);
 
     v0->unk_104 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[1]);
 
-    sub_02021CAC(v0->unk_104, 1);
-    sub_02021CE4(v0->unk_104, FX32_CONST(2));
-    sub_02021CC8(v0->unk_104, 1);
+    GraphicElementData_SetDrawFlag(v0->unk_104, 1);
+    GraphicElementData_SetAnimSpeed(v0->unk_104, FX32_CONST(2));
+    GraphicElementData_SetAnimateFlag(v0->unk_104, 1);
     SpriteActor_SetPositionXY(v0->unk_104, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 
     if (param0->unk_2C->unk_0C == 0) {
@@ -935,7 +935,7 @@ static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0)
 
     v0->unk_108 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &v1);
 
-    sub_02021CAC(v0->unk_108, 1);
+    GraphicElementData_SetDrawFlag(v0->unk_108, 1);
     SpriteActor_SetAnimFrame(v0->unk_108, param0->unk_2C->unk_0C);
     SpriteActor_SetPositionXY(v0->unk_108, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 }
@@ -1027,8 +1027,8 @@ static void ov80_021D259C (UnkStruct_ov80_021D2A08 * param0)
         v2->unk_0C = sub_0200CA08(param0->unk_D8, param0->unk_DC, &(Unk_ov80_021D30E8));
 
         SpriteActor_SetPositionXY(v2->unk_0C, v2->unk_00 * 7 + 25, v2->unk_04 * 7 + -34);
-        sub_02021F58(v2->unk_0C, 2);
-        sub_02021CAC(v2->unk_0C, 0);
+        GraphicElementData_SetPriority(v2->unk_0C, 2);
+        GraphicElementData_SetDrawFlag(v2->unk_0C, 0);
     }
 
     if (v0->unk_A4.unk_00 == 0) {
@@ -1047,8 +1047,8 @@ static void ov80_021D26AC (SysTask * param0, void * param1)
         return;
     }
 
-    sub_02021CAC(v0->unk_0C[v0->unk_0B].unk_0C, 0);
-    sub_02021CAC(v0->unk_0C[v0->unk_0A].unk_0C, 1);
+    GraphicElementData_SetDrawFlag(v0->unk_0C[v0->unk_0B].unk_0C, 0);
+    GraphicElementData_SetDrawFlag(v0->unk_0C[v0->unk_0A].unk_0C, 1);
 
     v0->unk_0B = v0->unk_0A;
     v0->unk_0A = (v0->unk_0A + (v0->unk_00 - 1)) % v0->unk_00;
@@ -1096,8 +1096,8 @@ static void ov80_021D2774 (SysTask * param0, void * param1)
 
     switch (v1->unk_04) {
     case 0:
-        sub_02021CAC(v1->unk_100, 1);
-        sub_02021CC8(v1->unk_100, 1);
+        GraphicElementData_SetDrawFlag(v1->unk_100, 1);
+        GraphicElementData_SetAnimateFlag(v1->unk_100, 1);
         SpriteActor_SetAnimFrame(v1->unk_100, 1);
         Sound_PlayEffect(1508);
         v1->unk_04++;
@@ -1114,8 +1114,8 @@ static void ov80_021D2774 (SysTask * param0, void * param1)
 
         break;
     case 2:
-        sub_02021CAC(v1->unk_100, 0);
-        sub_02021CC8(v1->unk_100, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_100, 0);
+        GraphicElementData_SetAnimateFlag(v1->unk_100, 0);
 
         v0->unk_14 = 0;
         sub_0200F174(4, 13, 2, 0x0, 8, 1, v0->unk_04);
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 5368641754..9f64663dc8 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -71,13 +71,13 @@ UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (SpriteRenderer * param0, SpriteGfxHandl
         v1->unk_14 = param2[v3];
         v1->unk_18 = sub_0200CA08(param0, param1, &v4);
 
-        sub_02021CAC(v1->unk_18, 1);
+        GraphicElementData_SetDrawFlag(v1->unk_18, 1);
 
         if (v1->unk_14) {
-            sub_02021E90(v1->unk_18, 5 + v1->unk_00.unk_09 + v1->unk_14);
+            GraphicElementData_SetExplicitPalette(v1->unk_18, 5 + v1->unk_00.unk_09 + v1->unk_14);
         } else {
             if ((v1->unk_00.unk_0A == 1) || (v1->unk_00.unk_0A == 2)) {
-                sub_02021CAC(v1->unk_18, 0);
+                GraphicElementData_SetDrawFlag(v1->unk_18, 0);
             }
         }
 
@@ -95,7 +95,7 @@ void ov80_021D2C1C (UnkStruct_ov80_021D2C1C * param0)
 
     for (v1 = 0; v1 < param0->unk_00; v1++) {
         v0 = &param0->unk_08[v1];
-        sub_02021C98(v0->unk_18, 0, 0);
+        GraphicElementData_SetAffineZRotationEx(v0->unk_18, 0, 0);
         GraphicElementData_Delete(v0->unk_18);
     }
 
@@ -154,7 +154,7 @@ int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int
 
     if ((v0 == NULL) || (v0->unk_14 == 0)) {
         if (param0->unk_04 != NULL) {
-            sub_02021E90(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
 
         param0->unk_04 = NULL;
@@ -166,7 +166,7 @@ int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int
         param0->unk_03 = 0;
     } else {
         if ((v0->unk_00.unk_0A == 2) || (v0->unk_00.unk_0A == 3)) {
-            sub_02021E90(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
     }
 
@@ -184,9 +184,9 @@ void ov80_021D2D28 (UnkStruct_ov80_021D2C1C * param0, int param1)
     }
 
     if (param0->unk_03 == 0) {
-        sub_02021E90(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
+        GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
     } else {
-        sub_02021E90(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+        GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
     }
 
     param0->unk_02++;
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 0a3c43d61f..7fa70c549c 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -409,10 +409,10 @@ void ov83_0223DB4C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C *
             ov83_0223D7A8(param2, &param0->unk_28[v1], v2, (70 + ((param1->unk_00[v0].unk_00) - 149)), 1, (6 + ((param1->unk_00[v0].unk_00) - 149)), 5, 4, 1000 + v0, param4);
 
             param0->unk_08[v1] = ov83_0223D9A8(param2, &param0->unk_28[v1], 0, 0, 0, 0, param4);
-            sub_02021CAC(param0->unk_08[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_08[v1], 0);
 
             param0->unk_18[v1] = ov83_0223D9A8(param2, &param3[0], 0, 0, 0, 0, param4);
-            sub_02021CAC(param0->unk_18[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_18[v1], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_18[v1], 1);
             v1++;
         }
@@ -454,7 +454,7 @@ void ov83_0223DC68 (UnkStruct_ov83_0223DB30 * param0)
         ov83_0223DA34(&param0->unk_16C[v0], Unk_ov83_02240460[v0].unk_0C * FX32_ONE, Unk_ov83_02240460[v0].unk_0E * FX32_ONE, Unk_ov83_02240460[v0].unk_04, Unk_ov83_02240460[v0].unk_10);
 
         v1 = ov83_0223DAFC(param0->unk_10C[v0].unk_00, param0->unk_16C[v0].unk_00, 0);
-        sub_02021C50(param0->unk_08[v0], &v1);
+        GraphicElementData_SetPosition(param0->unk_08[v0], &v1);
 
         param0->unk_1CC[v0] = 0;
         param0->unk_1DC[v0] = Unk_ov83_02240460[v0].unk_11;
@@ -480,7 +480,7 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0)
 
         if (param0->unk_1DC[param0->unk_1EC] <= 0) {
             param0->unk_1CC[param0->unk_1EC] = 1;
-            sub_02021CAC(param0->unk_08[param0->unk_1EC], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_08[param0->unk_1EC], 1);
 
             v3 = 2 + param0->unk_1EC;
             param0->unk_1EC++;
@@ -496,20 +496,20 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0)
             ov83_0223DA94(&param0->unk_16C[v0]);
 
             v2 = ov83_0223DAFC(param0->unk_10C[v0].unk_00, param0->unk_16C[v0].unk_00, 0);
-            sub_02021C50(param0->unk_08[v0], &v2);
+            GraphicElementData_SetPosition(param0->unk_08[v0], &v2);
 
             if (v1 == 1) {
-                sub_02021C50(param0->unk_18[v0], &v2);
-                sub_02021CAC(param0->unk_18[v0], 1);
-                sub_02021CC8(param0->unk_18[v0], 1);
-                sub_02021CAC(param0->unk_08[v0], 0);
+                GraphicElementData_SetPosition(param0->unk_18[v0], &v2);
+                GraphicElementData_SetDrawFlag(param0->unk_18[v0], 1);
+                GraphicElementData_SetAnimateFlag(param0->unk_18[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_08[v0], 0);
                 Sound_PlayEffect(1724);
                 param0->unk_1CC[v0]++;
             }
             break;
         case 2:
             if (sub_02021FD0(param0->unk_18[v0]) == 0) {
-                sub_02021CAC(param0->unk_18[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_18[v0], 0);
                 param0->unk_1CC[v0]++;
             }
             break;
@@ -697,7 +697,7 @@ void ov83_0223E260 (UnkStruct_ov83_0223E244 * param0)
 void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3, u32 param4, u32 param5)
 {
     param0->unk_08 = ov83_0223D9A8(param1, &param2[param4], (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param3);
-    sub_02021CAC(param0->unk_08, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_08, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_08, param5);
     param0->unk_00 = 1;
 }
@@ -711,21 +711,21 @@ void ov83_0223E2C8 (UnkStruct_ov83_0223E244 * param0)
 
 void ov83_0223E2E4 (UnkStruct_ov83_0223E244 * param0)
 {
-    sub_02021CAC(param0->unk_08, 1);
-    sub_02021CC8(param0->unk_08, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_08, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_08, 1);
 }
 
 void ov83_0223E2FC (UnkStruct_ov83_0223E244 * param0)
 {
     VecFx32 v0;
 
-    sub_02021CAC(param0->unk_08, 1);
-    sub_02021CC8(param0->unk_08, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_08, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_08, 1);
 
     v0.x = 168 * FX32_ONE;
     v0.y = 60 * FX32_ONE;
 
-    sub_02021C50(param0->unk_08, &v0);
+    GraphicElementData_SetPosition(param0->unk_08, &v0);
 }
 
 BOOL ov83_0223E32C (UnkStruct_ov83_0223E244 * param0)
@@ -921,9 +921,9 @@ void ov83_0223E5DC (UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 *
 
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov83_0223D9A8(param1, &param2[1], 128, 96, 0, 2, param3);
-        sub_02021CAC(param0->unk_04[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_04[v0], 4 + v0);
-        sub_02021C50(param0->unk_04[v0], &v1);
+        GraphicElementData_SetPosition(param0->unk_04[v0], &v1);
     }
 
     param0->unk_00 = 1;
@@ -951,7 +951,7 @@ void ov83_0223E658 (UnkStruct_ov83_0223E5C0 * param0)
         v1 = param0->unk_14->unk_130[v0];
         v2.x = v3->unk_00[v1] * FX32_ONE;
         v2.y = v3->unk_04[v1] * FX32_ONE;
-        sub_02021C50(param0->unk_04[v0], &v2);
+        GraphicElementData_SetPosition(param0->unk_04[v0], &v2);
     }
 }
 
@@ -964,7 +964,7 @@ void ov83_0223E69C (UnkStruct_ov83_0223E5C0 * param0, BOOL param1)
         v1 = param0->unk_14->unk_130[v0];
 
         if (ov83_0223D570(param0->unk_1C) != v1) {
-            sub_02021CAC(param0->unk_04[v0], param1);
+            GraphicElementData_SetDrawFlag(param0->unk_04[v0], param1);
         }
     }
 }
@@ -1415,14 +1415,14 @@ static void ov83_0223F074 (UnkStruct_ov83_0223F054 * param0)
         param0->unk_14.x = param0->unk_30.unk_00;
         param0->unk_14.y = param0->unk_48.unk_00;
 
-        sub_02021C50(param0->unk_78, &param0->unk_14);
+        GraphicElementData_SetPosition(param0->unk_78, &param0->unk_14);
 
         if (param0->unk_0C) {
             param0->unk_20.x = param0->unk_60.unk_00;
             param0->unk_20.y = param0->unk_60.unk_00;
             param0->unk_20.z = param0->unk_60.unk_00;
 
-            sub_02021C70(param0->unk_78, &param0->unk_20);
+            GraphicElementData_SetAffineScale(param0->unk_78, &param0->unk_20);
         }
     }
 
@@ -1465,7 +1465,7 @@ static void ov83_0223F0F4 (UnkStruct_ov83_0223F054 * param0, UnkStruct_ov83_0223
         v0.x += (128 * FX32_ONE);
         v0.y += (96 * FX32_ONE);
 
-        sub_02021C50(param0->unk_78, &v0);
+        GraphicElementData_SetPosition(param0->unk_78, &v0);
     }
 }
 
@@ -1489,12 +1489,12 @@ static void ov83_0223F1C0 (UnkStruct_ov83_0223F054 * param0, int param1, fx32 pa
     GF_ASSERT(param0->unk_78);
 
     if (param0->unk_0C) {
-        sub_02021C80(param0->unk_78, &param0->unk_20, 2);
+        GraphicElementData_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
     }
 
     SpriteActor_SetSpriteAnimActive(param0->unk_78, param14);
-    sub_02021CC8(param0->unk_78, 1);
-    sub_02021E80(param0->unk_78, 2);
+    GraphicElementData_SetAnimateFlag(param0->unk_78, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_78, 2);
 }
 
 static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0)
@@ -1508,7 +1508,7 @@ static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0)
     param0->unk_00 = 0;
     param0->unk_0C = 1;
 
-    sub_02021CF8(param0->unk_78, 2);
+    GraphicElementData_SetAffineOverwriteMode(param0->unk_78, 2);
 }
 
 void ov83_0223F29C (UnkStruct_ov83_0223F29C * param0)
@@ -1539,7 +1539,7 @@ void ov83_0223F2C4 (UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 *
             SpriteActor_SetSpriteAnimActive(param0->unk_3C[v0].unk_00, 1);
         }
 
-        sub_02021CAC(param0->unk_3C[v0].unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
     }
 
     param0->unk_7C = 1;
@@ -1590,7 +1590,7 @@ void ov83_0223F3D0 (UnkStruct_ov83_0223F29C * param0, int param1)
 
     param0->unk_3C[param1].unk_0C = 0;
 
-    sub_02021CAC(param0->unk_3C[param1].unk_00, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_3C[param1].unk_00, 0);
 }
 
 BOOL ov83_0223F3F0 (const UnkStruct_ov83_0223F29C * param0, int param1)
@@ -1625,7 +1625,7 @@ static void ov83_0223F420 (UnkStruct_ov83_0223F410 * param0)
         if (param0->unk_08 <= 0) {
             param0->unk_0C = 0;
 
-            sub_02021CAC(param0->unk_00, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_00, 0);
         }
     }
 }
@@ -1643,9 +1643,9 @@ static void ov83_0223F458 (UnkStruct_ov83_0223F410 * param0)
     }
 
     if (param0->unk_04 == 0) {
-        sub_02021CAC(param0->unk_00, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_00, 1);
     } else if (param0->unk_04 == 8) {
-        sub_02021CAC(param0->unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00, 0);
     } else if (param0->unk_04 == (8 * 2)) {
         param0->unk_04 = 0;
         return;
@@ -1672,7 +1672,7 @@ void ov83_0223F4CC (UnkStruct_ov83_0223F4AC * param0, UnkStruct_ov83_0223D784 *
 
     for (v0 = 0; v0 < 32; v0++) {
         param0->unk_0C[v0].unk_44 = ov83_0223D9A8(param1, &param2[1], 0, 0, 0, 5, param3);
-        sub_02021CAC(param0->unk_0C[v0].unk_44, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_0C[v0].unk_44, 0);
     }
 
     param0->unk_00 = 1;
@@ -1752,7 +1752,7 @@ static void ov83_0223F670 (UnkStruct_ov83_0223F670 * param0)
         ov83_0223DA94(&param0->unk_2C);
         param0->unk_08.x = param0->unk_14.unk_00;
         param0->unk_08.y = param0->unk_2C.unk_00;
-        sub_02021C50(param0->unk_44, &param0->unk_08);
+        GraphicElementData_SetPosition(param0->unk_44, &param0->unk_08);
     }
 
     if (param0->unk_04 == 1) {
@@ -1766,7 +1766,7 @@ static void ov83_0223F6B4 (UnkStruct_ov83_0223F670 * param0)
         return;
     }
 
-    sub_02021CAC(param0->unk_44, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_44, 0);
     param0->unk_00 = 0;
 }
 
@@ -1778,11 +1778,11 @@ static void ov83_0223F6CC (UnkStruct_ov83_0223F670 * param0, int param1, fx32 pa
     param0->unk_08.x = param2;
     param0->unk_08.y = param3;
 
-    sub_02021CAC(param0->unk_44, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_44, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_44, param1);
     sub_02021DE0(param0->unk_44);
-    sub_02021CC8(param0->unk_44, 1);
-    sub_02021E80(param0->unk_44, 2);
+    GraphicElementData_SetAnimateFlag(param0->unk_44, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_44, 2);
 
     param0->unk_00 = 1;
     param0->unk_04 = 0;
diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c
index 6d8c959659..8ec5178c4d 100644
--- a/src/overlay084/ov84_022403F4.c
+++ b/src/overlay084/ov84_022403F4.c
@@ -292,7 +292,7 @@ static void ov84_02240950 (UnkStruct_ov84_0223B5A0 * param0)
 
     {
         VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE};
-        sub_02021C80(param0->unk_E0[0]->unk_00, &v1, 2);
+        GraphicElementData_SetAffineScaleEx(param0->unk_E0[0]->unk_00, &v1, 2);
     }
 }
 
@@ -361,7 +361,7 @@ static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0)
 {
     VecFx32 v0;
 
-    v0 = *(sub_02021D28(param0->unk_E0[1]->unk_00));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_E0[1]->unk_00));
 
     if (param0->unk_454.unk_01 == 0) {
         v0.x -= param0->unk_454.unk_04[param0->unk_454.unk_03];
@@ -369,12 +369,12 @@ static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0)
         v0.x += param0->unk_454.unk_04[param0->unk_454.unk_03];
     }
 
-    sub_02021C50(param0->unk_E0[1]->unk_00, &v0);
+    GraphicElementData_SetPosition(param0->unk_E0[1]->unk_00, &v0);
     param0->unk_454.unk_03++;
 
     if (param0->unk_454.unk_03 == 8) {
         v0.x = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
-        sub_02021C50(param0->unk_E0[1]->unk_00, &v0);
+        GraphicElementData_SetPosition(param0->unk_E0[1]->unk_00, &v0);
         param0->unk_454.unk_00 = 0;
     }
 }
@@ -389,7 +389,7 @@ static void ov84_02240C48 (UnkStruct_ov84_0223B5A0 * param0)
     VecFx32 v0;
     fx32 v1;
 
-    v0 = *(sub_02021D28(param0->unk_E0[1]->unk_00));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_E0[1]->unk_00));
     v1 = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
 
     if (v1 < v0.x) {
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 4b01acd06c..8c919a48ce 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -486,7 +486,7 @@ static BOOL ov86_0223B464 (UnkStruct_ov86_0223B3C8 * param0)
         break;
     case 6:
         if (ov86_0223B6B4(param0, 0)) {
-            sub_02021CAC(param0->unk_1B4[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_1B4[v0], 0);
 
             if (++v0 < param0->unk_04) {
                 param0->unk_08 = 30;
@@ -848,7 +848,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
         v3.priority = 1 + v12;
         param0->unk_1B4[v12] = GraphicElementManager_AddElement(&v3);
 
-        sub_02021CAC(param0->unk_1B4[v12], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1B4[v12], 0);
         v11 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, param0->unk_2C8[v12]);
         Pokemon_BuildArchivedSprite(&v1, (Pokemon *)v11, 2);
 
@@ -885,7 +885,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     v3.priority = 0;
     param0->unk_1CC = GraphicElementManager_AddElement(&v3);
 
-    sub_02021CAC(param0->unk_1CC, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_1CC, 0);
     Heap_FreeToHeap(v10);
     Heap_FreeToHeap(v9);
 }
@@ -946,8 +946,8 @@ static void ov86_0223BDE0 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par
 
     VEC_Set(&v1->unk_0C, v0[v2].unk_00, 393216, 0);
 
-    sub_02021C50(v1->unk_08, &v1->unk_0C);
-    sub_02021CAC(v1->unk_08, 1);
+    GraphicElementData_SetPosition(v1->unk_08, &v1->unk_0C);
+    GraphicElementData_SetDrawFlag(v1->unk_08, 1);
 
     param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BE6C, v1, 0);
 }
@@ -957,7 +957,7 @@ static void ov86_0223BE6C (SysTask * param0, void * param1)
     UnkStruct_ov86_0223BDE0 * v0 = param1;
 
     v0->unk_0C.x = ov86_0223D284(&v0->unk_18);
-    sub_02021C50(v0->unk_08, &v0->unk_0C);
+    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -977,8 +977,8 @@ static void ov86_0223BEA0 (UnkStruct_ov86_0223B3C8 * param0, int param1)
 
     VEC_Set(&v0->unk_0C, FX32_CONST(128), FX32_CONST(232), 0);
 
-    sub_02021C50(v0->unk_08, &v0->unk_0C);
-    sub_02021CAC(v0->unk_08, 1);
+    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
+    GraphicElementData_SetDrawFlag(v0->unk_08, 1);
 
     param0->unk_1C34[param1] = ov86_0223B744(ov86_0223BF10, v0, 0);
 }
@@ -988,7 +988,7 @@ static void ov86_0223BF10 (SysTask * param0, void * param1)
     UnkStruct_ov86_0223BEA0 * v0 = param1;
 
     v0->unk_0C.y = ov86_0223D284(&v0->unk_18);
-    sub_02021C50(v0->unk_08, &v0->unk_0C);
+    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -1248,7 +1248,7 @@ static void ov86_0223C398 (SysTask * param0, void * param1)
     v1 = sub_02008900(&v0->unk_10);
 
     if (v1 >= 0) {
-        sub_02021F7C(v0->unk_08, &v0->unk_24[v1]);
+        GraphicElementData_SetImageProxy(v0->unk_08, &v0->unk_24[v1]);
     } else {
         ov86_0223BDCC(&v0->unk_00);
         SysTask_Done(param0);
@@ -1473,8 +1473,8 @@ static void ov86_0223C840 (UnkStruct_ov86_0223B3C8 * param0, int param1)
 
     for (v3 = 0; v3 < v2->unk_14; v3++) {
         v2->unk_94[v3] = v0[v3];
-        sub_02021C50(v2->unk_08[v3], &v0[v3]);
-        sub_02021CAC(v2->unk_08[v3], 1);
+        GraphicElementData_SetPosition(v2->unk_08[v3], &v0[v3]);
+        GraphicElementData_SetDrawFlag(v2->unk_08[v3], 1);
     }
 
     for (v3 = 0; v3 < 6; v3++) {
@@ -1493,7 +1493,7 @@ static void ov86_0223C914 (SysTask * param0, void * param1)
         v0->unk_94[v1].x = ov86_0223D284(&v0->unk_1C[v1]);
 
         if (v1 < v0->unk_14) {
-            sub_02021C50(v0->unk_08[v1], &(v0->unk_94[v1]));
+            GraphicElementData_SetPosition(v0->unk_08[v1], &(v0->unk_94[v1]));
         }
     }
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index c09d358b93..2d40140590 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -211,13 +211,13 @@ static BOOL ov87_021D12C0 (UnkStruct_ov87_021D106C * param0, int * param1)
     for (v1 = 0; v1 < v0->unk_14; v1++) {
         if (v1 == v0->unk_18) {
             sub_02021FE0(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
-            sub_02021F58(param0->unk_1C4[v1], 0);
+            GraphicElementData_SetPriority(param0->unk_1C4[v1], 0);
             Sound_FlagDefaultChatotCry(1);
 
             sub_02005844(v0->unk_20[v1].unk_10, v0->unk_20[v1].unk_13);
         } else {
             sub_02021FE0(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
-            sub_02021F58(param0->unk_1C4[v1], v1 + 1);
+            GraphicElementData_SetPriority(param0->unk_1C4[v1], v1 + 1);
         }
     }
 
@@ -531,7 +531,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         v2.priority = v9 + 1;
 
         param0->unk_1C4[v9] = GraphicElementManager_AddElement(&v2);
-        sub_02021CAC(param0->unk_1C4[v9], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1C4[v9], 0);
     }
 
     Heap_FreeToHeap(v8);
@@ -568,11 +568,11 @@ static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0)
             sub_02021FE0(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
         }
 
-        sub_02021CAC(param0->unk_1C4[v3], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_1C4[v3], 1);
     }
 
     for ( ; v3 < 6; v3++) {
-        sub_02021CAC(param0->unk_1C4[v3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1C4[v3], 0);
     }
 }
 
@@ -581,6 +581,6 @@ static void ov87_021D1AB8 (UnkStruct_ov87_021D106C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021CAC(param0->unk_1C4[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1C4[v0], 0);
     }
 }
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 76346f7a4c..84ba61cf3c 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -353,7 +353,7 @@ static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2,
     u8 * v0;
 
     GX_LoadOBJ(param0->pRawData, ((4 * 32 + 18) + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
-    sub_02021EF0(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
+    GraphicElementData_SetExplicitPaletteOffset(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
 }
 
 static void ov88_0223B320 (UnkStruct_02095E80 * param0)
@@ -410,8 +410,8 @@ static void ov88_0223B3C0 (UnkStruct_02095E80 * param0)
     ov88_0223B7A0(param0->unk_2270, 0, param0);
     ov88_0223B7A0(param0->unk_2274, 6, param0);
 
-    sub_02021CAC(param0->unk_39C[0], 1);
-    sub_02021CAC(param0->unk_39C[1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 1);
     SetMainCallback(ov88_0223C0E0, param0);
     NARC_dtor(v0);
 }
@@ -544,27 +544,27 @@ static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * para
         DC_FlushRange(param2->unk_818[v1]->pRawData, 0x20 * 4 * 4);
 
         ov88_0223B2F0(param2->unk_818[v1], param2->unk_6F4[v1].unk_00, param2->unk_6F4[v1].unk_06, param2->unk_6F4[v1].unk_05, v1, param2->unk_3D4[v1]);
-        sub_02021CAC(param2->unk_3D4[v1], 1);
+        GraphicElementData_SetDrawFlag(param2->unk_3D4[v1], 1);
 
         if (param2->unk_6F4[v1].unk_02 == 0) {
-            sub_02021CAC(param2->unk_404[v1], 0);
+            GraphicElementData_SetDrawFlag(param2->unk_404[v1], 0);
         } else {
-            sub_02021CAC(param2->unk_404[v1], 1);
+            GraphicElementData_SetDrawFlag(param2->unk_404[v1], 1);
             SpriteActor_SetSpriteAnimActive(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
         }
 
         if (param2->unk_6F4[v1].unk_0C == 0) {
-            sub_02021CAC(param2->unk_434[v1], 0);
+            GraphicElementData_SetDrawFlag(param2->unk_434[v1], 0);
         } else {
-            sub_02021CAC(param2->unk_434[v1], 1);
+            GraphicElementData_SetDrawFlag(param2->unk_434[v1], 1);
             SpriteActor_SetSpriteAnimActive(param2->unk_434[v1], 21);
         }
     }
 
     for (; v0 < 6; v0++) {
-        sub_02021CAC(param2->unk_3D4[v0 + param1], 0);
-        sub_02021CAC(param2->unk_404[v0 + param1], 0);
-        sub_02021CAC(param2->unk_434[v0 + param1], 0);
+        GraphicElementData_SetDrawFlag(param2->unk_3D4[v0 + param1], 0);
+        GraphicElementData_SetDrawFlag(param2->unk_404[v0 + param1], 0);
+        GraphicElementData_SetDrawFlag(param2->unk_434[v0 + param1], 0);
     }
 }
 
@@ -714,7 +714,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
                 int v9;
 
                 for (v9 = 0; v9 < 2; v9++) {
-                    sub_02021CAC(param0->unk_39C[v9], 1);
+                    GraphicElementData_SetDrawFlag(param0->unk_39C[v9], 1);
                 }
             }
         }
@@ -809,11 +809,11 @@ static void ov88_0223BE28 (UnkStruct_02095E80 * param0)
 
             ov88_0223C8D8(param0->unk_49C, 0, param0->unk_2270, param0->unk_88[0], param0);
             ov88_0223CB34(param0->unk_49C, 1, param0);
-            sub_02021CAC(param0->unk_464[3], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_464[3], 0);
         } else {
             ov88_0223BDA4(param0, param0->unk_88[0]);
             ov88_0223CB34(param0->unk_49C, 0, param0);
-            sub_02021CAC(param0->unk_464[2], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_464[2], 0);
         }
     }
 }
@@ -1331,15 +1331,15 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
     v5 = Party_GetPokemonBySlotIndex(param2, param3);
     v4 = Pokemon_SpriteYOffset(v5, 2);
 
-    sub_02021CAC(param4->unk_464[param1], 1);
+    GraphicElementData_SetDrawFlag(param4->unk_464[param1], 1);
     ov88_0223E87C(param4->unk_464[param1], Unk_ov88_0223EF54[param1][0], Unk_ov88_0223EF54[param1][1] + v4 + 192);
 
     if (param1 == 0) {
-        sub_02021D0C(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
+        GraphicElementData_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
     }
 
     SpriteActor_SetSpriteAnimActive(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
-    sub_02021CAC(param4->unk_464[2 + param1], 1);
+    GraphicElementData_SetDrawFlag(param4->unk_464[2 + param1], 1);
     ov88_0223C860(&param0[26 + param1], param2, param3, 9, 6);
 
     {
@@ -1353,14 +1353,14 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
 
         switch (v6) {
         case 2:
-            sub_02021CAC(param4->unk_464[4 + param1], 0);
+            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 0);
             break;
         case 0:
-            sub_02021CAC(param4->unk_464[4 + param1], 1);
+            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
             SpriteActor_SetSpriteAnimActive(param4->unk_464[4 + param1], 22 + 1);
             break;
         case 1:
-            sub_02021CAC(param4->unk_464[4 + param1], 1);
+            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
             SpriteActor_SetSpriteAnimActive(param4->unk_464[4 + param1], 22);
             break;
         }
@@ -1393,9 +1393,9 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
 
 static void ov88_0223CB34 (Window * param0, int param1, UnkStruct_02095E80 * param2)
 {
-    sub_02021CAC(param2->unk_464[param1], 0);
-    sub_02021CAC(param2->unk_464[2 + param1], 0);
-    sub_02021CAC(param2->unk_464[4 + param1], 0);
+    GraphicElementData_SetDrawFlag(param2->unk_464[param1], 0);
+    GraphicElementData_SetDrawFlag(param2->unk_464[2 + param1], 0);
+    GraphicElementData_SetDrawFlag(param2->unk_464[4 + param1], 0);
     sub_0201ACF4(&param0[26 + param1]);
     sub_0201ACF4(&param0[28 + param1]);
     sub_0201ACF4(&param0[30 + param1]);
@@ -1428,20 +1428,20 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
             v0.position.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
             param0->unk_39C[v1] = GraphicElementManager_AddElementEx(&v0);
-            sub_02021CC8(param0->unk_39C[v1], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
-            sub_02021F58(param0->unk_39C[v1], 100);
-            sub_02021CAC(param0->unk_39C[v1], 0);
+            GraphicElementData_SetPriority(param0->unk_39C[v1], 100);
+            GraphicElementData_SetDrawFlag(param0->unk_39C[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
             param0->unk_3D4[v1] = GraphicElementManager_AddElementEx(&v0);
-            sub_02021CC8(param0->unk_3D4[v1], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_3D4[v1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3D4[v1], 5 + v1);
-            sub_02021F58(param0->unk_3D4[v1], 5);
-            sub_02021CAC(param0->unk_3D4[v1], 0);
+            GraphicElementData_SetPriority(param0->unk_3D4[v1], 5);
+            GraphicElementData_SetDrawFlag(param0->unk_3D4[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
@@ -1449,8 +1449,8 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
             param0->unk_404[v1] = GraphicElementManager_AddElementEx(&v0);
-            sub_02021F58(param0->unk_404[v1], 3);
-            sub_02021CAC(param0->unk_404[v1], 0);
+            GraphicElementData_SetPriority(param0->unk_404[v1], 3);
+            GraphicElementData_SetDrawFlag(param0->unk_404[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
@@ -1458,16 +1458,16 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
             param0->unk_434[v1] = GraphicElementManager_AddElementEx(&v0);
-            sub_02021F58(param0->unk_434[v1], 3);
-            sub_02021CAC(param0->unk_434[v1], 0);
+            GraphicElementData_SetPriority(param0->unk_434[v1], 3);
+            GraphicElementData_SetDrawFlag(param0->unk_434[v1], 0);
         }
 
         v0.position.x = FX32_ONE * (128 - 4 * 8);
         v0.position.y = FX32_ONE * (8 * 8 + 2);
         param0->unk_47C = GraphicElementManager_AddElementEx(&v0);
-        sub_02021CC8(param0->unk_47C, 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_47C, 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_47C, 20);
-        sub_02021CAC(param0->unk_47C, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_47C, 0);
 
         for (v1 = 0; v1 < 6; v1++) {
             v0.resourceData = &param0->unk_378;
@@ -1475,8 +1475,8 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
             v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
             param0->unk_464[v1] = GraphicElementManager_AddElementEx(&v0);
-            sub_02021CAC(param0->unk_464[v1], 0);
-            sub_02021CC8(param0->unk_464[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_464[v1], 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_464[v1], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
         }
     }
@@ -1542,7 +1542,7 @@ static void ov88_0223CE74 (UnkStruct_02095E80 * param0)
             sub_02005844(v0, v1);
         }
 
-        sub_02021CC8(param0->unk_464[v2], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_464[v2], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_464[v2], 4 + v2);
     }
 }
@@ -1597,10 +1597,10 @@ static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2)
     v0.y = FX32_ONE * Unk_ov88_0223EF9C[param0][1];
 
     if (param0 == 12) {
-        sub_02021C50(param1, &v0);
+        GraphicElementData_SetPosition(param1, &v0);
         SpriteActor_SetSpriteAnimActive(param1, Unk_ov88_0223EE50[param2][2]);
     } else {
-        sub_02021C50(param1, &v0);
+        GraphicElementData_SetPosition(param1, &v0);
 
         if (param0 < 6) {
             SpriteActor_SetSpriteAnimActive(param1, Unk_ov88_0223EE50[param2][0]);
@@ -2183,36 +2183,36 @@ static int ov88_0223DD1C (UnkStruct_02095E80 * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (v0 != param0->unk_88[0]) {
-            sub_02021CAC(param0->unk_3D4[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0], 0);
 
             if (param0->unk_6F4[v0].unk_02) {
-                sub_02021CAC(param0->unk_404[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_404[v0], 0);
             }
 
             if (param0->unk_6F4[v0].unk_0C) {
-                sub_02021CAC(param0->unk_434[v0], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_434[v0], 0);
             }
         }
 
         sub_0201AD10(&param0->unk_49C[7 + v0]);
 
         if (v0 != (param0->unk_88[1] - 6)) {
-            sub_02021CAC(param0->unk_3D4[v0 + 6], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0 + 6], 0);
 
             if (param0->unk_6F4[v0 + 6].unk_02) {
-                sub_02021CAC(param0->unk_404[v0 + 6], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_404[v0 + 6], 0);
             }
 
             if (param0->unk_6F4[v0 + 6].unk_0C) {
-                sub_02021CAC(param0->unk_434[v0 + 6], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_434[v0 + 6], 0);
             }
         }
 
         sub_0201AD10(&param0->unk_49C[13 + v0]);
     }
 
-    sub_02021CAC(param0->unk_39C[0], 0);
-    sub_02021CAC(param0->unk_39C[1], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 0);
 
     ov88_0223DE68(param0->unk_231C, Unk_ov88_0223EF9C[param0->unk_88[0]][0] + 16, Unk_ov88_0223EF9C[param0->unk_88[0]][1] + -6, 6 * 8, 6 * 8);
     ov88_0223DE68(param0->unk_2334, Unk_ov88_0223EF9C[param0->unk_88[1]][0] + 16, Unk_ov88_0223EF9C[param0->unk_88[1]][1] + -6, 22 * 8, 6 * 8);
@@ -2238,18 +2238,18 @@ static void ov88_0223DE7C (GraphicElementData * param0, GraphicElementData * par
     v0.x = param4[0].x + ((param4[1].x - param4[0].x) / 20) * param3;
     v0.y = param4[0].y + ((param4[1].y - param4[0].y) / 20) * param3;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
         v1.x = v0.x + 20 * FX32_ONE;
         v1.y = v0.y + (16 + 6) * FX32_ONE;
-        sub_02021C50(param1, &v1);
+        GraphicElementData_SetPosition(param1, &v1);
     }
 
     if (param5->unk_0C) {
         v2.x = v0.x + (20 + 8) * FX32_ONE;
         v2.y = v0.y + (16 + 6) * FX32_ONE;
-        sub_02021C50(param2, &v2);
+        GraphicElementData_SetPosition(param2, &v2);
     }
 }
 
@@ -2265,7 +2265,7 @@ static int ov88_0223DF00 (UnkStruct_02095E80 * param0)
         ov88_0223C860(&param0->unk_49C[20], param0->unk_2274, param0->unk_88[1] - 6, 8, 1);
         ov88_0223BDA4(param0, param0->unk_88[1]);
         param0->unk_226C = ov88_0223E110;
-        sub_02021CAC(param0->unk_47C, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_47C, 1);
     }
 
     return 0;
@@ -2282,27 +2282,27 @@ static void ov88_0223DFF4 (UnkStruct_02095E80 * param0)
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_6F4[v0].unk_00 != 0) {
             ov88_0223E87C(param0->unk_3D4[v0], Unk_ov88_0223EF9C[v0][0] + 16, Unk_ov88_0223EF9C[v0][1] + -6);
-            sub_02021CAC(param0->unk_3D4[v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0], 1);
 
             if (param0->unk_6F4[v0].unk_02) {
                 ov88_0223E87C(param0->unk_404[v0], Unk_ov88_0223EF9C[v0][0] + (16 + 20), Unk_ov88_0223EF9C[v0][1] + 16);
-                sub_02021CAC(param0->unk_404[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_404[v0], 1);
             }
 
             if (param0->unk_6F4[v0].unk_0C) {
                 ov88_0223E87C(param0->unk_434[v0], Unk_ov88_0223EF9C[v0][0] + (16 + 20 + 8), Unk_ov88_0223EF9C[v0][1] + 16);
-                sub_02021CAC(param0->unk_434[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_434[v0], 1);
             }
 
             sub_0201A9A4(&param0->unk_49C[7 + v0]);
         }
     }
 
-    sub_02021CAC(param0->unk_39C[0], 1);
-    sub_02021CAC(param0->unk_39C[1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 1);
     ov88_0223CB34(param0->unk_49C, 1, param0);
-    sub_02021CAC(param0->unk_464[3], 0);
-    sub_02021CAC(param0->unk_47C, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_464[3], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_47C, 0);
 }
 
 static int ov88_0223E110 (UnkStruct_02095E80 * param0)
@@ -2565,7 +2565,7 @@ static void ov88_0223E87C (GraphicElementData * param0, int param1, int param2)
     v0.x = FX32_ONE * param1;
     v0.y = FX32_ONE * param2;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void ov88_0223E894 (UnkStruct_02095E80 * param0)
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index c794d49819..d38d6a901e 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -934,12 +934,12 @@ static void ov90_021D1BAC (UnkStruct_ov90_021D0ECC * param0)
         param0->unk_2A4[v0] = sub_0200CA08(param0->unk_29C, param0->unk_2A0, &v1[v0]);
     }
 
-    sub_02021CAC(param0->unk_2A4[2], 0);
-    sub_02021CAC(param0->unk_2A4[1], 0);
-    sub_02021CC8(param0->unk_2A4[0], 1);
-    sub_02021CC8(param0->unk_2A4[2], 1);
-    sub_02021CC8(param0->unk_2A4[3], 1);
-    sub_02021E80(param0->unk_2A4[1], 3);
+    GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[0], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[2], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[3], 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_2A4[1], 3);
 }
 
 static void ov90_021D1C28 (UnkStruct_ov90_021D0ECC * param0)
@@ -956,16 +956,16 @@ static void ov90_021D1C44 (UnkStruct_ov90_021D0ECC * param0, BOOL param1)
     BOOL v0;
 
     if (param1 == 0) {
-        sub_02021E90(param0->unk_2A4[0], 1);
+        GraphicElementData_SetExplicitPalette(param0->unk_2A4[0], 1);
         v0 = 0;
     } else {
-        sub_02021E90(param0->unk_2A4[0], 0);
+        GraphicElementData_SetExplicitPalette(param0->unk_2A4[0], 0);
         v0 = 1;
     }
 
-    sub_02021CC8(param0->unk_2A4[0], v0);
-    sub_02021CC8(param0->unk_2A4[2], v0);
-    sub_02021CC8(param0->unk_2A4[3], v0);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[0], v0);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[2], v0);
+    GraphicElementData_SetAnimateFlag(param0->unk_2A4[3], v0);
 }
 
 static void ov90_021D1C90 (UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param2, u8 param3)
@@ -973,30 +973,30 @@ static void ov90_021D1C90 (UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param
     u16 v0, v1;
 
     if (param0->unk_0E == 10 - 2) {
-        sub_02021CAC(param0->unk_2A4[1], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 1);
 
         if (param1 == 10) {
             SpriteActor_SetAnimFrame(param0->unk_2A4[1], 1);
-            sub_02021CAC(param0->unk_2A4[0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 0);
         } else {
             SpriteActor_SetAnimFrame(param0->unk_2A4[1], 0);
-            sub_02021CAC(param0->unk_2A4[0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 1);
         }
     } else {
-        sub_02021CAC(param0->unk_2A4[0], 1);
-        sub_02021CAC(param0->unk_2A4[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 0);
     }
 
     switch (param0->unk_0E) {
     case 0:
-        sub_02021CAC(param0->unk_2A4[2], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 0);
         break;
     case (10 - 2):
-        sub_02021CAC(param0->unk_2A4[3], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[3], 0);
         break;
     default:
-        sub_02021CAC(param0->unk_2A4[2], 1);
-        sub_02021CAC(param0->unk_2A4[3], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_2A4[3], 1);
         break;
     }
 
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 36eba2c065..9d45ecfe90 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -437,7 +437,7 @@ void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2);
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static void * ov94_0223C468 (DWCAllocType param0, u32 param1, int param2)
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 274bc12e3f..5d84c30e55 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -275,7 +275,7 @@ static void ov94_0223C85C (UnkStruct_ov94_0223FD4C * param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-    sub_02021CAC(param0->unk_E20, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_E20, 0);
 }
 
 static void ov94_0223C888 (UnkStruct_ov94_0223FD4C * param0)
@@ -315,7 +315,7 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
 
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(param0->unk_E20, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 1);
 }
 
@@ -423,7 +423,7 @@ static int ov94_0223CBEC (UnkStruct_ov94_0223FD4C * param0)
 {
     ov94_0223CF80(param0, 4, 1, 0, 0xf0f);
     ov94_0223C3F4(param0, 10, 6);
-    sub_02021CC8(param0->unk_E20, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
     ov94_0223C584(param0);
 
     return 3;
@@ -434,7 +434,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
     if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
         ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f);
         ov94_0223C3F4(param0, 10, 12);
-        sub_02021CC8(param0->unk_E20, 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
     } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
         switch (param0->unk_10C) {
         case 0:
@@ -450,7 +450,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
                     param0->unk_3A = (60 * 30);
                     Sound_PlayEffect(1500);
                 } else {
-                    sub_02021CC8(param0->unk_E20, 0);
+                    GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
                     ov94_0223CF80(param0, 34, 1, 0, 0xf0f);
                     ov94_0223C3F4(param0, 11, 5);
                     Sound_PlayEffect(1523);
@@ -466,7 +466,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
         case 2:
             ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f);
             ov94_0223C3F4(param0, 10, 12);
-            sub_02021CC8(param0->unk_E20, 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
             Sound_PlayEffect(1500);
             break;
         }
@@ -535,7 +535,7 @@ static int ov94_0223CE7C (UnkStruct_ov94_0223FD4C * param0)
         if (v0 == 0xfffffffe) {
             sub_0200E084(&param0->unk_109C, 1);
             sub_0201ACF4(&param0->unk_109C);
-            sub_02021CC8(param0->unk_E20, 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
             param0->unk_2C = 5;
         } else {
             sub_0200E084(&param0->unk_109C, 1);
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 33ab0eb997..cefb494a73 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -269,7 +269,7 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
 
     param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(param0->unk_F30, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
     sub_02039734();
 }
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 2905498af6..63067cbf41 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -232,7 +232,7 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
 
     param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(param0->unk_F30, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
     sub_02039734();
 }
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 7739665f5e..bc782a62be 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -303,9 +303,9 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
 
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(param0->unk_E20, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 0);
-    sub_02021E80(param0->unk_E20, 1);
+    GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
     sub_02039734();
 }
 
@@ -736,7 +736,7 @@ static void ov94_0223EFAC (UnkStruct_ov94_0223FD4C * param0)
         v1.x = FX32_ONE * Unk_ov94_02246848[ov94_0223EF94(param0)][0];
         v1.y = FX32_ONE * Unk_ov94_02246848[ov94_0223EF94(param0)][1];
 
-        sub_02021C50(param0->unk_E20, &v1);
+        GraphicElementData_SetPosition(param0->unk_E20, &v1);
     }
 }
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 37656cb0ad..e3af7109d0 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -367,13 +367,13 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v1);
 
-    sub_02021CC8(param0->unk_E20, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_E20, 4);
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        sub_02021E80(param0->unk_E20, 0);
+        GraphicElementData_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        sub_02021E80(param0->unk_E20, 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -384,7 +384,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         param0->unk_E28[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_E28[v0], 6 + v0);
-        sub_02021E80(param0->unk_E28[v0], 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_E28[v0], 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -395,7 +395,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         param0->unk_EA0[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_EA0[v0], 40);
-        sub_02021E80(param0->unk_EA0[v0], 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_EA0[v0], 1);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
@@ -406,7 +406,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         param0->unk_F18[v0] = GraphicElementManager_AddElementEx(&v1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_F18[v0], 42);
-        sub_02021E80(param0->unk_F18[v0], 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_F18[v0], 1);
     }
 
     for (v0 = 0; v0 < 2; v0++) {
@@ -415,9 +415,9 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 
         param0->unk_F54[v0] = GraphicElementManager_AddElementEx(&v1);
 
-        sub_02021CC8(param0->unk_F54[v0], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_F54[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F54[v0], 38 + v0);
-        sub_02021E80(param0->unk_F54[v0], 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_F54[v0], 1);
     }
 }
 
@@ -663,9 +663,9 @@ static void ov94_022404F0 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        sub_02021E80(param0->unk_E20, 0);
+        GraphicElementData_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        sub_02021E80(param0->unk_E20, 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
     }
 }
 
@@ -1082,7 +1082,7 @@ static void ov94_02240E5C (void * param0)
             DC_FlushRange(v2->unk_0C, ((4 * 4) * 0x20));
             GX_LoadOBJ(v2->unk_0C, v2->unk_00, ((4 * 4) * 0x20));
 
-            sub_02021E90(v2->unk_08, v2->unk_04);
+            GraphicElementData_SetExplicitPalette(v2->unk_08, v2->unk_04);
         }
     }
 
@@ -1113,10 +1113,10 @@ static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, Gra
 
     if (v0) {
         ov94_02240DF8(*param3, v3, v2, param4, param1, param5, param7);
-        sub_02021CAC(param1, 1);
+        GraphicElementData_SetDrawFlag(param1, 1);
 
         if (v1 != 0) {
-            sub_02021CAC(param2, 1);
+            GraphicElementData_SetDrawFlag(param2, 1);
 
             if (Item_IsMail(v1)) {
                 SpriteActor_SetSpriteAnimActive(param2, 41);
@@ -1124,11 +1124,11 @@ static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, Gra
                 SpriteActor_SetSpriteAnimActive(param2, 40);
             }
         } else {
-            sub_02021CAC(param2, 0);
+            GraphicElementData_SetDrawFlag(param2, 0);
         }
     } else {
-        sub_02021CAC(param1, 0);
-        sub_02021CAC(param2, 0);
+        GraphicElementData_SetDrawFlag(param1, 0);
+        GraphicElementData_SetDrawFlag(param2, 0);
 
         param7->unk_08 = NULL;
     }
@@ -1156,7 +1156,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1)
             ov94_02240EAC(sub_02079C9C(v5, param1, v1), param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
 
             if (v1 < 6) {
-                sub_02021CAC(param0->unk_F18[v1], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
@@ -1172,20 +1172,20 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1)
             ov94_02240EAC(v4, param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
 
             if (Pokemon_GetValue(v3, MON_DATA_MAIL_ID, NULL)) {
-                sub_02021CAC(param0->unk_F18[v1], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 1);
             } else {
-                sub_02021CAC(param0->unk_F18[v1], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
         for (; v1 < 30; v1++) {
             param0->unk_1108->unk_00[v1].unk_00 = 0;
-            sub_02021CAC(param0->unk_E28[v1], 0);
-            sub_02021CAC(param0->unk_EA0[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_E28[v1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_EA0[v1], 0);
             v7[v1].unk_08 = NULL;
 
             if (v1 < 6) {
-                sub_02021CAC(param0->unk_F18[v1], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index 0fd3cb093e..e0dd6558a5 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -57,16 +57,16 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
 
     param0->unk_F34[0] = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(param0->unk_F34[0], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_F34[0], 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_F34[0], 3 + param1 * 7);
-    sub_02021CAC(param0->unk_F34[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
         param0->unk_F34[v1 + 1] = GraphicElementManager_AddElementEx(&v0);
 
-        sub_02021CC8(param0->unk_F34[v1 + 1], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_F34[v1 + 1], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_F34[v1 + 1], 14 + v1 * 4);
-        sub_02021CAC(param0->unk_F34[v1 + 1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_F34[v1 + 1], 0);
 
         ov94_022441A0(param0->unk_F34[v1 + 1], Unk_ov94_02246322[v1][0], Unk_ov94_02246322[v1][1]);
     }
@@ -208,7 +208,7 @@ static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8) + (256 * FX32_ONE);
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov94_0224633E[] = {
@@ -256,9 +256,9 @@ void ov94_02244234 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2)
                 SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], 17 + v0 * 4);
             }
 
-            sub_02021CAC(param0->unk_F34[v0 + 1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
         } else {
-            sub_02021CAC(param0->unk_F34[v0 + 1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_F34[v0 + 1], 0);
         }
     }
 }
@@ -273,7 +273,7 @@ void ov94_022442E4 (UnkStruct_ov94_0223FD4C * param0)
     int v0;
 
     for (v0 = 0; v0 < 7; v0++) {
-        if (sub_02021D34(param0->unk_F34[v0 + 1])) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_F34[v0 + 1])) {
             if (sub_02021E24(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
                 SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], ov94_022442DC(v0) + 1);
             }
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 27b70af358..82689c9fa0 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -664,8 +664,8 @@ GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorR
     v0 = GraphicElementManager_AddElement(&v1);
 
     if (v0) {
-        sub_02021CC8(v0, 1);
-        sub_02021CE4(v0, FX32_ONE);
+        GraphicElementData_SetAnimateFlag(v0, 1);
+        GraphicElementData_SetAnimSpeed(v0, FX32_ONE);
     }
 
     return v0;
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index bb3519c9e7..57825db613 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -308,7 +308,7 @@ static int ov95_02247ED8 (UnkStruct_ov95_02247C6C * param0, int * param1)
     case 0:
         if (ScreenWipe_Done()) {
             SpriteActor_SetSpriteAnimActive(param0->unk_3C[0], 1);
-            sub_02021CAC(param0->unk_3C[0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_3C[0], 1);
             return 1;
         }
         break;
@@ -403,7 +403,7 @@ static int ov95_02248090 (UnkStruct_ov95_02247C6C * param0, int * param1)
         if (ov95_022483B4(param0)) {
             sub_02007DC8(param0->unk_10);
             SpriteActor_SetSpriteAnimActive(param0->unk_3C[1], 0);
-            sub_02021CAC(param0->unk_3C[1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_3C[1], 1);
             (*param1)++;
         }
         break;
@@ -495,9 +495,9 @@ static void ov95_0224829C (UnkStruct_ov95_02247C6C * param0)
     param0->unk_3C[0] = ov95_022475E4(param0->unk_00, &v2, 128, 100, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
     param0->unk_3C[1] = ov95_022475E4(param0->unk_00, &v2, 128, 90, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    sub_02021E80(param0->unk_3C[1], 1);
-    sub_02021CAC(param0->unk_3C[0], 0);
-    sub_02021CAC(param0->unk_3C[1], 0);
+    GraphicElementData_SetExplicitPriority(param0->unk_3C[1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_3C[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_3C[1], 0);
 }
 
 static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0)
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index f82fcc4854..d91a59260e 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -628,8 +628,8 @@ static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0)
 
         SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3][0], 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3][1], 1);
-        sub_02021CAC(param0->unk_1C[v3][0], 0);
-        sub_02021CAC(param0->unk_1C[v3][1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1C[v3][0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_1C[v3][1], 0);
     }
 }
 
@@ -682,7 +682,7 @@ static void ov95_02248E5C (UnkStruct_ov95_02248688 * param0, SysTask ** param1,
 
     for (v0 = 0; v0 < 20; v0++) {
         param2->unk_08[v0] = 0;
-        param2->unk_58[v0] = *(sub_02021D28(param0->unk_1C[v0][0]));
+        param2->unk_58[v0] = *(GraphicElementData_GetPosition(param0->unk_1C[v0][0]));
     }
 
     *(param2->unk_00) = SysTask_Start(ov95_02248EC4, param2, 0);
@@ -714,17 +714,17 @@ static void ov95_02248EC4 (SysTask * param0, void * param1)
             v0->unk_58[v2].y = -114688 + (v0->unk_58[v2].y - 1736704);
 
             if (v0->unk_08[v2]) {
-                sub_02021CAC(v0->unk_04->unk_1C[v2][0], 1);
-                sub_02021CAC(v0->unk_04->unk_1C[v2][1], 1);
+                GraphicElementData_SetDrawFlag(v0->unk_04->unk_1C[v2][0], 1);
+                GraphicElementData_SetDrawFlag(v0->unk_04->unk_1C[v2][1], 1);
             }
         }
 
-        sub_02021C50(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
+        GraphicElementData_SetPosition(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
 
         v1 = v0->unk_58[v2];
         v1.y += 229376;
 
-        sub_02021C50(v0->unk_04->unk_1C[v2][1], &v1);
+        GraphicElementData_SetPosition(v0->unk_04->unk_1C[v2][1], &v1);
     }
 }
 
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index a3e09ef8ba..2d61cac3dc 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -222,7 +222,7 @@ static int ov95_02249840 (UnkStruct_ov95_022497D8 * param0, int * param1)
         if (ov95_02249CF0(&(param0->unk_34))) {
             Sound_PlayEffect(1709);
             SpriteActor_SetSpriteAnimActive(param0->unk_20[0], 3);
-            sub_02021CAC(param0->unk_20[0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
@@ -415,7 +415,7 @@ static void ov95_02249B90 (UnkStruct_ov95_022497D8 * param0)
 
     param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, UnkEnum_ov95_02249B90_00, UnkEnum_ov95_02249B90_01, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    sub_02021CAC(param0->unk_20[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0)
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index 12edc00635..c1749bfffb 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -192,7 +192,7 @@ static int ov95_0224A464 (UnkStruct_ov95_0224A42C * param0, int * param1)
     case 0:
         if (ScreenWipe_Done()) {
             SpriteActor_SetSpriteAnimActive(param0->unk_20[0], 3);
-            sub_02021CAC(param0->unk_20[0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
@@ -390,7 +390,7 @@ static void ov95_0224A7B0 (UnkStruct_ov95_0224A42C * param0)
 
     ov95_022475C4(&v2, &param0->unk_10, &v1, &v0, 1);
     param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, 128, 96, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
-    sub_02021CAC(param0->unk_20[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0)
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index e684066a6c..da569c35f7 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -336,7 +336,7 @@ static int ov95_0224B6F0 (UnkStruct_ov95_0224B4D4 * param0, int * param1)
     case 0:
         if (ScreenWipe_Done()) {
             SpriteActor_SetSpriteAnimActive(param0->unk_40[0], 1);
-            sub_02021CAC(param0->unk_40[0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_40[0], 1);
             return 1;
         }
         break;
@@ -354,7 +354,7 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1)
     case 1:
         if (param0->unk_80 == NULL) {
             SpriteActor_SetSpriteAnimActive(param0->unk_40[1], 2);
-            sub_02021CAC(param0->unk_40[1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_40[1], 1);
             ov95_022479A8(param0->unk_78, 0);
             param0->unk_08 = 0;
             (*param1)++;
@@ -538,9 +538,9 @@ static void ov95_0224BAE8 (UnkStruct_ov95_0224B4D4 * param0)
     param0->unk_40[0] = ov95_022475E4(param0->unk_00, &v2, 128, 100, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
     param0->unk_40[1] = ov95_022475E4(param0->unk_00, &v2, 128, 90, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    sub_02021E80(param0->unk_40[1], 1);
-    sub_02021CAC(param0->unk_40[0], 0);
-    sub_02021CAC(param0->unk_40[1], 0);
+    GraphicElementData_SetExplicitPriority(param0->unk_40[1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_40[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_40[1], 0);
 }
 
 static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0)
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 480e1eda32..6ab8b89445 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -314,9 +314,9 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
             v1.position.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
             v1.position.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
             param0->unk_E30[v0] = GraphicElementManager_AddElementEx(&v1);
-            sub_02021CC8(param0->unk_E30[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_E30[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_E30[v0], v0);
-            sub_02021CAC(param0->unk_E30[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_E30[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index d4fa7a3241..5ffd6c0c64 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -1652,8 +1652,8 @@ void ov96_0223D948 (UnkStruct_ov96_0223BF40 * param0)
 static void ov96_0223D950 (UnkStruct_ov96_0223BF40 * param0, int param1, int param2)
 {
     if ((param1 == 0) || (param1 == 1)) {
-        sub_02021CAC(param0->unk_E30[0], param2);
-        sub_02021CAC(param0->unk_E30[1], param2);
+        GraphicElementData_SetDrawFlag(param0->unk_E30[0], param2);
+        GraphicElementData_SetDrawFlag(param0->unk_E30[1], param2);
     }
 }
 
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index 99e099973a..d2ac7c64aa 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -489,10 +489,10 @@ static void ov97_0222B404 (UnkStruct_0222AE60 * param0)
     ov97_02237B0C(116, 43, 40, 42, 41, 0);
 
     param0->unk_168[0] = ov97_02237D14(0, param0->unk_168[0], HW_LCD_WIDTH / 2, 8, 0);
-    sub_02021CAC(param0->unk_168[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_168[0], 0);
 
     param0->unk_168[1] = ov97_02237D14(0, param0->unk_168[1], HW_LCD_WIDTH / 2, HW_LCD_HEIGHT - 8, 1);
-    sub_02021CAC(param0->unk_168[1], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_168[1], 0);
 }
 
 static void ov97_0222B46C (UnkStruct_0222AE60 * param0)
@@ -893,8 +893,8 @@ static void ov97_0222BC1C (UnkStruct_0222AE60 * param0)
         }
     }
 
-    sub_02021CAC(param0->unk_168[0], v1);
-    sub_02021CAC(param0->unk_168[1], v2);
+    GraphicElementData_SetDrawFlag(param0->unk_168[0], v1);
+    GraphicElementData_SetDrawFlag(param0->unk_168[1], v2);
 }
 
 static void ov97_0222BC9C (OverlayManager * param0)
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index edbd41ef24..4335cd0fbd 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -940,7 +940,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
         break;
     case UnkEnum_ov97_0222C6F8_29:
         ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 30);
-        sub_02021CAC(param0->unk_3170, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
         DeleteWaitDial(param0->unk_34D8);
         param0->unk_34D8 = NULL;
         Sound_PlayEffect(1500);
@@ -977,7 +977,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
     case UnkEnum_ov97_0222C6F8_10:
         if (ov97_022332F4()) {
             ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 71);
-            sub_02021CAC(param0->unk_3170, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_3170, 1);
             ov97_0222C578(param0);
             *v3 = UnkEnum_ov97_0222C6F8_11;
         }
@@ -1071,7 +1071,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
 
             ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 73);
 
-            sub_02021CAC(param0->unk_3170, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
             DeleteWaitDial(param0->unk_34D8);
             Sound_PlayEffect(1500);
 
@@ -1096,7 +1096,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
         *v3 = UnkEnum_ov97_0222C6F8_23;
     case UnkEnum_ov97_0222C6F8_23:
         ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 74);
-        sub_02021CAC(param0->unk_3170, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
 
         if (param0->unk_34D8) {
             DeleteWaitDial(param0->unk_34D8);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index b1c0119d35..38a3db79b1 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -287,7 +287,7 @@ static void ov97_0222D40C (UnkStruct_ov97_0222D04C * param0, int param1)
     if (param1 != -1) {
         param0->unk_628 = ov97_02237D14(0, param0->unk_628, HW_LCD_WIDTH / 2, 100, param1);
     } else {
-        sub_02021CAC(param0->unk_628, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_628, 0);
     }
 }
 
@@ -1203,10 +1203,10 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
     }
 
     if (v0) {
-        sub_02021CC8(v0, 1);
-        sub_02021E80(v0, 0);
+        GraphicElementData_SetAnimateFlag(v0, 1);
+        GraphicElementData_SetExplicitPriority(v0, 0);
         SpriteActor_SetSpriteAnimActive(v0, 0);
-        sub_02021CAC(v0, 1);
+        GraphicElementData_SetDrawFlag(v0, 1);
     }
 
     return v0;
@@ -1218,14 +1218,14 @@ static void ov97_0222E5B4 (UnkStruct_ov97_0222E398 * param0)
 
     sub_02021DCC(param0->unk_3008.unk_0C, 2);
     SpriteActor_SetAnimFrame(param0->unk_3008.unk_0C, 0);
-    sub_02021CAC(param0->unk_3008.unk_0C, 0);
-    sub_02021F58(param0->unk_3008.unk_0C, 0);
-    sub_02021CF8(param0->unk_3008.unk_0C, 2);
+    GraphicElementData_SetDrawFlag(param0->unk_3008.unk_0C, 0);
+    GraphicElementData_SetPriority(param0->unk_3008.unk_0C, 0);
+    GraphicElementData_SetAffineOverwriteMode(param0->unk_3008.unk_0C, 2);
 
     {
         VecFx32 * v0;
 
-        v0 = ( VecFx32 * )sub_02021D28(param0->unk_3008.unk_0C);
+        v0 = ( VecFx32 * )GraphicElementData_GetPosition(param0->unk_3008.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(96);
     }
@@ -1237,14 +1237,14 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0)
 
     sub_02021DCC(param0->unk_3054.unk_0C, 4);
     SpriteActor_SetAnimFrame(param0->unk_3054.unk_0C, 0);
-    sub_02021CAC(param0->unk_3054.unk_0C, 0);
-    sub_02021F58(param0->unk_3054.unk_0C, 0);
-    sub_02021CF8(param0->unk_3054.unk_0C, 2);
+    GraphicElementData_SetDrawFlag(param0->unk_3054.unk_0C, 0);
+    GraphicElementData_SetPriority(param0->unk_3054.unk_0C, 0);
+    GraphicElementData_SetAffineOverwriteMode(param0->unk_3054.unk_0C, 2);
 
     {
         VecFx32 * v0;
 
-        v0 = ( VecFx32 * )sub_02021D28(param0->unk_3054.unk_0C);
+        v0 = ( VecFx32 * )GraphicElementData_GetPosition(param0->unk_3054.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(0) + FX32_CONST(256);
     }
@@ -1412,12 +1412,12 @@ static void ov97_0222E814 (UnkStruct_ov97_0222E398 * param0)
         param0->unk_88[v0].unk_40 = param0->unk_88[v0].unk_38;
         param0->unk_88[v0].unk_44 = param0->unk_88[v0].unk_38;
 
-        v1 = *( VecFx32 *)sub_02021D28(param0->unk_88[v0].unk_0C);
+        v1 = *( VecFx32 *)GraphicElementData_GetPosition(param0->unk_88[v0].unk_0C);
         v1.x = FX32_CONST(16 + (LCRNG_Next() % (256 - 32)));
         v1.y = FX32_CONST(0);
 
-        sub_02021C50(param0->unk_88[v0].unk_0C, &v1);
-        sub_02021CAC(param0->unk_88[v0].unk_0C, 0);
+        GraphicElementData_SetPosition(param0->unk_88[v0].unk_0C, &v1);
+        GraphicElementData_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1464,11 +1464,11 @@ static void ov97_0222EA68 (UnkStruct_ov97_0222E398 * param0)
             v1.x = param0->unk_88[v0].unk_10.x + (sub_0201D250(v2) * v3);
             v1.y = param0->unk_88[v0].unk_10.y + (sub_0201D264(v2) * v3);
 
-            sub_02021C50(param0->unk_88[v0].unk_0C, &v1);
+            GraphicElementData_SetPosition(param0->unk_88[v0].unk_0C, &v1);
         }
 
         sub_02021DCC(param0->unk_88[v0].unk_0C, 1);
-        sub_02021CAC(param0->unk_88[v0].unk_0C, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1516,13 +1516,13 @@ static void ov97_0222EBD0 (UnkStruct_ov97_0222E398 * param0)
         param0->unk_1848[v0].unk_40 = param0->unk_1848[v0].unk_38;
         param0->unk_1848[v0].unk_44 = param0->unk_1848[v0].unk_38;
 
-        v1 = *( VecFx32 *)sub_02021D28(param0->unk_1848[v0].unk_0C);
+        v1 = *( VecFx32 *)GraphicElementData_GetPosition(param0->unk_1848[v0].unk_0C);
 
         v1.x = FX32_CONST(128);
         v1.y = FX32_CONST(384);
 
-        sub_02021C50(param0->unk_1848[v0].unk_0C, &v1);
-        sub_02021CAC(param0->unk_1848[v0].unk_0C, 1);
+        GraphicElementData_SetPosition(param0->unk_1848[v0].unk_0C, &v1);
+        GraphicElementData_SetDrawFlag(param0->unk_1848[v0].unk_0C, 1);
 
         param0->unk_1848[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_1848[v0], 6);
     }
@@ -1574,20 +1574,20 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1)
         v0->unk_30--;
         return;
     } else {
-        sub_02021CAC(v0->unk_0C, 1);
+        GraphicElementData_SetDrawFlag(v0->unk_0C, 1);
     }
 
     {
         BOOL v4;
 
-        v1 = *(( VecFx32 * )sub_02021D28(v0->unk_0C));
+        v1 = *(( VecFx32 * )GraphicElementData_GetPosition(v0->unk_0C));
         v4 = ov97_0222EDC0(v0->unk_10.x >> FX32_SHIFT, v0->unk_10.y >> FX32_SHIFT, FX_FX32_TO_F32(v1.x), FX_FX32_TO_F32(v1.y), &v2, &v3, FX_FX32_TO_F32(v0->unk_1C), FX_FX32_TO_F32(v0->unk_20));
 
         if (v4 && (v0->unk_24 == 0)) {
             v1.x += FX_F32_TO_FX32(v2);
             v1.y += FX_F32_TO_FX32(v3);
 
-            sub_02021C50(v0->unk_0C, &v1);
+            GraphicElementData_SetPosition(v0->unk_0C, &v1);
         } else {
             switch (v0->unk_24) {
             case 0:
@@ -1661,14 +1661,14 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1)
                         v1.x += FX_F32_TO_FX32(v2);
                         v1.y += FX_F32_TO_FX32(v3);
 
-                        sub_02021C50(v0->unk_0C, &v1);
+                        GraphicElementData_SetPosition(v0->unk_0C, &v1);
                     } else {
                         v0->unk_08 = 1;
                     }
                 }
 
                 v0->unk_28 %= 360;
-                sub_02021C50(v0->unk_0C, &v1);
+                GraphicElementData_SetPosition(v0->unk_0C, &v1);
                 break;
             }
         }
@@ -1843,7 +1843,7 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         } else if (v3 > 30) {
             sub_02021DCC(v0->unk_3008.unk_0C, 3);
         } else if (v3 > 7) {
-            sub_02021CAC(v0->unk_3008.unk_0C, 1);
+            GraphicElementData_SetDrawFlag(v0->unk_3008.unk_0C, 1);
         }
 
         if (v1 || (v3 == (80 - 1))) {
@@ -1911,8 +1911,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
             break;
         }
 
-        v6 = ( VecFx32 * )sub_02021D28(v0->unk_3008.unk_0C);
-        v7 = ( VecFx32 * )sub_02021D28(v0->unk_3054.unk_0C);
+        v6 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_3008.unk_0C);
+        v7 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_3054.unk_0C);
 
         if (v6->y < FX32_CONST(256 - 32)) {
             v6->y += FX32_CONST(8);
@@ -1924,8 +1924,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
             if (v7->y < FX32_CONST(384)) {
                 v7->y += FX32_CONST(8);
 
-                if (sub_02021D34(v0->unk_3054.unk_0C) == 0) {
-                    sub_02021CAC(v0->unk_3054.unk_0C, 1);
+                if (GraphicElementData_GetDrawFlag(v0->unk_3054.unk_0C) == 0) {
+                    GraphicElementData_SetDrawFlag(v0->unk_3054.unk_0C, 1);
                 }
             } else {
                 v0->unk_00 = 7;
@@ -1958,7 +1958,7 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         }
 
         if (v10 > 50) {
-            sub_02021CAC(v0->unk_3054.unk_0C, 0);
+            GraphicElementData_SetDrawFlag(v0->unk_3054.unk_0C, 0);
         } else if (v10 > 30) {
             sub_02021DCC(v0->unk_3054.unk_0C, 2);
         } else if (v10 > 7) {
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 806c4551cf..b604f60cdc 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -279,9 +279,9 @@ static void ov97_022304AC (UnkStruct_ov97_02230868 * param0)
     param0->unk_3E10 = 0;
     param0->unk_2E88[0] = ov97_02237D14(0, param0->unk_2E88[0], 72, 168, 1);
 
-    sub_02021E80(param0->unk_2E88[0], 2);
+    GraphicElementData_SetExplicitPriority(param0->unk_2E88[0], 2);
     param0->unk_2E88[1] = ov97_02237D14(0, param0->unk_2E88[1], 184, 168, 0);
-    sub_02021E80(param0->unk_2E88[1], 2);
+    GraphicElementData_SetExplicitPriority(param0->unk_2E88[1], 2);
 }
 
 static void ov97_02230500 (Window * param0, u8 param1)
@@ -808,7 +808,7 @@ static void ov97_022310FC (UnkStruct_ov97_02230868 * param0)
 
         if (v2 == 0) {
             if (param0->unk_2E90[v1]) {
-                sub_02021CAC(param0->unk_2E90[v1], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_2E90[v1], 0);
             }
 
             continue;
@@ -820,7 +820,7 @@ static void ov97_022310FC (UnkStruct_ov97_02230868 * param0)
         DC_FlushRange(v4->pRawData, ((4 * 4) * 0x20));
         GX_LoadOBJ(v4->pRawData, (0x64 + v1 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
 
-        sub_02021E90(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
+        GraphicElementData_SetExplicitPalette(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
         Heap_FreeToHeap(v3);
     }
 }
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index a63591ee07..20c817cb24 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -660,7 +660,7 @@ static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int p
     DC_FlushRange(v2->pRawData, ((4 * 4) * 0x20));
     GX_LoadOBJ(v2->pRawData, (0x64 + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
 
-    sub_02021E90(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
+    GraphicElementData_SetExplicitPalette(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
     Heap_FreeToHeap(v0);
 }
 
@@ -699,7 +699,7 @@ static void ov97_02234364 (void)
         if (v1->unk_08) {
             DC_FlushRange(v1->unk_0C, ((4 * 4) * 0x20));
             GX_LoadOBJ(v1->unk_0C, v1->unk_00, ((4 * 4) * 0x20));
-            sub_02021E90(v1->unk_08, v1->unk_04);
+            GraphicElementData_SetExplicitPalette(v1->unk_08, v1->unk_04);
         }
     }
 }
@@ -723,17 +723,17 @@ static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0)
             v4 = GBASpeciesToDSFormId(ov97_02236DD0(v1), v5, v3);
 
             ov97_022342E4(v1, v2, v4, v0, param0->unk_20C[v0].unk_00, v6, v7);
-            sub_02021CAC(param0->unk_20C[v0].unk_00, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
 
             if (GetGBABoxMonData(&(param0->unk_E8E0->boxes[param0->unk_E8E4][v0]), 12, NULL)) {
-                sub_02021CAC(param0->unk_20C[v0].unk_04, 1);
+                GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 1);
             } else {
-                sub_02021CAC(param0->unk_20C[v0].unk_04, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
             }
         } else {
             ov97_022342E4(v1, v2, v4, v0, NULL, v6, v7);
-            sub_02021CAC(param0->unk_20C[v0].unk_00, 0);
-            sub_02021CAC(param0->unk_20C[v0].unk_04, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
         }
     }
 
@@ -766,11 +766,11 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
                 param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElementEx(&v3);
             }
 
-            sub_02021CC8(param0->unk_20C[v0].unk_00, 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_00, 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_20C[v0].unk_00, 10 + v0);
-            sub_02021E80(param0->unk_20C[v0].unk_00, 1);
-            sub_02021CAC(param0->unk_20C[v0].unk_00, 1);
-            sub_02021F58(param0->unk_20C[v0].unk_00, 100 + v0);
+            GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_00, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
+            GraphicElementData_SetPriority(param0->unk_20C[v0].unk_00, 100 + v0);
 
             v3.position.x += FX32_ONE * 6;
             v3.position.y += FX32_ONE * 12;
@@ -779,11 +779,11 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
                 param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElementEx(&v3);
             }
 
-            sub_02021CC8(param0->unk_20C[v0].unk_04, 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_04, 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_20C[v0].unk_04, 40);
-            sub_02021E80(param0->unk_20C[v0].unk_04, 1);
-            sub_02021CAC(param0->unk_20C[v0].unk_04, 0);
-            sub_02021F58(param0->unk_20C[v0].unk_04, 0 + v0);
+            GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_04, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+            GraphicElementData_SetPriority(param0->unk_20C[v0].unk_04, 0 + v0);
 
             v0++;
 
@@ -807,10 +807,10 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int
 
     v1 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CC8(v1, 1);
+    GraphicElementData_SetAnimateFlag(v1, 1);
     SpriteActor_SetSpriteAnimActive(v1, param3);
-    sub_02021E80(v1, 1);
-    sub_02021CAC(v1, param4);
+    GraphicElementData_SetExplicitPriority(v1, 1);
+    GraphicElementData_SetDrawFlag(v1, param4);
 
     return v1;
 }
@@ -1045,7 +1045,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
 {
     int v0, v1;
 
-    if (param0->unk_20C[param1].unk_00 && (sub_02021D34(param0->unk_20C[param1].unk_00) == 0)) {
+    if (param0->unk_20C[param1].unk_00 && (GraphicElementData_GetDrawFlag(param0->unk_20C[param1].unk_00) == 0)) {
         return 3;
     }
 
@@ -1081,16 +1081,16 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
 
         for (v0 = 0; v0 < 6; v0++) {
             if (param0->unk_42C[v0].unk_04 == -1) {
-                v2 = sub_02021D28(param0->unk_20C[param1].unk_00);
-                sub_02021C50(param0->unk_42C[v0].unk_00, v2);
-                v2 = sub_02021D28(param0->unk_42C[v0].unk_00);
+                v2 = GraphicElementData_GetPosition(param0->unk_20C[param1].unk_00);
+                GraphicElementData_SetPosition(param0->unk_42C[v0].unk_00, v2);
+                v2 = GraphicElementData_GetPosition(param0->unk_42C[v0].unk_00);
 
                 v3 = *v2;
                 v3.x -= FX32_ONE * 8;
                 v3.y -= FX32_ONE * 4;
 
-                sub_02021C50(param0->unk_42C[v0].unk_00, &v3);
-                sub_02021CAC(param0->unk_42C[v0].unk_00, 1);
+                GraphicElementData_SetPosition(param0->unk_42C[v0].unk_00, &v3);
+                GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
 
                 param0->unk_42C[v0].unk_04 = param1;
                 param0->unk_42C[v0].unk_08 = param0->unk_E8E4;
@@ -1100,7 +1100,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
             }
         }
     } else {
-        sub_02021CAC(param0->unk_42C[v1].unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_42C[v1].unk_00, 0);
 
         param0->unk_42C[v1].unk_04 = -1;
         param0->unk_474--;
@@ -1117,9 +1117,9 @@ static void ov97_022349E0 (UnkStruct_ov97_02234A2C * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if ((param0->unk_42C[v0].unk_04 != -1) && (param0->unk_42C[v0].unk_08 == param0->unk_E8E4)) {
-            sub_02021CAC(param0->unk_42C[v0].unk_00, 1);
+            GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
         } else {
-            sub_02021CAC(param0->unk_42C[v0].unk_00, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
         }
     }
 }
@@ -1459,17 +1459,17 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
     CellActorInitParamsEx v5;
 
     for (v0 = 0; v0 < 30; v0++) {
-        sub_02021CAC(param0->unk_20C[v0].unk_00, 0);
-        sub_02021CAC(param0->unk_20C[v0].unk_04, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_02021CAC(param0->unk_42C[v0].unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
     }
 
-    sub_02021CAC(param0->unk_3FC[0], 0);
-    sub_02021CAC(param0->unk_41C[0], 0);
-    sub_02021CAC(param0->unk_40C[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_3FC[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[0], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_40C[0], 0);
 
     ov97_022340FC(&v5, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -1479,10 +1479,10 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
 
         param0->unk_478[v0] = GraphicElementManager_AddElementEx(&v5);
 
-        sub_02021CC8(param0->unk_478[v0], 1);
+        GraphicElementData_SetAnimateFlag(param0->unk_478[v0], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_478[v0], 10 + v0);
-        sub_02021E80(param0->unk_478[v0], 1);
-        sub_02021CAC(param0->unk_478[v0], 1);
+        GraphicElementData_SetExplicitPriority(param0->unk_478[v0], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_478[v0], 1);
 
         v1 = ov97_02234124(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04);
         v2 = ov97_02234148(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04);
@@ -1525,9 +1525,9 @@ static void ov97_02235178 (UnkStruct_ov97_02234A2C * param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     ov97_02235158(&param0->unk_4FC);
 
-    sub_02021CAC(param0->unk_3FC[0], 1);
-    sub_02021CAC(param0->unk_41C[0], 1);
-    sub_02021CAC(param0->unk_40C[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_3FC[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[0], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_40C[0], 1);
 
     for (v0 = 0; v0 < 6; v0++) {
         param0->unk_42C[v0].unk_04 = -1;
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 34d08d33c7..8fbb4fe314 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -419,11 +419,11 @@ void ov97_02237CAC (int param0)
         VecFx32 * v1;
 
         if (v0->unk_270 == 0) {
-            if ((sub_02021D34(v0->unk_26C) == 0) && (param0 == 0)) {
-                sub_02021CAC(v0->unk_26C, 1);
+            if ((GraphicElementData_GetDrawFlag(v0->unk_26C) == 0) && (param0 == 0)) {
+                GraphicElementData_SetDrawFlag(v0->unk_26C, 1);
             }
 
-            v1 = ( VecFx32 * )sub_02021D28(v0->unk_26C);
+            v1 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_26C);
 
             if (v1->y < 384 * FX32_ONE) {
                 v1->y += FX32_ONE * 3;
@@ -465,10 +465,10 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
         param1 = GraphicElementManager_AddElementEx(&v1);
     }
 
-    sub_02021CC8(param1, 1);
-    sub_02021E80(param1, 0);
+    GraphicElementData_SetAnimateFlag(param1, 1);
+    GraphicElementData_SetExplicitPriority(param1, 0);
     SpriteActor_SetSpriteAnimActive(param1, param4);
-    sub_02021CAC(param1, 1);
+    GraphicElementData_SetDrawFlag(param1, 1);
 
     return param1;
 }
@@ -596,7 +596,7 @@ static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int pa
     }
 
     {
-        NNSG2dImagePaletteProxy * v6 = sub_02021F9C(param0);
+        NNSG2dImagePaletteProxy * v6 = GraphicElementData_GetPaletteProxy(param0);
         u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB);
 
         sub_02006E84(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08);
@@ -718,7 +718,7 @@ void ov97_02238194 (BGL * param0, UnkStruct_0202DF40 * param1)
         break;
     }
 
-    sub_02021CAC(v2->unk_26C, 0);
+    GraphicElementData_SetDrawFlag(v2->unk_26C, 0);
 }
 
 void ov97_0223829C (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2)
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 54e26f128e..544a78c56f 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -205,7 +205,7 @@ static int ov101_021D5A0C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00.unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 0, 0, 0, 0, 3, 2);
-    sub_02021CC8(v1->unk_0C.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -230,7 +230,7 @@ static void ov101_021D5A70 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v3);
     v3.y = v2 + (FX32_ONE * 16) + v4->unk_00.unk_00->unk_9C[v0];
-    sub_02021C50(v4->unk_0C.unk_04, &v3);
+    GraphicElementData_SetPosition(v4->unk_0C.unk_04, &v3);
 
     v2 = ((v2) / 32);
     v1 = Unk_ov101_021D927C[ov101_021D55A4(v4->unk_00.unk_00, v0, ((v2) / FX32_ONE))];
@@ -275,7 +275,7 @@ static int ov101_021D5B44 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 1, 1, 1, 1, 1, 1);
-    sub_02021CC8(v1->unk_0C.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -293,11 +293,11 @@ static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     u32 v2 = v1->unk_00->unk_60;
 
     if ((v1->unk_04 > 1) && (v2 < v1->unk_04)) {
-        sub_02021CAC(v1->unk_0C.unk_04, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    sub_02021CAC(v1->unk_0C.unk_04, 1);
+    GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
@@ -309,7 +309,7 @@ static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D937C[v2];
-    sub_02021C50(v1->unk_0C.unk_04, &v0);
+    GraphicElementData_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5C24 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -348,7 +348,7 @@ static int ov101_021D5C7C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 1, 1, 1, 1, 1, 1);
-    sub_02021CC8(v1->unk_0C.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -366,11 +366,11 @@ static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     u32 v2 = v1->unk_00->unk_64;
 
     if (v2 < v1->unk_04) {
-        sub_02021CAC(v1->unk_0C.unk_04, 0);
+        GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    sub_02021CAC(v1->unk_0C.unk_04, 1);
+    GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
@@ -382,7 +382,7 @@ static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D9354[v2];
-    sub_02021C50(v1->unk_0C.unk_04, &v0);
+    GraphicElementData_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -425,9 +425,9 @@ void ov101_021D5DA4 (UnkStruct_ov101_021D5D90 * param0, int param1)
     UnkStruct_ov101_021D630C * v0 = sub_02071598(param0);
 
     if (param1 == 1) {
-        sub_02021CAC(v0->unk_3C.unk_04, 0);
+        GraphicElementData_SetDrawFlag(v0->unk_3C.unk_04, 0);
     } else {
-        sub_02021CAC(v0->unk_3C.unk_04, 1);
+        GraphicElementData_SetDrawFlag(v0->unk_3C.unk_04, 1);
     }
 }
 
@@ -525,9 +525,9 @@ static int ov101_021D5E84 (UnkStruct_ov101_021D630C * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 192)), 0};
     VecFx32 v1 = {0x2000, 0x2000, 0};
 
-    sub_02021C70(param0->unk_3C.unk_04, &v1);
-    sub_02021C94(param0->unk_3C.unk_04, 0);
-    sub_02021C50(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 0);
     SpriteActor_SetAnimFrame(param0->unk_3C.unk_04, 0);
     Sound_PlayEffect(1572);
@@ -557,8 +557,8 @@ static int ov101_021D5EEC (UnkStruct_ov101_021D630C * param0)
         param0->unk_04++;
     }
 
-    sub_02021C50(param0->unk_3C.unk_04, &v0);
-    sub_02021C70(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v1);
 
     return 0;
 }
@@ -584,7 +584,7 @@ static int ov101_021D5F70 (UnkStruct_ov101_021D630C * param0)
 {
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 1);
     sub_02021DE0(param0->unk_3C.unk_04);
-    sub_02021CC8(param0->unk_3C.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_3C.unk_04, 1);
 
     Sound_PlayEffect(1744);
     param0->unk_04++;
@@ -616,9 +616,9 @@ static int ov101_021D5FB8 (UnkStruct_ov101_021D630C * param0)
 
     param0->unk_14 = v1;
 
-    sub_02021C50(param0->unk_3C.unk_04, &v1);
-    sub_02021C70(param0->unk_3C.unk_04, &v0);
-    sub_02021C94(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 3);
     sub_02021DE0(param0->unk_3C.unk_04);
 
@@ -634,7 +634,7 @@ static int ov101_021D6020 (UnkStruct_ov101_021D630C * param0)
     v0 = param0->unk_14;
     v0.y += v1[param0->unk_30 / 2];
 
-    sub_02021C50(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
 
     param0->unk_30++;
 
@@ -658,9 +658,9 @@ static int ov101_021D6084 (UnkStruct_ov101_021D630C * param0)
 
     param0->unk_14 = v1;
 
-    sub_02021C50(param0->unk_3C.unk_04, &v1);
-    sub_02021C70(param0->unk_3C.unk_04, &v0);
-    sub_02021C94(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 4);
     sub_02021DE0(param0->unk_3C.unk_04);
 
@@ -691,8 +691,8 @@ static int ov101_021D60EC (UnkStruct_ov101_021D630C * param0)
         param0->unk_04++;
     }
 
-    sub_02021C50(param0->unk_3C.unk_04, &v1);
-    sub_02021C70(param0->unk_3C.unk_04, &v2);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v2);
 
     return 0;
 }
@@ -714,9 +714,9 @@ static int ov101_021D6158 (UnkStruct_ov101_021D630C * param0)
     param0->unk_2C = 0;
     param0->unk_08 = 1;
 
-    sub_02021C50(param0->unk_3C.unk_04, &v1);
-    sub_02021C70(param0->unk_3C.unk_04, &v0);
-    sub_02021C94(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 2);
     sub_02021DE0(param0->unk_3C.unk_04);
 
@@ -744,8 +744,8 @@ static int ov101_021D61E0 (UnkStruct_ov101_021D630C * param0)
         param0->unk_30 = 0;
     }
 
-    sub_02021C50(param0->unk_3C.unk_04, &param0->unk_14);
-    sub_02021C94(param0->unk_3C.unk_04, param0->unk_2C);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &param0->unk_14);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, param0->unk_2C);
 
     return 0;
 }
@@ -764,9 +764,9 @@ static int ov101_021D6288 (UnkStruct_ov101_021D630C * param0)
     param0->unk_20 = v2;
     param0->unk_08 = 1;
 
-    sub_02021C50(param0->unk_3C.unk_04, &v1);
-    sub_02021C70(param0->unk_3C.unk_04, &v0);
-    sub_02021C94(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
+    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 2);
     sub_02021DE0(param0->unk_3C.unk_04);
 
@@ -841,11 +841,11 @@ static void ov101_021D6410 (UnkStruct_ov101_021D13C8 * param0, UnkStruct_ov101_0
 
     ov101_021D84A4(param0->unk_450, param1, param2, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 2, 2, 2, 2, 2, 7);
 
-    sub_02021CF8(param1->unk_04, 2);
-    sub_02021C60(param1->unk_04, &v0);
-    sub_02021C70(param1->unk_04, &v1);
-    sub_02021C94(param1->unk_04, sub_0201D2A4(0));
-    sub_02021CC8(param1->unk_04, 1);
+    GraphicElementData_SetAffineOverwriteMode(param1->unk_04, 2);
+    GraphicElementData_SetAffineTranslation(param1->unk_04, &v0);
+    GraphicElementData_SetAffineScale(param1->unk_04, &v1);
+    GraphicElementData_SetAffineZRotation(param1->unk_04, sub_0201D2A4(0));
+    GraphicElementData_SetAnimateFlag(param1->unk_04, 1);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150;
@@ -894,7 +894,7 @@ static void ov101_021D64FC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
             sub_020715E4(param0, &v1);
             ov101_021D84A4(v0->unk_10->unk_450, &v0->unk_14, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 3, 3, 3, 3, 2, 5);
-            sub_02021CC8(v0->unk_14.unk_04, 1);
+            GraphicElementData_SetAnimateFlag(v0->unk_14.unk_04, 1);
 
             v0->unk_00++;
         }
@@ -1102,9 +1102,9 @@ static int ov101_021D682C (UnkStruct_ov101_021D66D0 * param0)
         VecFx32 v2 = {0x1000, 0x1000, 0};
 
         ov101_021D84A4(param0->unk_20->unk_450, &param0->unk_24, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 4, 4, 4, 4, 2, 6);
-        sub_02021CF8(param0->unk_24.unk_04, 2);
-        sub_02021C60(param0->unk_24.unk_04, &v1);
-        sub_02021C94(param0->unk_24.unk_04, sub_0201D2A4(0));
+        GraphicElementData_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
+        GraphicElementData_SetAffineTranslation(param0->unk_24.unk_04, &v1);
+        GraphicElementData_SetAffineZRotation(param0->unk_24.unk_04, sub_0201D2A4(0));
 
         param0->unk_0C = 1;
         param0->unk_08++;
@@ -1127,11 +1127,11 @@ static int ov101_021D68AC (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x400, 0x400, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, 0);
-    sub_02021CC8(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
 
     param0->unk_08++;
     return 0;
@@ -1159,8 +1159,8 @@ static int ov101_021D6908 (UnkStruct_ov101_021D66D0 * param0)
         sub_02005844(35, 0);
     }
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     return 0;
 }
 
@@ -1187,11 +1187,11 @@ static int ov101_021D6994 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, 0);
-    sub_02021CC8(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
     Sound_PlayEffect(1745);
 
     param0->unk_08++;
@@ -1219,8 +1219,8 @@ static int ov101_021D69FC (UnkStruct_ov101_021D66D0 * param0)
         param0->unk_0C = 1;
     }
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
 
     return 0;
 }
@@ -1234,11 +1234,11 @@ static int ov101_021D6A60 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 0);
-    sub_02021CC8(param0->unk_24.unk_04, 0);
-    sub_02021CE4(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
     sub_02021DE0(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
@@ -1256,10 +1256,10 @@ static int ov101_021D6AC8 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
-    sub_02021CC8(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, FX32_ONE / 2);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE / 2);
 
     if (sub_02021E24(param0->unk_24.unk_04) != 2) {
         SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 2);
@@ -1281,11 +1281,11 @@ static int ov101_021D6B3C (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 5);
-    sub_02021CC8(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, FX32_ONE);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
     sub_02021DE0(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
@@ -1303,11 +1303,11 @@ static int ov101_021D6BA4 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 4);
-    sub_02021CC8(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, FX32_ONE);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
     sub_02021DE0(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
@@ -1325,11 +1325,11 @@ static int ov101_021D6C0C (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 3);
-    sub_02021CC8(param0->unk_24.unk_04, 1);
-    sub_02021CE4(param0->unk_24.unk_04, FX32_ONE);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
     sub_02021DE0(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
@@ -1347,10 +1347,10 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    sub_02021C70(param0->unk_24.unk_04, &v1);
-    sub_02021C50(param0->unk_24.unk_04, &v0);
-    sub_02021CC8(param0->unk_24.unk_04, 0);
-    sub_02021CE4(param0->unk_24.unk_04, FX32_ONE);
+    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
+    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
+    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
 
     SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 5);
     sub_02021DE0(param0->unk_24.unk_04);
@@ -1484,7 +1484,7 @@ static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32
     }
 
     v1.y = param2 - v0.y;
-    sub_02021C50(param5, &v1);
+    GraphicElementData_SetPosition(param5, &v1);
 }
 
 static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -1502,7 +1502,7 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
             ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_30, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4);
             ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_3C, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4);
-            sub_02021D0C(v0->unk_3C.unk_04, 1);
+            GraphicElementData_SetFlipMode(v0->unk_3C.unk_04, 1);
             v0->unk_00++;
         }
     case 1:
@@ -1530,12 +1530,12 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v4.x = (FX32_ONE * -32) + v3.x;
         v4.y = ((FX32_ONE * 192) + (FX32_ONE * 228)) - v3.y;
 
-        sub_02021C50(v0->unk_30.unk_04, &v4);
+        GraphicElementData_SetPosition(v0->unk_30.unk_04, &v4);
 
         v4.x = (FX32_ONE * 288) - v3.x;
         v4.y = ((FX32_ONE * 192) + (FX32_ONE * 228)) - v3.y;
 
-        sub_02021C50(v0->unk_3C.unk_04, &v4);
+        GraphicElementData_SetPosition(v0->unk_3C.unk_04, &v4);
 
         if (v2 == 2) {
             v0->unk_00++;
@@ -1688,7 +1688,7 @@ static int ov101_021D7260 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_04, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 6, 6, 6, 6, 2, 3);
-    sub_02021CC8(v1->unk_04.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(v1->unk_04.unk_04, 1);
 
     return 1;
 }
@@ -1709,7 +1709,7 @@ static void ov101_021D72B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v0 = 0;
     }
 
-    sub_02021CAC(v1->unk_04.unk_04, v0);
+    GraphicElementData_SetDrawFlag(v1->unk_04.unk_04, v0);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D918C = {
@@ -1746,11 +1746,11 @@ static int ov101_021D7304 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v3->unk_04->unk_450, &v3->unk_08, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 6, 6, 6, 6, 2, 3);
 
-    sub_02021CF8(v3->unk_08.unk_04, 2);
-    sub_02021C60(v3->unk_08.unk_04, &v1);
-    sub_02021C70(v3->unk_08.unk_04, &v2);
-    sub_02021C94(v3->unk_08.unk_04, sub_0201D2A4(0));
-    sub_02021CC8(v3->unk_08.unk_04, 1);
+    GraphicElementData_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    GraphicElementData_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    GraphicElementData_SetAffineScale(v3->unk_08.unk_04, &v2);
+    GraphicElementData_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
+    GraphicElementData_SetAnimateFlag(v3->unk_08.unk_04, 1);
 
     return 1;
 }
@@ -1801,7 +1801,7 @@ static int ov101_021D73EC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_04, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 7, 6, 7, 7, 2, 3);
-    sub_02021CC8(v1->unk_04.unk_04, 1);
+    GraphicElementData_SetAnimateFlag(v1->unk_04.unk_04, 1);
 
     return 1;
 }
@@ -1822,7 +1822,7 @@ static void ov101_021D7444 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v0 = 0;
     }
 
-    sub_02021CAC(v1->unk_04.unk_04, v0);
+    GraphicElementData_SetDrawFlag(v1->unk_04.unk_04, v0);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D922C = {
@@ -1859,11 +1859,11 @@ static int ov101_021D74A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v3->unk_04->unk_450, &v3->unk_08, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 7, 6, 7, 7, 2, 3);
 
-    sub_02021CF8(v3->unk_08.unk_04, 2);
-    sub_02021C60(v3->unk_08.unk_04, &v1);
-    sub_02021C70(v3->unk_08.unk_04, &v2);
-    sub_02021C94(v3->unk_08.unk_04, sub_0201D2A4(0));
-    sub_02021CC8(v3->unk_08.unk_04, 1);
+    GraphicElementData_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    GraphicElementData_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    GraphicElementData_SetAffineScale(v3->unk_08.unk_04, &v2);
+    GraphicElementData_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
+    GraphicElementData_SetAnimateFlag(v3->unk_08.unk_04, 1);
 
     return 1;
 }
@@ -1916,8 +1916,8 @@ static int ov101_021D7588 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     for (v0 = 0; v0 < 2; v0++) {
         ov101_021D84A4(v2->unk_00->unk_450, &v2->unk_04[v0], &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 8, 6, 8, 8, 2, 3);
-        sub_02021CAC(v2->unk_04[v0].unk_04, 0);
-        sub_02021CC8(v2->unk_04[v0].unk_04, 1);
+        GraphicElementData_SetDrawFlag(v2->unk_04[v0].unk_04, 0);
+        GraphicElementData_SetAnimateFlag(v2->unk_04[v0].unk_04, 1);
     }
 
     return 1;
@@ -1936,8 +1936,8 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     UnkStruct_ov101_021D75F0 * v0 = param1;
     UnkStruct_ov101_021D4764 * v1 = &v0->unk_00->unk_13C;
 
-    sub_02021CAC(v0->unk_04[0].unk_04, 0);
-    sub_02021CAC(v0->unk_04[1].unk_04, 0);
+    GraphicElementData_SetDrawFlag(v0->unk_04[0].unk_04, 0);
+    GraphicElementData_SetDrawFlag(v0->unk_04[1].unk_04, 0);
 
     if (v1->unk_0C == 1) {
         return;
@@ -1956,20 +1956,20 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v4 = (v5 % 100) / 10;
 
         if (v4) {
-            sub_02021C50(v0->unk_04[v3].unk_04, &v2);
+            GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
             SpriteActor_SetSpriteAnimActive(v0->unk_04[v3].unk_04, v4);
             sub_02021DE0(v0->unk_04[v3].unk_04);
-            sub_02021CAC(v0->unk_04[v3].unk_04, 1);
+            GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
             v2.x += (FX32_ONE * 8);
             v3++;
         }
 
         v4 = (v5 % 10);
 
-        sub_02021C50(v0->unk_04[v3].unk_04, &v2);
+        GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
         SpriteActor_SetSpriteAnimActive(v0->unk_04[v3].unk_04, v4);
         sub_02021DE0(v0->unk_04[v3].unk_04);
-        sub_02021CAC(v0->unk_04[v3].unk_04, 1);
+        GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
     }
 }
 
@@ -2030,7 +2030,7 @@ static void ov101_021D776C (UnkStruct_ov101_021D5D90 * param0, void * param1)
             v3 = 0;
         }
 
-        for (v0 = 0; v0 < 5; sub_02021CAC(v1->unk_04[v0].unk_04, v3), v0++) {
+        for (v0 = 0; v0 < 5; GraphicElementData_SetDrawFlag(v1->unk_04[v0].unk_04, v3), v0++) {
             (void)0;
         }
 
@@ -2133,10 +2133,10 @@ static int ov101_021D7810 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     for (v0 = 0, v1 = 1; v0 < v6->unk_08; v0++, v1 *= 10, v3.x -= (FX32_ONE * 16)) {
         ov101_021D84A4(v6->unk_14->unk_450, &v6->unk_18[v0], &v3, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 8, 6, 8, 8, 2, 3);
 
-        sub_02021CF8(v6->unk_18[v0].unk_04, 2);
-        sub_02021C60(v6->unk_18[v0].unk_04, &v4);
-        sub_02021C70(v6->unk_18[v0].unk_04, &v5);
-        sub_02021C94(v6->unk_18[v0].unk_04, sub_0201D2A4(0));
+        GraphicElementData_SetAffineOverwriteMode(v6->unk_18[v0].unk_04, 2);
+        GraphicElementData_SetAffineTranslation(v6->unk_18[v0].unk_04, &v4);
+        GraphicElementData_SetAffineScale(v6->unk_18[v0].unk_04, &v5);
+        GraphicElementData_SetAffineZRotation(v6->unk_18[v0].unk_04, sub_0201D2A4(0));
 
         v2 = (v6->unk_04 % (v1 * 10)) / v1;
 
@@ -2352,7 +2352,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         for (v0 = 0; v0 < 3; v0++) {
             v2 = Unk_ov101_021D9424[v3->unk_1C][v0];
             ov101_021D84A4(v3->unk_44->unk_450, &v3->unk_20[v0], &v2, (NNS_G2D_VRAM_TYPE_MAX), 0, 10, 0, 10, 10, 1, 0);
-            sub_02021CC8(v3->unk_20[v0].unk_04, 1);
+            GraphicElementData_SetAnimateFlag(v3->unk_20[v0].unk_04, 1);
         }
 
         v3->unk_00++;
@@ -2368,7 +2368,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
                 v1 = 1;
             }
 
-            sub_02021C50(v3->unk_20[v0].unk_04, &v2);
+            GraphicElementData_SetPosition(v3->unk_20[v0].unk_04, &v2);
         }
 
         if (v1 == 0) {
@@ -2393,7 +2393,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         }
 
         for (v0 = 0; v0 < 3; v0++) {
-            sub_02021CAC(v3->unk_20[v0].unk_04, v1);
+            GraphicElementData_SetDrawFlag(v3->unk_20[v0].unk_04, v1);
         }
 
         if (v3->unk_0C >= 30) {
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index e1ed5f63a2..e296b70bec 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -364,12 +364,12 @@ void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0)
 
 void ov101_021D8560 (GraphicElementData * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = sub_02021D28(param0);
+    const VecFx32 * v0 = GraphicElementData_GetPosition(param0);
     *param1 = *v0;
 }
 
 void ov101_021D8574 (GraphicElementData * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = sub_02021D2C(param0);
+    const VecFx32 * v0 = GraphicElementData_GetAffineScale(param0);
     *param1 = *v0;
 }
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 338a6f6d51..9d0cdd2751 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -412,7 +412,7 @@ void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 par
         }
     }
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
     return;
 }
 
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index 546c4ca9df..df2485886f 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -935,7 +935,7 @@ void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int pa
         DC_FlushRange(v4, sizeof((10 * 10 * ((8 / 2) * 8))));
         GX_LoadOBJ(v4, v11->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], (10 * 10 * ((8 / 2) * 8)));
 
-        v12 = sub_02021F9C(v5->unk_00);
+        v12 = GraphicElementData_GetPaletteProxy(v5->unk_00);
         v13 = sub_0201FAB4(v12, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteSys_LoadPalette(v2, v3.archive, v3.palette, param2, 2, 0x20, v13 * 16);
@@ -1022,7 +1022,7 @@ CellActorData * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, Pokemon * par
 
     v0 = SpriteActor_LoadResources(param0->unk_34.unk_00, param0->unk_34.unk_04, &v1);
 
-    sub_02021F24(v0->unk_00, Pokemon_IconPaletteIndex(param1));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_00, Pokemon_IconPaletteIndex(param1));
     sub_0200D330(v0);
 
     return v0;
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 70788d0020..430e618dc4 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -410,22 +410,22 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
 
                 for (v11 = 0; v11 < v4; v11++) {
                     v23 = v3->unk_30[v11]->unk_00;
-                    v21 = *(sub_02021D28((const GraphicElementData *)v23));
+                    v21 = *(GraphicElementData_GetPosition((const GraphicElementData *)v23));
 
                     v24 = v3->unk_40[v11]->unk_00;
-                    v22 = *(sub_02021D28((const GraphicElementData *)v24));
+                    v22 = *(GraphicElementData_GetPosition((const GraphicElementData *)v24));
 
-                    sub_02021C50(v23, &v22);
-                    sub_02021C50(v24, &v21);
+                    GraphicElementData_SetPosition(v23, &v22);
+                    GraphicElementData_SetPosition(v24, &v21);
 
                     v23 = v3->unk_50[v11]->unk_00;
-                    v21 = *(sub_02021D28((const GraphicElementData *)v23));
+                    v21 = *(GraphicElementData_GetPosition((const GraphicElementData *)v23));
 
                     v24 = v3->unk_60[v11]->unk_00;
-                    v22 = *(sub_02021D28((const GraphicElementData *)v24));
+                    v22 = *(GraphicElementData_GetPosition((const GraphicElementData *)v24));
 
-                    sub_02021C50(v23, &v22);
-                    sub_02021C50(v24, &v21);
+                    GraphicElementData_SetPosition(v23, &v22);
+                    GraphicElementData_SetPosition(v24, &v21);
                 }
             }
         }
@@ -453,11 +453,11 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
 
         if (v18 == 0) {
             for (v11 = 0; v11 < v4; v11++) {
-                sub_02021E80(v3->unk_30[v11]->unk_00, 2);
+                GraphicElementData_SetExplicitPriority(v3->unk_30[v11]->unk_00, 2);
             }
         } else {
             for (v11 = 0; v11 < v5; v11++) {
-                sub_02021E80(v3->unk_40[v11]->unk_00, 2);
+                GraphicElementData_SetExplicitPriority(v3->unk_40[v11]->unk_00, 2);
             }
         }
         break;
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 28751edb50..8fcd133ea8 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -706,13 +706,13 @@ void ov104_02238764 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
         for (v2 = 0; v2 < v0; v2++) {
             v3 = Party_GetPokemonBySlotIndex(param0->unk_70, v2);
             param0->unk_30[v2] = ov104_02232F4C(param1, v3, v2, Unk_ov104_0223FB18[v2].unk_00, Unk_ov104_0223FB18[v2].unk_02);
-            sub_02021CC8(param0->unk_30[v2]->unk_00, 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_30[v2]->unk_00, 0);
         }
     } else {
         for (v2 = 0; v2 < v1; v2++) {
             v3 = Party_GetPokemonBySlotIndex(param0->unk_74, v2);
             param0->unk_40[v2] = ov104_02232F4C(param1, v3, v2 + v0, Unk_ov104_0223FB28[v2].unk_00, Unk_ov104_0223FB28[v2].unk_02);
-            sub_02021CC8(param0->unk_40[v2]->unk_00, 0);
+            GraphicElementData_SetAnimateFlag(param0->unk_40[v2]->unk_00, 0);
         }
     }
 
@@ -751,9 +751,9 @@ void ov104_0223886C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
     }
 
     if (param2 == 1) {
-        sub_02021CAC(param0->unk_30[param3]->unk_00, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_30[param3]->unk_00, 1);
     } else {
-        sub_02021CAC(param0->unk_30[param3]->unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_30[param3]->unk_00, 0);
     }
 
     return;
@@ -770,9 +770,9 @@ void ov104_022388A4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
     }
 
     if (param2 == 1) {
-        sub_02021CAC(param0->unk_40[param3]->unk_00, 1);
+        GraphicElementData_SetDrawFlag(param0->unk_40[param3]->unk_00, 1);
     } else {
-        sub_02021CAC(param0->unk_40[param3]->unk_00, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_40[param3]->unk_00, 0);
     }
 
     return;
@@ -794,7 +794,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
             v3 = Party_GetPokemonBySlotIndex(param0->unk_70, v2);
 
             if (Pokemon_GetValue(v3, MON_DATA_HELD_ITEM, NULL) == 0) {
-                sub_02021CAC(param0->unk_50[v2]->unk_00, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_50[v2]->unk_00, 0);
             }
         }
     } else {
@@ -804,7 +804,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
             v3 = Party_GetPokemonBySlotIndex(param0->unk_74, v2);
 
             if (Pokemon_GetValue(v3, MON_DATA_HELD_ITEM, NULL) == 0) {
-                sub_02021CAC(param0->unk_60[v2]->unk_00, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_60[v2]->unk_00, 0);
             }
         }
     }
@@ -852,12 +852,12 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
 
         if (param4 == 1) {
             if (v0 == 0) {
-                sub_02021CAC(param0->unk_50[param3]->unk_00, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
             } else {
-                sub_02021CAC(param0->unk_50[param3]->unk_00, 1);
+                GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 1);
             }
         } else {
-            sub_02021CAC(param0->unk_50[param3]->unk_00, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
         }
     } else {
         if (param3 >= v2) {
@@ -869,12 +869,12 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
 
         if (param4 == 1) {
             if (v0 == 0) {
-                sub_02021CAC(param0->unk_60[param3]->unk_00, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
             } else {
-                sub_02021CAC(param0->unk_60[param3]->unk_00, 1);
+                GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 1);
             }
         } else {
-            sub_02021CAC(param0->unk_60[param3]->unk_00, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
         }
     }
 
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index 397b37bdd3..db5b50970c 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -530,7 +530,7 @@ static void ov104_0223E3FC (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0
         SpriteActor_EnableObject(param1->unk_04[v0], 0);
 
         if (v0 != 3) {
-            sub_02021CF8(param1->unk_04[v0]->unk_00, 2);
+            GraphicElementData_SetAffineOverwriteMode(param1->unk_04[v0]->unk_00, 2);
             SpriteActor_SetSpriteAnimActive(param1->unk_04[v0]->unk_00, 1);
             ov104_0223E534(&param1->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
@@ -569,8 +569,8 @@ static BOOL ov104_0223E4A4 (UnkStruct_ov104_0223E48C * param0)
         v1 = ov104_0223E544(&param0->unk_14[v0]);
         v3 = ov104_0223E58C(param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue);
 
-        sub_02021C70(param0->unk_04[v0]->unk_00, &v3);
-        sub_02021CAC(param0->unk_04[v0]->unk_00, 1);
+        GraphicElementData_SetAffineScale(param0->unk_04[v0]->unk_00, &v3);
+        GraphicElementData_SetDrawFlag(param0->unk_04[v0]->unk_00, 1);
 
         if (v1 == 0) {
             v2 = 0;
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index a0e19f7271..53284c1122 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -96,7 +96,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
 
         v2 = GraphicElementManager_AddElementEx(&v3);
 
-        sub_02021CC8(v2, 1);
+        GraphicElementData_SetAnimateFlag(v2, 1);
         SpriteActor_SetSpriteAnimActive(v2, param2);
     }
 
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 72aa4dba6a..33b5e307b2 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -53,7 +53,7 @@ void ov105_02245E30 (UnkStruct_ov105_02245E1C * param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    sub_02021C50(param0->unk_08, &v0);
+    GraphicElementData_SetPosition(param0->unk_08, &v0);
     return;
 }
 
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 6fe7677695..57088c2037 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -48,7 +48,7 @@ UnkStruct_ov105_02245EA8 * ov105_02245E54 (UnkStruct_ov105_02245AAC * param0, in
     v0->unk_0C = ov105_02245BA4(param0, 0, 6, 0, 0, 0);
 
     ov105_02245F14(v0, param1, param2);
-    sub_02021E90(v0->unk_0C, 1);
+    GraphicElementData_SetExplicitPalette(v0->unk_0C, 1);
 
     return v0;
 }
@@ -63,7 +63,7 @@ void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0)
 
 void ov105_02245EBC (UnkStruct_ov105_02245EA8 * param0, int param1)
 {
-    sub_02021CAC(param0->unk_0C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -71,12 +71,12 @@ VecFx32 ov105_02245EC8 (UnkStruct_ov105_02245EA8 * param0, int param1, int param
 {
     VecFx32 v0;
 
-    v0 = *(sub_02021D28(param0->unk_0C));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
     v0.x += (param1 * FX32_ONE);
     v0.y += (param2 * FX32_ONE);
 
-    sub_02021C50(param0->unk_0C, &v0);
-    return *(sub_02021D28(param0->unk_0C));
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    return *(GraphicElementData_GetPosition(param0->unk_0C));
 }
 
 void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2)
@@ -86,13 +86,13 @@ void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
 const VecFx32 * ov105_02245F2C (UnkStruct_ov105_02245EA8 * param0)
 {
-    return sub_02021D28(param0->unk_0C);
+    return GraphicElementData_GetPosition(param0->unk_0C);
 }
 
 void ov105_02245F38 (UnkStruct_ov105_02245EA8 * param0, u8 param1)
@@ -128,7 +128,7 @@ void ov105_02245F5C (UnkStruct_ov105_02245EA8 * param0)
     v0.x = ((v1->x / FX32_ONE) + 248) * FX32_ONE;
     v0.y = v1->y;
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -144,7 +144,7 @@ int ov105_02245F8C (UnkStruct_ov105_02245EA8 * param0)
 
 void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 {
-    sub_02021CE4(param0->unk_0C, FX32_ONE);
+    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
     SpriteActor_SetSpriteAnimActive(param0->unk_0C, param1);
 
     return;
@@ -152,6 +152,6 @@ void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 
 void ov105_02245FAC (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 {
-    sub_02021E90(param0->unk_0C, param1);
+    GraphicElementData_SetExplicitPalette(param0->unk_0C, param1);
     return;
 }
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index 88dd51c70d..b66a95236d 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -61,7 +61,7 @@ UnkStruct_ov105_02246060 * ov105_02245FB8 (UnkStruct_ov105_02245AAC * param0, u8
     v1.x = (v0->unk_04[v0->unk_02].unk_00 * FX32_ONE);
     v1.y = (v0->unk_04[v0->unk_02].unk_02 * FX32_ONE);
 
-    sub_02021C50(v0->unk_0C, &v1);
+    GraphicElementData_SetPosition(v0->unk_0C, &v1);
     return v0;
 }
 
@@ -75,7 +75,7 @@ void * ov105_02246060 (UnkStruct_ov105_02246060 * param0)
 
 void ov105_02246074 (UnkStruct_ov105_02246060 * param0, int param1)
 {
-    sub_02021CAC(param0->unk_0C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -148,11 +148,11 @@ void ov105_02246080 (UnkStruct_ov105_02246060 * param0)
         sub_02021DCC(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(sub_02021D28(param0->unk_0C));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
     v0.x = (param0->unk_04[param0->unk_02].unk_00 * FX32_ONE);
     v0.y = (param0->unk_04[param0->unk_02].unk_02 * FX32_ONE);
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -184,11 +184,11 @@ void ov105_022461C0 (UnkStruct_ov105_02246060 * param0, u8 param1)
         sub_02021DCC(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(sub_02021D28(param0->unk_0C));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
 
     v0.x = (param0->unk_04[param0->unk_02].unk_00 * FX32_ONE);
     v0.y = (param0->unk_04[param0->unk_02].unk_02 * FX32_ONE);
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     return;
 }
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 4780377923..c73c8b0bd0 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -110,8 +110,8 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
 
         v2 = GraphicElementManager_AddElementEx(&v3);
 
-        sub_02021CC8(v2, 1);
-        sub_02021CE4(v2, FX32_ONE);
+        GraphicElementData_SetAnimateFlag(v2, 1);
+        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
         SpriteActor_SetSpriteAnimActive(v2, param2);
     }
 
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index ad2e3fba42..0c8fb8c543 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -47,7 +47,7 @@ UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u3
     v1.x = (param3 * FX32_ONE);
     v1.y = (param4 * FX32_ONE);
 
-    sub_02021C50(v0->unk_10, &v1);
+    GraphicElementData_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
@@ -62,7 +62,7 @@ void * ov106_02243650 (UnkStruct_ov106_02243650 * param0)
 
 void ov106_02243664 (UnkStruct_ov106_02243650 * param0, int param1)
 {
-    sub_02021CAC(param0->unk_10, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -74,18 +74,18 @@ void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2)
         sub_02021DCC(param0->unk_10, param0->unk_0C[0]);
     }
 
-    v0 = *(sub_02021D28(param0->unk_10));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    sub_02021C50(param0->unk_10, &v0);
+    GraphicElementData_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1)
 {
-    sub_02021CE4(param0->unk_10, FX32_ONE);
+    GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
     sub_02021DCC(param0->unk_10, param1);
 
     return;
@@ -93,6 +93,6 @@ void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1)
 
 void ov106_022436CC (UnkStruct_ov106_02243650 * param0, Pokemon * param1)
 {
-    sub_02021F24(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index ccdddf52cb..413196fb41 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -148,8 +148,8 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
 
         v2 = GraphicElementManager_AddElementEx(&v3);
 
-        sub_02021CC8(v2, 1);
-        sub_02021CE4(v2, FX32_ONE);
+        GraphicElementData_SetAnimateFlag(v2, 1);
+        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
         SpriteActor_SetSpriteAnimActive(v2, param4);
     }
 
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 2681235957..4beeee842b 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -49,7 +49,7 @@ UnkStruct_ov107_02249B8C * ov107_02249B1C (UnkStruct_ov107_02249954 * param0, u3
     v1.x = (param5 * FX32_ONE);
     v1.y = (param6 * FX32_ONE);
 
-    sub_02021C50(v0->unk_04, &v1);
+    GraphicElementData_SetPosition(v0->unk_04, &v1);
     return v0;
 }
 
@@ -68,7 +68,7 @@ void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0)
 
 void ov107_02249BAC (UnkStruct_ov107_02249B8C * param0, int param1)
 {
-    sub_02021CAC(param0->unk_04, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_04, param1);
     return;
 }
 
@@ -76,17 +76,17 @@ void ov107_02249BB8 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(sub_02021D28(param0->unk_04));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_04));
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    sub_02021C50(param0->unk_04, &v0);
+    GraphicElementData_SetPosition(param0->unk_04, &v0);
     return;
 }
 
 void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1)
 {
-    sub_02021CE4(param0->unk_04, FX32_ONE);
+    GraphicElementData_SetAnimSpeed(param0->unk_04, FX32_ONE);
     SpriteActor_SetSpriteAnimActive(param0->unk_04, param1);
 
     return;
@@ -94,7 +94,7 @@ void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1)
 
 void ov107_02249C08 (UnkStruct_ov107_02249B8C * param0, Pokemon * param1)
 {
-    sub_02021F24(param0->unk_04, Pokemon_IconPaletteIndex(param1));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_04, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -117,7 +117,7 @@ BOOL ov107_02249C40 (UnkStruct_ov107_02249B8C * param0)
 
 void ov107_02249C4C (UnkStruct_ov107_02249B8C * param0, u8 param1)
 {
-    sub_02021E80(param0->unk_04, param1);
+    GraphicElementData_SetExplicitPriority(param0->unk_04, param1);
     return;
 }
 
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 607dd98c01..b383ec11b3 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -106,8 +106,8 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
 
         v2 = GraphicElementManager_AddElementEx(&v3);
 
-        sub_02021CC8(v2, 1);
-        sub_02021CE4(v2, FX32_ONE);
+        GraphicElementData_SetAnimateFlag(v2, 1);
+        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
         SpriteActor_SetSpriteAnimActive(v2, param4);
     }
 
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index ee6e93827a..65aeb5323e 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -52,7 +52,7 @@ UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u3
         v1.y += (192 << FX32_SHIFT);
     }
 
-    sub_02021C50(v0->unk_10, &v1);
+    GraphicElementData_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
@@ -67,7 +67,7 @@ void * ov108_02243594 (UnkStruct_ov108_02243594 * param0)
 
 void ov108_022435A8 (UnkStruct_ov108_02243594 * param0, int param1)
 {
-    sub_02021CAC(param0->unk_10, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -75,7 +75,7 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(sub_02021D28(param0->unk_10));
+    v0 = *(GraphicElementData_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
@@ -84,13 +84,13 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2)
         v0.y += (192 << FX32_SHIFT);
     }
 
-    sub_02021C50(param0->unk_10, &v0);
+    GraphicElementData_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1)
 {
-    sub_02021CE4(param0->unk_10, FX32_ONE);
+    GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
     sub_02021DCC(param0->unk_10, param1);
 
     return;
@@ -98,7 +98,7 @@ void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1)
 
 void ov108_02243610 (UnkStruct_ov108_02243594 * param0, Pokemon * param1)
 {
-    sub_02021F24(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -116,6 +116,6 @@ static const VecFx32 Unk_ov111_021D3834[] = {
 
 void ov108_02243624 (UnkStruct_ov108_02243594 * param0, u8 param1)
 {
-    sub_02021CC8(param0->unk_10, param1);
+    GraphicElementData_SetAnimateFlag(param0->unk_10, param1);
     return;
 }
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index b91d360e77..5aa58d27f5 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -662,9 +662,9 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
 
             param0->unk_29C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_29C[v0 + 1], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_29C[v0 + 1], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
-            sub_02021CAC(param0->unk_29C[v0 + 1], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1634,7 +1634,7 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0)
                 SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + v0 * 2);
             }
         }
-            sub_02021CAC(param0->unk_29C[v0 + 1], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
             param0->unk_400[v0] = 2;
             v1 = 1;
             break;
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index b57bbf9a3b..e021844e47 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -144,8 +144,8 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
 
         v2 = GraphicElementManager_AddElementEx(&v3);
 
-        sub_02021CC8(v2, 0);
-        sub_02021CE4(v2, FX32_ONE);
+        GraphicElementData_SetAnimateFlag(v2, 0);
+        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
         SpriteActor_SetSpriteAnimActive(v2, param2);
     }
 
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index f1edc8baf7..e04a769d6a 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -58,13 +58,13 @@ void * ov111_021D3448 (UnkStruct_ov111_021D33F4 * param0)
 
 void ov111_021D345C (UnkStruct_ov111_021D33F4 * param0, int param1)
 {
-    sub_02021CAC(param0->unk_0C, param1);
+    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D3468 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    sub_02021F58(param0->unk_0C, param1);
+    GraphicElementData_SetPriority(param0->unk_0C, param1);
     return;
 }
 
@@ -79,7 +79,7 @@ void ov111_021D3474 (UnkStruct_ov111_021D33F4 * param0, int param1, int param2)
         v0.y += (512 * FX32_ONE);
     }
 
-    sub_02021C50(param0->unk_0C, &v0);
+    GraphicElementData_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -87,7 +87,7 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para
 {
     const VecFx32 * v0;
 
-    v0 = sub_02021D28(param0->unk_0C);
+    v0 = GraphicElementData_GetPosition(param0->unk_0C);
 
     *param1 = (v0->x / FX32_ONE);
     *param2 = (v0->y / FX32_ONE);
@@ -97,7 +97,7 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para
 
 void ov111_021D34C4 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    sub_02021CE4(param0->unk_0C, FX32_ONE);
+    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
     sub_02021DCC(param0->unk_0C, param1);
 
     return;
@@ -122,34 +122,34 @@ void ov111_021D34E0 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
     u8 v0;
     v0 = param1;
 
-    sub_02021C80(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
+    GraphicElementData_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
 
     return;
 }
 
 void ov111_021D34F4 (UnkStruct_ov111_021D33F4 * param0, VecFx32 * param1)
 {
-    sub_02021C80(param0->unk_0C, param1, 2);
+    GraphicElementData_SetAffineScaleEx(param0->unk_0C, param1, 2);
     return;
 }
 
 void ov111_021D3500 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    sub_02021EC4(param0->unk_0C, param1);
+    GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D350C (UnkStruct_ov111_021D33F4 * param0, int param1)
 {
-    sub_02021CC8(param0->unk_0C, param1);
-    sub_02021CE4(param0->unk_0C, FX32_ONE);
+    GraphicElementData_SetAnimateFlag(param0->unk_0C, param1);
+    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
     SpriteActor_SetSpriteAnimActive(param0->unk_0C, sub_02021E24(param0->unk_0C));
     return;
 }
 
 void ov111_021D3530 (UnkStruct_ov111_021D33F4 * param0, BOOL param1)
 {
-    sub_02021FA0(param0->unk_0C, param1);
+    GraphicElementData_SetPixelated(param0->unk_0C, param1);
     return;
 }
 
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 0c36b623c8..62bae62d5b 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1985,9 +1985,9 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
         param0->unk_10 = ov114_0225CDB4(param8, param7->unk_00, v2, v3, 0, param9);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_10, v1);
-        sub_02021EF0(param0->unk_10, param5);
-        sub_02021CAC(param0->unk_10, 0);
-        sub_02021CC8(param0->unk_10, 1);
+        GraphicElementData_SetExplicitPaletteOffset(param0->unk_10, param5);
+        GraphicElementData_SetDrawFlag(param0->unk_10, 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_10, 1);
     }
 
     {
@@ -1999,7 +1999,7 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
         param0->unk_14 = ov114_0225CDB4(param8, param7->unk_00, v4, v5, 0, param9);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_14, 0);
-        sub_02021CAC(param0->unk_14, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
     }
 
     param0->unk_1A = param5;
@@ -2037,9 +2037,9 @@ static void ov114_0225DCA0 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0
 
 static void ov114_0225DD0C (UnkStruct_ov114_0225DAC0 * param0, u32 param1)
 {
-    sub_02021CAC(param0->unk_14, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_14, 1);
     SpriteActor_SetSpriteAnimActive(param0->unk_14, 4 + param1);
-    sub_02021CC8(param0->unk_14, 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_14, 1);
 }
 
 static void ov114_0225DD2C (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, s16 param3, s16 param4, u32 param5)
@@ -2061,7 +2061,7 @@ static void ov114_0225DD80 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0
 
 static void ov114_0225DD94 (UnkStruct_ov114_0225DAC0 * param0)
 {
-    sub_02021CAC(param0->unk_10, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_10, 1);
 }
 
 static void ov114_0225DDA0 (UnkStruct_ov114_0225DAC0 * param0)
@@ -2137,7 +2137,7 @@ static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_10, &v3);
+    GraphicElementData_SetPosition(param0->unk_10, &v3);
 
     v1 = 24;
     v2 = (Unk_ov114_02260204[param0->unk_18 - 1].unk_00[param0->unk_1B] * 8) + 21;
@@ -2145,7 +2145,7 @@ static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    sub_02021C50(param0->unk_14, &v3);
+    GraphicElementData_SetPosition(param0->unk_14, &v3);
 }
 
 static u32 ov114_0225DF44 (u32 param0, u32 param1, u32 param2)
@@ -3413,9 +3413,9 @@ static void ov114_0225F484 (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
             for (v1 = 0; v1 < 5; v1++) {
                 v2 = (v0 * 5) + v1;
                 param0->unk_08[v2] = ov114_0225CDB4(param0->unk_44, param2->unk_00, v3, v4, 0, param5);
-                sub_02021CAC(param0->unk_08[v2], 0);
+                GraphicElementData_SetDrawFlag(param0->unk_08[v2], 0);
                 SpriteActor_SetSpriteAnimActive(param0->unk_08[v2], v0);
-                sub_02021E80(param0->unk_08[v2], 0);
+                GraphicElementData_SetExplicitPriority(param0->unk_08[v2], 0);
 
                 v3 += 24;
             }
@@ -3465,7 +3465,7 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
         }
 
         Sound_PlayEffect(1404);
-        sub_02021CAC(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
         param0->unk_49 = 8;
         param0->unk_48++;
         break;
@@ -3480,7 +3480,7 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
 
                 if (param0->unk_4A != param0->unk_4B) {
                     for (v0 = 0; v0 < (5 * 3); v0++) {
-                        sub_02021CAC(param0->unk_08[v0], 0);
+                        GraphicElementData_SetDrawFlag(param0->unk_08[v0], 0);
                         SpriteActor_SetSpriteAnimActive(param0->unk_08[v0], 2);
                     }
                 }
@@ -3667,7 +3667,7 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0
     for (v0 = 0; v0 < 2; v0++) {
         param0->unk_00[v0] = ov114_0225CDB4(param1, param2, Unk_ov114_0226019C[v0].x >> FX32_SHIFT, Unk_ov114_0226019C[v0].y >> FX32_SHIFT, 0, param3);
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 5);
-        sub_02021E80(param0->unk_00[v0], 0);
+        GraphicElementData_SetExplicitPriority(param0->unk_00[v0], 0);
     }
 
     v1 = GX_GetVisibleWnd();
@@ -3683,7 +3683,7 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0
     param0->battlerType.effect = 1;
 
     SetHBlankCallback(ov114_0225FCF0, param0);
-    sub_02021D0C(param0->unk_00[1], 2);
+    GraphicElementData_SetFlipMode(param0->unk_00[1], 2);
 
     ov114_0225FC6C(param0);
 }
@@ -3714,8 +3714,8 @@ static BOOL ov114_0225FAD8 (UnkStruct_ov114_0225FAB8 * param0)
         param0->unk_08 = 1;
         v0 = 1;
 
-        sub_02021CAC(param0->unk_00[0], 0);
-        sub_02021CAC(param0->unk_00[1], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_00[1], 0);
     }
 
     ov114_0225FB10(param0, -1);
@@ -3746,7 +3746,7 @@ static void ov114_0225FB10 (UnkStruct_ov114_0225FAB8 * param0, s32 param1)
             v0.y += FX32_CONST(v2);
         }
 
-        sub_02021C50(param0->unk_00[v1], &v0);
+        GraphicElementData_SetPosition(param0->unk_00[v1], &v0);
     }
 
     ov114_0225FC6C(param0);
@@ -3844,7 +3844,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
     case 1:
         ov114_0225F9B8(&v0->unk_34, v0->unk_28, v0->unk_08, v0->unk_00);
         v0->unk_30 = ov114_0225CDB4(v0->unk_28, v0->unk_08, 128, 97, 64, v0->unk_00);
-        sub_02021E80(v0->unk_30, 0);
+        GraphicElementData_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
@@ -3884,9 +3884,9 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
 
         if (v3 == 15) {
             if (v0->unk_06 == 0) {
-                sub_02021F24(v0->unk_30, 0);
+                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
             } else if (v0->unk_06 == 4) {
-                sub_02021F24(v0->unk_30, 1);
+                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 1);
             }
 
             v0->unk_06++;
@@ -3900,7 +3900,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
 
         if (v1 == 0) {
             v0->unk_04++;
-            sub_02021F24(v0->unk_30, 0);
+            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
         }
         break;
     case 4:
@@ -3943,14 +3943,14 @@ static void ov114_0225FF54 (SysTask * param0, void * param1)
         ov114_0225F9B8(&v0->unk_34, v0->unk_28, v0->unk_08, v0->unk_00);
         v0->unk_30 = ov114_0225CDB4(v0->unk_28, v0->unk_08, 128, 97, 64, v0->unk_00);
         SpriteActor_SetSpriteAnimActive(v0->unk_30, 1);
-        sub_02021E80(v0->unk_30, 0);
+        GraphicElementData_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
         v1 = ov114_0225FAB8(&v0->unk_34);
 
         if (v1 == 1) {
-            sub_02021CC8(v0->unk_30, 1);
+            GraphicElementData_SetAnimateFlag(v0->unk_30, 1);
             v0->unk_04++;
             v0->unk_06 = 0;
         }
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 005284349a..555b8b7493 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1312,9 +1312,9 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, CellActorInitPara
         param0->unk_00[v0] = GraphicElementManager_AddElementEx(param1);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
-        sub_02021CAC(param0->unk_00[v0], 0);
-        sub_02021CC8(param0->unk_00[v0], 1);
-        sub_02021CE4(param0->unk_00[v0], FX32_CONST(1.5));
+        GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
+        GraphicElementData_SetAnimateFlag(param0->unk_00[v0], 1);
+        GraphicElementData_SetAnimSpeed(param0->unk_00[v0], FX32_CONST(1.5));
 
         param0->unk_0C[v0] = 0;
     }
@@ -1350,13 +1350,13 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p
     v1 = -1;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (sub_02021D34(param0->unk_00[v0]) == 0) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0]) == 0) {
             v1 = v0;
             v2 = 1;
         } else {
-            v3 = sub_02021F74(param0->unk_00[v0]);
+            v3 = GraphicElementData_GetPriority(param0->unk_00[v0]);
             v3++;
-            sub_02021F58(param0->unk_00[v0], v3);
+            GraphicElementData_SetPriority(param0->unk_00[v0], v3);
 
             if ((v2 == 0) && (v4 <= v3)) {
                 v4 = v3;
@@ -1391,10 +1391,10 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p
 
     SpriteActor_SetSpriteAnimActive(param0->unk_00[v1], v5);
     param0->unk_0C[v1] = 0;
-    sub_02021CAC(param0->unk_00[v1], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_00[v1], 1);
     ov115_0226177C(param0, v1);
-    sub_02021F58(param0->unk_00[v1], 0);
-    sub_02021E90(param0->unk_00[v1], v6);
+    GraphicElementData_SetPriority(param0->unk_00[v1], 0);
+    GraphicElementData_SetExplicitPalette(param0->unk_00[v1], v6);
 }
 
 static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0)
@@ -1402,7 +1402,7 @@ static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (sub_02021D34(param0->unk_00[v0]) == 1) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0]) == 1) {
             param0->unk_0C[v0]++;
 
             if (param0->unk_0C[v0] > 16) {
@@ -1423,12 +1423,12 @@ static void ov115_0226177C (UnkStruct_ov115_022615B0 * param0, u32 param1)
     v1 = param0->unk_18[param1];
     v1.y += v0;
 
-    sub_02021C50(param0->unk_00[param1], &v1);
+    GraphicElementData_SetPosition(param0->unk_00[param1], &v1);
 }
 
 static void ov115_022617D8 (UnkStruct_ov115_022615B0 * param0, u32 param1)
 {
-    sub_02021CAC(param0->unk_00[param1], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_00[param1], 0);
 }
 
 static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6)
@@ -2697,7 +2697,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         v2.heapID = param2;
 
         param0->unk_34 = GraphicElementManager_AddElement(&v2);
-        sub_02021CAC(param0->unk_34, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
     }
 
     NARC_dtor(v0);
@@ -2729,7 +2729,7 @@ static void ov115_02263130 (UnkStruct_ov115_02263130 * param0)
         param0->unk_39 = 0;
     }
 
-    sub_02021CAC(param0->unk_34, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_34, 1);
 }
 
 static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02260D78 * param1)
@@ -2787,7 +2787,7 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         break;
     case 3:
         if (ov115_022625C8(param1) == 0) {
-            sub_02021CAC(param0->unk_34, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_34, 0);
             return 1;
         }
         break;
@@ -3718,7 +3718,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
         v0.heapID = param2;
         param1->unk_00 = GraphicElementManager_AddElementEx(&v0);
 
-        sub_02021CAC(param1->unk_00, 0);
+        GraphicElementData_SetDrawFlag(param1->unk_00, 0);
     }
 
     Easy3DObject_Init(&param1->unk_7C, &param0->unk_760.unk_50);
@@ -3737,9 +3737,9 @@ static void ov115_02264740 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     param1->unk_F4 = 1;
     param1->unk_104 = 0;
 
-    sub_02021E90(param1->unk_00, param2->unk_04.unk_00);
+    GraphicElementData_SetExplicitPalette(param1->unk_00, param2->unk_04.unk_00);
     ov115_02264980(param1, param2, param3);
-    sub_02021CAC(param1->unk_00, 1);
+    GraphicElementData_SetDrawFlag(param1->unk_00, 1);
 }
 
 static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2)
@@ -3747,7 +3747,7 @@ static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     param1->unk_F8 = param2;
     param1->unk_104 = 0;
 
-    sub_02021CAC(param1->unk_00, 0);
+    GraphicElementData_SetDrawFlag(param1->unk_00, 0);
     ov115_022649F0(param1, param0);
 }
 
@@ -3830,7 +3830,7 @@ static void ov115_02264924 (UnkStruct_ov115_022647A0 * param0)
     param0->unk_F8 = NULL;
     param0->unk_F4 = 0;
 
-    sub_02021CAC(param0->unk_00, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
     Easy3DObject_SetVisibility(&param0->unk_7C, 0);
 }
 
@@ -3862,7 +3862,7 @@ static BOOL ov115_02264980 (UnkStruct_ov115_022647A0 * param0, const UnkStruct_o
     v0.y = (v1.y << FX32_SHIFT) + (512 << FX32_SHIFT);
     v0.z = 0;
 
-    sub_02021C50(param0->unk_00, &v0);
+    GraphicElementData_SetPosition(param0->unk_00, &v0);
 
     if ((v1.x < 0) || (v1.y < 0)) {
         return 0;
@@ -3875,7 +3875,7 @@ static void ov115_022649F0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0
 {
     Easy3DModel * v0;
 
-    sub_02021CAC(param0->unk_00, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
     param0->unk_F4 = 0;
 
     v0 = ov115_02264A40(param0->unk_F8, &param1->unk_760);
@@ -3941,8 +3941,8 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 
     param1->unk_04 = GraphicElementManager_AddElementEx(&v0);
 
-    sub_02021CAC(param1->unk_04, 0);
-    sub_02021E90(param1->unk_04, param2);
+    GraphicElementData_SetDrawFlag(param1->unk_04, 0);
+    GraphicElementData_SetExplicitPalette(param1->unk_04, param2);
 
     param1->unk_00 = 0;
 }
@@ -3954,7 +3954,7 @@ static void ov115_02264BA0 (UnkStruct_ov115_02264BA0 * param0)
 
 static void ov115_02264BAC (UnkStruct_ov115_02264BA0 * param0)
 {
-    sub_02021CAC(param0->unk_04, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_04, 1);
     param0->unk_00 = 1;
 }
 
@@ -3976,12 +3976,12 @@ static void ov115_02264BD8 (UnkStruct_ov115_02264BA0 * param0, s32 param1, s32 p
     v0.x = param1 << FX32_SHIFT;
     v0.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    sub_02021C50(param0->unk_04, &v0);
+    GraphicElementData_SetPosition(param0->unk_04, &v0);
 }
 
 static void ov115_02264BF8 (UnkStruct_ov115_02264BA0 * param0)
 {
-    sub_02021CAC(param0->unk_04, 0);
+    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
     param0->unk_00 = 0;
 }
 
@@ -4001,9 +4001,9 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 
     for (v0 = 0; v0 < 8; v0++) {
         param1->unk_00[v0].unk_04 = GraphicElementManager_AddElementEx(&v1);
-        sub_02021CAC(param1->unk_00[v0].unk_04, 0);
-        sub_02021CF8(param1->unk_00[v0].unk_04, 1);
-        sub_02021E90(param1->unk_00[v0].unk_04, param2);
+        GraphicElementData_SetDrawFlag(param1->unk_00[v0].unk_04, 0);
+        GraphicElementData_SetAffineOverwriteMode(param1->unk_00[v0].unk_04, 1);
+        GraphicElementData_SetExplicitPalette(param1->unk_00[v0].unk_04, param2);
         param1->unk_00[v0].unk_00 = 0;
     }
 }
@@ -4045,7 +4045,7 @@ static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0)
             v5.x = v4;
             v5.y = v4;
 
-            sub_02021C70(param0->unk_00[v0].unk_04, &v5);
+            GraphicElementData_SetAffineScale(param0->unk_00[v0].unk_04, &v5);
 
             if (param0->unk_00[v0].unk_18) {
                 param0->unk_00[v0].unk_08.x += v2 << FX32_SHIFT;
@@ -4054,11 +4054,11 @@ static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0)
             }
 
             param0->unk_00[v0].unk_08.y += v3 << FX32_SHIFT;
-            sub_02021C50(param0->unk_00[v0].unk_04, &param0->unk_00[v0].unk_08);
+            GraphicElementData_SetPosition(param0->unk_00[v0].unk_04, &param0->unk_00[v0].unk_08);
 
             if ((param0->unk_00[v0].unk_08.x < (-FX32_CONST(32))) || (param0->unk_00[v0].unk_08.x > (FX32_CONST(288))) || (param0->unk_00[v0].unk_08.y < (-FX32_CONST(32)) + (512 << FX32_SHIFT)) || (param0->unk_00[v0].unk_08.y > (FX32_CONST(224)) + (512 << FX32_SHIFT))) {
                 param0->unk_00[v0].unk_00 = 0;
-                sub_02021CAC(param0->unk_00[v0].unk_04, 0);
+                GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_04, 0);
             }
         }
     }
@@ -4089,10 +4089,10 @@ static void ov115_02264D80 (UnkStruct_ov115_02264C90 * param0, s32 param1, s32 p
     v1->unk_08.x = param1 << FX32_SHIFT;
     v1->unk_08.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    sub_02021C50(v1->unk_04, &v1->unk_08);
+    GraphicElementData_SetPosition(v1->unk_04, &v1->unk_08);
 
     v1->unk_00 = 1;
-    sub_02021CAC(v1->unk_04, 1);
+    GraphicElementData_SetDrawFlag(v1->unk_04, 1);
     v1->unk_14 = 0;
 }
 
@@ -4413,7 +4413,7 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
         v1.heapID = param3;
 
         param0->unk_34 = GraphicElementManager_AddElement(&v1);
-        sub_02021CAC(param0->unk_34, 0);
+        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
     }
 
     {
@@ -4495,7 +4495,7 @@ static void ov115_02265700 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
     }
 
     sub_020129D0(param0->unk_48, 1);
-    sub_02021CAC(param0->unk_34, 1);
+    GraphicElementData_SetDrawFlag(param0->unk_34, 1);
 
     param0->unk_98 = 1;
     param0->unk_9A = 0;
@@ -4552,7 +4552,7 @@ static void ov115_02265820 (UnkStruct_ov115_02265788 * param0)
         } else {
             param0->unk_98 = 0;
             sub_020129D0(param0->unk_48, 0);
-            sub_02021CAC(param0->unk_34, 0);
+            GraphicElementData_SetDrawFlag(param0->unk_34, 0);
         }
         break;
     }
@@ -4574,7 +4574,7 @@ static void ov115_02265820 (UnkStruct_ov115_02265788 * param0)
         v0.x = param0->unk_64.unk_00;
         v0.y = param0->unk_7C.unk_00;
 
-        sub_02021C50(param0->unk_34, &v0);
+        GraphicElementData_SetPosition(param0->unk_34, &v0);
         sub_02012938(param0->unk_48);
     }
 }
diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c
index 877f360ec4..fd562fe8e6 100644
--- a/src/overlay119/ov119_021D191C.c
+++ b/src/overlay119/ov119_021D191C.c
@@ -574,7 +574,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0)
                 NNSG2dImagePaletteProxy * v1;
                 int v2;
 
-                v1 = sub_02021F9C(param0->unk_78->unk_00);
+                v1 = GraphicElementData_GetPaletteProxy(param0->unk_78->unk_00);
                 v2 = sub_0201FAB4(v1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 sub_02003178(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v2), 0, 0, 16, 0xFFFF);
@@ -682,7 +682,7 @@ static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0)
                 NNSG2dImagePaletteProxy * v0;
                 int v1;
 
-                v0 = sub_02021F9C(param0->unk_78->unk_00);
+                v0 = GraphicElementData_GetPaletteProxy(param0->unk_78->unk_00);
                 v1 = sub_0201FAB4(v0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 sub_02003178(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v1), 0, 0, 16, 0xFFFF);
diff --git a/src/pokemon.c b/src/pokemon.c
index 0b31822315..8bf23e540f 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3175,7 +3175,7 @@ CellActorData *sub_02076994(SpriteRenderer *param0, SpriteGfxHandler *param1, Pa
 
     v1 = SpriteActor_LoadResources(param0, param1, &v0);
 
-    sub_02021F24(v1->unk_00, 0);
+    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v1->unk_00, 0);
     SpriteActor_SetSpritePositionXY(v1, param3, param4);
     sub_0200D330(v1);
     sub_0200D390(v1, 1);
diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c
index e44cd0e69f..844bb32e57 100644
--- a/src/pokemon_summary_app.c
+++ b/src/pokemon_summary_app.c
@@ -709,7 +709,7 @@ static int sub_0208CC6C (PokemonSummaryApp * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-        sub_02021CAC(param0->unk_41C[10], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
 
         if ((param0->cursor != 4) && (param0->cursor != param0->cursorTmp)) {
             Sound_PlayEffect(1501);
@@ -726,7 +726,7 @@ static int sub_0208CC6C (PokemonSummaryApp * param0)
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
         Sound_PlayEffect(1501);
-        sub_02021CAC(param0->unk_41C[10], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
         return 7;
     }
 
@@ -1656,7 +1656,7 @@ static u8 sub_0208DD8C (PokemonSummaryApp * param0)
             SpriteActor_DrawSprite(param0->unk_41C[12], 1);
         }
 
-        sub_02021CAC(param0->unk_41C[9], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
         return 1;
     }
 
@@ -1671,7 +1671,7 @@ static u8 sub_0208DEA4 (PokemonSummaryApp * param0)
         SpriteActor_DrawSprite(param0->unk_41C[12], 0);
         SpriteActor_DrawSprite(param0->unk_41C[18], 0);
         SpriteActor_DrawSprite(param0->unk_41C[19], 0);
-        sub_02021CAC(param0->unk_41C[9], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
         sub_0201AD10(&param0->staticWindows[35]);
         sub_0208F6DC(param0, NULL);
         sub_0209145C(param0);
@@ -1825,7 +1825,7 @@ static void sub_0208E190 (PokemonSummaryApp * param0)
         SpriteActor_DrawSprite(param0->unk_41C[12], 1);
     }
 
-    sub_02021CAC(param0->unk_41C[9], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
 }
 
 static u8 sub_0208E208 (PokemonSummaryApp * param0)
@@ -1867,7 +1867,7 @@ static u8 sub_0208E208 (PokemonSummaryApp * param0)
         sub_0208DFF4(param0);
         sub_0208F7A4(param0);
         sub_0208F844(param0);
-        sub_02021CAC(param0->unk_41C[9], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
 
         return 1;
     }
@@ -1882,7 +1882,7 @@ static u8 sub_0208E308 (PokemonSummaryApp * param0)
         sub_0208F964(param0);
         SpriteActor_DrawSprite(param0->unk_41C[19], 0);
         sub_0208E498(param0, 0xffffffff);
-        sub_02021CAC(param0->unk_41C[9], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
         sub_0201AD10(&param0->staticWindows[35]);
         sub_0208F6DC(param0, NULL);
         sub_0209145C(param0);
@@ -2017,12 +2017,12 @@ static u8 sub_0208E57C (PokemonSummaryApp * param0)
     case 2:
         sub_02090064(param0, 181);
         sub_0208F6DC(param0, &param0->staticWindows[35]);
-        sub_02021CAC(param0->unk_41C[67], 1);
-        sub_02021CAC(param0->unk_41C[70], 1);
-        sub_02021CAC(param0->unk_41C[63], 0);
-        sub_02021CAC(param0->unk_41C[64], 0);
-        sub_02021CAC(param0->unk_41C[65], 0);
-        sub_02021CAC(param0->unk_41C[66], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[67], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[70], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[63], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[64], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[65], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[66], 0);
         sub_0208E794(param0, 0);
 
         return 1;
@@ -2137,15 +2137,15 @@ static void sub_0208E794 (PokemonSummaryApp * param0, s8 param1)
     sub_02090F84(param0);
 
     if (param0->ribbonState != 0) {
-        sub_02021CAC(param0->unk_41C[68], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[68], 1);
     } else {
-        sub_02021CAC(param0->unk_41C[68], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[68], 0);
     }
 
     if ((param0->ribbonState * 4 + 8) < param0->ribbonMax) {
-        sub_02021CAC(param0->unk_41C[69], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[69], 1);
     } else {
-        sub_02021CAC(param0->unk_41C[69], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[69], 0);
     }
 }
 
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 3c0fa23838..40f7af4783 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -325,7 +325,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
 
     if (v0 != NULL) {
         SpriteActor_SetSpriteAnimActive(v0, param6);
-        sub_02021E90(v0, param8);
+        GraphicElementData_SetExplicitPalette(v0, param8);
     }
 
     return v0;
@@ -578,10 +578,10 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     v2->unk_0C = param2->transferToVRAM;
 
     if (v2->unk_00 != NULL) {
-        v1 = sub_02021EE8(v2->unk_00);
+        v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
 
         SpriteActor_SetSpriteAnimActive(v2->unk_00, param2->animIdx);
-        sub_02021E90(v2->unk_00, v1 + param2->plttIdx);
+        GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param2->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -810,7 +810,7 @@ void sub_0200D34C (CellActorData * param0, fx32 param1)
 
 u32 sub_0200D358 (CellActorData * param0)
 {
-    return sub_02021D44(param0->unk_00);
+    return GraphicElementData_GetAnimSequenceCount(param0->unk_00);
 }
 
 void sub_0200D364 (CellActorData * param0, u32 param1)
@@ -830,7 +830,7 @@ u32 sub_0200D37C (CellActorData * param0)
 
 void sub_0200D388 (GraphicElementData * param0, int param1)
 {
-    sub_02021CC8(param0, param1);
+    GraphicElementData_SetAnimateFlag(param0, param1);
 }
 
 void sub_0200D390 (CellActorData * param0, int param1)
@@ -840,7 +840,7 @@ void sub_0200D390 (CellActorData * param0, int param1)
 
 void sub_0200D39C (GraphicElementData * param0, fx32 param1)
 {
-    sub_02021CE4(param0, param1);
+    GraphicElementData_SetAnimSpeed(param0, param1);
 }
 
 void sub_0200D3A4 (CellActorData * param0, fx32 param1)
@@ -880,7 +880,7 @@ u16 sub_0200D3E0 (CellActorData * param0)
 
 void SpriteActor_DrawSprite (GraphicElementData * param0, int param1)
 {
-    sub_02021CAC(param0, param1);
+    GraphicElementData_SetDrawFlag(param0, param1);
 }
 
 void SpriteActor_EnableObject (CellActorData * param0, int param1)
@@ -890,7 +890,7 @@ void SpriteActor_EnableObject (CellActorData * param0, int param1)
 
 int sub_0200D400 (GraphicElementData * param0)
 {
-    return sub_02021D34(param0);
+    return GraphicElementData_GetDrawFlag(param0);
 }
 
 int sub_0200D408 (CellActorData * param0)
@@ -900,7 +900,7 @@ int sub_0200D408 (CellActorData * param0)
 
 void sub_0200D414 (GraphicElementData * param0, int param1)
 {
-    sub_02021E90(param0, param1);
+    GraphicElementData_SetExplicitPalette(param0, param1);
 }
 
 void sub_0200D41C (CellActorData * param0, int param1)
@@ -910,7 +910,7 @@ void sub_0200D41C (CellActorData * param0, int param1)
 
 void sub_0200D428 (GraphicElementData * param0, int param1)
 {
-    sub_02021EF0(param0, param1);
+    GraphicElementData_SetExplicitPaletteOffset(param0, param1);
 }
 
 void sub_0200D430 (CellActorData * param0, int param1)
@@ -920,17 +920,17 @@ void sub_0200D430 (CellActorData * param0, int param1)
 
 int sub_0200D43C (CellActorData * param0)
 {
-    return sub_02021F48(param0->unk_00);
+    return GraphicElementData_GetExplicitPaletteOffset(param0->unk_00);
 }
 
 void sub_0200D448 (GraphicElementData * param0, int param1)
 {
-    sub_02021E80(param0, param1);
+    GraphicElementData_SetExplicitPriority(param0, param1);
 }
 
 int sub_0200D454 (CellActorData * param0)
 {
-    return sub_02021E88(param0->unk_00);
+    return GraphicElementData_GetExplicitPriority(param0->unk_00);
 }
 
 void sub_0200D460 (CellActorData * param0, int param1)
@@ -940,7 +940,7 @@ void sub_0200D460 (CellActorData * param0, int param1)
 
 void sub_0200D46C (GraphicElementData * param0, int param1)
 {
-    sub_02021F58(param0, param1);
+    GraphicElementData_SetPriority(param0, param1);
 }
 
 void sub_0200D474 (CellActorData * param0, int param1)
@@ -950,7 +950,7 @@ void sub_0200D474 (CellActorData * param0, int param1)
 
 u32 sub_0200D480 (GraphicElementData * param0)
 {
-    return sub_02021F74(param0);
+    return GraphicElementData_GetPriority(param0);
 }
 
 u32 sub_0200D488 (CellActorData * param0)
@@ -965,13 +965,13 @@ void SpriteActor_SetPositionXY (GraphicElementData * param0, s16 param1, s16 par
     v0.x = param1 * FX32_ONE;
     v0.y = param2 * FX32_ONE;
 
-    if (sub_02021FC8(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         v0.y += (192 << FX32_SHIFT);
     }
 
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 void SpriteActor_SetSpritePositionXY (CellActorData * param0, s16 param1, s16 param2)
@@ -986,13 +986,13 @@ void sub_0200D4D0 (GraphicElementData * param0, s16 param1, s16 param2, fx32 par
     v0.x = param1 * FX32_ONE;
     v0.y = param2 * FX32_ONE;
 
-    if (sub_02021FC8(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         v0.y += param3;
     }
 
     v0.z = 0;
 
-    sub_02021C50(param0, &v0);
+    GraphicElementData_SetPosition(param0, &v0);
 }
 
 void sub_0200D500 (CellActorData * param0, s16 param1, s16 param2, fx32 param3)
@@ -1004,10 +1004,10 @@ void sub_0200D50C (GraphicElementData * param0, s16 * param1, s16 * param2)
 {
     const VecFx32 * v0;
 
-    v0 = sub_02021D28(param0);
+    v0 = GraphicElementData_GetPosition(param0);
     *param1 = v0->x / FX32_ONE;
 
-    if (sub_02021FC8(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = (v0->y - (192 << FX32_SHIFT)) / FX32_ONE;
     } else {
         *param2 = v0->y / FX32_ONE;
@@ -1023,10 +1023,10 @@ void sub_0200D55C (GraphicElementData * param0, s16 * param1, s16 * param2, fx32
 {
     const VecFx32 * v0;
 
-    v0 = sub_02021D28(param0);
+    v0 = GraphicElementData_GetPosition(param0);
     *param1 = v0->x / FX32_ONE;
 
-    if (sub_02021FC8(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = (v0->y - param3) / FX32_ONE;
     } else {
         *param2 = v0->y / FX32_ONE;
@@ -1043,13 +1043,13 @@ void sub_0200D5AC (GraphicElementData * param0, s16 param1, s16 param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0);
+    v0 = GraphicElementData_GetPosition(param0);
 
     v1.x = v0->x + (param1 * FX32_ONE);
     v1.y = v0->y + (param2 * FX32_ONE);
     v1.z = v0->z;
 
-    sub_02021C50(param0, &v1);
+    GraphicElementData_SetPosition(param0, &v1);
 }
 
 void sub_0200D5DC (CellActorData * param0, s16 param1, s16 param2)
@@ -1062,13 +1062,13 @@ void sub_0200D5E8 (CellActorData * param0, fx32 param1, fx32 param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0->unk_00);
+    v0 = GraphicElementData_GetPosition(param0->unk_00);
 
     v1.x = v0->x + param1;
     v1.y = v0->y + param2;
     v1.z = v0->z;
 
-    sub_02021C50(param0->unk_00, &v1);
+    GraphicElementData_SetPosition(param0->unk_00, &v1);
 }
 
 void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2)
@@ -1076,13 +1076,13 @@ void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0->unk_00);
+    v0 = GraphicElementData_GetPosition(param0->unk_00);
 
     v1.x = param1;
     v1.y = param2;
     v1.z = v0->z;
 
-    sub_02021C50(param0->unk_00, &v1);
+    GraphicElementData_SetPosition(param0->unk_00, &v1);
 }
 
 void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
@@ -1090,7 +1090,7 @@ void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = sub_02021D28(param0->unk_00);
+    v0 = GraphicElementData_GetPosition(param0->unk_00);
 
     *param1 = v0->x;
     *param2 = v0->y;
@@ -1098,7 +1098,7 @@ void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
 
 void sub_0200D650 (CellActorData * param0, fx32 param1, fx32 param2, fx32 param3)
 {
-    if (sub_02021FC8(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
         sub_0200D614(param0, param1, param2 + param3);
     } else {
         sub_0200D614(param0, param1, param2);
@@ -1109,14 +1109,14 @@ void sub_0200D67C (CellActorData * param0, fx32 * param1, fx32 * param2, fx32 pa
 {
     sub_0200D638(param0, param1, param2);
 
-    if (sub_02021FC8(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (GraphicElementData_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = *param2 - param3;
     }
 }
 
 void sub_0200D69C (GraphicElementData * param0, int param1)
 {
-    sub_02021CF8(param0, param1);
+    GraphicElementData_SetAffineOverwriteMode(param0, param1);
 }
 
 void sub_0200D6A4 (CellActorData * param0, int param1)
@@ -1129,13 +1129,13 @@ void sub_0200D6B0 (GraphicElementData * param0, f32 param1, f32 param2)
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = sub_02021D2C(param0);
+    v0 = GraphicElementData_GetAffineScale(param0);
     v1 = (VecFx32 *)v0;
 
     v1->x = (param1 * FX32_ONE);
     v1->y = (param2 * FX32_ONE);
 
-    sub_02021C70(param0, v1);
+    GraphicElementData_SetAffineScale(param0, v1);
 }
 
 void sub_0200D6E8 (CellActorData * param0, f32 param1, f32 param2)
@@ -1148,13 +1148,13 @@ void sub_0200D6F4 (GraphicElementData * param0, f32 param1, f32 param2)
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = sub_02021D2C(param0);
+    v0 = GraphicElementData_GetAffineScale(param0);
     v1 = (VecFx32 *)v0;
 
     v1->x = v0->x + (param1 * FX32_ONE);
     v1->y = v0->y + (param2 * FX32_ONE);
 
-    sub_02021C70(param0, v1);
+    GraphicElementData_SetAffineScale(param0, v1);
 }
 
 void sub_0200D74C (CellActorData * param0, f32 param1, f32 param2)
@@ -1167,7 +1167,7 @@ void sub_0200D758 (GraphicElementData * param0, f32 * param1, f32 * param2)
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = sub_02021D2C(param0);
+    v0 = GraphicElementData_GetAffineScale(param0);
 
     *param1 = FX_FX32_TO_F32(v0->x);
     *param2 = FX_FX32_TO_F32(v0->y);
@@ -1180,7 +1180,7 @@ void sub_0200D788 (CellActorData * param0, f32 * param1, f32 * param2)
 
 void sub_0200D794 (GraphicElementData * param0, u16 param1)
 {
-    sub_02021C94(param0, param1);
+    GraphicElementData_SetAffineZRotation(param0, param1);
 }
 
 void sub_0200D79C (CellActorData * param0, u16 param1)
@@ -1192,10 +1192,10 @@ void sub_0200D7A8 (GraphicElementData * param0, s32 param1)
 {
     u16 v0;
 
-    v0 = sub_02021D30(param0);
+    v0 = GraphicElementData_GetAffineZRotation(param0);
     v0 += param1;
 
-    sub_02021C94(param0, v0);
+    GraphicElementData_SetAffineZRotation(param0, v0);
 }
 
 void sub_0200D7C0 (CellActorData * param0, s32 param1)
@@ -1205,7 +1205,7 @@ void sub_0200D7C0 (CellActorData * param0, s32 param1)
 
 void sub_0200D7CC (GraphicElementData * param0, int param1)
 {
-    sub_02021D0C(param0, param1);
+    GraphicElementData_SetFlipMode(param0, param1);
 }
 
 void sub_0200D7D4 (CellActorData * param0, int param1)
@@ -1221,12 +1221,12 @@ void sub_0200D7E0 (CellActorData * param0, s16 param1, s16 param2)
     v0.y = param2 << FX32_SHIFT;
     v0.z = 0;
 
-    sub_02021C60(param0->unk_00, &v0);
+    GraphicElementData_SetAffineTranslation(param0->unk_00, &v0);
 }
 
 void sub_0200D7FC (CellActorData * param0, BOOL param1)
 {
-    sub_02021FA0(param0->unk_00, param1);
+    GraphicElementData_SetPixelated(param0->unk_00, param1);
 }
 
 void sub_0200D808 (GraphicElementData * param0, GXOamMode param1)
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 6868088ce7..2e1e8d38b2 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -205,7 +205,7 @@ void sub_020128C4 (FontOAM * param0, int param1, int param2)
     param2 *= FX32_ONE;
 
     if (param0->unk_08) {
-        v2 = sub_02021D28(param0->unk_08);
+        v2 = GraphicElementData_GetPosition(param0->unk_08);
 
         param1 += v2->x;
         param2 += v2->y;
@@ -217,7 +217,7 @@ void sub_020128C4 (FontOAM * param0, int param1, int param2)
         v1.x = param1 + (param0->unk_00[v0].unk_04 << FX32_SHIFT);
         v1.y = param2 + (param0->unk_00[v0].unk_08 << FX32_SHIFT);
 
-        sub_02021C50(param0->unk_00[v0].unk_00, &v1);
+        GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
     }
 }
 
@@ -233,7 +233,7 @@ void sub_02012938 (FontOAM * param0)
     if (param0->unk_08) {
         v3 = param0->unk_0C << FX32_SHIFT;
         v4 = param0->unk_10 << FX32_SHIFT;
-        v2 = sub_02021D28(param0->unk_08);
+        v2 = GraphicElementData_GetPosition(param0->unk_08);
 
         v3 += v2->x;
         v4 += v2->y;
@@ -244,7 +244,7 @@ void sub_02012938 (FontOAM * param0)
             v1.x = v3 + (param0->unk_00[v0].unk_04 << FX32_SHIFT);
             v1.y = v4 + (param0->unk_00[v0].unk_08 << FX32_SHIFT);
 
-            sub_02021C50(param0->unk_00[v0].unk_00, &v1);
+            GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
         }
     }
 }
@@ -266,7 +266,7 @@ void sub_020129D0 (FontOAM * param0, BOOL param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021CAC(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -277,7 +277,7 @@ void sub_02012A00 (FontOAM * param0, u8 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021E80(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetExplicitPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -288,7 +288,7 @@ void sub_02012A30 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021F58(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -299,7 +299,7 @@ void sub_02012A60 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021E90(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetExplicitPalette(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -310,7 +310,7 @@ void sub_02012A90 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021EF0(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetExplicitPaletteOffset(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -321,7 +321,7 @@ void sub_02012AC0 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021F24(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -399,7 +399,7 @@ void sub_02012BE0 (FontOAM * param0, const UnkStruct_02012B20 * param1, const Wi
     GraphicElementData * v3 = param0->unk_00[0].unk_00;
     int v4;
 
-    v4 = sub_02021FC8(v3);
+    v4 = GraphicElementData_GetVRamType(v3);
     v0 = sub_02012B58(param1, v4);
     v1 = (char *)Heap_AllocFromHeapAtEnd(param3, v0);
 
@@ -752,7 +752,7 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     if (param0->unk_10) {
         const VecFx32 * v2;
 
-        v2 = sub_02021D28(param0->unk_10);
+        v2 = GraphicElementData_GetPosition(param0->unk_10);
         v0.position = *v2;
     }
 
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index fbb5ab2028..638f91446b 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -12,10 +12,6 @@
 #include "heap.h"
 #include "unk_020218BC.h"
 
-#define GRAPHIC_ELEMENT_DATA_FLIP_NONE  0
-#define GRAPHIC_ELEMENT_DATA_FLIP_H     1
-#define GRAPHIC_ELEMENT_DATA_FLIP_V     2
-
 #define GRAPHIC_ELEMENT_ANIM_DATA_SIZE 29
 
 enum CellType {
@@ -55,9 +51,9 @@ typedef struct GraphicElementData {
     u16 affineZRotation;
     u8 affineOverwriteMode;
     u8 flip;
-    u8 overwriteFlags;
-    u8 explicitPalette;
-    u8 explicitPaletteOffset;
+    u8 overwriteFlags; // Specifies which of the 'explicit' fields are used. Overwrites data provided by the OAM.
+    u8 explicitPalette; // An explicit palette index.
+    u8 explicitPaletteOffset; // An explicit palette index offset added onto the index specified by the OAM.
     BOOL explicitMosaic;
     GXOamMode explicitOamMode;
     u8 draw;
@@ -352,123 +348,116 @@ void GraphicElementData_Delete(GraphicElementData *gfxElem)
     }
 }
 
-void sub_02021C50 (GraphicElementData * param0, const VecFx32 * param1)
+void GraphicElementData_SetPosition(GraphicElementData *elem, const VecFx32 *position)
 {
-    param0->position = *param1;
+    elem->position = *position;
 }
 
-void sub_02021C60 (GraphicElementData * param0, const VecFx32 * param1)
+void GraphicElementData_SetAffineTranslation(GraphicElementData *elem, const VecFx32 *translation)
 {
-    param0->affineTranslation = *param1;
+    elem->affineTranslation = *translation;
 }
 
-void sub_02021C70 (GraphicElementData * param0, const VecFx32 * param1)
+void GraphicElementData_SetAffineScale(GraphicElementData *elem, const VecFx32 *scale)
 {
-    param0->affineScale = *param1;
+    elem->affineScale = *scale;
 }
 
-void sub_02021C80 (GraphicElementData * param0, const VecFx32 * param1, int param2)
+void GraphicElementData_SetAffineScaleEx(GraphicElementData *elem, const VecFx32 *scale, enum AffineOverwriteMode mode)
 {
-    sub_02021C70(param0, param1);
-    sub_02021CF8(param0, param2);
+    GraphicElementData_SetAffineScale(elem, scale);
+    GraphicElementData_SetAffineOverwriteMode(elem, mode);
 }
 
-void sub_02021C94 (GraphicElementData * param0, u16 param1)
+void GraphicElementData_SetAffineZRotation(GraphicElementData *elem, u16 angle)
 {
-    param0->affineZRotation = param1;
+    elem->affineZRotation = angle;
 }
 
-void sub_02021C98 (GraphicElementData * param0, u16 param1, int param2)
+void GraphicElementData_SetAffineZRotationEx(GraphicElementData *elem, u16 angle, enum AffineOverwriteMode mode)
 {
-    sub_02021C94(param0, param1);
-    sub_02021CF8(param0, param2);
+    GraphicElementData_SetAffineZRotation(elem, angle);
+    GraphicElementData_SetAffineOverwriteMode(elem, mode);
 }
 
-void sub_02021CAC (GraphicElementData * param0, int param1)
+void GraphicElementData_SetDrawFlag(GraphicElementData *elem, BOOL draw)
 {
-    GF_ASSERT(param0);
-    GF_ASSERT(param1 < 2);
+    GF_ASSERT(elem);
+    GF_ASSERT(draw < 2); // This value is used as an index into an array of size 2 inside GraphicElementManager_Update
 
-    param0->draw = param1;
+    elem->draw = draw;
 }
 
-void sub_02021CC8 (GraphicElementData * param0, int param1)
+void GraphicElementData_SetAnimateFlag(GraphicElementData *elem, BOOL animate)
 {
-    GF_ASSERT(param0);
-    GF_ASSERT(param1 < 2);
+    GF_ASSERT(elem);
+    GF_ASSERT(animate < 2); // This value is used as an index into an array of size 2 inside GraphicElementManager_Update
 
-    param0->animate = param1;
+    elem->animate = animate;
 }
 
-void sub_02021CE4 (GraphicElementData * param0, fx32 param1)
+void GraphicElementData_SetAnimSpeed(GraphicElementData *elem, fx32 speed)
 {
-    GF_ASSERT(param0);
-
-    param0->animSpeed = param1;
+    GF_ASSERT(elem);
+    elem->animSpeed = speed;
 }
 
-void sub_02021CF8 (GraphicElementData * param0, int param1)
+void GraphicElementData_SetAffineOverwriteMode(GraphicElementData *elem, enum AffineOverwriteMode mode)
 {
-    GF_ASSERT(param0);
-
-    param0->affineOverwriteMode = param1;
+    GF_ASSERT(elem);
+    elem->affineOverwriteMode = mode;
 }
 
-void sub_02021D0C (GraphicElementData * param0, int param1)
+void GraphicElementData_SetFlipMode(GraphicElementData *elem, u32 mode)
 {
-    GF_ASSERT(param0);
-
-    param0->flip = param1;
-    param0->affineOverwriteMode = 0;
+    GF_ASSERT(elem);
+    elem->flip = mode;
+    elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
 }
 
-const VecFx32 * sub_02021D28 (const GraphicElementData * param0)
+const VecFx32 *GraphicElementData_GetPosition(const GraphicElementData *elem)
 {
-    return &param0->position;
+    return &elem->position;
 }
 
-const VecFx32 * sub_02021D2C (const GraphicElementData * param0)
+const VecFx32 *GraphicElementData_GetAffineScale(const GraphicElementData *elem)
 {
-    return &param0->affineScale;
+    return &elem->affineScale;
 }
 
-u16 sub_02021D30 (const GraphicElementData * param0)
+u16 GraphicElementData_GetAffineZRotation(const GraphicElementData *elem)
 {
-    return param0->affineZRotation;
+    return elem->affineZRotation;
 }
 
-int sub_02021D34 (const GraphicElementData * param0)
+BOOL GraphicElementData_GetDrawFlag(const GraphicElementData *elem)
 {
-    return param0->draw;
+    return elem->draw;
 }
 
-int sub_02021D3C (const GraphicElementData * param0)
+BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData *elem)
 {
-    return param0->animate;
+    return elem->animate;
 }
 
-u32 sub_02021D44 (const GraphicElementData * param0)
+u32 GraphicElementData_GetAnimSequenceCount(const GraphicElementData *elem)
 {
-    u32 v0;
-
-    GF_ASSERT(param0);
+    GF_ASSERT(elem);
 
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
-        v0 = v1->animBank->numSequences;
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        return cellAnim->animBank->numSequences;
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
-        v0 = v2->animBank->numSequences;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        return multiCellAnim->animBank->numSequences;
     }
-
-    return v0;
 }
 
 void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
 {
     const NNSG2dAnimSequence * v0;
 
-    GF_ASSERT(sub_02021D44(param0) > param1);
+    GF_ASSERT(GraphicElementData_GetAnimSequenceCount(param0) > param1);
     param0->unk_F0 = param1;
 
     if ((param0->type == 1) || (param0->type == 3)) {
@@ -552,75 +541,74 @@ u16 sub_02021E74 (const GraphicElementData * param0)
     return NNS_G2dGetAnimCtrlCurrentFrame(v0);
 }
 
-void sub_02021E80 (GraphicElementData * param0, u8 param1)
+void GraphicElementData_SetExplicitPriority(GraphicElementData *elem, u8 priority)
 {
-    param0->explicitPriority = param1;
+    elem->explicitPriority = priority;
 }
 
-u8 sub_02021E88 (const GraphicElementData * param0)
+u8 GraphicElementData_GetExplicitPriority(const GraphicElementData *elem)
 {
-    return param0->explicitPriority;
+    return elem->explicitPriority;
 }
 
-void sub_02021E90 (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetExplicitPalette(GraphicElementData *elem, u32 palette)
 {
-    GF_ASSERT(param0);
+    GF_ASSERT(elem);
 
-    param0->explicitPalette = param1;
-    param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
-    param0->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    elem->explicitPalette = palette;
+    elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
+    elem->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
 }
 
-void sub_02021EC4 (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData *elem, u32 palette)
 {
-    sub_02021E90(param0, param1);
-    param0->explicitPalette += GetPaletteIndexForProxy(&param0->paletteProxy, param0->vramType);
+    GraphicElementData_SetExplicitPalette(elem, palette);
+    elem->explicitPalette += GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
 }
 
-u32 sub_02021EE8 (const GraphicElementData * param0)
+u32 GraphicElementData_GetExplicitPalette(const GraphicElementData *elem)
 {
-    return param0->explicitPalette;
+    return elem->explicitPalette;
 }
 
-void sub_02021EF0 (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData *elem, u32 paletteOffset)
 {
-    GF_ASSERT(param0);
+    GF_ASSERT(elem);
 
-    param0->explicitPaletteOffset = param1;
-    param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
-    param0->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
+    elem->explicitPaletteOffset = paletteOffset;
+    elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    elem->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
 }
 
-void sub_02021F24 (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData *elem, u32 paletteOffset)
 {
-    sub_02021EF0(param0, param1);
-    param0->explicitPaletteOffset += GetPaletteIndexForProxy(&param0->paletteProxy, param0->vramType);
+    GraphicElementData_SetExplicitPaletteOffset(elem, paletteOffset);
+    elem->explicitPaletteOffset += GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
 }
 
-u32 sub_02021F48 (const GraphicElementData * param0)
+u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData *elem)
 {
-    GF_ASSERT(param0);
-    return param0->explicitPaletteOffset;
+    GF_ASSERT(elem);
+    return elem->explicitPaletteOffset;
 }
 
-void sub_02021F58 (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetPriority(GraphicElementData *elem, u32 priority)
 {
-    GraphicElementManager * v0 = (GraphicElementManager *)param0->manager;
-
-    param0->priority = param1;
+    GraphicElementManager *gfxElemMgr = elem->manager;
+    elem->priority = priority;
 
-    GraphicElementManager_RemoveElement(param0);
-    GraphicElementManager_InsertElement(v0, param0);
+    GraphicElementManager_RemoveElement(elem);
+    GraphicElementManager_InsertElement(gfxElemMgr, elem);
 }
 
-u32 sub_02021F74 (const GraphicElementData * param0)
+u32 GraphicElementData_GetPriority(const GraphicElementData *elem)
 {
-    return param0->priority;
+    return elem->priority;
 }
 
-void sub_02021F7C (GraphicElementData * param0, const NNSG2dImageProxy * param1)
+void GraphicElementData_SetImageProxy(GraphicElementData *elem, const NNSG2dImageProxy *imageProxy)
 {
-    param0->imageProxy = *param1;
+    elem->imageProxy = *imageProxy;
 }
 
 NNSG2dImageProxy * SpriteActor_ImageProxy (GraphicElementData * param0)
@@ -628,25 +616,25 @@ NNSG2dImageProxy * SpriteActor_ImageProxy (GraphicElementData * param0)
     return &param0->imageProxy;
 }
 
-NNSG2dImagePaletteProxy * sub_02021F9C (GraphicElementData * param0)
+NNSG2dImagePaletteProxy *GraphicElementData_GetPaletteProxy(GraphicElementData *paletteProxy)
 {
-    return &param0->paletteProxy;
+    return &paletteProxy->paletteProxy;
 }
 
-void sub_02021FA0 (GraphicElementData * param0, BOOL param1)
+void GraphicElementData_SetPixelated(GraphicElementData *elem, BOOL pixelated)
 {
-    param0->explicitMosaic = param1;
+    elem->explicitMosaic = pixelated;
 
-    if (param1 == 1) {
-        param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
+    if (pixelated == TRUE) {
+        elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
     } else {
-        param0->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
+        elem->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
     }
 }
 
-NNS_G2D_VRAM_TYPE sub_02021FC8 (const GraphicElementData * param0)
+NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData *elem)
 {
-    return param0->vramType;
+    return elem->vramType;
 }
 
 BOOL sub_02021FD0 (GraphicElementData * param0)
@@ -927,7 +915,7 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
     NNS_G2dSetRendererOverwriteOBJMode(gfxElemMgr->renderer, elem->explicitOamMode);
     NNS_G2dSetRendererOverwritePriority(gfxElemMgr->renderer, elem->explicitPriority);
 
-    if (elem->type == 1 || elem->type == 3) {
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
         CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
         NNS_G2dDrawCellAnimation(&cellAnim->anim);
     } else {
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index a54cf1aff2..a689e2d98d 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -622,7 +622,7 @@ int sub_0205D424 (struct UnkStruct_0205D3AC_t * param0)
         v0 = v1->unk_00;
         v0.y -= FX_Mul(FX_SinIdx(v1->unk_10), (16 * FX32_ONE));
 
-        sub_02021C50(v1->unk_0C, &v0);
+        GraphicElementData_SetPosition(v1->unk_0C, &v0);
         v1->unk_10 += (0x8000 / 16);
         GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
 
@@ -706,7 +706,7 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0)
 
     v0->unk_00.y += (FX32_ONE * 8);
 
-    sub_02021C50(v0->unk_0C, &v0->unk_00);
+    GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
     GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
 
     if (v0->unk_10 == 0) {
@@ -717,7 +717,7 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0)
     } else {
         if (v0->unk_00.y >= ((69 * FX32_ONE))) {
             v0->unk_00.y = ((69 * FX32_ONE));
-            sub_02021C50(v0->unk_0C, &v0->unk_00);
+            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
             return 0;
         }
     }
@@ -770,7 +770,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 1:
         if (v0->unk_00.y > (-32 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
-            sub_02021C50(v0->unk_0C, &v0->unk_00);
+            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
             GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_00.y = (384 * FX32_ONE);
@@ -780,7 +780,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 2:
         v0->unk_00.y -= (FX32_ONE * 8);
 
-        sub_02021C50(v0->unk_0C, &v0->unk_00);
+        GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
         GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if ((v0->unk_00.y < (300 * FX32_ONE))) {
@@ -791,7 +791,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 3:
         if (v0->unk_00.y > (192 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
-            sub_02021C50(v0->unk_0C, &v0->unk_00);
+            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
             GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_10++;
@@ -820,7 +820,7 @@ void sub_0205D714 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
 
     SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1);
     v0->unk_14 = (2 * FX32_ONE);
-    sub_02021CAC(v0->unk_0C, 0);
+    GraphicElementData_SetDrawFlag(v0->unk_0C, 0);
 }
 
 void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0)
@@ -842,7 +842,7 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0)
 
     switch (v1->unk_10) {
     case 0:
-        sub_02021CAC(v1->unk_0C, 1);
+        GraphicElementData_SetDrawFlag(v1->unk_0C, 1);
         v1->unk_10++;
         break;
     case 1:
@@ -850,7 +850,7 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0)
             v0 = v1->unk_00;
             v0.y -= FX_Mul(FX_SinIdx(v1->unk_14), (32 * FX32_ONE));
 
-            sub_02021C50(v1->unk_0C, &v0);
+            GraphicElementData_SetPosition(v1->unk_0C, &v0);
             v1->unk_14 += (0x8000 / 8);
             GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
         } else {
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 8c2b09dbdb..d768dd826c 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -1013,7 +1013,7 @@ static void sub_0207EE14 (GameWindowLayout * param0)
     }
 
     if ((param0->unk_5A4->unk_20 != 2) && (param0->unk_5A4->unk_20 != 17) && (param0->unk_5A4->unk_20 != 23) && (param0->unk_5A4->unk_20 != 22)) {
-        sub_02021CAC(param0->unk_5B0[8], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[8], 0);
         SpriteActor_SetSpriteAnimActive(param0->unk_5B0[9], 0);
 
         {
@@ -1027,7 +1027,7 @@ static void sub_0207EE14 (GameWindowLayout * param0)
     }
 
     if ((param0->unk_5A4->unk_20 == 4) || (param0->unk_5A4->unk_20 == 21)) {
-        sub_02021CAC(param0->unk_5B0[9], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[9], 0);
         v0 ^= 2;
     }
 
@@ -1467,10 +1467,10 @@ static u8 sub_0207FA24 (GameWindowLayout * param0)
 
     if ((v0 != param0->unk_B11) && (v0 != 0xff)) {
         if ((v0 == 6) || (v0 == 7)) {
-            sub_02021CAC(param0->unk_5B0[6], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
         } else {
             SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
-            sub_02021CAC(param0->unk_5B0[6], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
             SpriteActor_SetPositionXY(param0->unk_5B0[6], v2, v3);
         }
 
@@ -1558,7 +1558,7 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
 
         sub_0201E028(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, 4);
         SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
-        sub_02021CAC(param0->unk_5B0[6], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v1, v2);
 
         param0->unk_B0C = 1;
@@ -1579,13 +1579,13 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
 void sub_0207FD68 (GameWindowLayout * param0, u8 param1)
 {
     if ((param1 == 6) || (param1 == 7)) {
-        sub_02021CAC(param0->unk_5B0[6], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
     } else {
         u8 v0, v1;
 
         sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
         SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-        sub_02021CAC(param0->unk_5B0[6], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     }
 
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index f2edc22fad..1e5711ee4f 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -170,13 +170,13 @@ void sub_02082E58 (GameWindowLayout * param0)
         param0->unk_5B0[10 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[4 + v0]);
         param0->unk_704[v0].unk_1A = Unk_020F20C0[4 + v0].unk_04;
         param0->unk_704[v0].unk_1C = Unk_020F20C0[4 + v0].unk_06;
-        sub_02021CAC(param0->unk_5B0[10 + v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[10 + v0], 0);
         param0->unk_5B0[16 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[10 + v0]);
         param0->unk_5B0[22 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[16 + v0]);
     }
 
-    sub_02021CAC(param0->unk_5B0[7], 0);
-    sub_02021CAC(param0->unk_5B0[28], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 0);
 }
 
 void sub_02082FAC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3)
@@ -210,12 +210,12 @@ void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2)
     GraphicElementData ** v0 = &param0->unk_5B0[10 + param1];
 
     if (param2 == 7) {
-        sub_02021CAC(*v0, 0);
+        GraphicElementData_SetDrawFlag(*v0, 0);
         return;
     }
 
     SpriteActor_SetSpriteAnimActive(*v0, param2);
-    sub_02021CAC(*v0, 1);
+    GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
@@ -223,7 +223,7 @@ void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
     GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
     if (param2 == 0) {
-        sub_02021CAC(*v0, 0);
+        GraphicElementData_SetDrawFlag(*v0, 0);
         return;
     }
 
@@ -233,7 +233,7 @@ void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
         SpriteActor_SetSpriteAnimActive(*v0, 0);
     }
 
-    sub_02021CAC(*v0, 1);
+    GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083080 (GameWindowLayout * param0, u8 param1)
@@ -241,7 +241,7 @@ void sub_02083080 (GameWindowLayout * param0, u8 param1)
     GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
     SpriteActor_SetSpriteAnimActive(*v0, 1);
-    sub_02021CAC(*v0, 1);
+    GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
 void sub_020830A0 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3)
@@ -264,11 +264,11 @@ void sub_02083104 (GameWindowLayout * param0, u8 param1)
     GraphicElementData ** v0 = &param0->unk_5B0[22 + param1];
 
     if (param0->unk_704[param1].unk_12 == 0) {
-        sub_02021CAC(*v0, 0);
+        GraphicElementData_SetDrawFlag(*v0, 0);
         return;
     }
 
-    sub_02021CAC(*v0, 1);
+    GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
 static void sub_02083138 (GraphicElementData * param0, u8 param1)
@@ -347,7 +347,7 @@ void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2)
 
     sub_0201E010(&param0->unk_7F4[param1], &v0, &v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-    sub_02021CAC(param0->unk_5B0[6], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
     SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     sub_0200D414(param0->unk_5B0[6], param2);
 }
@@ -361,19 +361,19 @@ void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2)
     v0.y += (256 * FX32_ONE);
     v0.z = 0;
 
-    sub_02021C50(param0->unk_5B0[28], &v0);
-    sub_02021CAC(param0->unk_5B0[28], 1);
+    GraphicElementData_SetPosition(param0->unk_5B0[28], &v0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 1);
     SpriteActor_SetAnimFrame(param0->unk_5B0[28], 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_5B0[28], 0);
 }
 
 void sub_02083334 (GameWindowLayout * param0)
 {
-    if (sub_02021D34(param0->unk_5B0[28]) == 1) {
+    if (GraphicElementData_GetDrawFlag(param0->unk_5B0[28]) == 1) {
         GraphicElementData_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
 
         if (sub_02021E74(param0->unk_5B0[28]) == 2) {
-            sub_02021CAC(param0->unk_5B0[28], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 0);
         }
     }
 }
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 149bf6d735..5d741e6c8e 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -442,7 +442,7 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
     sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
     SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
     SpriteActor_SetSpriteAnimActive(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
-    sub_02021CAC(param0->unk_5B0[7], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
     sub_0207F8F8(param0, param0->unk_B0F_0);
     sub_0200E084(&param0->unk_04[33], 1);
     sub_0208337C(param0);
@@ -454,7 +454,7 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
 void sub_02083B88 (GameWindowLayout * param0)
 {
     param0->unk_B0F_6 = 0;
-    sub_02021CAC(param0->unk_5B0[7], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
 
     if (param0->unk_B11 < 6) {
         sub_0207F8F8(param0, param0->unk_B11);
@@ -504,8 +504,8 @@ void sub_02083BD4 (GameWindowLayout * param0)
         memcpy(&param0->unk_7F8.unk_180[1][v6 * 16], &v1[v4 + (v5 + v6) * 32], 16 * 2);
     }
 
-    sub_02021CAC(param0->unk_5B0[6], 0);
-    sub_02021CAC(param0->unk_5B0[7], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
 }
 
 BOOL sub_02083D1C (GameWindowLayout * param0)
@@ -554,7 +554,7 @@ BOOL sub_02083D1C (GameWindowLayout * param0)
 
     case 4:
         Party_SwapSlots(param0->unk_5A4->unk_00, v0->unk_300[0], v0->unk_300[1]);
-        sub_02021CAC(param0->unk_5B0[6], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
 
         v0->unk_304 = 0;
         param0->unk_B0F_6 = 0;
@@ -847,7 +847,7 @@ int sub_02084780 (GameWindowLayout * param0)
 
     if (Pokemon_GetValue(v0, MON_DATA_MAIL_ID, NULL) == 0) {
         MessageLoader_GetStrbuf(param0->unk_69C, 129, param0->unk_6A4);
-        sub_02021CAC(param0->unk_5B0[22 + param0->unk_B11], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
     } else {
         MessageLoader_GetStrbuf(param0->unk_69C, 130, param0->unk_6A4);
         param0->unk_B11 = 7;
@@ -1021,7 +1021,7 @@ static int sub_02084A18 (GameWindowLayout * param0)
         sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
         SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
         SpriteActor_SetSpriteAnimActive(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
-        sub_02021CAC(param0->unk_5B0[7], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 36, 1);
 
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 124c329711..e64781f643 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1039,8 +1039,8 @@ static int sub_02086D38 (UnkStruct_02087A10 * param0, int param1)
     sub_02088350(param0);
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) {
-        if (sub_02021D34(param0->unk_390[8]) == 0) {
-            sub_02021CAC(param0->unk_390[8], 1);
+        if (GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) {
+            GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
             return param1;
         }
 
@@ -1592,12 +1592,12 @@ static void sub_020879DC (SysTask * param0, void * param1)
     VecFx32 v1;
     UnkStruct_020879DC * v2 = (UnkStruct_020879DC *)param1;
 
-    v0 = sub_02021D28(v2->unk_00);
+    v0 = GraphicElementData_GetPosition(v2->unk_00);
     v1.x = v0->x + v2->unk_08;
     v1.y = FX32_ONE * Unk_020F2984[v2->unk_0C][1];
     v1.z = 0;
 
-    sub_02021C50(v2->unk_04, &v1);
+    GraphicElementData_SetPosition(v2->unk_04, &v1);
 }
 
 static void sub_02087A10 (UnkStruct_02087A10 * param0)
@@ -1629,13 +1629,13 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
 
             param0->unk_390[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_390[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_390[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_390[v0], Unk_020F2984[v0][2]);
-            sub_02021F58(param0->unk_390[v0], Unk_020F2984[v0][3]);
+            GraphicElementData_SetPriority(param0->unk_390[v0], Unk_020F2984[v0][3]);
         }
 
-        sub_02021CAC(param0->unk_390[4], 0);
-        sub_02021CAC(param0->unk_390[8], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_390[4], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 0);
 
         for (v0 = 0; v0 < 7; v0++) {
             UnkStruct_020879DC * v2;
@@ -1654,7 +1654,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
 
             param0->unk_3C8[v0] = GraphicElementManager_AddElementEx(&v1);
 
-            sub_02021CC8(param0->unk_3C8[v0], 1);
+            GraphicElementData_SetAnimateFlag(param0->unk_3C8[v0], 1);
             SpriteActor_SetSpriteAnimActive(param0->unk_3C8[v0], 43);
         }
 
@@ -1672,7 +1672,7 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
     param1->position.y = FX32_ONE * (16 - 8);
     param0->unk_3F8[0] = GraphicElementManager_AddElementEx(param1);
 
-    sub_02021CC8(param0->unk_3F8[0], 1);
+    GraphicElementData_SetAnimateFlag(param0->unk_3F8[0], 1);
 
     switch (param0->unk_00) {
     case 0:
@@ -1727,19 +1727,19 @@ static void sub_02087CDC (SysTask * param0, void * param1)
     switch (v0->unk_04) {
     case 0:
         v1.x = v0->unk_08 + 4 * FX32_ONE;
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
         break;
     case 2:
         v1.x = v0->unk_08 - 3 * FX32_ONE;
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
         break;
     case 4:
         v1.x = v0->unk_08 + 2 * FX32_ONE;
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
         break;
     case 6:
         v1.x = v0->unk_08;
-        sub_02021C50(v0->unk_00, &v1);
+        GraphicElementData_SetPosition(v0->unk_00, &v1);
         SysTask_FinishAndFreeParam(param0);
         break;
     }
@@ -1780,8 +1780,8 @@ static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param
             v4 = SysTask_GetParam(v5);
             v4->unk_00 = param6[7];
             v4->unk_04 = 0;
-            v4->unk_08 = sub_02021D28(param6[7])->x;
-            v4->unk_0C = sub_02021D28(param6[7])->y;
+            v4->unk_08 = GraphicElementData_GetPosition(param6[7])->x;
+            v4->unk_0C = GraphicElementData_GetPosition(param6[7])->y;
 
             param5[v0].x = -11;
             (*param2)++;
@@ -1967,41 +1967,41 @@ static void sub_02088350 (UnkStruct_02087A10 * param0)
     int v1 = 0;
     BOOL v2 = 0;
 
-    if (sub_02021D34(param0->unk_390[8]) == 0) {
+    if (GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) {
         v2 = 1;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
         Sound_PlayEffect(1500);
-        sub_02021CAC(param0->unk_390[8], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 1;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
         Sound_PlayEffect(1500);
-        sub_02021CAC(param0->unk_390[8], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 2;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
         Sound_PlayEffect(1500);
-        sub_02021CAC(param0->unk_390[8], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 3;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
         Sound_PlayEffect(1500);
-        sub_02021CAC(param0->unk_390[8], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 4;
         v0++;
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_START) {
         Sound_PlayEffect(1500);
-        sub_02021CAC(param0->unk_390[8], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         param0->unk_1C.unk_00 = 12;
         param0->unk_1C.unk_04 = 0;
         v0++;
@@ -2036,7 +2036,7 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
 
         v0.x = FX32_ONE * (26 + param0->unk_1C.unk_00 * 16);
         v0.y = FX32_ONE * ((111 - 20) + (param0->unk_1C.unk_04 - 1) * 19);
-        sub_02021C50(param0->unk_390[8], &v0);
+        GraphicElementData_SetPosition(param0->unk_390[8], &v0);
     } else {
         VecFx32 v1;
         int v2 = param0->unk_3A[param0->unk_1C.unk_04][param0->unk_1C.unk_00] - (0xe001 + 1);
@@ -2045,7 +2045,7 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
         v1.y = FX32_ONE * (88 - 20);
 
         SpriteActor_SetSpriteAnimActive(param0->unk_390[8], Unk_020F24E8[v2]);
-        sub_02021C50(param0->unk_390[8], &v1);
+        GraphicElementData_SetPosition(param0->unk_390[8], &v1);
     }
 
     param0->unk_38 = 180;
@@ -2242,8 +2242,8 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
         }
     }
 
-    if ((sub_02021D34(param0->unk_390[8]) == 0) && (gCoreSys.touchPressed == 0)) {
-        sub_02021CAC(param0->unk_390[8], 1);
+    if ((GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) && (gCoreSys.touchPressed == 0)) {
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
         return 2;
     }
 
@@ -2280,7 +2280,7 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
             sub_02088844(param0->unk_3A, param0->unk_4C4);
             param0->unk_4F4[param1 - (0xe001 + 1)]++;
             Sound_PlayEffect(1694);
-            sub_02021CAC(param0->unk_390[8], param2);
+            GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 6):
@@ -2302,12 +2302,12 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
             param0->unk_4F4[5]++;
 
             Sound_PlayEffect(1500);
-            sub_02021CAC(param0->unk_390[8], param2);
+            GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 7):
         sub_02015760(param0->unk_628);
-        sub_02021CAC(param0->unk_390[8], param2);
+        GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
 
         if (param0->unk_14 == 0) {
             Sound_PlayEffect(1506);
@@ -2333,7 +2333,7 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
 
             sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
             Sound_PlayEffect(1515);
-            sub_02021CAC(param0->unk_390[8], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
             sub_02021FE0(param0->unk_390[8], GX_OAM_MODE_XLU);
 
             G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2, 8, 8);
@@ -2521,7 +2521,7 @@ static void sub_02088FD0 (UnkStruct_02087A10 * param0)
         }
 
         if (param0->unk_1C.unk_14 == 0) {
-            sub_02021CAC(param0->unk_390[8], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_390[8], 0);
         } else {
             sub_02088454(param0, 0);
         }
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index 0f3895c9e8..f94fe8f668 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -200,31 +200,31 @@ void sub_0208EB64 (PokemonSummaryApp * param0)
 
     sub_0208EF0C(param0);
 
-    sub_02021CAC(param0->unk_41C[9], 0);
-    sub_02021CAC(param0->unk_41C[10], 0);
-    sub_02021CAC(param0->unk_41C[41], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[41], 0);
 
-    sub_02021CAC(param0->unk_41C[42], 0);
-    sub_02021CAC(param0->unk_41C[43], 0);
-    sub_02021CAC(param0->unk_41C[44], 0);
-    sub_02021CAC(param0->unk_41C[45], 0);
-    sub_02021CAC(param0->unk_41C[46], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[42], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[43], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[44], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[45], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[46], 0);
 
-    sub_02021CAC(param0->unk_41C[47], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[47], 0);
 
-    sub_02021CAC(param0->unk_41C[48], 0);
-    sub_02021CAC(param0->unk_41C[49], 0);
-    sub_02021CAC(param0->unk_41C[50], 0);
-    sub_02021CAC(param0->unk_41C[51], 0);
-    sub_02021CAC(param0->unk_41C[52], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 0);
 
-    sub_02021CAC(param0->unk_41C[71], 0);
-    sub_02021CAC(param0->unk_41C[72], 0);
-    sub_02021CAC(param0->unk_41C[73], 0);
-    sub_02021CAC(param0->unk_41C[74], 0);
-    sub_02021CAC(param0->unk_41C[75], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[71], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[72], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[73], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[74], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[75], 0);
 
-    sub_02021CAC(param0->unk_41C[76], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
 }
 
 static u8 sub_0208ECB8 (PokemonSummaryApp * param0)
@@ -255,7 +255,7 @@ void sub_0208ECF4 (PokemonSummaryApp * param0)
 
     for (v5 = 0; v5 < 8; v5++) {
         if (PokemonSummary_PageIsVisble(param0, v5) == 0) {
-            sub_02021CAC(v0[v5], 0);
+            GraphicElementData_SetDrawFlag(v0[v5], 0);
             continue;
         }
 
@@ -280,7 +280,7 @@ void sub_0208ECF4 (PokemonSummaryApp * param0)
         }
 
         SpriteActor_SetPositionXY(param0->unk_41C[v5], v1, v2);
-        sub_02021CAC(v0[v5], 1);
+        GraphicElementData_SetDrawFlag(v0[v5], 1);
 
         v6++;
     }
@@ -306,8 +306,8 @@ void sub_0208EE10 (PokemonSummaryApp * param0, u8 param1)
         param1 = 0;
     }
 
-    sub_02021CAC(param0->unk_41C[21], param1);
-    sub_02021CAC(param0->unk_41C[22], param1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[21], param1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[22], param1);
 }
 
 void sub_0208EE3C (PokemonSummaryApp * param0)
@@ -327,15 +327,15 @@ void sub_0208EE3C (PokemonSummaryApp * param0)
 void sub_0208EE9C (PokemonSummaryApp * param0)
 {
     if (param0->monData.status == 7) {
-        sub_02021CAC(param0->unk_41C[20], 0);
-        sub_02021CAC(param0->unk_41C[76], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
     } else if (param0->monData.status != 0) {
-        sub_02021CAC(param0->unk_41C[76], 0);
-        sub_02021CAC(param0->unk_41C[20], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 1);
         SpriteActor_SetSpriteAnimActive(param0->unk_41C[20], param0->monData.status);
     } else {
-        sub_02021CAC(param0->unk_41C[76], 1);
-        sub_02021CAC(param0->unk_41C[20], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 1);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 0);
     }
 }
 
@@ -480,7 +480,7 @@ void sub_0208F310 (PokemonSummaryApp * param0)
 
     sub_0200D50C(param0->unk_41C[9], &v0, &v1);
     SpriteActor_SetPositionXY(param0->unk_41C[10], v0, v1);
-    sub_02021CAC(param0->unk_41C[10], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[10], 1);
 }
 
 void sub_0208F34C (PokemonSummaryApp * param0)
@@ -500,7 +500,7 @@ void sub_0208F34C (PokemonSummaryApp * param0)
     }
 
     for (v0 = 29; v0 <= 40; v0++) {
-        sub_02021CAC(param0->unk_41C[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
         SpriteActor_SetAnimFrame(param0->unk_41C[v0], 0);
     }
 }
@@ -529,7 +529,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
         break;
     case 1:
         if (param0->sheenCount == 0) {
-            sub_02021CAC(param0->unk_41C[29 + param0->sheenPos], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[29 + param0->sheenPos], 1);
             SpriteActor_SetAnimFrame(param0->unk_41C[29 + param0->sheenPos], 0);
             SpriteActor_SetSpriteAnimActive(param0->unk_41C[29 + param0->sheenPos], 0);
 
@@ -544,7 +544,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
         param0->sheenCount = (param0->sheenCount + 1) % 10;
         break;
     case 2:
-        if (sub_02021D34(param0->unk_41C[29 + param0->sheenMax - 1]) == 0) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_41C[29 + param0->sheenMax - 1]) == 0) {
             param0->sheenCount = 0;
             param0->sheenState = 3;
             break;
@@ -555,7 +555,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
 
         if (param0->sheenCount == 32) {
             for (v0 = 29; v0 < 29 + param0->sheenMax; v0++) {
-                sub_02021CAC(param0->unk_41C[v0], 1);
+                GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 1);
                 SpriteActor_SetAnimFrame(param0->unk_41C[v0], 0);
                 SpriteActor_SetSpriteAnimActive(param0->unk_41C[v0], 0);
             }
@@ -576,14 +576,14 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
     }
 
     for (v0 = 29; v0 < 29 + param0->sheenMax; v0++) {
-        if (sub_02021D34(param0->unk_41C[v0]) == 0) {
+        if (GraphicElementData_GetDrawFlag(param0->unk_41C[v0]) == 0) {
             continue;
         }
 
         GraphicElementData_UpdateAnim(param0->unk_41C[v0], FX32_ONE);
 
         if (sub_02021E74(param0->unk_41C[v0]) == 6) {
-            sub_02021CAC(param0->unk_41C[v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
         }
     }
 }
@@ -617,7 +617,7 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 {
     s16 v0, v1;
 
-    sub_02021CAC(param0->unk_41C[41], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[41], 1);
     SpriteActor_SetAnimFrame(param0->unk_41C[41], 0);
     SpriteActor_SetSpriteAnimActive(param0->unk_41C[41], 0);
 
@@ -633,7 +633,7 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 void sub_0208F684 (PokemonSummaryApp * param0)
 {
     if (sub_02021E74(param0->unk_41C[41]) == 2) {
-        sub_02021CAC(param0->unk_41C[41], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[41], 0);
     }
 }
 
@@ -643,7 +643,7 @@ void sub_0208F6A4 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 5; v0++) {
         if ((param0->subscreen & (1 << v0))) {
-            sub_02021CAC(param0->unk_41C[42 + v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[42 + v0], 1);
         }
     }
 }
@@ -651,12 +651,12 @@ void sub_0208F6A4 (PokemonSummaryApp * param0)
 void sub_0208F6DC (PokemonSummaryApp * param0, Window * param1)
 {
     if (param1 == NULL) {
-        sub_02021CAC(param0->unk_41C[47], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[47], 0);
         return;
     }
 
     SpriteActor_SetPositionXY(param0->unk_41C[47], sub_0201C29C(param1) * 8 - 10, 8);
-    sub_02021CAC(param0->unk_41C[47], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[47], 1);
 }
 
 void sub_0208F71C (PokemonSummaryApp * param0)
@@ -672,7 +672,7 @@ void sub_0208F71C (PokemonSummaryApp * param0)
 
     sub_0200D948(param0->renderer, param0->gfxHandler, 19, v1, 0, 11);
     sub_0200D414(param0->unk_41C[19], PokeIconPaletteIndex(param0->monData.species, param0->monData.form, param0->monData.isEgg) + 7);
-    sub_02021D0C(param0->unk_41C[19], (PokemonPersonalData_GetFormValue(param0->monData.species, param0->monData.form, 28) ^ 1));
+    GraphicElementData_SetFlipMode(param0->unk_41C[19], (PokemonPersonalData_GetFormValue(param0->monData.species, param0->monData.form, 28) ^ 1));
 }
 
 void sub_0208F7A4 (PokemonSummaryApp * param0)
@@ -715,20 +715,20 @@ void sub_0208F844 (PokemonSummaryApp * param0)
     SpriteActor_SetPositionXY(param0->unk_41C[51], sub_0208F800(param0->monData.smart, 72, 87), sub_0208F800(param0->monData.smart, 92, 73));
     SpriteActor_SetPositionXY(param0->unk_41C[52], sub_0208F800(param0->monData.tough, 65, 87), sub_0208F800(param0->monData.tough, 65, 73));
 
-    sub_02021CAC(param0->unk_41C[48], 1);
-    sub_02021CAC(param0->unk_41C[49], 1);
-    sub_02021CAC(param0->unk_41C[50], 1);
-    sub_02021CAC(param0->unk_41C[51], 1);
-    sub_02021CAC(param0->unk_41C[52], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 1);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 1);
 }
 
 void sub_0208F964 (PokemonSummaryApp * param0)
 {
-    sub_02021CAC(param0->unk_41C[48], 0);
-    sub_02021CAC(param0->unk_41C[49], 0);
-    sub_02021CAC(param0->unk_41C[50], 0);
-    sub_02021CAC(param0->unk_41C[51], 0);
-    sub_02021CAC(param0->unk_41C[52], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 0);
+    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 0);
 }
 
 static void sub_0208F9B0 (PokemonSummaryApp * param0, u8 param1, u8 param2)
@@ -742,7 +742,7 @@ void sub_0208FA04 (PokemonSummaryApp * param0)
     u16 v0;
 
     for (v0 = 55; v0 <= 70; v0++) {
-        sub_02021CAC(param0->unk_41C[v0], 0);
+        GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
     }
 
     if (param0->page != 6) {
@@ -753,7 +753,7 @@ void sub_0208FA04 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 12; v0++) {
         if (v0 < param0->ribbonMax) {
-            sub_02021CAC(param0->unk_41C[55 + v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 1);
             sub_0208F9B0(param0, PokemonSummary_RibbonAt(param0, v0), v0);
         }
     }
@@ -767,10 +767,10 @@ void sub_0208FAA4 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if ((param0->ribbonState * 4 + v0) < param0->ribbonMax) {
-            sub_02021CAC(param0->unk_41C[55 + v0], 1);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 1);
             sub_0208F9B0(param0, PokemonSummary_RibbonAt(param0, v0), v0);
         } else {
-            sub_02021CAC(param0->unk_41C[55 + v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 0);
         }
     }
 }
@@ -783,7 +783,7 @@ void sub_0208FB00 (PokemonSummaryApp * param0)
 
 void sub_0208FB30 (PokemonSummaryApp * param0)
 {
-    if (sub_02021D34(param0->unk_41C[70]) == 1) {
+    if (GraphicElementData_GetDrawFlag(param0->unk_41C[70]) == 1) {
         GraphicElementData_UpdateAnim(param0->unk_41C[70], FX32_ONE);
     }
 }
@@ -802,7 +802,7 @@ void sub_0208FB54 (PokemonSummaryApp * param0, u8 param1)
 
     if (param1 == 0) {
         for (v0 = 0; v0 < 5; v0++) {
-            sub_02021CAC(param0->unk_41C[71 + v0], 0);
+            GraphicElementData_SetDrawFlag(param0->unk_41C[71 + v0], 0);
         }
     } else {
         v1 = param0->monData.cool;
@@ -836,11 +836,11 @@ static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, c
     s32 v0, v1;
 
     if ((param1 == 0) || (param1 != param2)) {
-        sub_02021CAC(param0, 0);
+        GraphicElementData_SetDrawFlag(param0, 0);
         return;
     }
 
-    sub_02021CAC(param0, 1);
+    GraphicElementData_SetDrawFlag(param0, 1);
 
     if (param3[0] >= param3[2]) {
         v0 = param3[2] + (((((param3[0] - param3[2]) << 8) / 256) * param1) >> 8);
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 5e1adeea74..22a0b254ee 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -166,7 +166,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
         SpriteActor_SetSpriteAnimActive(v4->unk_00, 0);
         v2 = sub_0200A760(
             v6, v0);
-        sub_02021E90(v4->unk_00, v2);
+        GraphicElementData_SetExplicitPalette(v4->unk_00, v2);
     } else {
         GF_ASSERT(FALSE);
     }

From 27d31edbb51b2ed9c5ebf174c111e997bffb0e68 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 14:09:44 +0200
Subject: [PATCH 13/19] Document remaining gfx elem functions

---
 include/unk_020218BC.h                  |  28 +--
 src/battle/ov16_0226871C.c              |   4 +-
 src/battle/party_gauge.c                |   8 +-
 src/choose_starter/choose_starter_app.c |   2 +-
 src/field_menu.c                        |  10 +-
 src/overlay005/encounter_effect_core.c  |  44 ++---
 src/overlay005/ov5_021D2F14.c           |   4 +-
 src/overlay005/ov5_021D5EB8.c           |   2 +-
 src/overlay006/ov6_022426AC.c           |   4 +-
 src/overlay006/ov6_02243258.c           |  26 +--
 src/overlay007/ov7_0224BE9C.c           |   4 +-
 src/overlay007/ov7_0224CD28.c           |   2 +-
 src/overlay009/ov9_02249960.c           |   2 +-
 src/overlay012/ov12_0222F700.c          |   2 +-
 src/overlay019/ov19_021D61B0.c          |   2 +-
 src/overlay019/ov19_021D8B54.c          |  72 ++++----
 src/overlay019/ov19_021DA270.c          |  10 +-
 src/overlay019/ov19_021DA814.c          |   6 +-
 src/overlay019/ov19_021DCF88.c          |  16 +-
 src/overlay019/ov19_021DE3E8.c          |  32 ++--
 src/overlay019/ov19_021DEC04.c          |  20 +-
 src/overlay020/ov20_021D2098.c          |   2 +-
 src/overlay020/ov20_021D2EA4.c          |  16 +-
 src/overlay020/ov20_021D3864.c          |   8 +-
 src/overlay020/ov20_021D3A54.c          |   8 +-
 src/overlay020/ov20_021D40E8.c          |   8 +-
 src/overlay020/ov20_021D4728.c          |  12 +-
 src/overlay021/ov21_021D0D80.c          |   6 +-
 src/overlay021/ov21_021D1FA4.c          |  12 +-
 src/overlay021/ov21_021D57B4.c          |   4 +-
 src/overlay021/ov21_021D5AEC.c          |  20 +-
 src/overlay021/ov21_021D76B0.c          |  12 +-
 src/overlay021/ov21_021D85B0.c          |  32 ++--
 src/overlay021/ov21_021D94BC.c          |  58 +++---
 src/overlay021/ov21_021DC9BC.c          |   8 +-
 src/overlay021/ov21_021DDD2C.c          |   8 +-
 src/overlay021/ov21_021DE668.c          |  14 +-
 src/overlay021/ov21_021DF734.c          |  14 +-
 src/overlay021/ov21_021E0C68.c          |   6 +-
 src/overlay021/ov21_021E1924.c          |  24 +--
 src/overlay021/ov21_021E29DC.c          |   2 +-
 src/overlay021/ov21_021E3FFC.c          |  10 +-
 src/overlay021/ov21_021E4CA4.c          |  40 ++--
 src/overlay021/ov21_021E6014.c          |   8 +-
 src/overlay021/ov21_021E68F4.c          |  10 +-
 src/overlay021/ov21_021E737C.c          |  10 +-
 src/overlay021/ov21_021E8484.c          |  10 +-
 src/overlay021/ov21_021E8D48.c          |  10 +-
 src/overlay022/ov22_02255094.c          |   2 +-
 src/overlay022/ov22_0225A428.c          |   8 +-
 src/overlay022/ov22_0225B660.c          |   4 +-
 src/overlay023/ov23_0223E140.c          |  40 ++--
 src/overlay023/ov23_0224340C.c          |  42 ++---
 src/overlay023/ov23_02248F1C.c          |   8 +-
 src/overlay023/ov23_0224F294.c          |  10 +-
 src/overlay056/ov56_022561C0.c          |  12 +-
 src/overlay058/ov58_021D0D80.c          |  24 +--
 src/overlay059/ov59_021D0D80.c          |  16 +-
 src/overlay063/ov63_0222AE60.c          |  26 +--
 src/overlay064/ov64_0222DCE0.c          |  10 +-
 src/overlay065/ov65_0222DCE0.c          |  18 +-
 src/overlay065/ov65_02235060.c          |   4 +-
 src/overlay065/ov65_0223648C.c          |   2 +-
 src/overlay068/ov68_0225C700.c          |   2 +-
 src/overlay069/ov69_0225C700.c          |   2 +-
 src/overlay070/ov70_0225D9A4.c          |   6 +-
 src/overlay071/ov71_0223B140.c          |   4 +-
 src/overlay071/ov71_0223CF0C.c          |   8 +-
 src/overlay072/ov72_0223D7A0.c          |  12 +-
 src/overlay077/ov77_021D54B0.c          |   2 +-
 src/overlay077/ov77_021D6670.c          |   2 +-
 src/overlay079/ov79_021D0D80.c          |   4 +-
 src/overlay079/ov79_021D183C.c          |  10 +-
 src/overlay083/ov83_0223B5A0.c          |   2 +-
 src/overlay083/ov83_0223C958.c          |   2 +-
 src/overlay083/ov83_0223D6A8.c          |  20 +-
 src/overlay086/ov86_0223B140.c          |   2 +-
 src/overlay087/ov87_021D106C.c          |  10 +-
 src/overlay088/ov88_0223B140.c          |  28 +--
 src/overlay094/ov94_0223BCB0.c          |   2 +-
 src/overlay094/ov94_0223C610.c          |   2 +-
 src/overlay094/ov94_0223D0C4.c          |   2 +-
 src/overlay094/ov94_0223DC04.c          |   4 +-
 src/overlay094/ov94_0223E46C.c          |   4 +-
 src/overlay094/ov94_0223FB48.c          |  14 +-
 src/overlay094/ov94_02243EF8.c          |  18 +-
 src/overlay095/ov95_02246C20.c          |   2 +-
 src/overlay095/ov95_02247B6C.c          |   6 +-
 src/overlay095/ov95_02248590.c          |   4 +-
 src/overlay095/ov95_02249740.c          |   4 +-
 src/overlay095/ov95_0224A390.c          |   4 +-
 src/overlay095/ov95_0224B3D8.c          |   4 +-
 src/overlay096/ov96_0223B6A0.c          |   4 +-
 src/overlay097/ov97_0222D30C.c          |  22 +--
 src/overlay097/ov97_02230410.c          |   6 +-
 src/overlay097/ov97_02233B18.c          |  10 +-
 src/overlay097/ov97_02237694.c          |   4 +-
 src/overlay101/ov101_021D59AC.c         |  90 ++++-----
 src/overlay101/ov101_021D7E48.c         |   2 +-
 src/overlay104/ov104_0222DCE0.c         |   6 +-
 src/overlay104/ov104_0223DC7C.c         |   2 +-
 src/overlay105/ov105_02241AE0.c         |   2 +-
 src/overlay105/ov105_02245AAC.c         |   2 +-
 src/overlay105/ov105_02245DC4.c         |   2 +-
 src/overlay105/ov105_02245E54.c         |   2 +-
 src/overlay105/ov105_02245FB8.c         |   8 +-
 src/overlay106/ov106_02241AE0.c         |   2 +-
 src/overlay106/ov106_02243310.c         |   2 +-
 src/overlay106/ov106_022435FC.c         |   4 +-
 src/overlay107/ov107_02241AE0.c         |   2 +-
 src/overlay107/ov107_02245EB0.c         |   2 +-
 src/overlay107/ov107_02249604.c         |   2 +-
 src/overlay107/ov107_02249B1C.c         |   4 +-
 src/overlay108/ov108_02241AE0.c         |   2 +-
 src/overlay108/ov108_02243030.c         |   2 +-
 src/overlay108/ov108_0224351C.c         |   2 +-
 src/overlay109/ov109_021D3D50.c         |  12 +-
 src/overlay111/ov111_021D0D80.c         |   2 +-
 src/overlay111/ov111_021D2F80.c         |   2 +-
 src/overlay111/ov111_021D33F4.c         |   6 +-
 src/overlay112/ov112_0225C700.c         |   2 +-
 src/overlay114/ov114_0225C700.c         |  22 +--
 src/overlay115/ov115_02260CEC.c         |   8 +-
 src/unk_0200A784.c                      |   4 +-
 src/unk_0200C6E4.c                      |  22 +--
 src/unk_0200DA60.c                      |   8 +-
 src/unk_02012744.c                      |   2 +-
 src/unk_020218BC.c                      | 234 ++++++++++++------------
 src/unk_0205CA94.c                      |  14 +-
 src/unk_0206A780.c                      |   2 +-
 src/unk_0206F314.c                      |  14 +-
 src/unk_0207E0B8.c                      |  22 +--
 src/unk_02082C2C.c                      |  20 +-
 src/unk_02083370.c                      |   4 +-
 src/unk_0208694C.c                      |  52 +++---
 src/unk_0208EA44.c                      |  26 +--
 src/unk_02098FFC.c                      |   4 +-
 137 files changed, 873 insertions(+), 879 deletions(-)

diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 20cc554011..5481808568 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -7,6 +7,8 @@
 #include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay115/struct_ov115_02261520.h"
 
+#include "constants/heap.h"
+
 #include <nitro/gx.h>
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
@@ -25,7 +27,7 @@ GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerPar
 BOOL GraphicElementManager_Delete(GraphicElementManager * param0);
 BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
 BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
-void sub_020219F8(const GraphicElementManager * param0);
+void GraphicElementManager_Update(const GraphicElementManager * param0);
 void GraphicElementData_Reset(GraphicElementData * param0);
 GraphicElementData * GraphicElementManager_AddElementEx(const CellActorInitParamsEx * param0);
 GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams * param0);
@@ -46,14 +48,14 @@ const VecFx32 * GraphicElementData_GetAffineScale(const GraphicElementData * par
 u16 GraphicElementData_GetAffineZRotation(const GraphicElementData * param0);
 BOOL GraphicElementData_GetDrawFlag(const GraphicElementData * param0);
 BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData * param0);
-u32 GraphicElementData_GetAnimSequenceCount(const GraphicElementData * param0);
-void SpriteActor_SetSpriteAnimActive(GraphicElementData * param0, u32 param1);
-void sub_02021DCC(GraphicElementData * param0, u32 param1);
-void sub_02021DE0(GraphicElementData * param0);
-u32 sub_02021E24(const GraphicElementData * param0);
+u32 GraphicElementData_GetAnimCount(const GraphicElementData * param0);
+void GraphicElementData_SetAnim(GraphicElementData * param0, u32 param1);
+void GraphicElementData_SetAnimNoRestart(GraphicElementData * param0, u32 param1);
+void GraphicElementData_RestartAnim(GraphicElementData * param0);
+u32 GraphicElementData_GetActiveAnim(const GraphicElementData * param0);
 void GraphicElementData_UpdateAnim(GraphicElementData * param0, fx32 param1);
 void SpriteActor_SetAnimFrame(GraphicElementData * param0, u16 param1);
-u16 sub_02021E74(const GraphicElementData * param0);
+u16 GraphicElementData_GetAnimFrame(const GraphicElementData * param0);
 void GraphicElementData_SetExplicitPriority(GraphicElementData * param0, u8 param1);
 u8 GraphicElementData_GetExplicitPriority(const GraphicElementData * param0);
 void GraphicElementData_SetExplicitPalette(GraphicElementData * param0, u32 param1);
@@ -69,11 +71,11 @@ NNSG2dImageProxy * SpriteActor_ImageProxy(GraphicElementData * param0);
 NNSG2dImagePaletteProxy * GraphicElementData_GetPaletteProxy(GraphicElementData * param0);
 void GraphicElementData_SetPixelated(GraphicElementData * param0, BOOL param1);
 NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(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 GraphicElementData * param0, u32 param1, u32 param2);
-u32 sub_020220F4(const GraphicElementData * param0);
+BOOL GraphicElementData_IsAnimated(GraphicElementData * param0);
+void GraphicElementData_SetExplicitOAMMode(GraphicElementData * param0, GXOamMode param1);
+void Utility_Clear2DMainOAM(enum HeapId param0);
+void Utility_Clear2DSubOAM(enum HeapId param0);
+u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData * param0, u32 param1, u32 param2);
+u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData * param0);
 
 #endif // POKEPLATINUM_UNK_020218BC_H
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index 77ab0badc1..acffd8631f 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -1513,12 +1513,12 @@ void ov16_02269168 (UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[])
     for (v0 = 0; v0 < 6; v0++) {
         v1 = ov16_0226A934(param1[v0]);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5BC[v0]->unk_00, v1);
+        GraphicElementData_SetAnim(param0->unk_5BC[v0]->unk_00, v1);
         SpriteActor_UpdateObject(param0->unk_5BC[v0]->unk_00);
 
         v1 = ov16_0226A934(param2[v0]);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5D4[v0]->unk_00, v1);
+        GraphicElementData_SetAnim(param0->unk_5D4[v0]->unk_00, v1);
         SpriteActor_UpdateObject(param0->unk_5D4[v0]->unk_00);
     }
 }
diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c
index 5a73b59708..e1f7e0ad57 100644
--- a/src/battle/party_gauge.c
+++ b/src/battle/party_gauge.c
@@ -323,10 +323,10 @@ static void ShowArrow(PartyGaugeArrow *arrow, enum PartyGaugeSide side, enum Par
 
     if (side == PARTY_GAUGE_OURS) {
         SpriteActor_SetSpritePositionXY(arrow->cells, ARROW_X_START_OURS, sArrowYPosOurs[pos]);
-        SpriteActor_SetSpriteAnimActive(arrow->cells->unk_00, PGANM_ARROW_OURS);
+        GraphicElementData_SetAnim(arrow->cells->unk_00, PGANM_ARROW_OURS);
     } else {
         SpriteActor_SetSpritePositionXY(arrow->cells, ARROW_X_START_THEIRS, sArrowYPosTheirs[pos]);
-        SpriteActor_SetSpriteAnimActive(arrow->cells->unk_00, PGANM_ARROW_THEIRS);
+        GraphicElementData_SetAnim(arrow->cells->unk_00, PGANM_ARROW_THEIRS);
     }
 
     SpriteActor_UpdateObject(arrow->cells->unk_00);
@@ -479,7 +479,7 @@ static void ShowPokeballs(PartyGaugePokeballs *pokeballs, s8 *numBalls, enum Par
         SpriteActor_SetSpritePositionXY(pokeballs->cells, POKEBALL_X_START_THEIRS, sPokeballYPosTheirs[pos]);
     }
 
-    SpriteActor_SetSpriteAnimActive(pokeballs->cells->unk_00, frame);
+    GraphicElementData_SetAnim(pokeballs->cells->unk_00, frame);
     SpriteActor_UpdateObject(pokeballs->cells->unk_00);
 
     pokeballs->side = side;
@@ -579,7 +579,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
             break;
         }
 
-        SpriteActor_SetSpriteAnimActive(pokeballs->cells->unk_00, pokeballs->flipAnimation);
+        GraphicElementData_SetAnim(pokeballs->cells->unk_00, pokeballs->flipAnimation);
         pokeballs->delay = 0;
         pokeballs->state++;
         // fall-through
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index a38906775b..b1cf510b4d 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -1064,7 +1064,7 @@ static void DrawScene (ChooseStarterApp * param0)
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    sub_020219F8(param0->unk_248);
+    GraphicElementManager_Update(param0->unk_248);
 }
 
 static void MakeCamera (ChooseStarterApp * param0, int param1)
diff --git a/src/field_menu.c b/src/field_menu.c
index 109811013c..7d0fccba01 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -513,7 +513,7 @@ static BOOL sub_0203AC44 (TaskManager * taskMan)
 
     if (menu->unk_20 != NULL) {
         sub_0203B520(menu);
-        sub_020219F8(menu->unk_38.unk_00);
+        GraphicElementManager_Update(menu->unk_38.unk_00);
     }
 
     return FALSE;
@@ -865,9 +865,9 @@ static void sub_0203B558 (GraphicElementData * graphicElement, u32 param1)
 
 static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 param2)
 {
-    u32 v0 = sub_02021E24(graphicElement);
+    u32 v0 = GraphicElementData_GetActiveAnim(graphicElement);
 
-    SpriteActor_SetSpriteAnimActive(graphicElement, (v0 / 3) * 3 + param1);
+    GraphicElementData_SetAnim(graphicElement, (v0 / 3) * 3 + param1);
     GraphicElementData_SetExplicitPaletteWithOffset(graphicElement, param2);
 }
 
@@ -879,11 +879,11 @@ static void sub_0203B5B4 (FieldMenu * menu, u16 param1, u16 param2)
 
 static void sub_0203B5E8 (GraphicElementData * graphicElement)
 {
-    if ((sub_02021E24(graphicElement) % 3) != 1) {
+    if ((GraphicElementData_GetActiveAnim(graphicElement) % 3) != 1) {
         return;
     }
 
-    if (sub_02021FD0(graphicElement) == 0) {
+    if (GraphicElementData_IsAnimated(graphicElement) == 0) {
         sub_0203B588(graphicElement, 2, 1);
     }
 }
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index e71d750215..814d423b75 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -774,9 +774,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
 
         EncounterEffect_ScreenSlice(encEffect, trainerEffect->screenSliceEfx, 96, 6, 0, (255 * FX32_ONE), (FX32_ONE * 10));
 
-        SpriteActor_SetSpriteAnimActive(
+        GraphicElementData_SetAnim(
             trainerEffect->pokeballSprites[0], 1);
-        SpriteActor_SetSpriteAnimActive(
+        GraphicElementData_SetAnim(
             trainerEffect->pokeballSprites[1], 2);
 
         QuadraticInterpolationTaskFX32_Init(&trainerEffect->unk_2C, 0, (255 * FX32_ONE), (FX32_ONE * 10), 6);
@@ -836,7 +836,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
     }
 
     if (encEffect->state != 7) {
-        sub_020219F8(trainerEffect->unk_48.unk_00);
+        GraphicElementManager_Update(trainerEffect->unk_48.unk_00);
     }
 }
 
@@ -980,7 +980,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
     }
 
     if (encEffect->state != 7) {
-        sub_020219F8(v1->unk_2C.unk_00);
+        GraphicElementManager_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -1052,7 +1052,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
 
             GraphicElementData_SetAffineOverwriteMode(
                 v1->unk_224[v5], 2);
-            sub_02021FE0(v1->unk_224[v5], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_XLU);
         }
 
         LinearInterpolationTaskS32_Init(&v1->unk_2C, 0, 0xffff, 8);
@@ -1079,7 +1079,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
             G2_BlendNone();
 
             for (v5 = 0; v5 < 2; v5++) {
-                sub_02021FE0(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
+                GraphicElementData_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
             }
 
             v0->state++;
@@ -1152,7 +1152,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_50.unk_00);
+        GraphicElementManager_Update(v1->unk_50.unk_00);
     }
 }
 
@@ -1365,7 +1365,7 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
     sub_0201A9A4(v1->unk_270);
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_00.unk_00);
+        GraphicElementManager_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1490,7 +1490,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_5C.unk_00);
+        GraphicElementManager_Update(v1->unk_5C.unk_00);
     }
 }
 
@@ -1703,7 +1703,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
     }
 
     if (v0->state != 9) {
-        sub_020219F8(v1->unk_00.unk_00);
+        GraphicElementManager_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1743,7 +1743,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
         v1->unk_200 = ov5_021DE62C(
             &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
         GraphicElementData_SetDrawFlag(v1->unk_200, 0);
-        sub_02021FE0(v1->unk_200, GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_XLU);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1777,7 +1777,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            sub_02021FE0(v1->unk_200, GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_NORMAL);
             v0->state++;
         }
 
@@ -1832,7 +1832,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_2C.unk_00);
+        GraphicElementManager_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -1951,7 +1951,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_00.unk_00);
+        GraphicElementManager_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -2141,7 +2141,7 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_00.unk_00);
+        GraphicElementManager_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -2165,7 +2165,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
         v1->unk_1DC = ov5_021DE62C(
             &v1->unk_08, &v1->unk_1A8, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
         GraphicElementData_SetDrawFlag(v1->unk_1DC, 0);
-        sub_02021FE0(v1->unk_1DC, GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_XLU);
         GraphicElementData_SetExplicitPriority(v1->unk_1DC, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
@@ -2212,7 +2212,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            sub_02021FE0(v1->unk_1DC, GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_NORMAL);
             v0->state++;
             v1->unk_21C = 16;
         }
@@ -2269,7 +2269,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        sub_020219F8(v1->unk_08.unk_00);
+        GraphicElementManager_Update(v1->unk_08.unk_00);
     }
 }
 
@@ -2843,7 +2843,7 @@ static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47
 
         if (v0 != 3) {
             GraphicElementData_SetAffineOverwriteMode(param0->unk_04[v0], 2);
-            SpriteActor_SetSpriteAnimActive(param0->unk_04[v0], 1);
+            GraphicElementData_SetAnim(param0->unk_04[v0], 1);
 
             LinearInterpolationTaskFX32_Init(&param0->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
@@ -3142,7 +3142,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
     }
 
     if (encEffect->state != 15) {
-        sub_020219F8(v0->unk_44.unk_00);
+        GraphicElementManager_Update(v0->unk_44.unk_00);
     }
 
     return 0;
@@ -3292,7 +3292,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2CC[v5] = ov5_021DE62C(
                 &v0->unk_5C, v7, 0, 0, 0, 0);
             GraphicElementData_SetDrawFlag(v0->unk_2CC[v5], 0);
-            SpriteActor_SetSpriteAnimActive(v0->unk_2CC[v5], v8);
+            GraphicElementData_SetAnim(v0->unk_2CC[v5], v8);
             GraphicElementData_SetExplicitPriority(v0->unk_2CC[v5], 1);
         }
 
@@ -3602,7 +3602,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
     }
 
     if (encEffect->state != 14) {
-        sub_020219F8(v0->unk_5C.unk_00);
+        GraphicElementManager_Update(v0->unk_5C.unk_00);
 
         if (4 < encEffect->state) {
             sub_020241B4();
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index eb47df2c3f..4e81b87bca 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -122,7 +122,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v1 = GraphicElementManager_AddElementEx(&v0);
     GF_ASSERT(v1);
 
-    SpriteActor_SetSpriteAnimActive(v1, param1->unk_0A);
+    GraphicElementData_SetAnim(v1, param1->unk_0A);
     GraphicElementData_SetExplicitPaletteWithOffset(v1, param1->unk_10);
 
     return v1;
@@ -389,7 +389,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
 
     if (v2->unk_00 != NULL) {
         v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
-        SpriteActor_SetSpriteAnimActive(v2->unk_00, param1->animIdx);
+        GraphicElementData_SetAnim(v2->unk_00, param1->animIdx);
         GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param1->plttIdx);
     } else {
         GF_ASSERT(FALSE);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 6bdb3c86ea..6b16f330d5 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -814,7 +814,7 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
 static void ov5_021D6284 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021D61D0 * v0 = param1;
-    sub_020219F8(v0->unk_130);
+    GraphicElementManager_Update(v0->unk_130);
 }
 
 static void ov5_021D6290 (UnkStruct_02009F38 * param0, int param1, int param2)
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index af8aec346b..10016580dc 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -158,7 +158,7 @@ static void ov6_02242860 (SysTask * param0, void * param1)
     UnkStruct_ov6_022426B8 * v0 = param1;
 
     if (v0->unk_1CC) {
-        sub_020219F8(v0->unk_38);
+        GraphicElementManager_Update(v0->unk_38);
     } else {
         v0->unk_1D0 = 1;
         SysTask_Done(param0);
@@ -223,6 +223,6 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         param0->unk_1C8 = GraphicElementManager_AddElementEx(&v2);
 
         GraphicElementData_SetAnimateFlag(param0->unk_1C8, 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1C8, 0);
+        GraphicElementData_SetAnim(param0->unk_1C8, 0);
     }
 }
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 1b57865a18..ba596d0ec9 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -599,7 +599,7 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
     v1 = ov6_02243740(param0, &v0, 2, v2, 2, 1, 0, 131);
 
     GraphicElementData_SetDrawFlag(v1, 0);
-    SpriteActor_SetSpriteAnimActive(v1, 6);
+    GraphicElementData_SetAnim(v1, 6);
 
     return v1;
 }
@@ -738,7 +738,7 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
         GraphicElementData_SetAffineTranslation(v3, &v4);
         GraphicElementData_SetAffineScale(v3, &v5);
         GraphicElementData_SetAffineZRotation(v3, sub_0201D2A4(0));
-        SpriteActor_SetSpriteAnimActive(v3, 2);
+        GraphicElementData_SetAnim(v3, 2);
     }
 
     ov6_02243F2C();
@@ -867,7 +867,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
 static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0)
 {
     GraphicElementData_SetDrawFlag(param0->unk_68, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1);
+    GraphicElementData_SetAnim(param0->unk_58.unk_08, 1);
 
     param0->unk_04 = 0;
     param0->unk_01++;
@@ -901,7 +901,7 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
         GraphicElementData_SetAffineScale(param0->unk_68, &v1);
         GraphicElementData_SetAffineZRotation(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
         GraphicElementData_SetDrawFlag(param0->unk_68, 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 6);
+        GraphicElementData_SetAnim(param0->unk_58.unk_08, 6);
         GraphicElementData_SetAnimateFlag(param0->unk_58.unk_08, 1);
     }
 
@@ -970,7 +970,7 @@ static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0)
     param0->unk_04++;
 
     if (param0->unk_04 == 8) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_58.unk_08, 1);
+        GraphicElementData_SetAnim(param0->unk_58.unk_08, 1);
         ov6_02243F74(param0->unk_58.fieldSystem, 0);
     }
 
@@ -1434,7 +1434,7 @@ static int ov6_022444D0 (UnkStruct_ov6_02243FFC * param0)
         return 0;
     }
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_248, 1);
+    GraphicElementData_SetAnim(param0->unk_248, 1);
     param0->unk_00++;
 
     return 0;
@@ -1835,7 +1835,7 @@ static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0)
 static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
 {
     if (param0->unk_70 != NULL) {
-        sub_020219F8(param0->unk_70);
+        GraphicElementManager_Update(param0->unk_70);
     }
 }
 
@@ -1871,7 +1871,7 @@ static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const
     GraphicElementData * v0;
 
     v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2);
-    SpriteActor_SetSpriteAnimActive(v0, param3);
+    GraphicElementData_SetAnim(v0, param3);
 
     return v0;
 }
@@ -1888,7 +1888,7 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
     v0 = ov6_02244C20(param0, param1, 2, v1, 2, 1, 0, 131);
 
     GraphicElementData_SetDrawFlag(v0, 0);
-    SpriteActor_SetSpriteAnimActive(v0, 6);
+    GraphicElementData_SetAnim(v0, 6);
 
     return v0;
 }
@@ -2617,7 +2617,7 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 {
     GraphicElementData * v0 = param0->unk_5C.unk_00->unk_248;
 
-    SpriteActor_SetSpriteAnimActive(v0, 3);
+    GraphicElementData_SetAnim(v0, 3);
 
     {
         fx32 v1, v2;
@@ -2759,7 +2759,7 @@ static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0)
     v0 = *v1;
 
     sub_020715D4(param0, &v0);
-    SpriteActor_SetSpriteAnimActive(v2->unk_20, 5);
+    GraphicElementData_SetAnim(v2->unk_20, 5);
 }
 
 static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
@@ -2776,7 +2776,7 @@ static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
     ov6_022437C8(v1->unk_20, &v0);
 
     sub_020715D4(param0, &v0);
-    SpriteActor_SetSpriteAnimActive(v1->unk_20, 4);
+    GraphicElementData_SetAnim(v1->unk_20, 4);
 }
 
 static int ov6_02245C04 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2922,7 +2922,7 @@ static void ov6_02245D10 (SysTask * param0, void * param1)
         }
 
         if (v1->unk_18.unk_08 != NULL) {
-            sub_020219F8(v1->unk_18.unk_08);
+            GraphicElementManager_Update(v1->unk_18.unk_08);
         }
     }
 }
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index d89d62e6f9..9419dfb57b 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -362,7 +362,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0)
         break;
     }
 
-    sub_020219F8(param0->unk_1C);
+    GraphicElementManager_Update(param0->unk_1C);
 
     return 0;
 }
@@ -658,7 +658,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
         v3.position.y = v4[v0] * FX32_ONE;
         param0->unk_158[v0] = GraphicElementManager_AddElement(&v3);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_158[v0], v0);
+        GraphicElementData_SetAnim(param0->unk_158[v0], v0);
         GraphicElementData_SetAnimateFlag(param0->unk_158[v0], 1);
     }
 }
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index 96921b94ac..5a81ed04e9 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -305,7 +305,7 @@ BOOL ov7_0224CEAC (TaskManager * param0)
     if ((v1->unk_297 >= 4) && (v1->unk_297 <= 11)) {
         GraphicElementData_UpdateAnim(v1->unk_25C[0], FX32_ONE);
         GraphicElementData_UpdateAnim(v1->unk_25C[1], FX32_ONE);
-        sub_020219F8(v1->unk_94.unk_00);
+        GraphicElementManager_Update(v1->unk_94.unk_00);
     }
 
     return 0;
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index f3c5f1c52a..641db0997c 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2751,7 +2751,7 @@ static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0)
 static void ov9_0224B124 (SysTask * param0, void * param1)
 {
     UnkStruct_ov9_0224B064 * v0 = param1;
-    sub_020219F8(v0->unk_00);
+    GraphicElementManager_Update(v0->unk_00);
 }
 
 static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c
index f2be779947..595a618e9a 100644
--- a/src/overlay012/ov12_0222F700.c
+++ b/src/overlay012/ov12_0222F700.c
@@ -785,7 +785,7 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
     case 4:
         sub_0200D330(v0->unk_0C.unk_00);
 
-        if (sub_02021FD0(v0->unk_0C.unk_00->unk_00) == 0) {
+        if (GraphicElementData_IsAnimated(v0->unk_0C.unk_00->unk_00) == 0) {
             SpriteActor_SetOAMMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
             v0->unk_EC++;
         }
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 5f4b2590ee..6adbd2d55d 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -405,7 +405,7 @@ static void ov19_021D6664 (SysTask * param0, void * param1)
 
     ov19_021DAA80(&v0->unk_6604);
 
-    sub_020219F8(v0->unk_18);
+    GraphicElementManager_Update(v0->unk_18);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 089f2883a9..f8a71df1db 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -126,17 +126,17 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
         param0->unk_10 = ov19_021D785C(param0->unk_00, &v0, v4, 20, 43, NNS_G2D_VRAM_TYPE_2DMAIN);
     }
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_08, 5);
+    GraphicElementData_SetAnim(param0->unk_08, 5);
     GraphicElementData_SetExplicitPriority(param0->unk_08, 2);
 
     v1 = ov19_021D5E10(param0->unk_790);
 
     if (v1 != 2) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_0C, 6);
-        SpriteActor_SetSpriteAnimActive(param0->unk_10, 7);
+        GraphicElementData_SetAnim(param0->unk_0C, 6);
+        GraphicElementData_SetAnim(param0->unk_10, 7);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0->unk_0C, 8);
-        SpriteActor_SetSpriteAnimActive(param0->unk_10, 9);
+        GraphicElementData_SetAnim(param0->unk_0C, 8);
+        GraphicElementData_SetAnim(param0->unk_10, 9);
     }
 
     if (v1 != 0) {
@@ -145,11 +145,11 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
 
     if (v2 != 3) {
         if (ov19_021D5E38(param0->unk_790) == 1) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+            GraphicElementData_SetAnim(param0->unk_04, 0);
             ov19_021DA3CC(param0->unk_48, param0->unk_4C, (5 * 6));
             param0->unk_78C = 0;
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_04, 2);
+            GraphicElementData_SetAnim(param0->unk_04, 2);
             ov19_021D8E00(param0);
             param0->unk_78C = 1;
         }
@@ -157,10 +157,10 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
         param0->unk_78D = 0;
     } else {
         if (ov19_021D5F7C(param0->unk_790) == 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+            GraphicElementData_SetAnim(param0->unk_04, 0);
             param0->unk_78D = 0;
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_04, 2);
+            GraphicElementData_SetAnim(param0->unk_04, 2);
             param0->unk_78D = 1;
         }
 
@@ -370,11 +370,11 @@ static void ov19_021D9088 (SysTask * param0, void * param1)
     }
 
     if (v0->unk_786 != 2) {
-        SpriteActor_SetSpriteAnimActive(v0->unk_0C, 6);
-        SpriteActor_SetSpriteAnimActive(v0->unk_10, 7);
+        GraphicElementData_SetAnim(v0->unk_0C, 6);
+        GraphicElementData_SetAnim(v0->unk_10, 7);
     } else {
-        SpriteActor_SetSpriteAnimActive(v0->unk_0C, 8);
-        SpriteActor_SetSpriteAnimActive(v0->unk_10, 9);
+        GraphicElementData_SetAnim(v0->unk_0C, 8);
+        GraphicElementData_SetAnim(v0->unk_10, 9);
     }
 
     SysTask_Done(param0);
@@ -382,7 +382,7 @@ static void ov19_021D9088 (SysTask * param0, void * param1)
 
 void ov19_021D9230 (UnkStruct_ov19_021D8E00 * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_04, 1);
 
     param0->unk_780 = (12 << FX32_SHIFT) / 6;
     param0->unk_770 = (param0->unk_768 + 12);
@@ -417,7 +417,7 @@ static void ov19_021D928C (SysTask * param0, void * param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 2);
+        GraphicElementData_SetAnim(v0->unk_04, 2);
         ov19_021DA038(v0);
 
         v0->unk_787 = 6;
@@ -479,7 +479,7 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 1);
+        GraphicElementData_SetAnim(v0->unk_04, 1);
         ov19_021DA1F8(v0);
 
         v0->unk_787 = 6;
@@ -495,7 +495,7 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
         v1.y = v0->unk_768 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 0);
+        GraphicElementData_SetAnim(v0->unk_04, 0);
 
         v0->unk_784 = 255;
         v0->unk_78E = 1;
@@ -509,7 +509,7 @@ void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
     VecFx32 v0;
     GraphicElementData * v1;
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_04, 1);
 
     param0->unk_788 = 0;
 
@@ -526,7 +526,7 @@ void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
 BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (ov19_021D95E0(param0)) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 2);
+        GraphicElementData_SetAnim(param0->unk_04, 2);
         ov19_021DA110(param0);
         return 1;
     }
@@ -614,7 +614,7 @@ void ov19_021D9690 (UnkStruct_ov19_021D8E00 * param0)
     VecFx32 v0;
 
     if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 3);
+        GraphicElementData_SetAnim(param0->unk_04, 3);
     }
 
     v0 = *GraphicElementData_GetPosition(param0->unk_04);
@@ -649,7 +649,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
             v0->unk_787 = 2;
 
             if ((v0->unk_78C == 0) && (v0->unk_78D == 0)) {
-                SpriteActor_SetSpriteAnimActive(v0->unk_04, 4);
+                GraphicElementData_SetAnim(v0->unk_04, 4);
             }
 
             v0->unk_784++;
@@ -692,8 +692,8 @@ BOOL ov19_021D9858 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_788 == 0) {
         if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-            if (sub_02021E24(param0->unk_04) != 0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+            if (GraphicElementData_GetActiveAnim(param0->unk_04) != 0) {
+                GraphicElementData_SetAnim(param0->unk_04, 0);
             }
         }
 
@@ -730,12 +730,12 @@ void ov19_021D9900 (UnkStruct_ov19_021D8E00 * param0)
     }
 
     ov19_021DA204(param0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+    GraphicElementData_SetAnim(param0->unk_04, 0);
 }
 
 void ov19_021D9938 (UnkStruct_ov19_021D8E00 * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_04, 1);
     ov19_021DA7B8(param0->unk_48, param0->unk_4C, 1);
 
     param0->unk_784 = 0;
@@ -754,7 +754,7 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
     case 1:
         if (ov19_021D3B18(v0)) {
             if (ov19_021D3B20(v0)) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+                GraphicElementData_SetAnim(param0->unk_04, 0);
                 ov19_021DA204(param0);
                 return 1;
             } else {
@@ -765,7 +765,7 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
         break;
     case 2:
         if (ov19_021DA7E0(param0->unk_48, param0->unk_4C)) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_04, 2);
+            GraphicElementData_SetAnim(param0->unk_04, 2);
             return 1;
         }
 
@@ -838,7 +838,7 @@ void ov19_021D9AEC (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D9B10 (UnkStruct_ov19_021D8E00 * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_04, 1);
 }
 
 void ov19_021D9B1C (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
@@ -867,13 +867,13 @@ static void ov19_021D9B78 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 1);
+        GraphicElementData_SetAnim(v0->unk_04, 1);
         ov19_021DE954(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DE9A8(v0->unk_760)) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_04, 2);
+            GraphicElementData_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -901,13 +901,13 @@ static void ov19_021D9C18 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 1);
+        GraphicElementData_SetAnim(v0->unk_04, 1);
         ov19_021DEA18(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEA64(v0->unk_760)) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_04, 0);
+            GraphicElementData_SetAnim(v0->unk_04, 0);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -934,13 +934,13 @@ static void ov19_021D9CB4 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 1);
+        GraphicElementData_SetAnim(v0->unk_04, 1);
         ov19_021DEA74(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEB08(v0->unk_760)) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_04, 2);
+            GraphicElementData_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -950,14 +950,14 @@ static void ov19_021D9CB4 (SysTask * param0, void * param1)
 void ov19_021D9D10 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_78D) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+        GraphicElementData_SetAnim(param0->unk_04, 1);
     }
 }
 
 void ov19_021D9D28 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_78D) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+        GraphicElementData_SetAnim(param0->unk_04, 0);
         param0->unk_78D = 0;
     }
 }
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 180313e6da..7a16c78094 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -202,20 +202,20 @@ void ov19_021DA63C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 
         if ((param2 & 1)) {
             if (param1->unk_30 == 0) {
-                sub_02021FE0(param1->unk_00, GX_OAM_MODE_XLU);
+                GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
                 return;
             }
         }
 
         for (v0 = 0; v0 < 6; v0++) {
             if ((param2 & (2 << v0)) && ((param1->unk_2E & (1 << v0)) == 0)) {
-                sub_02021FE0(param1->unk_00, GX_OAM_MODE_XLU);
+                GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
                 return;
             }
         }
     }
 
-    sub_02021FE0(param1->unk_00, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_NORMAL);
 }
 
 void ov19_021DA68C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2)
@@ -282,12 +282,12 @@ void ov19_021DA7B8 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
         GraphicElementData_SetAffineOverwriteMode(param1->unk_00, 0);
     }
 
-    SpriteActor_SetSpriteAnimActive(param1->unk_00, param2);
+    GraphicElementData_SetAnim(param1->unk_00, param2);
 }
 
 BOOL ov19_021DA7E0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1)
 {
-    return sub_02021FD0(param1->unk_00) == 0;
+    return GraphicElementData_IsAnimated(param1->unk_00) == 0;
 }
 
 void ov19_021DA7F4 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2)
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index 46d4e25c6e..8f4c6695bf 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -61,13 +61,13 @@ void ov19_021DA8FC (UnkStruct_ov19_021DA8D8 * param0, int param1)
 {
     switch (param1) {
     case 0:
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 0);
+        GraphicElementData_SetAnim(param0->unk_04, 0);
         break;
     case 1:
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+        GraphicElementData_SetAnim(param0->unk_04, 1);
         break;
     case 2:
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 2);
+        GraphicElementData_SetAnim(param0->unk_04, 2);
         break;
     }
 }
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index 6be7864e0e..ca72c5f77a 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -460,7 +460,7 @@ static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1)
     GraphicElementData_SetFlipMode(param0->unk_30, 1);
 
     if (ov19_021D5E08(param0->unk_04) == 3) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_30, 1);
+        GraphicElementData_SetAnim(param0->unk_30, 1);
     }
 }
 
@@ -551,7 +551,7 @@ void ov19_021DD378 (UnkStruct_ov19_021DCF88 * param0)
             v2->unk_18 = Unk_ov19_021E0258[v0] >> FX32_SHIFT;
 
             if (v2->unk_08 != NULL) {
-                SpriteActor_SetSpriteAnimActive(v2->unk_08, 1);
+                GraphicElementData_SetAnim(v2->unk_08, 1);
             }
 
             ov19_021DD344(param0, v1, v2);
@@ -575,7 +575,7 @@ static void ov19_021DD46C (SysTask * param0, void * param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (sub_02021FD0(v0->unk_08) == 0) {
+        if (GraphicElementData_IsAnimated(v0->unk_08) == 0) {
             v0->unk_04++;
         }
         break;
@@ -599,7 +599,7 @@ static void ov19_021DD46C (SysTask * param0, void * param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (++(v0->unk_0E) >= 16) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_08, 0);
+            GraphicElementData_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -613,7 +613,7 @@ static void ov19_021DD544 (SysTask * param0, void * param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (sub_02021FD0(v0->unk_08) == 0) {
+        if (GraphicElementData_IsAnimated(v0->unk_08) == 0) {
             G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 16, 0);
             v0->unk_0E = (16 - 1);
             v0->unk_04++;
@@ -648,7 +648,7 @@ static void ov19_021DD544 (SysTask * param0, void * param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (++(v0->unk_0E) >= 16) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_08, 0);
+            GraphicElementData_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -948,7 +948,7 @@ static void ov19_021DD9DC (UnkStruct_ov19_021DCF88 * param0)
         param0->unk_34[v3] = ov19_021D785C(param0->unk_0C, &v0, 240, 368, 48, NNS_G2D_VRAM_TYPE_2DSUB);
         GF_ASSERT(param0->unk_34[v3] != NULL);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
+        GraphicElementData_SetAnim(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
     }
 
     param0->unk_80 = ov19_021D5EC0(param0->unk_04);
@@ -1485,7 +1485,7 @@ void ov19_021DE2F4 (UnkStruct_ov19_021DCF88 * param0)
             u32 v1 = ov19_021D5EC8(param0->unk_04);
 
             for (v0 = 0; v0 < 8; v0++) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
+                GraphicElementData_SetAnim(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
             }
         }
     }
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 3645493475..2ba86fa2e9 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -203,7 +203,7 @@ static void ov19_021DE59C (UnkStruct_ov19_021DE3E8 * param0)
         int v1 = ov19_021DE538(param0, 1);
 
         ov19_021DE718(param0, v1, v0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1C[v1], 6);
+        GraphicElementData_SetAnim(param0->unk_1C[v1], 6);
         GraphicElementData_SetDrawFlag(param0->unk_1C[v1], 1);
     }
 }
@@ -235,7 +235,7 @@ static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0)
         ov19_021D78AC(param0->unk_1C[v3], 2);
 
         GraphicElementData_SetPosition(param0->unk_1C[v3], &v1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3], 0);
+        GraphicElementData_SetAnim(param0->unk_1C[v3], 0);
         GraphicElementData_SetDrawFlag(param0->unk_1C[v3], 1);
     }
 }
@@ -287,7 +287,7 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 2);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
         }
 
         v1 = ov19_021D5E74(param0->unk_08);
@@ -297,7 +297,7 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0)
 
             if (v0 >= 0) {
                 ov19_021DE718(param0, v0, v1);
-                SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 1);
+                GraphicElementData_SetAnim(param0->unk_1C[v0], 1);
                 GraphicElementData_SetDrawFlag(param0->unk_1C[v0], 1);
             }
         }
@@ -312,7 +312,7 @@ BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            if (sub_02021FD0(param0->unk_1C[v0])) {
+            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
         }
@@ -320,7 +320,7 @@ BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0)
         v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (sub_02021FD0(param0->unk_1C[v0])) {
+            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -371,7 +371,7 @@ static void ov19_021DE8E0 (SysTask * param0, void * param1)
         }
         break;
     case 1:
-        if (sub_02021FD0(v0->unk_04) == 0) {
+        if (GraphicElementData_IsAnimated(v0->unk_04) == 0) {
             ov19_021D78AC(v0->unk_04, v0->unk_28);
             v0->unk_00->unk_34--;
             SysTask_Done(param0);
@@ -395,7 +395,7 @@ void ov19_021DE954 (UnkStruct_ov19_021DE3E8 * param0)
             v1.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v0, 3);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 3);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 3);
             ov19_021DE858(param0, v0, &v1, 2, 12);
         }
     }
@@ -413,7 +413,7 @@ void ov19_021DE9B8 (UnkStruct_ov19_021DE3E8 * param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 2);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
         }
     }
 }
@@ -424,7 +424,7 @@ BOOL ov19_021DE9E4 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (sub_02021FD0(param0->unk_1C[v0])) {
+            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -446,7 +446,7 @@ void ov19_021DEA18 (UnkStruct_ov19_021DE3E8 * param0)
 
             ov19_021DE694(param0, &v1, &v2);
             ov19_021DE57C(param0, v0, 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 4);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 4);
             ov19_021DE858(param0, v0, &v1, 3, 12);
         }
     }
@@ -469,7 +469,7 @@ void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0)
 
             ov19_021DE694(param0, &v2, &v3);
             ov19_021DE57C(param0, v0, 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 4);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 4);
 
             ov19_021DE858(param0, v0, &v2, 3, 12);
             ov19_021D9B1C(param0->unk_18, &v2);
@@ -478,7 +478,7 @@ void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0)
             v2.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v1, 3);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v1], 3);
+            GraphicElementData_SetAnim(param0->unk_1C[v1], 3);
             ov19_021DE858(param0, v1, &v2, 2, 12);
         }
     }
@@ -495,7 +495,7 @@ void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 5);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 5);
             param0->unk_38 = v0;
             return;
         }
@@ -503,7 +503,7 @@ void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0)
         v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C[v0], 2);
+            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
             param0->unk_38 = v0;
             return;
         }
@@ -516,7 +516,7 @@ BOOL ov19_021DEB60 (UnkStruct_ov19_021DE3E8 * param0)
 {
     if (param0->unk_00) {
         if (param0->unk_38 != -1) {
-            if (sub_02021FD0(param0->unk_1C[param0->unk_38])) {
+            if (GraphicElementData_IsAnimated(param0->unk_1C[param0->unk_38])) {
                 return 0;
             }
 
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 6df503d0a3..72f7689a53 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -161,11 +161,11 @@ void ov19_021DEDDC (UnkStruct_ov19_021DEC04 * param0, BOOL param1)
         int v0 = ov19_021D5F9C(param0->unk_08);
 
         if (param1) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_28[v0 ^ 1], 2);
-            SpriteActor_SetSpriteAnimActive(param0->unk_28[v0], 0);
+            GraphicElementData_SetAnim(param0->unk_28[v0 ^ 1], 2);
+            GraphicElementData_SetAnim(param0->unk_28[v0], 0);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_28[v0 ^ 1], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_28[v0], 0);
+            GraphicElementData_SetAnim(param0->unk_28[v0 ^ 1], 1);
+            GraphicElementData_SetAnim(param0->unk_28[v0], 0);
         }
 
         ov19_021DEEFC(param0);
@@ -607,11 +607,11 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1)
         param0->unk_28[v4] = ov19_021D785C(param0->unk_10, &v2, v0[v4].unk_00, v0[v4].unk_02, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
         GraphicElementData_SetExplicitPalette(param0->unk_28[v4], v4);
-        SpriteActor_SetSpriteAnimActive(param0->unk_28[v4], 0);
+        GraphicElementData_SetAnim(param0->unk_28[v4], 0);
 
         for (v5 = 0; v5 < 5; v5++) {
             param0->unk_34[v4][v5] = ov19_021D785C(param0->unk_10, &v2, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB);
-            SpriteActor_SetSpriteAnimActive(param0->unk_34[v4][v5], 5 + v4);
+            GraphicElementData_SetAnim(param0->unk_34[v4][v5], 5 + v4);
             GraphicElementData_SetExplicitPalette(param0->unk_34[v4][v5], v4);
             GraphicElementData_SetDrawFlag(param0->unk_34[v4][v5], 0);
         }
@@ -619,7 +619,7 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1)
 
     GraphicElementData_SetFlipMode(param0->unk_28[1], 1);
     param0->unk_30 = ov19_021D785C(param0->unk_10, &v2, 128, 176 + 384, 0, NNS_G2D_VRAM_TYPE_2DSUB);
-    SpriteActor_SetSpriteAnimActive(param0->unk_30, 3);
+    GraphicElementData_SetAnim(param0->unk_30, 3);
     GraphicElementData_SetExplicitPalette(param0->unk_30, 2);
     param0->unk_380 = SysTask_Start(ov19_021DF930, param0, 1);
 
@@ -719,13 +719,13 @@ static void ov19_021DF930 (SysTask * param0, void * param1)
     UnkStruct_ov19_021DEC04 * v0 = param1;
     BOOL v1 = ov19_021D5FC0(v0->unk_08);
 
-    if (sub_02021E24(v0->unk_30) == 3) {
+    if (GraphicElementData_GetActiveAnim(v0->unk_30) == 3) {
         if (v1) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_30, 4);
+            GraphicElementData_SetAnim(v0->unk_30, 4);
         }
     } else {
         if (v1 == 0) {
-            SpriteActor_SetSpriteAnimActive(v0->unk_30, 3);
+            GraphicElementData_SetAnim(v0->unk_30, 3);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index ad63274553..611a66dadf 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -173,7 +173,7 @@ static void ov20_021D217C (SysTask * param0, void * param1)
 {
     UnkStruct_ov20_021D2128 * v0 = param1;
 
-    sub_020219F8(v0->unk_24);
+    GraphicElementManager_Update(v0->unk_24);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 09560d5257..1804d6380a 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -229,10 +229,10 @@ static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0)
     ov20_021D375C(param0, 1);
     param0->unk_40 = ov20_021D2E50(param0->unk_00, &v0, 6, 24, 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_40, 13);
+    GraphicElementData_SetAnim(param0->unk_40, 13);
     param0->unk_44 = ov20_021D2E50(param0->unk_00, &v0, 250, 24, 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_44, 12);
+    GraphicElementData_SetAnim(param0->unk_44, 12);
 
     if (ov20_021D1F84(param0->unk_04) != 2) {
         GraphicElementData_SetDrawFlag(param0->unk_44, 0);
@@ -493,8 +493,8 @@ void ov20_021D36D0 (UnkStruct_ov20_021D30F8 * param0)
         GraphicElementData_SetDrawFlag(param0->unk_40, 1);
         GraphicElementData_SetDrawFlag(param0->unk_44, 1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_40, 13);
-        SpriteActor_SetSpriteAnimActive(param0->unk_44, 12);
+        GraphicElementData_SetAnim(param0->unk_40, 13);
+        GraphicElementData_SetAnim(param0->unk_44, 12);
     }
 }
 
@@ -525,15 +525,15 @@ static void ov20_021D375C (UnkStruct_ov20_021D30F8 * param0, BOOL param1)
 {
     if (param0->unk_5C != 0) {
         if (param1) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 0);
+            GraphicElementData_SetAnim(param0->unk_3C, 0);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 1);
+            GraphicElementData_SetAnim(param0->unk_3C, 1);
         }
     } else {
         if (param1) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 14);
+            GraphicElementData_SetAnim(param0->unk_3C, 14);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 15);
+            GraphicElementData_SetAnim(param0->unk_3C, 15);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index db8dd16c63..67548e3e46 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -103,18 +103,18 @@ static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0)
     ov20_021D2E0C(param0->unk_00, &v0, 0, 3);
     param0->unk_0C = ov20_021D2E50(param0->unk_00, &v0, 64, 56, 5, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2);
+    GraphicElementData_SetAnim(param0->unk_0C, 2);
     GraphicElementData_SetDrawFlag(param0->unk_0C, 0);
 }
 
 void ov20_021D39BC (UnkStruct_ov20_021D3980 * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, 3);
+    GraphicElementData_SetAnim(param0->unk_0C, 3);
 }
 
 void ov20_021D39C8 (UnkStruct_ov20_021D3980 * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2);
+    GraphicElementData_SetAnim(param0->unk_0C, 2);
 }
 
 void ov20_021D39D4 (UnkStruct_ov20_021D3980 * param0, BOOL param1)
@@ -146,7 +146,7 @@ void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1)
     }
 
     GraphicElementData_SetPosition(param0->unk_0C, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, 2);
+    GraphicElementData_SetAnim(param0->unk_0C, 2);
 }
 
 void ov20_021D3A2C (UnkStruct_ov20_021D3980 * param0)
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index 22c1b85d2e..031011a1bf 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -234,7 +234,7 @@ static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0)
 
     ov20_021D2E0C(param0->unk_00, &v0, 0, 1);
     param0->unk_5C = ov20_021D2E50(param0->unk_00, &v0, 48, 54, 2, NNS_G2D_VRAM_TYPE_2DMAIN);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5C, 4);
+    GraphicElementData_SetAnim(param0->unk_5C, 4);
     GraphicElementData_SetDrawFlag(param0->unk_5C, 0);
 }
 
@@ -244,9 +244,9 @@ void ov20_021D3E48 (UnkStruct_ov20_021D3E0C * param0, BOOL param1)
 
     if (param1) {
         if (ov20_021D1F94(param0->unk_04) == 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_5C, 4);
+            GraphicElementData_SetAnim(param0->unk_5C, 4);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_5C, 6);
+            GraphicElementData_SetAnim(param0->unk_5C, 6);
         }
     }
 }
@@ -283,7 +283,7 @@ void ov20_021D3E74 (UnkStruct_ov20_021D3E0C * param0, u32 param1)
     v0.y *= FX32_ONE;
 
     GraphicElementData_SetPosition(param0->unk_5C, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5C, v2);
+    GraphicElementData_SetAnim(param0->unk_5C, v2);
 }
 
 void ov20_021D3EF8 (UnkStruct_ov20_021D3E0C * param0)
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 77529c76fa..36f3950629 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -120,15 +120,15 @@ static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0)
     ov20_021D2E0C(param0->unk_00, &v0, 0, 2);
     param0->unk_30 = ov20_021D2E50(param0->unk_00, &v0, 72, 56, 3, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_30, 8);
+    GraphicElementData_SetAnim(param0->unk_30, 8);
     GraphicElementData_SetDrawFlag(param0->unk_30, 0);
 
     param0->unk_34 = ov20_021D2E50(param0->unk_00, &v0, 240, 64, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    SpriteActor_SetSpriteAnimActive(param0->unk_34, 11);
+    GraphicElementData_SetAnim(param0->unk_34, 11);
     GraphicElementData_SetDrawFlag(param0->unk_34, 0);
 
     param0->unk_38 = ov20_021D2E50(param0->unk_00, &v0, 240, 144, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    SpriteActor_SetSpriteAnimActive(param0->unk_38, 10);
+    GraphicElementData_SetAnim(param0->unk_38, 10);
     GraphicElementData_SetDrawFlag(param0->unk_38, 0);
 }
 
@@ -240,7 +240,7 @@ void ov20_021D4480 (UnkStruct_ov20_021D4210 * param0, u32 param1)
     v0.z = 0;
 
     GraphicElementData_SetPosition(param0->unk_30, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_30, 8);
+    GraphicElementData_SetAnim(param0->unk_30, 8);
 }
 
 void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1)
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index 96d63d5244..b521c1d8bf 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -312,11 +312,11 @@ static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1)
     ov20_021D4AF8(&(param0->unk_1C), param1, 22, 23);
 
     param0->unk_14 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 56, 0, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_14, 0);
+    GraphicElementData_SetAnim(param0->unk_14, 0);
     GraphicElementData_SetDrawFlag(param0->unk_14, 0);
 
     param0->unk_18 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 136, 0, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_18, 2);
+    GraphicElementData_SetAnim(param0->unk_18, 2);
     GraphicElementData_SetDrawFlag(param0->unk_18, 0);
 }
 
@@ -475,20 +475,20 @@ void ov20_021D4DF4 (UnkStruct_ov20_021D4AD4 * param0, int param1, int param2)
     case 0:
         switch (param2) {
         case 1:
-            SpriteActor_SetSpriteAnimActive(param0->unk_14, 1);
+            GraphicElementData_SetAnim(param0->unk_14, 1);
             break;
         case 0:
-            SpriteActor_SetSpriteAnimActive(param0->unk_14, 0);
+            GraphicElementData_SetAnim(param0->unk_14, 0);
             break;
         }
         break;
     case 1:
         switch (param2) {
         case 1:
-            SpriteActor_SetSpriteAnimActive(param0->unk_18, 3);
+            GraphicElementData_SetAnim(param0->unk_18, 3);
             break;
         case 0:
-            SpriteActor_SetSpriteAnimActive(param0->unk_18, 2);
+            GraphicElementData_SetAnim(param0->unk_18, 2);
             break;
         }
         break;
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 085105d324..588a747e8d 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -554,7 +554,7 @@ void ov21_021D144C (GraphicElementData * param0, int param1)
         break;
     case 3:
     case (3 + 1):
-        if (sub_02021E74(param0) > 0) {
+        if (GraphicElementData_GetAnimFrame(param0) > 0) {
             GraphicElementData_UpdateAnim(param0, -(FX32_ONE * 2));
         }
         break;
@@ -565,7 +565,7 @@ void ov21_021D144C (GraphicElementData * param0, int param1)
 
 void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2)
 {
-    int v0 = sub_02021E74(param0);
+    int v0 = GraphicElementData_GetAnimFrame(param0);
     int v1, v2;
 
     switch (v0) {
@@ -597,7 +597,7 @@ void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = sub_02021E74(param0);
+    v0 = GraphicElementData_GetAnimFrame(param0);
 
     if (v0 < 2) {
         sub_02012AC0(param1->unk_00, param3);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 5ff661f0c5..cbd304ea23 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -136,7 +136,7 @@ void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0)
 
 void ov21_021D2124 (UnkStruct_ov21_021D13FC * param0)
 {
-    sub_020219F8(param0->unk_138);
+    GraphicElementManager_Update(param0->unk_138);
 
     NNS_G2dSetupSoftwareSpriteCamera();
 
@@ -267,8 +267,8 @@ UnkStruct_02009DC8 * ov21_021D2344 (const UnkStruct_ov21_021D13FC * param0, int
 
 void ov21_021D2360 (const UnkStruct_ov21_021D13FC * param0, GXOamMode param1)
 {
-    sub_02021FE0(param0->unk_1B0.unk_00, param1);
-    sub_02021FE0(param0->unk_1B0.unk_04, param1);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_1B0.unk_00, param1);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_1B0.unk_04, param1);
     sub_02012AF0(param0->unk_1B0.unk_08->unk_00, param1);
 }
 
@@ -883,7 +883,7 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
     param0->unk_1B0.unk_04 = GraphicElementManager_AddElement(&v1);
 
     GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_1B0.unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_1B0.unk_04, 1);
 
     param0->unk_1B0.unk_08 = NULL;
     param0->unk_1B0.unk_28 = 0;
@@ -930,7 +930,7 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
     param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
     GraphicElementData_SetDrawFlag(param0->unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_04, 1);
 
     param0->unk_08 = NULL;
     param0->unk_28 = 0;
@@ -1017,7 +1017,7 @@ static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
 
     for (v2 = 0; v2 < 4; v2++) {
         v3->unk_00[v2] = GraphicElementManager_AddElement(&v1);
-        SpriteActor_SetSpriteAnimActive(v3->unk_00[v2], v2);
+        GraphicElementData_SetAnim(v3->unk_00[v2], v2);
     }
 
     ov21_021D2584(v3, 0);
diff --git a/src/overlay021/ov21_021D57B4.c b/src/overlay021/ov21_021D57B4.c
index 9d4675366e..52434198bb 100644
--- a/src/overlay021/ov21_021D57B4.c
+++ b/src/overlay021/ov21_021D57B4.c
@@ -143,9 +143,9 @@ void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int par
     GraphicElementData_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
-        SpriteActor_SetSpriteAnimActive(param0, param7);
+        GraphicElementData_SetAnim(param0, param7);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0, param6);
+        GraphicElementData_SetAnim(param0, param6);
     }
 }
 
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index c80befb5e3..2862914b64 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -845,20 +845,20 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
 
     for (v1 = 0; v1 < 9; v1++) {
         param0->unk_00[v1] = GraphicElementManager_AddElement(&v0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v1], 0);
+        GraphicElementData_SetAnim(param0->unk_00[v1], 0);
     }
 
     v0.priority = 0;
 
     for (v1 = 0; v1 < 9; v1++) {
         param0->unk_50[v1] = GraphicElementManager_AddElement(&v0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_50[v1], 1);
+        GraphicElementData_SetAnim(param0->unk_50[v1], 1);
     }
 
     v0.priority = 0;
     param0->unk_74 = GraphicElementManager_AddElement(&v0);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_74, 2);
+    GraphicElementData_SetAnim(param0->unk_74, 2);
 
     v0.priority = 0;
     v0.position.x = 56 << FX32_SHIFT;
@@ -868,7 +868,7 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     param0->unk_7C = GraphicElementManager_AddElement(&v0);
 
     GraphicElementData_SetDrawFlag(param0->unk_7C, 0);
-    sub_02021FE0(param0->unk_7C, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_7C, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021D67EC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3)
@@ -1482,11 +1482,11 @@ static void ov21_021D70E8 (UnkStruct_ov21_021D71A8 * param0)
 {
     int v0;
 
-    sub_02021FE0(param0->unk_74, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 9; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
-        sub_02021FE0(param0->unk_50[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
 
         if (param0->unk_28[v0]) {
             sub_02012AF0(param0->unk_28[v0]->unk_00, GX_OAM_MODE_XLU);
@@ -1498,11 +1498,11 @@ static void ov21_021D7124 (UnkStruct_ov21_021D71A8 * param0)
 {
     int v0;
 
-    sub_02021FE0(param0->unk_74, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 9; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
-        sub_02021FE0(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
 
         if (param0->unk_28[v0]) {
             sub_02012AF0(param0->unk_28[v0]->unk_00, GX_OAM_MODE_NORMAL);
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index e328873fa6..48d0ae294a 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -613,7 +613,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2);
+    GraphicElementData_SetAnim(param0->unk_00[0], 2);
 
     if (param2->unk_1C->unk_04->unk_1740 == 1) {
         GraphicElementData_SetDrawFlag(param0->unk_00[0], 0);
@@ -625,7 +625,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
+    GraphicElementData_SetAnim(param0->unk_00[1], 0);
 
     if ((ov21_021D36A4(param2->unk_1C->unk_04, 1) == 0) || (param2->unk_1C->unk_04->unk_1740 == 1)) {
         GraphicElementData_SetDrawFlag(param0->unk_00[1], 0);
@@ -637,7 +637,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 1);
+    GraphicElementData_SetAnim(param0->unk_00[2], 1);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
@@ -645,7 +645,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_18 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_18, 3);
+    GraphicElementData_SetAnim(param0->unk_18, 3);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 146 << FX32_SHIFT;
@@ -653,7 +653,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_1C = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_1C, 4);
+    GraphicElementData_SetAnim(param0->unk_1C, 4);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 8 << FX32_SHIFT;
@@ -661,7 +661,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_20, 5);
+    GraphicElementData_SetAnim(param0->unk_20, 5);
 }
 
 static void ov21_021D7FEC (UnkStruct_ov21_021D7C64 * param0)
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 5f1d0213d7..59022807bc 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -661,14 +661,14 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     v1.position.y = 164 << FX32_SHIFT;
     param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_20, 3);
+    GraphicElementData_SetAnim(param0->unk_20, 3);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 96 << FX32_SHIFT;
 
     param0->unk_58 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_58, 17);
+    GraphicElementData_SetAnim(param0->unk_58, 17);
     GraphicElementData_SetDrawFlag(param0->unk_58, 0);
     GraphicElementData_SetAffineOverwriteMode(param0->unk_58, 1);
     GraphicElementData_SetExplicitPriority(param0->unk_58, 0);
@@ -992,46 +992,46 @@ static void ov21_021D924C (UnkStruct_ov21_021D9320 * param0, int param1)
 
         switch (param1) {
         case 1:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 3);
+            GraphicElementData_SetAnim(param0->unk_20, 3);
             break;
         case 2:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 4);
+            GraphicElementData_SetAnim(param0->unk_20, 4);
             break;
         case 3:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 5);
+            GraphicElementData_SetAnim(param0->unk_20, 5);
             break;
         case 4:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 6);
+            GraphicElementData_SetAnim(param0->unk_20, 6);
             break;
         case 5:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 7);
+            GraphicElementData_SetAnim(param0->unk_20, 7);
             break;
         case 6:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 8);
+            GraphicElementData_SetAnim(param0->unk_20, 8);
             break;
         case 7:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 9);
+            GraphicElementData_SetAnim(param0->unk_20, 9);
             break;
         case 8:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 10);
+            GraphicElementData_SetAnim(param0->unk_20, 10);
             break;
         case 9:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 11);
+            GraphicElementData_SetAnim(param0->unk_20, 11);
             break;
         case 10:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 12);
+            GraphicElementData_SetAnim(param0->unk_20, 12);
             break;
         case 11:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 13);
+            GraphicElementData_SetAnim(param0->unk_20, 13);
             break;
         case 12:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 14);
+            GraphicElementData_SetAnim(param0->unk_20, 14);
             break;
         case 13:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 15);
+            GraphicElementData_SetAnim(param0->unk_20, 15);
             break;
         case 14:
-            SpriteActor_SetSpriteAnimActive(param0->unk_20, 16);
+            GraphicElementData_SetAnim(param0->unk_20, 16);
             break;
         default:
             break;
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index ffdf7cfa62..097c76e0ac 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -2451,16 +2451,16 @@ static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
 
         switch (v0) {
         case 0:
-            SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 3);
+            GraphicElementData_SetAnim(param0->unk_00[v0], 3);
             break;
         case 1:
         case 2:
         case 3:
         case 4:
-            SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
+            GraphicElementData_SetAnim(param0->unk_00[v0], 2);
             break;
         case 5:
-            SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 1);
+            GraphicElementData_SetAnim(param0->unk_00[v0], 1);
             break;
         }
     }
@@ -2499,7 +2499,7 @@ static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
+            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
@@ -2516,7 +2516,7 @@ static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
+            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
@@ -2533,7 +2533,7 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
+            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2543,7 +2543,7 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[10] = GraphicElementManager_AddElement(param1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_30[10], 5);
+    GraphicElementData_SetAnim(param0->unk_30[10], 5);
 }
 
 static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
@@ -2558,7 +2558,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 2) + v1], 0);
+            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2568,7 +2568,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[8] = GraphicElementManager_AddElement(param1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_30[8], 0);
+    GraphicElementData_SetAnim(param0->unk_30[8], 0);
 
     param1->position.y = 176;
     param1->position.x = (48 - 24);
@@ -2576,7 +2576,7 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
     param0->unk_30[9] = GraphicElementManager_AddElement(param1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_30[9], 4);
+    GraphicElementData_SetAnim(param0->unk_30[9], 4);
 }
 
 static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
@@ -2592,7 +2592,7 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             param1->position.x <<= FX32_SHIFT;
             param0->unk_30[(v0 * 3) + v1] = GraphicElementManager_AddElement(param1);
 
-            SpriteActor_SetSpriteAnimActive(param0->unk_30[(v0 * 3) + v1], 6);
+            GraphicElementData_SetAnim(param0->unk_30[(v0 * 3) + v1], 6);
         }
     }
 }
@@ -2623,46 +2623,46 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 
             switch ((v3 * 3) + v4) {
             case 0:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 0);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             case 1:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 5);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 5);
                 break;
             case 2:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 10);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 10);
                 break;
             case 3:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 1);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 1);
                 break;
             case 4:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 6);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 6);
                 break;
             case 5:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 11);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 11);
                 break;
             case 6:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 2);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 2);
                 break;
             case 7:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 9);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 9);
                 break;
             case 8:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 12);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 12);
                 break;
             case 9:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 3);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 3);
                 break;
             case 10:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 8);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 8);
                 break;
             case 11:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 13);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 13);
                 break;
             case 12:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 4);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 4);
                 break;
             case 13:
-                SpriteActor_SetSpriteAnimActive(param0->unk_A8[(v3 * 3) + v4], 7);
+                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 7);
                 break;
             case 14:
                 GraphicElementData_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
@@ -3487,7 +3487,7 @@ static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            sub_02021FE0(param0->unk_30[v0], param1);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
         }
 
         if (param0->unk_6C[v0]) {
@@ -3495,7 +3495,7 @@ static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1)
         }
 
         if (param0->unk_A8[v0]) {
-            sub_02021FE0(param0->unk_A8[v0], param1);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_A8[v0], param1);
         }
     }
 }
@@ -3507,7 +3507,7 @@ static void ov21_021DC90C (UnkStruct_ov21_021DC96C * param0, int param1)
     for (v0 = 0; v0 < 15; v0++) {
         if (v0 != 10) {
             if (param0->unk_30[v0]) {
-                sub_02021FE0(param0->unk_30[v0], param1);
+                GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
             }
 
             if (param0->unk_6C[v0]) {
@@ -3524,7 +3524,7 @@ static void ov21_021DC93C (UnkStruct_ov21_021DC96C * param0, int param1)
     for (v0 = 0; v0 < 15; v0++) {
         if (v0 != 9) {
             if (param0->unk_30[v0]) {
-                sub_02021FE0(param0->unk_30[v0], param1);
+                GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
             }
 
             if (param0->unk_6C[v0]) {
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index e83d0fff46..529ae0b868 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -592,7 +592,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 
     param0->unk_C8 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_C8, 2);
+    GraphicElementData_SetAnim(param0->unk_C8, 2);
     sub_020093B4(&v0, 108 + 6000, 14 + 6000, 106 + 6000, 107 + 6000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
     v1.manager = v2->unk_138;
@@ -606,7 +606,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
     for (v3 = 0; v3 < (22 * 2); v3++) {
         param0->unk_04[v3] = GraphicElementManager_AddElement(&v1);
         GraphicElementData_SetDrawFlag(param0->unk_04[v3], 0);
-        sub_02021FE0(param0->unk_04[v3], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_04[v3], GX_OAM_MODE_XLU);
     }
 }
 
@@ -689,7 +689,7 @@ static void ov21_021DD420 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    sub_02021FE0(param0->unk_C8, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_CC->unk_00, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -701,7 +701,7 @@ static void ov21_021DD458 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    sub_02021FE0(param0->unk_C8, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_CC->unk_00, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 3; v0++) {
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 20ad425513..fbf12c123c 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -337,12 +337,12 @@ static int ov21_021DDFB4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021DE040 (UnkStruct_ov21_021DDEC8 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021DE04C (UnkStruct_ov21_021DDEC8 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
 }
 
 static void ov21_021DE058 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3)
@@ -450,7 +450,7 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
 
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, 0);
+    GraphicElementData_SetAnim(param0->unk_00, 0);
 }
 
 static void ov21_021DE2E0 (UnkStruct_ov21_021DDEC8 * param0)
@@ -595,7 +595,7 @@ static void ov21_021DE49C (UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov2
     v0.y += (192 << FX32_SHIFT);
 
     GraphicElementData_SetPosition(param0->unk_00, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, ov21_021DCA28(param1->unk_00));
+    GraphicElementData_SetAnim(param0->unk_00, ov21_021DCA28(param1->unk_00));
 }
 
 static void ov21_021DE4D4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, int param3)
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 752279a1e3..77acc20370 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -658,13 +658,13 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v4);
+    GraphicElementData_SetAnim(param0->unk_00[1], 0 + v4);
 
     if (v4 != v5) {
         v1.position.x = (220 * FX32_ONE);
         v1.position.y = (72 * FX32_ONE);
         param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[2], 0 + v5);
+        GraphicElementData_SetAnim(param0->unk_00[2], 0 + v5);
     } else {
         param0->unk_00[2] = NULL;
     }
@@ -765,7 +765,7 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     param0->unk_0C = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, 0x11);
+    GraphicElementData_SetAnim(param0->unk_0C, 0x11);
 
     if (ov21_021D37CC(param2->unk_04) != 2) {
         v3 = 0;
@@ -973,11 +973,11 @@ static void ov21_021DF64C (UnkStruct_ov21_021DF374 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         }
     }
 
-    sub_02021FE0(param0->unk_0C, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_XLU);
 }
 
@@ -987,11 +987,11 @@ static void ov21_021DF680 (UnkStruct_ov21_021DF374 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         }
     }
 
-    sub_02021FE0(param0->unk_0C, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_NORMAL);
 }
 
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index 350f72798c..ff8f3813f1 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -580,9 +580,9 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
         param0->unk_00[v5] = GraphicElementManager_AddElement(&v1);
 
         if ((v5 % 2) == 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_00[v5], 0);
+            GraphicElementData_SetAnim(param0->unk_00[v5], 0);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_00[v5], 2);
+            GraphicElementData_SetAnim(param0->unk_00[v5], 2);
         }
     }
 
@@ -592,7 +592,7 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
 
     param0->unk_BC = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_BC, 1);
+    GraphicElementData_SetAnim(param0->unk_BC, 1);
     GraphicElementData_SetAnimateFlag(param0->unk_BC, 1);
     GraphicElementData_SetExplicitPriority(param0->unk_BC, 0);
 
@@ -655,10 +655,10 @@ static void ov21_021DFFF8 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
     }
 
-    sub_02021FE0(param0->unk_BC, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 2; v0++) {
         sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_XLU);
@@ -670,10 +670,10 @@ static void ov21_021E0038 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
     }
 
-    sub_02021FE0(param0->unk_BC, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 2; v0++) {
         sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_NORMAL);
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index d52737121e..ac339b93a4 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -543,7 +543,7 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, 0x11);
+    GraphicElementData_SetAnim(param0->unk_00, 0x11);
 
     if (ov21_021D37CC(param2->unk_04) != 2) {
         v3 = 0;
@@ -747,13 +747,13 @@ static BOOL ov21_021E1730 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E17AC (UnkStruct_ov21_021E14D4 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021E17C4 (UnkStruct_ov21_021E14D4 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_NORMAL);
 }
 
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 41bf456520..5eadcb7712 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -724,7 +724,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0);
+    GraphicElementData_SetAnim(param0->unk_00[0], 0);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 76 << FX32_SHIFT;
@@ -732,7 +732,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 
     param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0);
+    GraphicElementData_SetAnim(param0->unk_00[1], 0);
     sub_020093B4(&v0, 99 + 5000, 11 + 2100, 97 + 5000, 98 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
     v1.resourceData = &v0;
@@ -743,7 +743,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
         v1.position.x = Unk_ov21_021E9D80[v3];
         param0->unk_00[v3 + 2] = GraphicElementManager_AddElement(&v1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
+        GraphicElementData_SetAnim(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
     }
 
     v1.priority = 31 - 1;
@@ -753,14 +753,14 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_50[0] = GraphicElementManager_AddElement(&v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_50[0], 13);
+    GraphicElementData_SetAnim(param0->unk_50[0], 13);
 
     v1.position.x = (128 + -32) << FX32_SHIFT;
     v1.position.y = (76 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
     param0->unk_50[1] = GraphicElementManager_AddElement(&v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_50[1], 12);
+    GraphicElementData_SetAnim(param0->unk_50[1], 12);
 
     for (v3 = 1 + 1; v3 < 8; v3++) {
         param0->unk_50[v3] = NULL;
@@ -851,14 +851,14 @@ static void ov21_021E2588 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
 
         if (param0->unk_20[v0]) {
             sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_XLU);
         }
 
         if (param0->unk_50[v0]) {
-            sub_02021FE0(param0->unk_50[v0], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
         }
     }
 }
@@ -868,14 +868,14 @@ static void ov21_021E25C0 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
 
         if (param0->unk_20[v0]) {
             sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_NORMAL);
         }
 
         if (param0->unk_50[v0]) {
-            sub_02021FE0(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
         }
     }
 }
@@ -925,7 +925,7 @@ static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E274C(param1, param2, param4, param8, param9);
 
-    v0 = sub_02021E74(param1);
+    v0 = GraphicElementData_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -1152,8 +1152,8 @@ static void ov21_021E29A4 (GraphicElementData * param0, int param1, int param2)
     v0 = Unk_ov21_021E9D98[param2 - 2];
 
     if (param1 == 1) {
-        SpriteActor_SetSpriteAnimActive(param0, v0 + 1);
+        GraphicElementData_SetAnim(param0, v0 + 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0, v0);
+        GraphicElementData_SetAnim(param0, v0);
     }
 }
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 78426e60c7..a42df229bc 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -1315,7 +1315,7 @@ static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
         }
 
         param0->unk_00[v3] = GraphicElementManager_AddElement(&v1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v3], v3);
+        GraphicElementData_SetAnim(param0->unk_00[v3], v3);
     }
 }
 
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index f3cbfb92da..ce1b65609f 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -389,10 +389,10 @@ static void ov21_021E4360 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            sub_02021FE0(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
         }
 
-        sub_02021FE0(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
     }
 }
 
@@ -402,10 +402,10 @@ static void ov21_021E4394 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            sub_02021FE0(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
         }
 
-        sub_02021FE0(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
     }
 }
 
@@ -760,7 +760,7 @@ static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1)
 
         v1.y += -8 << FX32_SHIFT;
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v0].unk_00, 1);
+        GraphicElementData_SetAnim(param0->unk_00[v0].unk_00, 1);
     }
 
     v1.y = 96 << FX32_SHIFT;
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 60033ee2f7..1c21be25d6 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -441,10 +441,10 @@ static int ov21_021E4F78 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_XLU);
-    sub_02021FE0(param0->unk_3C, GX_OAM_MODE_XLU);
-    sub_02021FE0(param0->unk_04, GX_OAM_MODE_XLU);
-    sub_02021FE0(param0->unk_20, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_XLU);
 
     sub_02012AF0(param0->unk_50[0]->unk_00, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_XLU);
@@ -452,10 +452,10 @@ static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0)
 
 static void ov21_021E5040 (UnkStruct_ov21_021E5004 * param0)
 {
-    sub_02021FE0(param0->unk_00, GX_OAM_MODE_NORMAL);
-    sub_02021FE0(param0->unk_3C, GX_OAM_MODE_NORMAL);
-    sub_02021FE0(param0->unk_04, GX_OAM_MODE_NORMAL);
-    sub_02021FE0(param0->unk_20, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_NORMAL);
 
     sub_02012AF0(param0->unk_50[0]->unk_00, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_NORMAL);
@@ -863,7 +863,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
     param0->unk_3C = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C, 4);
+    GraphicElementData_SetAnim(param0->unk_3C, 4);
     GraphicElementData_SetAnimateFlag(param0->unk_3C, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_3C, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_3C, 8);
@@ -874,7 +874,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, 1);
+    GraphicElementData_SetAnim(param0->unk_00, 1);
     GraphicElementData_SetAffineOverwriteMode(param0->unk_00, 1);
 
     v1.position.x = 180 << FX32_SHIFT;
@@ -883,7 +883,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
     param0->unk_04 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, 3);
+    GraphicElementData_SetAnim(param0->unk_04, 3);
     GraphicElementData_SetAnimateFlag(param0->unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_04, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_04, 5);
@@ -900,7 +900,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
     param0->unk_20 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_20, 6);
+    GraphicElementData_SetAnim(param0->unk_20, 6);
     GraphicElementData_SetAnimateFlag(param0->unk_20, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_20, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_20, 5);
@@ -979,13 +979,13 @@ static void ov21_021E59B4 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov2
     int v0;
 
     if (param0->unk_40 != param1->unk_34) {
-        v0 = sub_02021E74(param0->unk_3C);
+        v0 = GraphicElementData_GetAnimFrame(param0->unk_3C);
 
         if (param1->unk_34 == 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 4);
+            GraphicElementData_SetAnim(param0->unk_3C, 4);
             SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C, 0);
+            GraphicElementData_SetAnim(param0->unk_3C, 0);
             SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
         }
 
@@ -1175,7 +1175,7 @@ static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         param3 = 1;
     }
 
-    v0 = sub_02021E74(param0);
+    v0 = GraphicElementData_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1209,7 +1209,7 @@ static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         param3 = 3;
     }
 
-    v0 = sub_02021E74(param0);
+    v0 = GraphicElementData_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1244,17 +1244,17 @@ static void ov21_021E5D90 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
 {
     int v0;
 
-    v0 = sub_02021E74(param0);
+    v0 = GraphicElementData_GetAnimFrame(param0);
 
     if (param2 == 1) {
         if (param1->unk_08 == param1->unk_00) {
-            SpriteActor_SetSpriteAnimActive(param0, param1->unk_04);
+            GraphicElementData_SetAnim(param0, param1->unk_04);
             param1->unk_08 = param1->unk_04;
             SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
         }
     } else {
         if (param1->unk_08 == param1->unk_04) {
-            SpriteActor_SetSpriteAnimActive(param0, param1->unk_00);
+            GraphicElementData_SetAnim(param0, param1->unk_00);
             param1->unk_08 = param1->unk_00;
             SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
         }
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 1de4bf8f2e..ee5e936437 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -296,12 +296,12 @@ static int ov21_021E6204 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021E6274 (UnkStruct_ov21_021E6274 * param0)
 {
-    sub_02021FE0(param0->unk_10, GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021E6280 (UnkStruct_ov21_021E6274 * param0)
 {
-    sub_02021FE0(param0->unk_10, GX_OAM_MODE_NORMAL);
+    GraphicElementData_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_NORMAL);
 }
 
 static void ov21_021E628C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3)
@@ -433,9 +433,9 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
     param0->unk_10 = GraphicElementManager_AddElement(&v1);
 
     if (ov21_021D3920(param2->unk_04) == 0) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_10, 5);
+        GraphicElementData_SetAnim(param0->unk_10, 5);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0->unk_10, 6);
+        GraphicElementData_SetAnim(param0->unk_10, 6);
     }
 
     ov21_021E6860(param0->unk_10, v4);
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index c2fcf3daf0..71e1d4d81d 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -366,7 +366,7 @@ static void ov21_021E6C60 (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -376,7 +376,7 @@ static void ov21_021E6C88 (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -584,7 +584,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
 
     param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 1);
+    GraphicElementData_SetAnim(param0->unk_00[0], 1);
 
     v1.position.x = 188 << FX32_SHIFT;
     v1.position.y = 120 << FX32_SHIFT;
@@ -592,7 +592,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
 
     param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 1);
+    GraphicElementData_SetAnim(param0->unk_00[1], 1);
 }
 
 static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0)
@@ -671,7 +671,7 @@ static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E727C(param1, param2, param4, param8, param9);
 
-    v0 = sub_02021E74(param1);
+    v0 = GraphicElementData_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index de510a9b0c..43dd4e636e 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -650,9 +650,9 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     param0->unk_00 = GraphicElementManager_AddElement(&v1);
 
     if (ov21_021D3920(param2->unk_00) == 0) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_00, 3);
+        GraphicElementData_SetAnim(param0->unk_00, 3);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0->unk_00, 4);
+        GraphicElementData_SetAnim(param0->unk_00, 4);
     }
 
     v1.position.x = 128 << FX32_SHIFT;
@@ -660,21 +660,21 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 
     param0->unk_08 = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_08, 1);
+    GraphicElementData_SetAnim(param0->unk_08, 1);
     GraphicElementData_SetExplicitPriority(param0->unk_08, 1);
 
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
     param0->unk_0C[0] = GraphicElementManager_AddElement(&v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C[0], 0);
+    GraphicElementData_SetAnim(param0->unk_0C[0], 0);
 
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
     param0->unk_0C[1] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C[1], 0);
+    GraphicElementData_SetAnim(param0->unk_0C[1], 0);
     sub_020093B4(&v0, sub_02009E08(param0->unk_14[0]), sub_02009E08(param0->unk_14[1]), sub_02009E08(param0->unk_14[2]), sub_02009E08(param0->unk_14[3]), 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
     v1.manager = v2->unk_138;
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 6cfb0bc89b..d58917f877 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -354,7 +354,7 @@ static void ov21_021E8794 (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -364,7 +364,7 @@ static void ov21_021E87AC (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        sub_02021FE0(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -556,7 +556,7 @@ static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
 
     param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 2);
+    GraphicElementData_SetAnim(param0->unk_00[0], 2);
 }
 
 static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0)
@@ -623,7 +623,7 @@ static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E8C94(param1, param2, param4, param8, param9);
 
-    v0 = sub_02021E74(param1);
+    v0 = GraphicElementData_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -667,7 +667,7 @@ static void ov21_021E8C94 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = sub_02021E74(param0);
+    v0 = GraphicElementData_GetAnimFrame(param0);
 
     if (v0 < 2) {
         sub_02012AC0(param1->unk_00, param3);
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 317540fcbf..a867763fa8 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -211,7 +211,7 @@ static void ov21_021E8E0C (UnkStruct_ov21_021E8D48 * param0, const UnkStruct_ov2
     param0->unk_00 = param1->unk_00;
     param0->unk_19C = sub_020095C4(32, &param0->unk_10, param1->unk_0C);
 
-    sub_02022014(param1->unk_0C);
+    Utility_Clear2DMainOAM(param1->unk_0C);
     ov21_021E9A0C(param1->unk_0C);
 
     param0->unk_0C = ov21_021E99E0(param1->unk_08, param1->unk_10, 48, 72, param1->unk_0C);
@@ -551,7 +551,7 @@ static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManag
     param0->unk_00 = GraphicElementManager_AddElement(&v0);
 
     GF_ASSERT(param0->unk_00);
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, 0x11);
+    GraphicElementData_SetAnim(param0->unk_00, 0x11);
 }
 
 static void ov21_021E9554 (UnkStruct_ov21_021E95B0 * param0)
@@ -620,13 +620,13 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
 
     param0->unk_00[0] = GraphicElementManager_AddElement(&v0);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[0], 0 + v2);
+    GraphicElementData_SetAnim(param0->unk_00[0], 0 + v2);
 
     if (v2 != v3) {
         v0.position.x = (220 * FX32_ONE);
         v0.position.y = (72 * FX32_ONE);
         param0->unk_00[1] = GraphicElementManager_AddElement(&v0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[1], 0 + v3);
+        GraphicElementData_SetAnim(param0->unk_00[1], 0 + v3);
     } else {
         param0->unk_00[1] = NULL;
     }
@@ -722,7 +722,7 @@ static void ov21_021E9828 (SysTask * param0, void * param1)
         ov21_021E9A9C(&v0->unk_228);
     }
 
-    sub_020219F8(v0->unk_19C);
+    GraphicElementManager_Update(v0->unk_19C);
 }
 
 static void ov21_021E98D8 (PaletteData * param0, Sprite * param1)
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 6239ac7d13..994dbdcdae 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -743,7 +743,7 @@ static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0)
 
 static void ov22_02255AC0 (UnkStruct_ov22_0225A0E4 * param0)
 {
-    sub_020219F8(param0->unk_44);
+    GraphicElementManager_Update(param0->unk_44);
 }
 
 static void ov22_02255ACC (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1)
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index f89bd2cea2..82f98b8411 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -316,7 +316,7 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag
             v1.position.x *= FX32_ONE;
 
             param0->unk_10[(v2 * 10) + v3] = GraphicElementManager_AddElement(&v1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_10[(v2 * 10) + v3], 1);
+            GraphicElementData_SetAnim(param0->unk_10[(v2 * 10) + v3], 1);
 
             if (((v2 * 10) + v3) >= param3) {
                 GraphicElementData_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
@@ -331,11 +331,11 @@ static void ov22_0225A9C8 (UnkStruct_ov22_0225A914 * param0, int param1)
 
     if (param0->unk_60 < param1) {
         for (v0 = param0->unk_60; v0 < param1; v0++) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_10[v0], 0);
+            GraphicElementData_SetAnim(param0->unk_10[v0], 0);
         }
     } else if (param0->unk_60 > param1) {
         for (v0 = param0->unk_60 - 1; v0 >= param1; v0--) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_10[v0], 1);
+            GraphicElementData_SetAnim(param0->unk_10[v0], 1);
         }
     }
 
@@ -483,7 +483,7 @@ static void ov22_0225ACE4 (UnkStruct_ov22_0225AB54 * param0)
         v1 = v2 / v3;
 
         GF_ASSERT(v1 <= 10);
-        SpriteActor_SetSpriteAnimActive(param0->unk_10[v0], 0 + v1);
+        GraphicElementData_SetAnim(param0->unk_10[v0], 0 + v1);
 
         v2 -= v1 * v3;
         v3 /= 10;
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index f6e43d8027..d5b53f03fe 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -287,7 +287,7 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0)
     GF_ASSERT(v8);
     v5 = StringTemplate_Default(13);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_1FC, 5);
+    GraphicElementData_SetAnim(param0->unk_1FC, 5);
     v0.x = 48 << FX32_SHIFT;
     v0.y = 144 << FX32_SHIFT;
     v0.z = 0;
@@ -334,7 +334,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0)
     int v8, v9;
     int v10;
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_1FC, param0->unk_08);
+    GraphicElementData_SetAnim(param0->unk_1FC, param0->unk_08);
 
     v0 = sub_0202A5D0(param0->unk_04);
     v1 = StringTemplate_Default(13);
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index b616ade9ed..50462f08a8 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -1268,19 +1268,19 @@ static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOO
     VecFx32 v3;
 
     if (param2) {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[0], 0);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[0], 0);
     } else {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[0], 1);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[0], 1);
     }
 
     if (param3) {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[3], 2);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 2);
         Sound_PlayEffect(1700);
     } else if (param2) {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[3], 3);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 3);
         Sound_PlayEffect(1698);
     } else {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[3], 4);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 4);
         Sound_PlayEffect(1699);
     }
 
@@ -1294,7 +1294,7 @@ static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOO
     GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
 
     if (param4) {
-        SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[4], 5);
+        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[4], 5);
         GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[4], 1);
         GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[4], &v3);
     }
@@ -1514,11 +1514,11 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         ov23_02240CFC(v0);
         ov23_02240B84(Unk_ov23_02257740->unk_04);
         ov23_0223FDE0(v0);
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
         break;
     case 14:
         ov23_0223FDE0(v0);
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
 
         v0->unk_08--;
 
@@ -1530,7 +1530,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 15:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
 
         if (Message_Printing(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1542,7 +1542,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 16:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
 
         if (ov23_022409F0(v0)) {
             v0->unk_00 = 17;
@@ -1552,7 +1552,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 17:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
 
         if (Message_Printing(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1568,13 +1568,13 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 18:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
         ov23_02254044(ov23_0224219C());
         sub_0200F174(3, 16, 16, 0x0, 6, 1, 29);
         (v0->unk_00)++;
         break;
     case 19:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
 
         if (ScreenWipe_Done()) {
             sub_02039794();
@@ -1629,10 +1629,10 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
 
         ov23_02240B84(Unk_ov23_02257740->unk_04);
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
         break;
     case 23:
-        sub_020219F8(Unk_ov23_02257740->unk_20);
+        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
         sub_0200F174(3, 2, 2, 0x0, 15, 1, 29);
         Sound_PlayEffect(1697);
         v0->unk_00 = 24;
@@ -1647,7 +1647,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
 
             v0->unk_00 = 25;
         } else {
-            sub_020219F8(Unk_ov23_02257740->unk_20);
+            GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
         }
 
         break;
@@ -2013,7 +2013,7 @@ static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0)
                 v4.x = FX32_ONE * v1;
                 v4.y = FX32_ONE * v2;
 
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
+                GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
                 GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
             }
         }
@@ -2379,7 +2379,7 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[2], 6);
+            GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[2], 6);
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
@@ -2398,7 +2398,7 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[2], 7);
+            GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[2], 7);
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
@@ -2435,7 +2435,7 @@ static void ov23_02240688 (BGL * param0)
     v4 = 6 - (v1 % 24) / 4;
 
     ov23_02240660(&v0);
-    SpriteActor_SetSpriteAnimActive(Unk_ov23_02257740->unk_24C[1], v4);
+    GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[1], v4);
 
     v1 = v1 + 8;
     v2 = ((26 * 8) - v1) / 8;
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 2742c022e6..fd1aac6ae7 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -3336,7 +3336,7 @@ static void ov23_0224644C (int param0)
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
             GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
@@ -3477,7 +3477,7 @@ static BOOL ov23_02246640 (BGL * param0, UnkStruct_ov23_02245ED4 * param1)
         param1->unk_110 = 0;
     }
 
-    sub_020219F8(Unk_ov23_02257764->unk_44);
+    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3687,10 +3687,10 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 1);
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], v1 * 4);
-            sub_02021FE0(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
             GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
@@ -3758,7 +3758,7 @@ static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1)
 
             if ((Unk_ov23_022563E8[param1->unk_08[v0]] * FX32_ONE) > v11) {
                 Sound_PlayEffect(1574);
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
+                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
                 param1->unk_E4[v0] = 1;
                 break;
             }
@@ -3791,7 +3791,7 @@ static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1)
         }
     }
 
-    sub_020219F8(Unk_ov23_02257764->unk_44);
+    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3864,7 +3864,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
 
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
@@ -3960,7 +3960,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             param1->unk_125 = 2;
             param1->unk_120 = 0;
             param1->unk_11C = 5;
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[0], 0);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[0], 0);
         }
         break;
     case 2:
@@ -4060,7 +4060,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             sub_0200A490(param1->unk_F8[0], param1->unk_F8[6]);
 
             for (v0 = 1; v0 < 9; v0++) {
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v0], 1);
+                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v0], 1);
 
                 v11.x = (70 + 12 * v0) * FX32_ONE;
                 v11.y = (param1->unk_120 + 39 + v0 % 2) * FX32_ONE;
@@ -4069,14 +4069,14 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
                 GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
             }
 
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[10], 1);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[10], 1);
 
             v11.x = 100 * FX32_ONE;
             v11.y = (param1->unk_120 + 21) * FX32_ONE;
 
             GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[10], &v11);
             GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[10], 1);
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[11], 1);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[11], 1);
 
             v11.x = 122 * FX32_ONE;
             v11.y = param1->unk_120 * FX32_ONE;
@@ -4094,7 +4094,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         param1->unk_120 += 1;
 
         if (param1->unk_124 % 8) {
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
         }
 
         if (param1->unk_124 == 75) {
@@ -4111,7 +4111,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         return 1;
     }
 
-    sub_020219F8(Unk_ov23_02257764->unk_44);
+    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4334,7 +4334,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
             Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
 
             GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
-            SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
+            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
             GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
@@ -4425,13 +4425,13 @@ static BOOL ov23_02247F4C (BGL * param0, UnkStruct_ov23_02247E38 * param1)
         v11.z = FX32_ONE * v4;
 
         GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
-        sub_02021DCC(Unk_ov23_02257764->unk_25C[0], v1);
+        GraphicElementData_SetAnimNoRestart(Unk_ov23_02257764->unk_25C[0], v1);
         break;
     case 2:
         break;
     }
 
-    sub_020219F8(Unk_ov23_02257764->unk_44);
+    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4732,7 +4732,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
     v2.y = v2.z = v2.x;
 
     GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
-    sub_02021FE0(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
+    GraphicElementData_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
 
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_OBJ, GX_BLEND_PLANEMASK_BG0, 16 - (param1->unk_30 / 2), 16);
 
@@ -4760,7 +4760,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
         return 1;
     }
 
-    sub_020219F8(Unk_ov23_02257764->unk_44);
+    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4795,11 +4795,11 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
 
             if (v1 == 0) {
                 GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 0);
+                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
             } else if (v1 < 9) {
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 1);
+                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 1);
             } else {
-                SpriteActor_SetSpriteAnimActive(Unk_ov23_02257764->unk_25C[v1], 2);
+                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
             }
 
             GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 64922c040c..908b0c5a6a 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -131,7 +131,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
                 GraphicElementData_SetDrawFlag(v0->unk_390[v2], 0);
 
                 if (v2 == 0) {
-                    SpriteActor_SetSpriteAnimActive(v0->unk_390[v2], 1);
+                    GraphicElementData_SetAnim(v0->unk_390[v2], 1);
                 }
             }
 
@@ -139,7 +139,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
                 v0->unk_3B0[v2] = GraphicElementManager_AddElementEx(&v3);
                 GraphicElementData_SetAnimateFlag(v0->unk_3B0[v2], 1);
                 GraphicElementData_SetDrawFlag(v0->unk_3B0[v2], 0);
-                SpriteActor_SetSpriteAnimActive(v0->unk_3B0[v2], 2);
+                GraphicElementData_SetAnim(v0->unk_3B0[v2], 2);
             }
         }
 
@@ -166,7 +166,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         ov23_02249334(v0->unk_A4);
         ov23_0224937C(v0->unk_A4, v0->unk_3B0);
         ov23_0224966C(v0->unk_1B8, &v0->unk_3F4, &v0->unk_404, &v0->unk_408, &v0->unk_40C, &v0->unk_410);
-        sub_020219F8(v0->unk_1BC);
+        GraphicElementManager_Update(v0->unk_1BC);
         break;
     case 6:
         if (FieldMessage_FinishedPrinting(v0->unk_404)) {
@@ -310,7 +310,7 @@ static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
 
             if (param0[v0][2] != param0[v0][3]) {
                 if (param0[v0][2] != 0) {
-                    SpriteActor_SetSpriteAnimActive(param1[v0], param0[v0][2]);
+                    GraphicElementData_SetAnim(param1[v0], param0[v0][2]);
                     GraphicElementData_SetDrawFlag(param1[v0], 1);
                 } else {
                     GraphicElementData_SetDrawFlag(param1[v0], 0);
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 490567fc80..20c0225113 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -261,9 +261,9 @@ static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1)
 
 static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2)
 {
-    u32 v0 = sub_02021E24(param0);
+    u32 v0 = GraphicElementData_GetActiveAnim(param0);
 
-    SpriteActor_SetSpriteAnimActive(param0, (v0 / 3) * 3 + param1);
+    GraphicElementData_SetAnim(param0, (v0 / 3) * 3 + param1);
     GraphicElementData_SetExplicitPaletteWithOffset(param0, param2);
 }
 
@@ -275,11 +275,11 @@ static void ov23_0224F52C (UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 par
 
 static void ov23_0224F560 (GraphicElementData * param0)
 {
-    if ((sub_02021E24(param0) % 3) != 1) {
+    if ((GraphicElementData_GetActiveAnim(param0) % 3) != 1) {
         return;
     }
 
-    if (sub_02021FD0(param0) == 0) {
+    if (GraphicElementData_IsAnimated(param0) == 0) {
         ov23_0224F500(param0, 2, 1);
     }
 }
@@ -643,7 +643,7 @@ static BOOL ov23_0224FA58 (SysTask * param0, void * param1)
     switch (v0->unk_2A0) {
     case 0xffffffff:
         ov23_0224F498(v0);
-        sub_020219F8(v0->unk_74.unk_00);
+        GraphicElementManager_Update(v0->unk_74.unk_00);
         return 0;
     case 0xfffffffe:
         v0->unk_2AA = 2;
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 4a296449d0..7d4bed9ac8 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -179,7 +179,7 @@ static void ov56_022561C0 (SysTask * param0, void * param1)
         ov56_02256D04(v0);
         ov56_022568E0(v0);
         ov56_022571D0(v0);
-        sub_020219F8(v0->unk_28);
+        GraphicElementManager_Update(v0->unk_28);
         break;
     case 3:
         break;
@@ -438,7 +438,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
             param0->unk_1FC[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1FC[v0], v0);
+            GraphicElementData_SetAnim(param0->unk_1FC[v0], v0);
         }
     }
 }
@@ -968,11 +968,11 @@ static void ov56_0225718C (UnkStruct_ov56_02256468 * param0, int param1)
     u16 v0;
     u16 v1;
 
-    v0 = sub_02021E74(param0->unk_1FC[param1]);
-    v1 = sub_02021E24(param0->unk_1FC[param1]);
+    v0 = GraphicElementData_GetAnimFrame(param0->unk_1FC[param1]);
+    v1 = GraphicElementData_GetActiveAnim(param0->unk_1FC[param1]);
 
     if ((v0 > 1) || (v1 != param1 + 4)) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_1FC[param1], param1 + 4);
+        GraphicElementData_SetAnim(param0->unk_1FC[param1], param1 + 4);
     }
 
     param0->unk_2F4[param1] = 1;
@@ -984,7 +984,7 @@ static void ov56_022571D0 (UnkStruct_ov56_02256468 * param0)
     u16 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = sub_02021E74(param0->unk_1FC[v0]);
+        v1 = GraphicElementData_GetAnimFrame(param0->unk_1FC[v0]);
 
         if (param0->unk_2F4[v0] == 1) {
             if (v1 >= 1) {
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index b551980bc4..9599acdcb6 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -300,7 +300,7 @@ int ov58_021D0F08 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_34);
+    GraphicElementManager_Update(v0->unk_34);
 
     return 0;
 }
@@ -697,7 +697,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             param0->unk_23C[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_23C[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_23C[v0], v0);
+            GraphicElementData_SetAnim(param0->unk_23C[v0], v0);
             GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 0);
         }
 
@@ -709,14 +709,14 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             param0->unk_2AC[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_2AC[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
+            GraphicElementData_SetAnim(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
 
             if (v0 >= 8) {
                 GraphicElementData_SetExplicitPriority(param0->unk_2AC[v0], 2);
             }
         }
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_2AC[0], 6);
+        GraphicElementData_SetAnim(param0->unk_2AC[0], 6);
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.position.x = FX32_ONE * 24;
@@ -725,7 +725,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             param0->unk_274[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_274[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_274[v0], v0);
+            GraphicElementData_SetAnim(param0->unk_274[v0], v0);
             GraphicElementData_SetPriority(param0->unk_274[v0], 1);
             GraphicElementData_SetDrawFlag(param0->unk_274[v0], 0);
         }
@@ -869,9 +869,9 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
 
             for (v3 = 0; v3 < 3; v3++) {
                 if ((v0 - 9) == v3) {
-                    SpriteActor_SetSpriteAnimActive(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
+                    GraphicElementData_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
                 } else {
-                    SpriteActor_SetSpriteAnimActive(param0->unk_2AC[9 + v3], 29 + 2 * v3);
+                    GraphicElementData_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3);
                 }
             }
 
@@ -912,9 +912,9 @@ static void ov58_021D1CAC (GraphicElementData ** param0, int param1)
 
     for (v0 = 0; v0 < 8; v0++) {
         if (v0 == param1) {
-            SpriteActor_SetSpriteAnimActive(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
+            GraphicElementData_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0[v0], Unk_ov58_021D2EEC[v0][2]);
+            GraphicElementData_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2]);
         }
     }
 }
@@ -922,9 +922,9 @@ static void ov58_021D1CAC (GraphicElementData ** param0, int param1)
 static void ov58_021D1CDC (GraphicElementData ** param0, BOOL param1)
 {
     if (param1 == 1) {
-        SpriteActor_SetSpriteAnimActive(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
+        GraphicElementData_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0[8], Unk_ov58_021D2EEC[8][2]);
+        GraphicElementData_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2]);
     }
 }
 
@@ -1782,7 +1782,7 @@ static int ov58_021D2B5C (UnkStruct_02095EAC * param0)
 
             if (param0->unk_945C) {
                 ov58_021D2D10(param0);
-                SpriteActor_SetSpriteAnimActive(param0->unk_2AC[8], Unk_ov58_021D2EEC[8][2]);
+                GraphicElementData_SetAnim(param0->unk_2AC[8], Unk_ov58_021D2EEC[8][2]);
             }
 
             return 2;
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 0114a3d6e2..36b39f7249 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -292,7 +292,7 @@ int ov59_021D0F00 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_50);
+    GraphicElementManager_Update(v0->unk_50);
 
     return 0;
 }
@@ -672,7 +672,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
             param0->unk_28C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_28C[v0 + 1], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
+            GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
             GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 0);
         }
 
@@ -1051,7 +1051,7 @@ void ov59_021D1D40 (UnkStruct_020961E8 * param0)
 {
     MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48);
     ov59_021D1784(&param0->unk_36C, param0->unk_48, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_28C[0], 37);
+    GraphicElementData_SetAnim(param0->unk_28C[0], 37);
 
     param0->unk_0C.unk_00 = 1;
 }
@@ -1111,7 +1111,7 @@ static int ov59_021D1E0C (UnkStruct_020961E8 * param0, int param1)
         sub_020057A4(1624, 8);
         ov59_021D2628(param0, 13, 0);
         ov59_021D19B0(param0, 29);
-        SpriteActor_SetSpriteAnimActive(param0->unk_28C[0], 0);
+        GraphicElementData_SetAnim(param0->unk_28C[0], 0);
 
         param0->unk_0C.unk_00 = 0;
         param0->unk_3B4 = 0;
@@ -1626,10 +1626,10 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0)
             v2 = TrainerInfo_Appearance(param0->unk_3C8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 38 + v3 * 2);
+                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov59_021D2860(param0->unk_390, param0->unk_3A0, v0, v2, v3);
-                SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + v0 * 2);
+                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2);
             }
         }
             GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
@@ -1641,9 +1641,9 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0)
         case 3:
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3C8[v0][0]);
-                SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
+                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                SpriteActor_SetSpriteAnimActive(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
+                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
             }
 
             param0->unk_3F0[v0] = 0;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 7c5cbc6d44..42041dd87a 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -472,9 +472,9 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     GraphicElementData_SetExplicitPriority(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 5 + 1);
+        GraphicElementData_SetAnim(v0->unk_04, 5 + 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(v0->unk_04, 1);
+        GraphicElementData_SetAnim(v0->unk_04, 1);
     }
 
     v0->unk_0C = 9;
@@ -585,7 +585,7 @@ void ov63_0222B2C8 (UnkStruct_ov63_0222BB38 * param0, u16 param1)
 
 u16 ov63_0222B2D4 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return sub_02021E74(param0->unk_04);
+    return GraphicElementData_GetAnimFrame(param0->unk_04);
 }
 
 void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
@@ -1016,55 +1016,55 @@ static void ov63_0222BB38 (UnkStruct_ov63_0222BB38 * param0)
 static void ov63_0222BB50 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, param0->unk_10);
 }
 
 static void ov63_0222BB5C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 4);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 4);
 }
 
 static void ov63_0222BB6C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BB7C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
     param0->unk_10 = param1;
 }
 
 static void ov63_0222BB90 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 9 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 9 + param0->unk_10);
 }
 
 static void ov63_0222BBA0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBB0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBC0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBD0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    sub_02021DCC(param0->unk_04, 5 + param0->unk_10);
+    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBE0 (UnkStruct_ov63_0222BB38 * param0)
@@ -1082,7 +1082,7 @@ static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0)
     if (param0->unk_14 == 0) {
         SpriteActor_SetAnimFrame(param0->unk_04, 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0->unk_04, 5 + param0->unk_10);
+        GraphicElementData_SetAnim(param0->unk_04, 5 + param0->unk_10);
     }
 }
 
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 54be7b014b..52871d648d 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -905,7 +905,7 @@ static void ov64_0222E1A4 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov6
 
 static void ov64_0222E21C (UnkStruct_ov64_0222E21C * param0)
 {
-    sub_020219F8(param0->unk_04);
+    GraphicElementManager_Update(param0->unk_04);
 }
 
 static void ov64_0222E228 (UnkStruct_ov64_0222E21C * param0)
@@ -1244,7 +1244,7 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
 
         GraphicElementData_SetAnimateFlag(param0->unk_270[v1], 1);
         GraphicElementData_SetDrawFlag(param0->unk_270[v1], 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_270[v1], v1);
+        GraphicElementData_SetAnim(param0->unk_270[v1], v1);
     }
 }
 
@@ -2646,7 +2646,7 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     u32 v1;
 
     GraphicElementData_SetDrawFlag(param0->unk_104, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_104, 2);
+    GraphicElementData_SetAnim(param0->unk_104, 2);
 
     param0->unk_108 = 0;
 
@@ -2672,11 +2672,11 @@ static BOOL ov64_02230008 (UnkStruct_ov64_0222F0C4 * param0)
 {
     u32 v0;
 
-    if (sub_02021FD0(param0->unk_104) == 0) {
+    if (GraphicElementData_IsAnimated(param0->unk_104) == 0) {
         return 1;
     }
 
-    v0 = sub_02021E74(param0->unk_104);
+    v0 = GraphicElementData_GetAnimFrame(param0->unk_104);
 
     if ((v0 - param0->unk_108) >= 2) {
         param0->unk_108 = v0;
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 6d21f6a16e..a7cead18c5 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -844,7 +844,7 @@ int ov65_0222E3FC (OverlayManager * param0, int * param1)
     }
 
     if (v0->unk_18C) {
-        sub_020219F8(v0->unk_18C);
+        GraphicElementManager_Update(v0->unk_18C);
     }
 
     if (ov65_02235194(&v0->unk_3EC) == 1) {
@@ -6708,7 +6708,7 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
 
         param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElementEx(&v9[v1]);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
+        GraphicElementData_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
     }
 
     sub_02002BB8(2, param2);
@@ -6837,7 +6837,7 @@ static void ov65_02234E40 (u32 param0, u32 param1, void * param2)
 
 static void ov65_02234E50 (UnkStruct_ov65_02234E50 * param0, u32 param1)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+    GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
     SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1));
 
     if (param1 == 1) {
@@ -6852,16 +6852,16 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
     u32 v2;
 
     if ((param2 == param1)) {
-        v1 = sub_02021E74(param0->unk_21C[param1]);
+        v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
 
         if ((param3 == 0) || (param3 == 2)) {
             if (param3 == 0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
+                GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
             }
 
             if (v1 < 3) {
                 GraphicElementData_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
-                v1 = sub_02021E74(param0->unk_21C[param1]);
+                v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
 
                 if (param1 == 1) {
                     sub_020128C4(param0->unk_234, -18, Unk_ov65_0223893C[v1]);
@@ -6877,11 +6877,11 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
             }
         }
     } else {
-        v2 = sub_02021E24(param0->unk_21C[param1]);
-        v1 = sub_02021E74(param0->unk_21C[param1]);
+        v2 = GraphicElementData_GetActiveAnim(param0->unk_21C[param1]);
+        v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
 
         if (v2 == Unk_ov65_0223892C[param1]) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+            GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
             SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1) - v1);
         }
 
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index b66dcc25ed..e86d2a754a 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -219,7 +219,7 @@ u32 ov65_02235198 (UnkStruct_ov65_02235130 * param0)
 void ov65_02235244 (UnkStruct_ov65_02235130 * param0)
 {
     if (param0->unk_00) {
-        sub_020219F8(param0->unk_14.unk_00);
+        GraphicElementManager_Update(param0->unk_14.unk_00);
     }
 }
 
@@ -697,7 +697,7 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_34, 0);
     GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_38, 0);
     GraphicElementData_SetAnimateFlag(param0->unk_1A0.unk_34, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_1A0.unk_38, 1);
+    GraphicElementData_SetAnim(param0->unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235B14 (UnkStruct_ov65_022358CC * param0)
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index bb07664acf..cdb3096b74 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -502,7 +502,7 @@ int ov65_02236548 (OverlayManager * param0, int * param1)
     }
 
     ov65_022372B0(&v0->unk_30);
-    sub_020219F8(v0->unk_30.unk_18);
+    GraphicElementManager_Update(v0->unk_30.unk_18);
 
     return 0;
 }
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 7484845f7a..3fadfd61b5 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -472,7 +472,7 @@ static void ov68_0225C960 (UnkStruct_ov68_0225C91C * param0)
 
 static void ov68_0225C980 (UnkStruct_ov68_0225C91C * param0)
 {
-    sub_020219F8(param0->unk_04);
+    GraphicElementManager_Update(param0->unk_04);
 }
 
 static void ov68_0225C98C (UnkStruct_ov68_0225C91C * param0)
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 8779fe182e..1c052c67d4 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -1409,7 +1409,7 @@ static void ov69_0225D35C (UnkStruct_ov69_0225D35C * param0)
 
 static void ov69_0225D384 (UnkStruct_ov69_0225D35C * param0)
 {
-    sub_020219F8(param0->unk_04);
+    GraphicElementManager_Update(param0->unk_04);
 }
 
 static void ov69_0225D390 (UnkStruct_ov69_0225D35C * param0)
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 17d96d57f0..decaab2d3c 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -1363,7 +1363,7 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1,
 
 static void ov70_0225E6C0 (UnkStruct_ov70_0225E4EC * param0)
 {
-    sub_020219F8(param0->unk_04);
+    GraphicElementManager_Update(param0->unk_04);
     sub_0201DCE8();
 }
 
@@ -1697,7 +1697,7 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
         v1.position.y = Unk_ov70_0226D580[v2] * FX32_ONE;
         param0->unk_50[v2] = GraphicElementManager_AddElement(&v1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_50[v2], v2);
+        GraphicElementData_SetAnim(param0->unk_50[v2], v2);
         GraphicElementData_SetAnimateFlag(param0->unk_50[v2], 1);
         GraphicElementData_SetDrawFlag(param0->unk_50[v2], 0);
     }
@@ -2750,7 +2750,7 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
         v4.position.y = (FX32_CONST(152) + (256 * FX32_ONE));
         param0->unk_54 = GraphicElementManager_AddElement(&v4);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_54, v1);
+        GraphicElementData_SetAnim(param0->unk_54, v1);
         GraphicElementData_SetDrawFlag(param0->unk_54, param5);
     }
 }
diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c
index 6a35b2dad0..a7542b8977 100644
--- a/src/overlay071/ov71_0223B140.c
+++ b/src/overlay071/ov71_0223B140.c
@@ -282,7 +282,7 @@ int ov71_0223B388 (OverlayManager * param0, int * param1)
 
                 GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
                 GraphicElementData_SetAnimateFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
-                SpriteActor_SetSpriteAnimActive(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
+                GraphicElementData_SetAnim(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
 
                 v0->unk_337E = 0;
                 v0->unk_3380 = 0;
@@ -378,7 +378,7 @@ int ov71_0223B388 (OverlayManager * param0, int * param1)
     }
 
     ov71_0223C2F4(v0);
-    sub_020219F8(v0->unk_30E4.unk_00);
+    GraphicElementManager_Update(v0->unk_30E4.unk_00);
 
     return 0;
 }
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 86a52fb85b..6b6a7dcfc0 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -130,7 +130,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.position.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
             param0->unk_1C0[v0] = GraphicElementManager_AddElementEx(&v3);
             GraphicElementData_SetAnimateFlag(param0->unk_1C0[v0], 0);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v0], v0);
+            GraphicElementData_SetAnim(param0->unk_1C0[v0], v0);
 
             if (!param1[v0]) {
                 GraphicElementData_SetDrawFlag(param0->unk_1C0[v0], 0);
@@ -146,7 +146,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
                 GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
-                SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 8);
+                GraphicElementData_SetAnim(param0->unk_1C0[v2 + v0], 8);
                 GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
 
@@ -158,7 +158,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.priority = 1;
                 param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
                 GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
-                SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2 + v0], 9);
+                GraphicElementData_SetAnim(param0->unk_1C0[v2 + v0], 9);
                 GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
         }
@@ -171,7 +171,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.priority = 0;
             param0->unk_1C0[v2] = GraphicElementManager_AddElementEx(&v3);
             GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2], 0);
-            SpriteActor_SetSpriteAnimActive(param0->unk_1C0[v2], 10);
+            GraphicElementData_SetAnim(param0->unk_1C0[v2], 10);
             GraphicElementData_SetDrawFlag(param0->unk_1C0[v2], 0);
         }
     }
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 36dc7c24c8..ab78adba41 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -204,7 +204,7 @@ int ov72_0223D920 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_3C);
+    GraphicElementManager_Update(v0->unk_3C);
 
     return 0;
 }
@@ -540,7 +540,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
             param0->unk_2B4[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_2B4[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
+            GraphicElementData_SetAnim(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
             GraphicElementData_SetExplicitPalette(param0->unk_2B4[v0], 0);
 
             if (v0 == 0) {
@@ -700,9 +700,9 @@ static void ov72_0223E388 (GraphicElementData ** param0, int param1)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (v0 == param1) {
-            SpriteActor_SetSpriteAnimActive(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
+            GraphicElementData_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0[v0], Unk_ov72_0223EB3C[v0][2]);
+            GraphicElementData_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2]);
         }
     }
 }
@@ -710,9 +710,9 @@ static void ov72_0223E388 (GraphicElementData ** param0, int param1)
 static void ov72_0223E3A8 (GraphicElementData ** param0, BOOL param1)
 {
     if (param1 == 1) {
-        SpriteActor_SetSpriteAnimActive(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
+        GraphicElementData_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(param0[0], Unk_ov72_0223EB3C[0][2]);
+        GraphicElementData_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2]);
     }
 }
 
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 8694ef72ab..6582e703c9 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -404,7 +404,7 @@ void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 
 void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0)
 {
-    sub_020219F8(param0->unk_00);
+    GraphicElementManager_Update(param0->unk_00);
 
     if (param0->unk_300 != NULL) {
         sub_0201DCE8();
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index ce9f6309cd..d0e634308b 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -258,7 +258,7 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
 
 static void ov77_021D69B4 (UnkStruct_ov77_021D6800 * param0)
 {
-    sub_020219F8(param0->unk_00);
+    GraphicElementManager_Update(param0->unk_00);
 }
 
 void ov77_021D69C0 (UnkStruct_ov77_021D670C * param0, const int param1)
diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c
index 884e1b0c1e..f22f0fe2a4 100644
--- a/src/overlay079/ov79_021D0D80.c
+++ b/src/overlay079/ov79_021D0D80.c
@@ -773,7 +773,7 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
         param0->unk_1CC[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[3]);
 
         GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1CC[v0], v0 + 3);
+        GraphicElementData_SetAnim(param0->unk_1CC[v0], v0 + 3);
         SpriteActor_SetPositionXY(param0->unk_1CC[v0], v2[v0].unk_00, v2[v0].unk_02);
     }
 
@@ -792,7 +792,7 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
         param0->unk_1E0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[4]);
 
         GraphicElementData_SetDrawFlag(param0->unk_1E0[v0], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1E0[v0], v0 * 3);
+        GraphicElementData_SetAnim(param0->unk_1E0[v0], v0 * 3);
         GraphicElementData_SetAnimSpeed(param0->unk_1E0[v0], FX32_CONST(2));
         GraphicElementData_SetExplicitPalette(param0->unk_1E0[v0], v0 + 2);
         GraphicElementData_SetAnimateFlag(param0->unk_1E0[v0], 0);
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 6b17f95398..195bf1d28b 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -215,29 +215,29 @@ void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2)
 {
     switch (param2) {
     case 0:
-        SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3);
+        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3);
         GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 0);
         sub_0201C04C(
             &param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         break;
     case 1:
-        sub_02021DE0(param0->unk_1E0[param1]);
+        GraphicElementData_RestartAnim(param0->unk_1E0[param1]);
         GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 2:
-        SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3 + 1);
+        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
     case 3:
-        SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3 + 2);
+        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 4:
-        SpriteActor_SetSpriteAnimActive(param0->unk_1E0[param1], param1 * 3 + 1);
+        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
         GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index ffe98b5ef0..e322fb640a 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -411,7 +411,7 @@ static int ov83_0223B9EC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B
     case 5:
         v2 = ov83_0223E32C(&param1->unk_5E4);
         {
-            int v3 = sub_02021E74(param1->unk_5E4.unk_08);
+            int v3 = GraphicElementData_GetAnimFrame(param1->unk_5E4.unk_08);
 
             if (param1->unk_3BC != (v3 + 1) / 3) {
                 if (v3 < 10) {
diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c
index d0a7e0da0b..a551aa99a8 100644
--- a/src/overlay083/ov83_0223C958.c
+++ b/src/overlay083/ov83_0223C958.c
@@ -134,7 +134,7 @@ void ov83_0223CBA4 (UnkStruct_ov83_0223B784 * param0)
 
     if (param0->unk_31C) {
         if (param0->unk_2C.unk_00) {
-            sub_020219F8(param0->unk_2C.unk_00);
+            GraphicElementManager_Update(param0->unk_2C.unk_00);
         }
     }
 }
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 7fa70c549c..e0e4d90816 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -413,7 +413,7 @@ void ov83_0223DB4C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C *
 
             param0->unk_18[v1] = ov83_0223D9A8(param2, &param3[0], 0, 0, 0, 0, param4);
             GraphicElementData_SetDrawFlag(param0->unk_18[v1], 0);
-            SpriteActor_SetSpriteAnimActive(param0->unk_18[v1], 1);
+            GraphicElementData_SetAnim(param0->unk_18[v1], 1);
             v1++;
         }
 
@@ -508,7 +508,7 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0)
             }
             break;
         case 2:
-            if (sub_02021FD0(param0->unk_18[v0]) == 0) {
+            if (GraphicElementData_IsAnimated(param0->unk_18[v0]) == 0) {
                 GraphicElementData_SetDrawFlag(param0->unk_18[v0], 0);
                 param0->unk_1CC[v0]++;
             }
@@ -698,7 +698,7 @@ void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 *
 {
     param0->unk_08 = ov83_0223D9A8(param1, &param2[param4], (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param3);
     GraphicElementData_SetDrawFlag(param0->unk_08, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_08, param5);
+    GraphicElementData_SetAnim(param0->unk_08, param5);
     param0->unk_00 = 1;
 }
 
@@ -730,7 +730,7 @@ void ov83_0223E2FC (UnkStruct_ov83_0223E244 * param0)
 
 BOOL ov83_0223E32C (UnkStruct_ov83_0223E244 * param0)
 {
-    if (sub_02021FD0(param0->unk_08) == 0) {
+    if (GraphicElementData_IsAnimated(param0->unk_08) == 0) {
         return 1;
     }
 
@@ -922,7 +922,7 @@ void ov83_0223E5DC (UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 *
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov83_0223D9A8(param1, &param2[1], 128, 96, 0, 2, param3);
         GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_04[v0], 4 + v0);
+        GraphicElementData_SetAnim(param0->unk_04[v0], 4 + v0);
         GraphicElementData_SetPosition(param0->unk_04[v0], &v1);
     }
 
@@ -1427,7 +1427,7 @@ static void ov83_0223F074 (UnkStruct_ov83_0223F054 * param0)
     }
 
     if (param0->unk_08 == 0) {
-        if (sub_02021FD0(param0->unk_78) == 0) {
+        if (GraphicElementData_IsAnimated(param0->unk_78) == 0) {
             param0->unk_08 = 1;
         }
     }
@@ -1492,7 +1492,7 @@ static void ov83_0223F1C0 (UnkStruct_ov83_0223F054 * param0, int param1, fx32 pa
         GraphicElementData_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
     }
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_78, param14);
+    GraphicElementData_SetAnim(param0->unk_78, param14);
     GraphicElementData_SetAnimateFlag(param0->unk_78, 1);
     GraphicElementData_SetExplicitPriority(param0->unk_78, 2);
 }
@@ -1536,7 +1536,7 @@ void ov83_0223F2C4 (UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 *
         param0->unk_3C[v0].unk_00 = ov83_0223D9A8(param1, &param0->unk_04, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param2);
 
         if (v0 >= 2) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C[v0].unk_00, 1);
+            GraphicElementData_SetAnim(param0->unk_3C[v0].unk_00, 1);
         }
 
         GraphicElementData_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
@@ -1779,8 +1779,8 @@ static void ov83_0223F6CC (UnkStruct_ov83_0223F670 * param0, int param1, fx32 pa
     param0->unk_08.y = param3;
 
     GraphicElementData_SetDrawFlag(param0->unk_44, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_44, param1);
-    sub_02021DE0(param0->unk_44);
+    GraphicElementData_SetAnim(param0->unk_44, param1);
+    GraphicElementData_RestartAnim(param0->unk_44);
     GraphicElementData_SetAnimateFlag(param0->unk_44, 1);
     GraphicElementData_SetExplicitPriority(param0->unk_44, 2);
 
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 8c919a48ce..def7bfdbdc 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -606,7 +606,7 @@ static void ov86_0223B6CC (SysTask * param0, void * param1)
     NNS_G3dGePopMtx(1);
     G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
 
-    sub_020219F8(v0->unk_24);
+    GraphicElementManager_Update(v0->unk_24);
     sub_0200A858();
 }
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 2d40140590..9ddd434bd6 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -143,7 +143,7 @@ static void ov87_021D11AC (void * param0)
 {
     UnkStruct_ov87_021D106C * v0 = param0;
 
-    sub_020219F8(v0->unk_34);
+    GraphicElementManager_Update(v0->unk_34);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -210,13 +210,13 @@ static BOOL ov87_021D12C0 (UnkStruct_ov87_021D106C * param0, int * param1)
 
     for (v1 = 0; v1 < v0->unk_14; v1++) {
         if (v1 == v0->unk_18) {
-            sub_02021FE0(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
             GraphicElementData_SetPriority(param0->unk_1C4[v1], 0);
             Sound_FlagDefaultChatotCry(1);
 
             sub_02005844(v0->unk_20[v1].unk_10, v0->unk_20[v1].unk_13);
         } else {
-            sub_02021FE0(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
             GraphicElementData_SetPriority(param0->unk_1C4[v1], v1 + 1);
         }
     }
@@ -563,9 +563,9 @@ static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0)
         if (v3 == v2->unk_18) {
             Sound_FlagDefaultChatotCry(1);
             sub_02005844(v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_13);
-            sub_02021FE0(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
         } else {
-            sub_02021FE0(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
         }
 
         GraphicElementData_SetDrawFlag(param0->unk_1C4[v3], 1);
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 84ba61cf3c..7c964021b5 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -502,7 +502,7 @@ int ov88_0223B57C (OverlayManager * param0, int * param1)
 
     if (!v0->unk_44) {
         ov88_0223E848(v0);
-        sub_020219F8(v0->unk_194);
+        GraphicElementManager_Update(v0->unk_194);
     }
 
     sub_02038A1C(26, v0->unk_174);
@@ -550,14 +550,14 @@ static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * para
             GraphicElementData_SetDrawFlag(param2->unk_404[v1], 0);
         } else {
             GraphicElementData_SetDrawFlag(param2->unk_404[v1], 1);
-            SpriteActor_SetSpriteAnimActive(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
+            GraphicElementData_SetAnim(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
         }
 
         if (param2->unk_6F4[v1].unk_0C == 0) {
             GraphicElementData_SetDrawFlag(param2->unk_434[v1], 0);
         } else {
             GraphicElementData_SetDrawFlag(param2->unk_434[v1], 1);
-            SpriteActor_SetSpriteAnimActive(param2->unk_434[v1], 21);
+            GraphicElementData_SetAnim(param2->unk_434[v1], 21);
         }
     }
 
@@ -796,7 +796,7 @@ static void ov88_0223BDA4 (UnkStruct_02095E80 * param0, int param1)
     param0->unk_2168 = ov88_0223C800(1, v0, param0->unk_848[param1 / 6], &param0->unk_2148[param1 / 6]);
 
     ov88_0223C8D8(param0->unk_49C, 1, param0->unk_2274, param1 % 6, param0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
+    GraphicElementData_SetAnim(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
 }
 
 static void ov88_0223BE28 (UnkStruct_02095E80 * param0)
@@ -1338,7 +1338,7 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
         GraphicElementData_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
     }
 
-    SpriteActor_SetSpriteAnimActive(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
+    GraphicElementData_SetAnim(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
     GraphicElementData_SetDrawFlag(param4->unk_464[2 + param1], 1);
     ov88_0223C860(&param0[26 + param1], param2, param3, 9, 6);
 
@@ -1357,11 +1357,11 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
             break;
         case 0:
             GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            SpriteActor_SetSpriteAnimActive(param4->unk_464[4 + param1], 22 + 1);
+            GraphicElementData_SetAnim(param4->unk_464[4 + param1], 22 + 1);
             break;
         case 1:
             GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            SpriteActor_SetSpriteAnimActive(param4->unk_464[4 + param1], 22);
+            GraphicElementData_SetAnim(param4->unk_464[4 + param1], 22);
             break;
         }
     }
@@ -1439,7 +1439,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
             param0->unk_3D4[v1] = GraphicElementManager_AddElementEx(&v0);
             GraphicElementData_SetAnimateFlag(param0->unk_3D4[v1], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_3D4[v1], 5 + v1);
+            GraphicElementData_SetAnim(param0->unk_3D4[v1], 5 + v1);
             GraphicElementData_SetPriority(param0->unk_3D4[v1], 5);
             GraphicElementData_SetDrawFlag(param0->unk_3D4[v1], 0);
         }
@@ -1466,7 +1466,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         v0.position.y = FX32_ONE * (8 * 8 + 2);
         param0->unk_47C = GraphicElementManager_AddElementEx(&v0);
         GraphicElementData_SetAnimateFlag(param0->unk_47C, 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_47C, 20);
+        GraphicElementData_SetAnim(param0->unk_47C, 20);
         GraphicElementData_SetDrawFlag(param0->unk_47C, 0);
 
         for (v1 = 0; v1 < 6; v1++) {
@@ -1477,7 +1477,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
             param0->unk_464[v1] = GraphicElementManager_AddElementEx(&v0);
             GraphicElementData_SetDrawFlag(param0->unk_464[v1], 0);
             GraphicElementData_SetAnimateFlag(param0->unk_464[v1], 0);
-            SpriteActor_SetSpriteAnimActive(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
+            GraphicElementData_SetAnim(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
         }
     }
 }
@@ -1543,7 +1543,7 @@ static void ov88_0223CE74 (UnkStruct_02095E80 * param0)
         }
 
         GraphicElementData_SetAnimateFlag(param0->unk_464[v2], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_464[v2], 4 + v2);
+        GraphicElementData_SetAnim(param0->unk_464[v2], 4 + v2);
     }
 }
 
@@ -1598,14 +1598,14 @@ static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2)
 
     if (param0 == 12) {
         GraphicElementData_SetPosition(param1, &v0);
-        SpriteActor_SetSpriteAnimActive(param1, Unk_ov88_0223EE50[param2][2]);
+        GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][2]);
     } else {
         GraphicElementData_SetPosition(param1, &v0);
 
         if (param0 < 6) {
-            SpriteActor_SetSpriteAnimActive(param1, Unk_ov88_0223EE50[param2][0]);
+            GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][0]);
         } else {
-            SpriteActor_SetSpriteAnimActive(param1, Unk_ov88_0223EE50[param2][1]);
+            GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][1]);
         }
     }
 }
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 9d45ecfe90..401d111c45 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -203,7 +203,7 @@ int ov94_0223BE2C (OverlayManager * param0, int * param1)
     ov94_0223C598(v0);
 
     if (v0->unk_BE4 != NULL) {
-        sub_020219F8(v0->unk_BE4);
+        GraphicElementManager_Update(v0->unk_BE4);
     }
 
     return 0;
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 5d84c30e55..3ebbb84afe 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -316,7 +316,7 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_E20, 1);
+    GraphicElementData_SetAnim(param0->unk_E20, 1);
 }
 
 static void ov94_0223C9B0 (UnkStruct_ov94_0223FD4C * param0)
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index cefb494a73..a05e9df554 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -270,7 +270,7 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
     param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
+    GraphicElementData_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 63067cbf41..73cfc031f6 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -233,7 +233,7 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
     param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_F30, 37);
+    GraphicElementData_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
@@ -357,7 +357,7 @@ static int ov94_0223E0A4 (UnkStruct_ov94_0223FD4C * param0)
 
         if (1) {
             if ((v0 != param0->unk_11C) && (v0 >= 0)) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], 16 + v0 * 4);
+                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 16 + v0 * 4);
                 param0->unk_2C = 2;
                 ov94_0223C4C0(param0, 3, 0);
                 param0->unk_11C = v0;
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index bc782a62be..04ed9cd684 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -304,7 +304,7 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_E20, 0);
+    GraphicElementData_SetAnim(param0->unk_E20, 0);
     GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
     sub_02039734();
 }
@@ -464,7 +464,7 @@ static int ov94_0223EA84 (UnkStruct_ov94_0223FD4C * param0)
 
         if (param0->unk_10F2) {
             if (v1 >= 0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_F34[v1 + 1], 16 + v1 * 4);
+                GraphicElementData_SetAnim(param0->unk_F34[v1 + 1], 16 + v1 * 4);
                 param0->unk_2C = 2;
                 ov94_0223C4C0(param0, 3, 0);
                 param0->unk_11C = v1;
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index e3af7109d0..430486adb0 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -368,7 +368,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     param0->unk_E20 = GraphicElementManager_AddElementEx(&v1);
 
     GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_E20, 4);
+    GraphicElementData_SetAnim(param0->unk_E20, 4);
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
         GraphicElementData_SetExplicitPriority(param0->unk_E20, 0);
@@ -383,7 +383,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 
         param0->unk_E28[v0] = GraphicElementManager_AddElementEx(&v1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_E28[v0], 6 + v0);
+        GraphicElementData_SetAnim(param0->unk_E28[v0], 6 + v0);
         GraphicElementData_SetExplicitPriority(param0->unk_E28[v0], 1);
     }
 
@@ -394,7 +394,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 
         param0->unk_EA0[v0] = GraphicElementManager_AddElementEx(&v1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_EA0[v0], 40);
+        GraphicElementData_SetAnim(param0->unk_EA0[v0], 40);
         GraphicElementData_SetExplicitPriority(param0->unk_EA0[v0], 1);
     }
 
@@ -405,7 +405,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
 
         param0->unk_F18[v0] = GraphicElementManager_AddElementEx(&v1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_F18[v0], 42);
+        GraphicElementData_SetAnim(param0->unk_F18[v0], 42);
         GraphicElementData_SetExplicitPriority(param0->unk_F18[v0], 1);
     }
 
@@ -416,7 +416,7 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         param0->unk_F54[v0] = GraphicElementManager_AddElementEx(&v1);
 
         GraphicElementData_SetAnimateFlag(param0->unk_F54[v0], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_F54[v0], 38 + v0);
+        GraphicElementData_SetAnim(param0->unk_F54[v0], 38 + v0);
         GraphicElementData_SetExplicitPriority(param0->unk_F54[v0], 1);
     }
 }
@@ -1119,9 +1119,9 @@ static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, Gra
             GraphicElementData_SetDrawFlag(param2, 1);
 
             if (Item_IsMail(v1)) {
-                SpriteActor_SetSpriteAnimActive(param2, 41);
+                GraphicElementData_SetAnim(param2, 41);
             } else {
-                SpriteActor_SetSpriteAnimActive(param2, 40);
+                GraphicElementData_SetAnim(param2, 40);
             }
         } else {
             GraphicElementData_SetDrawFlag(param2, 0);
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index e0dd6558a5..464bad91d4 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -58,14 +58,14 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
     param0->unk_F34[0] = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(param0->unk_F34[0], 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_F34[0], 3 + param1 * 7);
+    GraphicElementData_SetAnim(param0->unk_F34[0], 3 + param1 * 7);
     GraphicElementData_SetDrawFlag(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
         param0->unk_F34[v1 + 1] = GraphicElementManager_AddElementEx(&v0);
 
         GraphicElementData_SetAnimateFlag(param0->unk_F34[v1 + 1], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_F34[v1 + 1], 14 + v1 * 4);
+        GraphicElementData_SetAnim(param0->unk_F34[v1 + 1], 14 + v1 * 4);
         GraphicElementData_SetDrawFlag(param0->unk_F34[v1 + 1], 0);
 
         ov94_022441A0(param0->unk_F34[v1 + 1], Unk_ov94_02246322[v1][0], Unk_ov94_02246322[v1][1]);
@@ -94,7 +94,7 @@ void ov94_02243FA8 (UnkStruct_ov94_0223FD4C * param0, int param1)
 
 static void ov94_02243FF0 (UnkStruct_ov94_02243FF0 * param0, int param1)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
+    GraphicElementData_SetAnim(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
 }
 
 static void ov94_0224400C (SysTask * param0, void * param1)
@@ -116,7 +116,7 @@ static void ov94_0224400C (SysTask * param0, void * param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!sub_02021FD0(v2->unk_F34[0])) {
+        if (!GraphicElementData_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 2);
             v1->unk_00 = 2;
         }
@@ -177,7 +177,7 @@ static void ov94_022440FC (SysTask * param0, void * param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!sub_02021FD0(v2->unk_F34[0])) {
+        if (!GraphicElementData_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 0);
             v1->unk_00 = 2;
             Sound_PlayEffect(1584);
@@ -251,9 +251,9 @@ void ov94_02244234 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2)
             ov94_02244378(param0->unk_10F8, param0->unk_1100, v0, v1, v2);
 
             if (param2) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], 14 + v0 * 4);
+                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 14 + v0 * 4);
             } else {
-                SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], 17 + v0 * 4);
+                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 17 + v0 * 4);
             }
 
             GraphicElementData_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
@@ -274,8 +274,8 @@ void ov94_022442E4 (UnkStruct_ov94_0223FD4C * param0)
 
     for (v0 = 0; v0 < 7; v0++) {
         if (GraphicElementData_GetDrawFlag(param0->unk_F34[v0 + 1])) {
-            if (sub_02021E24(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_F34[v0 + 1], ov94_022442DC(v0) + 1);
+            if (GraphicElementData_GetActiveAnim(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
+                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], ov94_022442DC(v0) + 1);
             }
         }
     }
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 82689c9fa0..1fa77d7d53 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -265,7 +265,7 @@ static void ov95_02246F0C (SysTask * param0, void * param1)
 {
     UnkStruct_ov95_02247628 * v0 = param1;
 
-    sub_020219F8(v0->unk_18);
+    GraphicElementManager_Update(v0->unk_18);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 57825db613..b2f39bc21f 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -307,7 +307,7 @@ static int ov95_02247ED8 (UnkStruct_ov95_02247C6C * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C[0], 1);
+            GraphicElementData_SetAnim(param0->unk_3C[0], 1);
             GraphicElementData_SetDrawFlag(param0->unk_3C[0], 1);
             return 1;
         }
@@ -402,13 +402,13 @@ static int ov95_02248090 (UnkStruct_ov95_02247C6C * param0, int * param1)
     case 1:
         if (ov95_022483B4(param0)) {
             sub_02007DC8(param0->unk_10);
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C[1], 0);
+            GraphicElementData_SetAnim(param0->unk_3C[1], 0);
             GraphicElementData_SetDrawFlag(param0->unk_3C[1], 1);
             (*param1)++;
         }
         break;
     case 2:
-        if (sub_02021FD0(param0->unk_3C[1]) == 0) {
+        if (GraphicElementData_IsAnimated(param0->unk_3C[1]) == 0) {
             ov95_022479A8(param0->unk_74, 1);
             ov95_02248364(param0, 16, 0, 16);
             ov95_02248420(param0);
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index d91a59260e..bff8a6de74 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -626,8 +626,8 @@ static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0)
         param0->unk_1C[v3][0] = ov95_022475E4(param0->unk_00, &v2, v4, v5, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
         param0->unk_1C[v3][1] = ov95_022475E4(param0->unk_00, &v2, v4, v5 + 56, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3][0], 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_1C[v3][1], 1);
+        GraphicElementData_SetAnim(param0->unk_1C[v3][0], 0);
+        GraphicElementData_SetAnim(param0->unk_1C[v3][1], 1);
         GraphicElementData_SetDrawFlag(param0->unk_1C[v3][0], 0);
         GraphicElementData_SetDrawFlag(param0->unk_1C[v3][1], 0);
     }
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 2d61cac3dc..0edf898680 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -221,13 +221,13 @@ static int ov95_02249840 (UnkStruct_ov95_022497D8 * param0, int * param1)
     case 2:
         if (ov95_02249CF0(&(param0->unk_34))) {
             Sound_PlayEffect(1709);
-            SpriteActor_SetSpriteAnimActive(param0->unk_20[0], 3);
+            GraphicElementData_SetAnim(param0->unk_20[0], 3);
             GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 3:
-        if (sub_02021FD0(param0->unk_20[0]) == 0) {
+        if (GraphicElementData_IsAnimated(param0->unk_20[0]) == 0) {
             sub_0200F174(0, 0, 0, 0x7fff, 16, 1, 58);
             (*param1)++;
         }
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index c1749bfffb..aef2632edb 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -191,13 +191,13 @@ static int ov95_0224A464 (UnkStruct_ov95_0224A42C * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_20[0], 3);
+            GraphicElementData_SetAnim(param0->unk_20[0], 3);
             GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 1:
-        if (sub_02021FD0(param0->unk_20[0]) == 0) {
+        if (GraphicElementData_IsAnimated(param0->unk_20[0]) == 0) {
             Sound_PlayEffect(1707);
             ov95_0224A864(param0, &(param0->unk_34));
             ov95_022479A8(param0->unk_2C, 1);
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index da569c35f7..87355a0352 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -335,7 +335,7 @@ static int ov95_0224B6F0 (UnkStruct_ov95_0224B4D4 * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_40[0], 1);
+            GraphicElementData_SetAnim(param0->unk_40[0], 1);
             GraphicElementData_SetDrawFlag(param0->unk_40[0], 1);
             return 1;
         }
@@ -353,7 +353,7 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1)
         (*param1)++;
     case 1:
         if (param0->unk_80 == NULL) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_40[1], 2);
+            GraphicElementData_SetAnim(param0->unk_40[1], 2);
             GraphicElementData_SetDrawFlag(param0->unk_40[1], 1);
             ov95_022479A8(param0->unk_78, 0);
             param0->unk_08 = 0;
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 6ab8b89445..435101a7b8 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -161,7 +161,7 @@ int ov96_0223B7F8 (OverlayManager * param0, int * param1)
     }
 
     if (v0->unk_BF4 != NULL) {
-        sub_020219F8(v0->unk_BF4);
+        GraphicElementManager_Update(v0->unk_BF4);
     }
 
     return 0;
@@ -315,7 +315,7 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
             v1.position.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
             param0->unk_E30[v0] = GraphicElementManager_AddElementEx(&v1);
             GraphicElementData_SetAnimateFlag(param0->unk_E30[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_E30[v0], v0);
+            GraphicElementData_SetAnim(param0->unk_E30[v0], v0);
             GraphicElementData_SetDrawFlag(param0->unk_E30[v0], 0);
         }
     }
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 38a3db79b1..242597388e 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -1205,7 +1205,7 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
     if (v0) {
         GraphicElementData_SetAnimateFlag(v0, 1);
         GraphicElementData_SetExplicitPriority(v0, 0);
-        SpriteActor_SetSpriteAnimActive(v0, 0);
+        GraphicElementData_SetAnim(v0, 0);
         GraphicElementData_SetDrawFlag(v0, 1);
     }
 
@@ -1216,7 +1216,7 @@ static void ov97_0222E5B4 (UnkStruct_ov97_0222E398 * param0)
 {
     param0->unk_3008.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    sub_02021DCC(param0->unk_3008.unk_0C, 2);
+    GraphicElementData_SetAnimNoRestart(param0->unk_3008.unk_0C, 2);
     SpriteActor_SetAnimFrame(param0->unk_3008.unk_0C, 0);
     GraphicElementData_SetDrawFlag(param0->unk_3008.unk_0C, 0);
     GraphicElementData_SetPriority(param0->unk_3008.unk_0C, 0);
@@ -1235,7 +1235,7 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0)
 {
     param0->unk_3054.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    sub_02021DCC(param0->unk_3054.unk_0C, 4);
+    GraphicElementData_SetAnimNoRestart(param0->unk_3054.unk_0C, 4);
     SpriteActor_SetAnimFrame(param0->unk_3054.unk_0C, 0);
     GraphicElementData_SetDrawFlag(param0->unk_3054.unk_0C, 0);
     GraphicElementData_SetPriority(param0->unk_3054.unk_0C, 0);
@@ -1291,7 +1291,7 @@ static void ov97_0222E6F8 (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         param0->unk_88[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
-        sub_02021DCC(param0->unk_88[v0].unk_0C, 1);
+        GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
         SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
     }
 }
@@ -1303,7 +1303,7 @@ static void ov97_0222E734 (UnkStruct_ov97_0222E398 * param0)
     for (v0 = 0; v0 < 80; v0++) {
         if (v0 < (80 / 4)) {
             param0->unk_88[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
-            sub_02021DCC(param0->unk_88[v0].unk_0C, 1);
+            GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
             SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
         } else {
             param0->unk_88[v0].unk_0C = NULL;
@@ -1317,7 +1317,7 @@ static void ov97_0222E77C (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         param0->unk_1848[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB);
-        sub_02021DCC(param0->unk_1848[v0].unk_0C, 5);
+        GraphicElementData_SetAnimNoRestart(param0->unk_1848[v0].unk_0C, 5);
         SpriteActor_SetAnimFrame(param0->unk_1848[v0].unk_0C, 0);
     }
 }
@@ -1467,7 +1467,7 @@ static void ov97_0222EA68 (UnkStruct_ov97_0222E398 * param0)
             GraphicElementData_SetPosition(param0->unk_88[v0].unk_0C, &v1);
         }
 
-        sub_02021DCC(param0->unk_88[v0].unk_0C, 1);
+        GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
         GraphicElementData_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
@@ -1839,9 +1839,9 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         }
 
         if (v3 > 50) {
-            sub_02021DCC(v0->unk_3008.unk_0C, 4);
+            GraphicElementData_SetAnimNoRestart(v0->unk_3008.unk_0C, 4);
         } else if (v3 > 30) {
-            sub_02021DCC(v0->unk_3008.unk_0C, 3);
+            GraphicElementData_SetAnimNoRestart(v0->unk_3008.unk_0C, 3);
         } else if (v3 > 7) {
             GraphicElementData_SetDrawFlag(v0->unk_3008.unk_0C, 1);
         }
@@ -1960,9 +1960,9 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         if (v10 > 50) {
             GraphicElementData_SetDrawFlag(v0->unk_3054.unk_0C, 0);
         } else if (v10 > 30) {
-            sub_02021DCC(v0->unk_3054.unk_0C, 2);
+            GraphicElementData_SetAnimNoRestart(v0->unk_3054.unk_0C, 2);
         } else if (v10 > 7) {
-            sub_02021DCC(v0->unk_3054.unk_0C, 3);
+            GraphicElementData_SetAnimNoRestart(v0->unk_3054.unk_0C, 3);
         }
 
         if (v1) {
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index b604f60cdc..5b4f2afacb 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -997,8 +997,8 @@ static void ov97_022314FC (UnkStruct_ov97_02230868 * param0, int param1, int * p
     }
 
     if (v1 != param0->unk_3E10) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
+        GraphicElementData_SetAnim(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
+        GraphicElementData_SetAnim(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
     }
 
     v0 = 0;
@@ -1258,7 +1258,7 @@ static int ov97_0223161C (OverlayManager * param0, int * param1)
     }
 
     if (v4->unk_2CA4 != NULL) {
-        sub_020219F8(v4->unk_2CA4);
+        GraphicElementManager_Update(v4->unk_2CA4);
     }
 
     ov97_02237CA0();
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 20c817cb24..767165c25f 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -767,7 +767,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             }
 
             GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_00, 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_20C[v0].unk_00, 10 + v0);
+            GraphicElementData_SetAnim(param0->unk_20C[v0].unk_00, 10 + v0);
             GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_00, 1);
             GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
             GraphicElementData_SetPriority(param0->unk_20C[v0].unk_00, 100 + v0);
@@ -780,7 +780,7 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             }
 
             GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_04, 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_20C[v0].unk_04, 40);
+            GraphicElementData_SetAnim(param0->unk_20C[v0].unk_04, 40);
             GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_04, 1);
             GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
             GraphicElementData_SetPriority(param0->unk_20C[v0].unk_04, 0 + v0);
@@ -808,7 +808,7 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int
     v1 = GraphicElementManager_AddElementEx(&v0);
 
     GraphicElementData_SetAnimateFlag(v1, 1);
-    SpriteActor_SetSpriteAnimActive(v1, param3);
+    GraphicElementData_SetAnim(v1, param3);
     GraphicElementData_SetExplicitPriority(v1, 1);
     GraphicElementData_SetDrawFlag(v1, param4);
 
@@ -1480,7 +1480,7 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
         param0->unk_478[v0] = GraphicElementManager_AddElementEx(&v5);
 
         GraphicElementData_SetAnimateFlag(param0->unk_478[v0], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_478[v0], 10 + v0);
+        GraphicElementData_SetAnim(param0->unk_478[v0], 10 + v0);
         GraphicElementData_SetExplicitPriority(param0->unk_478[v0], 1);
         GraphicElementData_SetDrawFlag(param0->unk_478[v0], 1);
 
@@ -2141,7 +2141,7 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1)
     }
 
     if (v3->unk_28 != NULL) {
-        sub_020219F8(v3->unk_28);
+        GraphicElementManager_Update(v3->unk_28);
     }
 
     return 0;
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 8fbb4fe314..a51c0ca721 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -434,7 +434,7 @@ void ov97_02237CAC (int param0)
     }
 
     if (v0->unk_34.unk_00 != NULL) {
-        sub_020219F8(v0->unk_34.unk_00);
+        GraphicElementManager_Update(v0->unk_34.unk_00);
     }
 }
 
@@ -467,7 +467,7 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
 
     GraphicElementData_SetAnimateFlag(param1, 1);
     GraphicElementData_SetExplicitPriority(param1, 0);
-    SpriteActor_SetSpriteAnimActive(param1, param4);
+    GraphicElementData_SetAnim(param1, param4);
     GraphicElementData_SetDrawFlag(param1, 1);
 
     return param1;
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 544a78c56f..364305d939 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -235,8 +235,8 @@ static void ov101_021D5A70 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v2 = ((v2) / 32);
     v1 = Unk_ov101_021D927C[ov101_021D55A4(v4->unk_00.unk_00, v0, ((v2) / FX32_ONE))];
 
-    if (v1 != sub_02021E24(v4->unk_0C.unk_04)) {
-        SpriteActor_SetSpriteAnimActive(v4->unk_0C.unk_04, v1);
+    if (v1 != GraphicElementData_GetActiveAnim(v4->unk_0C.unk_04)) {
+        GraphicElementData_SetAnim(v4->unk_0C.unk_04, v1);
         SpriteActor_SetAnimFrame(v4->unk_0C.unk_04, 0);
     }
 }
@@ -302,9 +302,9 @@ static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
 
-    if (v2 != sub_02021E24(v1->unk_0C.unk_04)) {
-        SpriteActor_SetSpriteAnimActive(v1->unk_0C.unk_04, v2);
-        sub_02021DE0(v1->unk_0C.unk_04);
+    if (v2 != GraphicElementData_GetActiveAnim(v1->unk_0C.unk_04)) {
+        GraphicElementData_SetAnim(v1->unk_0C.unk_04, v2);
+        GraphicElementData_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
@@ -375,9 +375,9 @@ static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
 
-    if (v2 != sub_02021E24(v1->unk_0C.unk_04)) {
-        SpriteActor_SetSpriteAnimActive(v1->unk_0C.unk_04, v2);
-        sub_02021DE0(v1->unk_0C.unk_04);
+    if (v2 != GraphicElementData_GetActiveAnim(v1->unk_0C.unk_04)) {
+        GraphicElementData_SetAnim(v1->unk_0C.unk_04, v2);
+        GraphicElementData_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
@@ -528,7 +528,7 @@ static int ov101_021D5E84 (UnkStruct_ov101_021D630C * param0)
     GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v1);
     GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
     GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 0);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 0);
     SpriteActor_SetAnimFrame(param0->unk_3C.unk_04, 0);
     Sound_PlayEffect(1572);
 
@@ -582,8 +582,8 @@ static int(*const Unk_ov101_021D912C[])(UnkStruct_ov101_021D630C *) = {
 
 static int ov101_021D5F70 (UnkStruct_ov101_021D630C * param0)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 1);
-    sub_02021DE0(param0->unk_3C.unk_04);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 1);
+    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
     GraphicElementData_SetAnimateFlag(param0->unk_3C.unk_04, 1);
 
     Sound_PlayEffect(1744);
@@ -619,8 +619,8 @@ static int ov101_021D5FB8 (UnkStruct_ov101_021D630C * param0)
     GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
     GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
     GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 3);
-    sub_02021DE0(param0->unk_3C.unk_04);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 3);
+    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -661,8 +661,8 @@ static int ov101_021D6084 (UnkStruct_ov101_021D630C * param0)
     GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
     GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
     GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 4);
-    sub_02021DE0(param0->unk_3C.unk_04);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 4);
+    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -717,8 +717,8 @@ static int ov101_021D6158 (UnkStruct_ov101_021D630C * param0)
     GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
     GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
     GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 2);
-    sub_02021DE0(param0->unk_3C.unk_04);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 2);
+    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -767,8 +767,8 @@ static int ov101_021D6288 (UnkStruct_ov101_021D630C * param0)
     GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
     GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
     GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_3C.unk_04, 2);
-    sub_02021DE0(param0->unk_3C.unk_04);
+    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 2);
+    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
 
@@ -1129,7 +1129,7 @@ static int ov101_021D68AC (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
 
@@ -1189,7 +1189,7 @@ static int ov101_021D6994 (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 1);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
     Sound_PlayEffect(1745);
@@ -1236,10 +1236,10 @@ static int ov101_021D6A60 (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 0);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 0);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
-    sub_02021DE0(param0->unk_24.unk_04);
+    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1261,9 +1261,9 @@ static int ov101_021D6AC8 (UnkStruct_ov101_021D66D0 * param0)
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE / 2);
 
-    if (sub_02021E24(param0->unk_24.unk_04) != 2) {
-        SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 2);
-        sub_02021DE0(param0->unk_24.unk_04);
+    if (GraphicElementData_GetActiveAnim(param0->unk_24.unk_04) != 2) {
+        GraphicElementData_SetAnim(param0->unk_24.unk_04, 2);
+        GraphicElementData_RestartAnim(param0->unk_24.unk_04);
     }
 
     param0->unk_0C = 1;
@@ -1283,10 +1283,10 @@ static int ov101_021D6B3C (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 5);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 5);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    sub_02021DE0(param0->unk_24.unk_04);
+    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1305,10 +1305,10 @@ static int ov101_021D6BA4 (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 4);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 4);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    sub_02021DE0(param0->unk_24.unk_04);
+    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1327,10 +1327,10 @@ static int ov101_021D6C0C (UnkStruct_ov101_021D66D0 * param0)
 
     GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
     GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 3);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 3);
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    sub_02021DE0(param0->unk_24.unk_04);
+    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1352,8 +1352,8 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0)
     GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
     GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_24.unk_04, 5);
-    sub_02021DE0(param0->unk_24.unk_04);
+    GraphicElementData_SetAnim(param0->unk_24.unk_04, 5);
+    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_14 = 0;
     param0->unk_0C = 1;
@@ -1366,12 +1366,12 @@ static int ov101_021D6CE0 (UnkStruct_ov101_021D66D0 * param0)
 {
     GraphicElementData_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
 
-    if (sub_02021FD0(param0->unk_24.unk_04) == 0) {
+    if (GraphicElementData_IsAnimated(param0->unk_24.unk_04) == 0) {
         param0->unk_14++;
 
         if (param0->unk_14 >= 8) {
             param0->unk_14 = 0;
-            sub_02021DE0(param0->unk_24.unk_04);
+            GraphicElementData_RestartAnim(param0->unk_24.unk_04);
         }
     }
 
@@ -1957,8 +1957,8 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
         if (v4) {
             GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
-            SpriteActor_SetSpriteAnimActive(v0->unk_04[v3].unk_04, v4);
-            sub_02021DE0(v0->unk_04[v3].unk_04);
+            GraphicElementData_SetAnim(v0->unk_04[v3].unk_04, v4);
+            GraphicElementData_RestartAnim(v0->unk_04[v3].unk_04);
             GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
             v2.x += (FX32_ONE * 8);
             v3++;
@@ -1967,8 +1967,8 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v4 = (v5 % 10);
 
         GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
-        SpriteActor_SetSpriteAnimActive(v0->unk_04[v3].unk_04, v4);
-        sub_02021DE0(v0->unk_04[v3].unk_04);
+        GraphicElementData_SetAnim(v0->unk_04[v3].unk_04, v4);
+        GraphicElementData_RestartAnim(v0->unk_04[v3].unk_04);
         GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
     }
 }
@@ -2051,8 +2051,8 @@ static void ov101_021D776C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
         for (v4 = 10000; v4 >= 1; v4 /= 10, v5++) {
             v6 = (v7 % (v4 * 10)) / v4;
-            SpriteActor_SetSpriteAnimActive(v1->unk_04[v5].unk_04, v6);
-            sub_02021DE0(v1->unk_04[v5].unk_04);
+            GraphicElementData_SetAnim(v1->unk_04[v5].unk_04, v6);
+            GraphicElementData_RestartAnim(v1->unk_04[v5].unk_04);
         }
     }
 }
@@ -2140,8 +2140,8 @@ static int ov101_021D7810 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
         v2 = (v6->unk_04 % (v1 * 10)) / v1;
 
-        SpriteActor_SetSpriteAnimActive(v6->unk_18[v0].unk_04, v2);
-        sub_02021DE0(v6->unk_18[v0].unk_04);
+        GraphicElementData_SetAnim(v6->unk_18[v0].unk_04, v2);
+        GraphicElementData_RestartAnim(v6->unk_18[v0].unk_04);
     }
 
     v6->unk_10 = v0;
@@ -2222,7 +2222,7 @@ static int ov101_021D7A00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         ov101_021D84A4(v5->unk_08->unk_450, &v5->unk_0C[v0], &v4, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 9, 7, 9, 9, 2, 3);
 
         v3 = (v1 % (v2 * 10)) / v2;
-        SpriteActor_SetSpriteAnimActive(v5->unk_0C[v0].unk_04, v3);
+        GraphicElementData_SetAnim(v5->unk_0C[v0].unk_04, v3);
     }
 
     return 1;
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index e296b70bec..5c3c485707 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -146,7 +146,7 @@ void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0)
 
 void ov101_021D80D4 (UnkStruct_ov101_021D7E48 * param0)
 {
-    sub_020219F8(param0->unk_0C);
+    GraphicElementManager_Update(param0->unk_0C);
     sub_0201DCE8();
 }
 
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 9d0cdd2751..322c0fb104 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -386,12 +386,12 @@ void ov104_0222E1C0 (SaveData * param0, Party * param1, Pokemon * param2)
 
 void ov104_0222E1D8 (GraphicElementData * param0, u8 param1)
 {
-    if (sub_02021E24(param0) == param1) {
+    if (GraphicElementData_GetActiveAnim(param0) == param1) {
         return;
     }
 
     SpriteActor_SetAnimFrame(param0, 0);
-    SpriteActor_SetSpriteAnimActive(param0, param1);
+    GraphicElementData_SetAnim(param0, param1);
     GraphicElementData_UpdateAnim(param0, FX32_ONE);
     return;
 }
@@ -405,7 +405,7 @@ void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 par
     v0.z = 0;
 
     if (param3 == 1) {
-        if (sub_02021E74(param0) == 0) {
+        if (GraphicElementData_GetAnimFrame(param0) == 0) {
             v0.y = (param2 - 3) * FX32_ONE;
         } else {
             v0.y = (param2 + 1) * FX32_ONE;
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index db5b50970c..508a14a97d 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -531,7 +531,7 @@ static void ov104_0223E3FC (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0
 
         if (v0 != 3) {
             GraphicElementData_SetAffineOverwriteMode(param1->unk_04[v0]->unk_00, 2);
-            SpriteActor_SetSpriteAnimActive(param1->unk_04[v0]->unk_00, 1);
+            GraphicElementData_SetAnim(param1->unk_04[v0]->unk_00, 1);
             ov104_0223E534(&param1->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
             ov104_0223E534(&param1->unk_14[v0], FX32_CONST(1), FX32_CONST(1), 6);
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 7ec0a06a5e..d2fc055f86 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -582,7 +582,7 @@ int ov105_02241BD8 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_144.unk_00);
+    GraphicElementManager_Update(v0->unk_144.unk_00);
     ov105_02245D50(v0->unk_128);
 
     return 0;
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 53284c1122..3ab021f01d 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -97,7 +97,7 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
         v2 = GraphicElementManager_AddElementEx(&v3);
 
         GraphicElementData_SetAnimateFlag(v2, 1);
-        SpriteActor_SetSpriteAnimActive(v2, param2);
+        GraphicElementData_SetAnim(v2, param2);
     }
 
     return v2;
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 33b5e307b2..05a26e4f15 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -59,5 +59,5 @@ void ov105_02245E30 (UnkStruct_ov105_02245E1C * param0, int param1, int param2)
 
 BOOL ov105_02245E48 (UnkStruct_ov105_02245E1C * param0)
 {
-    return sub_02021FD0(param0->unk_08);
+    return GraphicElementData_IsAnimated(param0->unk_08);
 }
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 57088c2037..9b242d9510 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -145,7 +145,7 @@ int ov105_02245F8C (UnkStruct_ov105_02245EA8 * param0)
 void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 {
     GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, param1);
+    GraphicElementData_SetAnim(param0->unk_0C, param1);
 
     return;
 }
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index b66a95236d..08946d9e9e 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -145,7 +145,7 @@ void ov105_02246080 (UnkStruct_ov105_02246060 * param0)
     }
 
     if (param0->unk_08 != NULL) {
-        sub_02021DCC(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        GraphicElementData_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
     v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
@@ -166,9 +166,9 @@ void ov105_022461A4 (UnkStruct_ov105_02246060 * param0, int param1)
     param0->unk_03 = param1;
 
     if (param1 == 0) {
-        sub_02021DCC(param0->unk_0C, 8);
+        GraphicElementData_SetAnimNoRestart(param0->unk_0C, 8);
     } else {
-        sub_02021DCC(param0->unk_0C, 13);
+        GraphicElementData_SetAnimNoRestart(param0->unk_0C, 13);
     }
 
     return;
@@ -181,7 +181,7 @@ void ov105_022461C0 (UnkStruct_ov105_02246060 * param0, u8 param1)
     param0->unk_02 = param1;
 
     if (param0->unk_08 != NULL) {
-        sub_02021DCC(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        GraphicElementData_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
     v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 2ec6f2cc9e..21b542914d 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -311,7 +311,7 @@ int ov106_02241B9C (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_C0.unk_00);
+    GraphicElementManager_Update(v0->unk_C0.unk_00);
     return 0;
 }
 
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index c73c8b0bd0..0687b7aa00 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -112,7 +112,7 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
 
         GraphicElementData_SetAnimateFlag(v2, 1);
         GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        SpriteActor_SetSpriteAnimActive(v2, param2);
+        GraphicElementData_SetAnim(v2, param2);
     }
 
     return v2;
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 0c8fb8c543..512ce9d7f1 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -71,7 +71,7 @@ void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2)
     VecFx32 v0;
 
     if (param0->unk_0C != NULL) {
-        sub_02021DCC(param0->unk_10, param0->unk_0C[0]);
+        GraphicElementData_SetAnimNoRestart(param0->unk_10, param0->unk_0C[0]);
     }
 
     v0 = *(GraphicElementData_GetPosition(param0->unk_10));
@@ -86,7 +86,7 @@ void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2)
 void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1)
 {
     GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    sub_02021DCC(param0->unk_10, param1);
+    GraphicElementData_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index 224629ab16..0ca0410f04 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -586,7 +586,7 @@ int ov107_02241BD4 (OverlayManager * param0, int * param1)
     }
 
     ov107_02245C00(v0);
-    sub_020219F8(v0->unk_1D8.unk_00);
+    GraphicElementManager_Update(v0->unk_1D8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index fbe7e8e0bb..734d670e3a 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -380,7 +380,7 @@ int ov107_02245FD0 (OverlayManager * param0, int * param1)
     }
 
     ov107_022492A8(v0);
-    sub_020219F8(v0->unk_158.unk_00);
+    GraphicElementManager_Update(v0->unk_158.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 413196fb41..3dcfbdd514 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -150,7 +150,7 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
 
         GraphicElementData_SetAnimateFlag(v2, 1);
         GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        SpriteActor_SetSpriteAnimActive(v2, param4);
+        GraphicElementData_SetAnim(v2, param4);
     }
 
     return v2;
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 4beeee842b..7707187419 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -87,7 +87,7 @@ void ov107_02249BB8 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2)
 void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1)
 {
     GraphicElementData_SetAnimSpeed(param0->unk_04, FX32_ONE);
-    SpriteActor_SetSpriteAnimActive(param0->unk_04, param1);
+    GraphicElementData_SetAnim(param0->unk_04, param1);
 
     return;
 }
@@ -112,7 +112,7 @@ void ov107_02249C28 (UnkStruct_ov107_02249B8C * param0, u8 param1)
 
 BOOL ov107_02249C40 (UnkStruct_ov107_02249B8C * param0)
 {
-    return sub_02021FD0(param0->unk_04);
+    return GraphicElementData_IsAnimated(param0->unk_04);
 }
 
 void ov107_02249C4C (UnkStruct_ov107_02249B8C * param0, u8 param1)
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 5b615e8c33..14df84b8c6 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -409,7 +409,7 @@ int ov108_02241C38 (OverlayManager * param0, int * param1)
         v0->unk_13_0 ^= 1;
     }
 
-    sub_020219F8(v0->unk_E8.unk_00);
+    GraphicElementManager_Update(v0->unk_E8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index b383ec11b3..d1dba09ca5 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -108,7 +108,7 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
 
         GraphicElementData_SetAnimateFlag(v2, 1);
         GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        SpriteActor_SetSpriteAnimActive(v2, param4);
+        GraphicElementData_SetAnim(v2, param4);
     }
 
     return v2;
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index 65aeb5323e..674ec1a5a3 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -91,7 +91,7 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2)
 void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1)
 {
     GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    sub_02021DCC(param0->unk_10, param1);
+    GraphicElementData_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 5aa58d27f5..91bc774f12 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -292,7 +292,7 @@ int ov109_021D3EB0 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_60);
+    GraphicElementManager_Update(v0->unk_60);
     return 0;
 }
 
@@ -663,7 +663,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
             param0->unk_29C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_29C[v0 + 1], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
+            GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
             GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 0);
         }
 
@@ -1628,10 +1628,10 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0)
             v2 = TrainerInfo_Appearance(param0->unk_3D8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 38 + v3 * 2);
+                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov109_021D57E0(param0->unk_3A0, param0->unk_3B0, v0, v2, v3);
-                SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + v0 * 2);
+                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2);
             }
         }
             GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
@@ -1644,9 +1644,9 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0)
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3D8[v0][0]);
 
-                SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
+                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                SpriteActor_SetSpriteAnimActive(param0->unk_29C[v0 + 1], 27 + v0 * 2 + 1);
+                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2 + 1);
             }
 
             param0->unk_400[v0] = 0;
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index 534d9393cf..3285c502c0 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -423,7 +423,7 @@ int ov111_021D0E34 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_16C.unk_00);
+    GraphicElementManager_Update(v0->unk_16C.unk_00);
 
     return 0;
 }
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index e021844e47..6d39123b0d 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -146,7 +146,7 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
 
         GraphicElementData_SetAnimateFlag(v2, 0);
         GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        SpriteActor_SetSpriteAnimActive(v2, param2);
+        GraphicElementData_SetAnim(v2, param2);
     }
 
     return v2;
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index e04a769d6a..b94300873a 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -98,7 +98,7 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para
 void ov111_021D34C4 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
     GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    sub_02021DCC(param0->unk_0C, param1);
+    GraphicElementData_SetAnimNoRestart(param0->unk_0C, param1);
 
     return;
 }
@@ -143,7 +143,7 @@ void ov111_021D350C (UnkStruct_ov111_021D33F4 * param0, int param1)
 {
     GraphicElementData_SetAnimateFlag(param0->unk_0C, param1);
     GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    SpriteActor_SetSpriteAnimActive(param0->unk_0C, sub_02021E24(param0->unk_0C));
+    GraphicElementData_SetAnim(param0->unk_0C, GraphicElementData_GetActiveAnim(param0->unk_0C));
     return;
 }
 
@@ -155,5 +155,5 @@ void ov111_021D3530 (UnkStruct_ov111_021D33F4 * param0, BOOL param1)
 
 BOOL ov111_021D353C (UnkStruct_ov111_021D33F4 * param0)
 {
-    return sub_02021FD0(param0->unk_0C);
+    return GraphicElementData_IsAnimated(param0->unk_0C);
 }
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index a281b3ca75..a8065a8003 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -497,7 +497,7 @@ static void ov112_0225C9F4 (UnkStruct_ov112_0225C9BC * param0)
 
 static void ov112_0225CA14 (UnkStruct_ov112_0225C9BC * param0)
 {
-    sub_020219F8(param0->unk_04);
+    GraphicElementManager_Update(param0->unk_04);
 }
 
 static void ov112_0225CA20 (UnkStruct_ov112_0225C9BC * param0)
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 62bae62d5b..dbc81d9cd2 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -1421,7 +1421,7 @@ static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0)
 
 static void ov114_0225D070 (UnkStruct_ov114_0225CFCC * param0)
 {
-    sub_020219F8(param0->unk_00);
+    GraphicElementManager_Update(param0->unk_00);
 }
 
 static void ov114_0225D07C (UnkStruct_ov114_0225CFCC * param0)
@@ -1984,7 +1984,7 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
 
         param0->unk_10 = ov114_0225CDB4(param8, param7->unk_00, v2, v3, 0, param9);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_10, v1);
+        GraphicElementData_SetAnim(param0->unk_10, v1);
         GraphicElementData_SetExplicitPaletteOffset(param0->unk_10, param5);
         GraphicElementData_SetDrawFlag(param0->unk_10, 0);
         GraphicElementData_SetAnimateFlag(param0->unk_10, 1);
@@ -1998,7 +1998,7 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
 
         param0->unk_14 = ov114_0225CDB4(param8, param7->unk_00, v4, v5, 0, param9);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_14, 0);
+        GraphicElementData_SetAnim(param0->unk_14, 0);
         GraphicElementData_SetDrawFlag(param0->unk_14, 0);
     }
 
@@ -2038,7 +2038,7 @@ static void ov114_0225DCA0 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0
 static void ov114_0225DD0C (UnkStruct_ov114_0225DAC0 * param0, u32 param1)
 {
     GraphicElementData_SetDrawFlag(param0->unk_14, 1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_14, 4 + param1);
+    GraphicElementData_SetAnim(param0->unk_14, 4 + param1);
     GraphicElementData_SetAnimateFlag(param0->unk_14, 1);
 }
 
@@ -3414,7 +3414,7 @@ static void ov114_0225F484 (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
                 v2 = (v0 * 5) + v1;
                 param0->unk_08[v2] = ov114_0225CDB4(param0->unk_44, param2->unk_00, v3, v4, 0, param5);
                 GraphicElementData_SetDrawFlag(param0->unk_08[v2], 0);
-                SpriteActor_SetSpriteAnimActive(param0->unk_08[v2], v0);
+                GraphicElementData_SetAnim(param0->unk_08[v2], v0);
                 GraphicElementData_SetExplicitPriority(param0->unk_08[v2], 0);
 
                 v3 += 24;
@@ -3481,7 +3481,7 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
                 if (param0->unk_4A != param0->unk_4B) {
                     for (v0 = 0; v0 < (5 * 3); v0++) {
                         GraphicElementData_SetDrawFlag(param0->unk_08[v0], 0);
-                        SpriteActor_SetSpriteAnimActive(param0->unk_08[v0], 2);
+                        GraphicElementData_SetAnim(param0->unk_08[v0], 2);
                     }
                 }
             }
@@ -3666,7 +3666,7 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0
 
     for (v0 = 0; v0 < 2; v0++) {
         param0->unk_00[v0] = ov114_0225CDB4(param1, param2, Unk_ov114_0226019C[v0].x >> FX32_SHIFT, Unk_ov114_0226019C[v0].y >> FX32_SHIFT, 0, param3);
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 5);
+        GraphicElementData_SetAnim(param0->unk_00[v0], 5);
         GraphicElementData_SetExplicitPriority(param0->unk_00[v0], 0);
     }
 
@@ -3856,9 +3856,9 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
         }
         break;
     case 3:
-        v2 = sub_02021E74(v0->unk_30);
+        v2 = GraphicElementData_GetAnimFrame(v0->unk_30);
         GraphicElementData_UpdateAnim(v0->unk_30, FX32_CONST(2));
-        v3 = sub_02021E74(v0->unk_30);
+        v3 = GraphicElementData_GetAnimFrame(v0->unk_30);
 
         if (v2 != v3) {
             switch (v3) {
@@ -3896,7 +3896,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
             }
         }
 
-        v1 = sub_02021FD0(v0->unk_30);
+        v1 = GraphicElementData_IsAnimated(v0->unk_30);
 
         if (v1 == 0) {
             v0->unk_04++;
@@ -3942,7 +3942,7 @@ static void ov114_0225FF54 (SysTask * param0, void * param1)
     case 1:
         ov114_0225F9B8(&v0->unk_34, v0->unk_28, v0->unk_08, v0->unk_00);
         v0->unk_30 = ov114_0225CDB4(v0->unk_28, v0->unk_08, 128, 97, 64, v0->unk_00);
-        SpriteActor_SetSpriteAnimActive(v0->unk_30, 1);
+        GraphicElementData_SetAnim(v0->unk_30, 1);
         GraphicElementData_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 555b8b7493..dd2e86cba2 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -1311,7 +1311,7 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, CellActorInitPara
         param0->unk_18[v0] = param1->position;
         param0->unk_00[v0] = GraphicElementManager_AddElementEx(param1);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_00[v0], 2);
+        GraphicElementData_SetAnim(param0->unk_00[v0], 2);
         GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
         GraphicElementData_SetAnimateFlag(param0->unk_00[v0], 1);
         GraphicElementData_SetAnimSpeed(param0->unk_00[v0], FX32_CONST(1.5));
@@ -1389,7 +1389,7 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p
         v6 = 7;
     }
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_00[v1], v5);
+    GraphicElementData_SetAnim(param0->unk_00[v1], v5);
     param0->unk_0C[v1] = 0;
     GraphicElementData_SetDrawFlag(param0->unk_00[v1], 1);
     ov115_0226177C(param0, v1);
@@ -2749,7 +2749,7 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         {
             u32 v0;
 
-            v0 = sub_02021E74(param0->unk_34);
+            v0 = GraphicElementData_GetAnimFrame(param0->unk_34);
 
             switch (v0) {
             case 10:
@@ -2999,7 +2999,7 @@ static void ov115_0226369C (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    sub_020219F8(param1->unk_1C);
+    GraphicElementManager_Update(param1->unk_1C);
 }
 
 static void ov115_0226376C (UnkStruct_ov115_02261ADC * param0, u32 param1)
diff --git a/src/unk_0200A784.c b/src/unk_0200A784.c
index 7051269c2b..62255595c5 100644
--- a/src/unk_0200A784.c
+++ b/src/unk_0200A784.c
@@ -120,12 +120,12 @@ NNSG2dOamManagerInstance * sub_0200A914 (int param0)
 
 void sub_0200A93C (int param0)
 {
-    sub_02022014(param0);
+    Utility_Clear2DMainOAM(param0);
 }
 
 void sub_0200A944 (int param0)
 {
-    sub_0202204C(param0);
+    Utility_Clear2DSubOAM(param0);
 }
 
 static BOOL sub_0200A94C (const GXOamAttr * param0, u16 param1, BOOL param2)
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 40f7af4783..faeec80291 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -157,7 +157,7 @@ void sub_0200C7E4 (GraphicElementData * param0)
 void sub_0200C7EC (SpriteGfxHandler * param0)
 {
     GF_ASSERT(param0 != NULL);
-    sub_020219F8(param0->unk_00);
+    GraphicElementManager_Update(param0->unk_00);
 }
 
 void sub_0200C800 (void)
@@ -324,7 +324,7 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     v0 = GraphicElementManager_AddElementEx(&v1);
 
     if (v0 != NULL) {
-        SpriteActor_SetSpriteAnimActive(v0, param6);
+        GraphicElementData_SetAnim(v0, param6);
         GraphicElementData_SetExplicitPalette(v0, param8);
     }
 
@@ -580,7 +580,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     if (v2->unk_00 != NULL) {
         v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
 
-        SpriteActor_SetSpriteAnimActive(v2->unk_00, param2->animIdx);
+        GraphicElementData_SetAnim(v2->unk_00, param2->animIdx);
         GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param2->plttIdx);
     } else {
         GF_ASSERT(FALSE);
@@ -810,22 +810,22 @@ void sub_0200D34C (CellActorData * param0, fx32 param1)
 
 u32 sub_0200D358 (CellActorData * param0)
 {
-    return GraphicElementData_GetAnimSequenceCount(param0->unk_00);
+    return GraphicElementData_GetAnimCount(param0->unk_00);
 }
 
 void sub_0200D364 (CellActorData * param0, u32 param1)
 {
-    SpriteActor_SetSpriteAnimActive(param0->unk_00, param1);
+    GraphicElementData_SetAnim(param0->unk_00, param1);
 }
 
 void sub_0200D370 (CellActorData * param0, u32 param1)
 {
-    sub_02021DCC(param0->unk_00, param1);
+    GraphicElementData_SetAnimNoRestart(param0->unk_00, param1);
 }
 
 u32 sub_0200D37C (CellActorData * param0)
 {
-    return sub_02021E24(param0->unk_00);
+    return GraphicElementData_GetActiveAnim(param0->unk_00);
 }
 
 void sub_0200D388 (GraphicElementData * param0, int param1)
@@ -850,7 +850,7 @@ void sub_0200D3A4 (CellActorData * param0, fx32 param1)
 
 BOOL sub_0200D3B0 (GraphicElementData * param0)
 {
-    return sub_02021FD0(param0);
+    return GraphicElementData_IsAnimated(param0);
 }
 
 BOOL sub_0200D3B8 (CellActorData * param0)
@@ -870,7 +870,7 @@ void sub_0200D3CC (CellActorData * param0, u16 param1)
 
 u16 sub_0200D3D8 (GraphicElementData * param0)
 {
-    return sub_02021E74(param0);
+    return GraphicElementData_GetAnimFrame(param0);
 }
 
 u16 sub_0200D3E0 (CellActorData * param0)
@@ -1231,7 +1231,7 @@ void sub_0200D7FC (CellActorData * param0, BOOL param1)
 
 void sub_0200D808 (GraphicElementData * param0, GXOamMode param1)
 {
-    sub_02021FE0(param0, param1);
+    GraphicElementData_SetExplicitOAMMode(param0, param1);
 }
 
 void SpriteActor_SetOAMMode (CellActorData * param0, GXOamMode param1)
@@ -1241,7 +1241,7 @@ void SpriteActor_SetOAMMode (CellActorData * param0, GXOamMode param1)
 
 u32 sub_0200D81C (CellActorData * param0)
 {
-    return sub_020220F4(param0->unk_00);
+    return GraphicElementData_GetUserAttrForCurrentAnimFrame(param0->unk_00);
 }
 
 BOOL sub_0200D828 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6)
diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c
index 70d5076cec..795202ee24 100644
--- a/src/unk_0200DA60.c
+++ b/src/unk_0200DA60.c
@@ -589,16 +589,16 @@ static void sub_0200EC9C (SysTask * param0, void * param1)
         return;
     case 2:
         v0->unk_1D3 = 3;
-        SpriteActor_SetSpriteAnimActive(v0->unk_1C8->unk_00, 1);
+        GraphicElementData_SetAnim(v0->unk_1C8->unk_00, 1);
         break;
     case 3:
-        if (sub_02021E74(v0->unk_1C8->unk_00) == 6) {
+        if (GraphicElementData_GetAnimFrame(v0->unk_1C8->unk_00) == 6) {
             v0->unk_1D3 = 0;
         }
     }
 
     GraphicElementData_UpdateAnim(v0->unk_1C8->unk_00, FX32_ONE);
-    sub_020219F8(v0->unk_00.unk_00);
+    GraphicElementManager_Update(v0->unk_00.unk_00);
 }
 
 static UnkStruct_0200ED50 * sub_0200ED14 (BGL * param0, u8 param1, u8 param2, u8 param3, u32 param4)
@@ -637,7 +637,7 @@ static void sub_0200EDD4 (UnkStruct_0200ED50 * param0, u8 param1, u8 param2)
 
     param0->unk_1C8 = ov5_021D3584(&param0->unk_00, &v0);
 
-    sub_020219F8(param0->unk_00.unk_00);
+    GraphicElementManager_Update(param0->unk_00.unk_00);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 2e1e8d38b2..f4558fb729 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -332,7 +332,7 @@ void sub_02012AF0 (FontOAM * param0, GXOamMode param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        sub_02021FE0(param0->unk_00[v0].unk_00, param1);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0].unk_00, param1);
     }
 }
 
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index 638f91446b..ee409ce1be 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -1,6 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
+#include "nitro/gx/g2_oam.h"
 #include "nnsys/g2d/g2d_Image.h"
 #include "nnsys/g2d/g2d_RendererCore.h"
 #include "struct_defs/struct_020095C4.h"
@@ -13,6 +14,7 @@
 #include "unk_020218BC.h"
 
 #define GRAPHIC_ELEMENT_ANIM_DATA_SIZE 29
+#define MAX_SIMULTANEOUS_SPRITES 128
 
 enum CellType {
     CELL_TYPE_NONE = 0,
@@ -64,7 +66,7 @@ typedef struct GraphicElementData {
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
     u32 type;
-    u16 unk_F0;
+    u16 activeAnimID;
     u8 explicitPriority;
     u16 priority;
     NNS_G2D_VRAM_TYPE vramType;
@@ -199,7 +201,7 @@ BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr)
     return TRUE;
 }
 
-void sub_020219F8 (const GraphicElementManager *gfxElemMgr)
+void GraphicElementManager_Update(const GraphicElementManager *gfxElemMgr)
 {
     static const GraphicElementDrawFunc sDrawFuncs[] = {
         GraphicElementManager_DrawElement_Stub,
@@ -256,7 +258,7 @@ GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParams
     }
 
     elem->manager = params->manager;
-    elem->unk_F0 = 0;
+    elem->activeAnimID = 0;
     elem->position = params->position;
     elem->affineScale = params->affineScale;
     elem->affineZRotation = params->affineZRotation;
@@ -315,37 +317,37 @@ GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams
 
 void GraphicElementData_Delete(GraphicElementData *gfxElem)
 {
-    if (gfxElem->type != CELL_TYPE_NONE) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&gfxElem->animData;
+    if (gfxElem->type == CELL_TYPE_NONE) {
+        return;
+    }
 
-        if (gfxElem->prev != NULL) {
-            GraphicElementManager_RemoveElement(gfxElem);
-        }
+    if (gfxElem->prev != NULL) {
+        GraphicElementManager_RemoveElement(gfxElem);
+    }
 
-        if (gfxElem->type == CELL_TYPE_VRAM_CELL) {
-            VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->animData;
+    if (gfxElem->type == CELL_TYPE_VRAM_CELL) {
+        VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->animData;
 
-            if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
-                NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
-            }
+        if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
+            NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
         }
+    }
 
-        if (gfxElem->type == CELL_TYPE_MULTI_CELL) {
-            MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->animData;
+    if (gfxElem->type == CELL_TYPE_MULTI_CELL) {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->animData;
 
-            if (multiCellAnim->nodes != NULL) {
-                Heap_FreeToHeap(multiCellAnim->nodes);
-            }
+        if (multiCellAnim->nodes != NULL) {
+            Heap_FreeToHeap(multiCellAnim->nodes);
+        }
 
-            if (multiCellAnim->cellAnims != NULL) {
-                Heap_FreeToHeap(multiCellAnim->cellAnims);
-            }
+        if (multiCellAnim->cellAnims != NULL) {
+            Heap_FreeToHeap(multiCellAnim->cellAnims);
         }
+    }
 
-        gfxElem->type = CELL_TYPE_NONE;
+    gfxElem->type = CELL_TYPE_NONE;
 
-        GraphicElementManager_FreeElement(gfxElem->manager, gfxElem);
-    }
+    GraphicElementManager_FreeElement(gfxElem->manager, gfxElem);
 }
 
 void GraphicElementData_SetPosition(GraphicElementData *elem, const VecFx32 *position)
@@ -440,7 +442,7 @@ BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData *elem)
     return elem->animate;
 }
 
-u32 GraphicElementData_GetAnimSequenceCount(const GraphicElementData *elem)
+u32 GraphicElementData_GetAnimCount(const GraphicElementData *elem)
 {
     GF_ASSERT(elem);
 
@@ -453,55 +455,53 @@ u32 GraphicElementData_GetAnimSequenceCount(const GraphicElementData *elem)
     }
 }
 
-void SpriteActor_SetSpriteAnimActive (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetAnim(GraphicElementData *elem, u32 animID)
 {
-    const NNSG2dAnimSequence * v0;
-
-    GF_ASSERT(GraphicElementData_GetAnimSequenceCount(param0) > param1);
-    param0->unk_F0 = param1;
+    GF_ASSERT(GraphicElementData_GetAnimCount(elem) > animID);
+    elem->activeAnimID = animID;
 
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
 
-        v0 = NNS_G2dGetAnimSequenceByIdx(v1->animBank, param1);
-        NNS_G2dSetCellAnimationSequence(&v1->anim, v0);
-        NNS_G2dStartAnimCtrl(&v1->anim.animCtrl);
+        const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, animID);
+        NNS_G2dSetCellAnimationSequence(&cellAnim->anim, animSequence);
+        NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
 
-        v0 = NNS_G2dGetAnimSequenceByIdx(v2->animBank, param1);
-        NNS_G2dSetAnimSequenceToMCAnimation(&v2->anim, v0);
-        NNS_G2dStartAnimCtrl(&v2->anim.animCtrl);
+        const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, animID);
+        NNS_G2dSetAnimSequenceToMCAnimation(&multiCellAnim->anim, animSequence);
+        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
     }
 }
 
-void sub_02021DCC (GraphicElementData * param0, u32 param1)
+void GraphicElementData_SetAnimNoRestart(GraphicElementData *elem, u32 animID)
 {
-    if (param0->unk_F0 != param1) {
-        SpriteActor_SetSpriteAnimActive(param0, param1);
+    if (elem->activeAnimID != animID) {
+        GraphicElementData_SetAnim(elem, animID);
     }
 }
 
-void sub_02021DE0 (GraphicElementData * param0)
+void GraphicElementData_RestartAnim(GraphicElementData *elem)
 {
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
 
-        NNS_G2dResetAnimCtrlState(&v0->anim.animCtrl);
-        NNS_G2dStartAnimCtrl(&v0->anim.animCtrl);
-        SpriteActor_SetAnimFrame(param0, 0);
+        NNS_G2dResetAnimCtrlState(&cellAnim->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
+        SpriteActor_SetAnimFrame(elem, 0);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
 
-        NNS_G2dResetAnimCtrlState(&v1->anim.animCtrl);
-        NNS_G2dStartAnimCtrl(&v1->anim.animCtrl);
-        SpriteActor_SetAnimFrame(param0, 0);
+        NNS_G2dResetAnimCtrlState(&multiCellAnim->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
+        SpriteActor_SetAnimFrame(elem, 0);
     }
 }
 
-u32 sub_02021E24 (const GraphicElementData * param0)
+u32 GraphicElementData_GetActiveAnim(const GraphicElementData *elem)
 {
-    return param0->unk_F0;
+    return elem->activeAnimID;
 }
 
 void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames)
@@ -515,30 +515,30 @@ void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames)
     }
 }
 
-void SpriteActor_SetAnimFrame (GraphicElementData * param0, u16 param1)
+void SpriteActor_SetAnimFrame(GraphicElementData *elem, u16 frame)
 {
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        NNS_G2dSetCellAnimationCurrentFrame(&v0->anim, param1);
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        NNS_G2dSetCellAnimationCurrentFrame(&cellAnim->anim, frame);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
-        NNS_G2dSetMCAnimationCurrentFrame(&v1->anim, param1);
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        NNS_G2dSetMCAnimationCurrentFrame(&multiCellAnim->anim, frame);
     }
 }
 
-u16 sub_02021E74 (const GraphicElementData * param0)
+u16 GraphicElementData_GetAnimFrame(const GraphicElementData *elem)
 {
-    NNSG2dAnimController * v0;
+    NNSG2dAnimController *controller;
 
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v1 = (CellAnimationData *)&param0->animData;
-        v0 = NNS_G2dGetCellAnimationAnimCtrl(&v1->anim);
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        controller = NNS_G2dGetCellAnimationAnimCtrl(&cellAnim->anim);
     } else {
-        MultiCellAnimationData * v2 = (MultiCellAnimationData *)&param0->animData;
-        v0 = NNS_G2dGetMCAnimAnimCtrl(&v2->anim);
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        controller = NNS_G2dGetMCAnimAnimCtrl(&multiCellAnim->anim);
     }
 
-    return NNS_G2dGetAnimCtrlCurrentFrame(v0);
+    return NNS_G2dGetAnimCtrlCurrentFrame(controller);
 }
 
 void GraphicElementData_SetExplicitPriority(GraphicElementData *elem, u8 priority)
@@ -594,7 +594,7 @@ u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData *elem)
 
 void GraphicElementData_SetPriority(GraphicElementData *elem, u32 priority)
 {
-    GraphicElementManager *gfxElemMgr = elem->manager;
+    GraphicElementManager *gfxElemMgr = elem->manager; // Required to match
     elem->priority = priority;
 
     GraphicElementManager_RemoveElement(elem);
@@ -637,82 +637,77 @@ NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData *elem)
     return elem->vramType;
 }
 
-BOOL sub_02021FD0 (GraphicElementData * param0)
+BOOL GraphicElementData_IsAnimated(GraphicElementData *elem)
 {
-    GF_ASSERT(param0);
+    GF_ASSERT(elem);
 
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v0 = (CellAnimationData *)&param0->animData;
-        return NNS_G2dIsAnimCtrlActive(&v0->anim.animCtrl);
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        return NNS_G2dIsAnimCtrlActive(&cellAnim->anim.animCtrl);
     } else {
-        MultiCellAnimationData * v1 = (MultiCellAnimationData *)&param0->animData;
-        return NNS_G2dIsAnimCtrlActive(&v1->anim.animCtrl);
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        return NNS_G2dIsAnimCtrlActive(&multiCellAnim->anim.animCtrl);
     }
 }
 
-void sub_02021FE0 (GraphicElementData * param0, GXOamMode param1)
+void GraphicElementData_SetExplicitOAMMode(GraphicElementData *elem, GXOamMode mode)
 {
-    GF_ASSERT(param0);
+    GF_ASSERT(elem);
 
-    param0->explicitOamMode = param1;
+    elem->explicitOamMode = mode;
 
-    if (param1 == GX_OAM_MODE_NORMAL) {
-        param0->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
+    if (mode == GX_OAM_MODE_NORMAL) {
+        elem->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
     } else {
-        param0->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
+        elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
     }
 }
 
-void sub_02022014 (int param0)
+void Utility_Clear2DMainOAM(enum HeapId heapID)
 {
-    void * v0;
+    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
 
-    v0 = Heap_AllocFromHeap(param0, sizeof(GXOamAttr) * 128);
+    MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
+    DC_FlushRange(oam, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
+    GX_LoadOAM(oam, 0, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
 
-    MI_CpuFill16(v0, 0x2C0, sizeof(GXOamAttr) * 128);
-    DC_FlushRange(v0, sizeof(GXOamAttr) * 128);
-    GX_LoadOAM(v0, 0, sizeof(GXOamAttr) * 128);
-
-    Heap_FreeToHeap(v0);
+    Heap_FreeToHeap(oam);
 }
 
-void sub_0202204C (int param0)
+void Utility_Clear2DSubOAM(enum HeapId heapID)
 {
-    void * v0;
-
-    v0 = Heap_AllocFromHeap(param0, sizeof(GXOamAttr) * 128);
+    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
 
-    MI_CpuFill16(v0, 0x2C0, sizeof(GXOamAttr) * 128);
-    GXS_LoadOAM(v0, 0, sizeof(GXOamAttr) * 128);
+    MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
+    // According to the NitroSDK docs there should be a call to DC_FlushRange here.
+    GXS_LoadOAM(oam, 0, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
 
-    Heap_FreeToHeap(v0);
+    Heap_FreeToHeap(oam);
 }
 
-u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
+u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData *elem, u32 animID, u32 frame)
 {
-    const NNSG2dAnimBankData * v0;
-    const NNSG2dUserExAnimAttrBank * v1;
-    const NNSG2dUserExAnimSequenceAttr * v2;
-    const NNSG2dUserExAnimFrameAttr * v3;
+    const NNSG2dAnimBankData *animBank;
 
-    if ((param0->type == 1) || (param0->type == 3)) {
-        CellAnimationData * v4 = (CellAnimationData *)&param0->animData;
-        v0 = v4->animBank;
+    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+        animBank = cellAnim->animBank;
     } else {
-        MultiCellAnimationData * v5 = (MultiCellAnimationData *)&param0->animData;
-        v0 = v5->animBank;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        animBank = multiCellAnim->animBank;
     }
 
-    v1 = NNS_G2dGetUserExAnimAttrBank(v0);
+    const NNSG2dUserExAnimAttrBank *animAttrBank = NNS_G2dGetUserExAnimAttrBank(animBank);
 
-    if (v1) {
-        v2 = NNS_G2dGetUserExAnimSequenceAttr(v1, param1);
+    // Guard clauses don't match here so the nested if's are required
+    if (animAttrBank) {
+        const NNSG2dUserExAnimSequenceAttr *animAttr = NNS_G2dGetUserExAnimSequenceAttr(animAttrBank, animID);
 
-        if (v2) {
-            v3 = NNS_G2dGetUserExAnimFrameAttr(v2, param2);
+        if (animAttr) {
+            const NNSG2dUserExAnimFrameAttr *frameAttr = NNS_G2dGetUserExAnimFrameAttr(animAttr, frame);
 
-            if (v3) {
-                return NNS_G2dGetUserExAnimFrmAttrValue(v3);
+            if (frameAttr) {
+                return NNS_G2dGetUserExAnimFrmAttrValue(frameAttr);
             }
         }
     }
@@ -720,15 +715,12 @@ u32 sub_0202207C (const GraphicElementData * param0, u32 param1, u32 param2)
     return 0;
 }
 
-u32 sub_020220F4 (const GraphicElementData * param0)
+u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData *elem)
 {
-    u32 v0;
-    u32 v1;
-
-    v0 = sub_02021E24(param0);
-    v1 = sub_02021E74(param0);
+    u32 animID = GraphicElementData_GetActiveAnim(elem);
+    u32 frame = GraphicElementData_GetAnimFrame(elem);
 
-    return sub_0202207C(param0, v0, v1);
+    return GraphicElementData_GetUserAttrForAnimFrame(elem, animID, frame);
 }
 
 static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index a689e2d98d..d538e3885f 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -132,7 +132,7 @@ void sub_0205CA94 (SysTask * param0, void * param1)
     v3 = v0->unk_1E4;
 
     if (v0->unk_04.unk_00) {
-        sub_020219F8(v0->unk_04.unk_00);
+        GraphicElementManager_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -195,7 +195,7 @@ void sub_0205CBFC (SysTask * param0, void * param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 5) {
-        sub_020219F8(v0->unk_04.unk_00);
+        GraphicElementManager_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -250,7 +250,7 @@ void sub_0205CD3C (SysTask * param0, void * param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 6) {
-        sub_020219F8(v0->unk_04.unk_00);
+        GraphicElementManager_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -313,7 +313,7 @@ void sub_0205CE7C (SysTask * param0, void * param1)
     v3 = v0->unk_1E4;
 
     if (v3 != 6) {
-        sub_020219F8(v0->unk_04.unk_00);
+        GraphicElementManager_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -738,7 +738,7 @@ void sub_0205D5E0 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1);
+    GraphicElementData_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0)
@@ -818,7 +818,7 @@ void sub_0205D714 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1);
+    GraphicElementData_SetAnim(v0->unk_0C, 1);
     v0->unk_14 = (2 * FX32_ONE);
     GraphicElementData_SetDrawFlag(v0->unk_0C, 0);
 }
@@ -886,7 +886,7 @@ void sub_0205D844 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = 96 * FX32_ONE;
     v0->unk_0C = sub_0205D344(param0, 1, &v0->unk_00, 1, 1);
 
-    SpriteActor_SetSpriteAnimActive(v0->unk_0C, 1);
+    GraphicElementData_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0)
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index 2a6468610b..d81172fba1 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -94,7 +94,7 @@ void sub_0206A870 (UnkStruct_0206A844 * param0)
         }
     }
 
-    sub_020219F8(param0->unk_00.unk_00);
+    GraphicElementManager_Update(param0->unk_00.unk_00);
 }
 
 void sub_0206A8A0 (UnkStruct_0206A844 * param0, s16 param1, s16 param2, s16 param3)
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index 64a1fb357d..dee6ccd753 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -867,31 +867,31 @@ static BOOL sub_020702D0 (TaskManager * param0)
         break;
     case 2:
         v1->unk_00 = sub_0206F488(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 3:
         v1->unk_00 = sub_0206F498(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 4:
         v1->unk_00 = sub_0206F508(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 5:
         v1->unk_00 = sub_0206F514(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 6:
         v1->unk_00 = sub_0206F554(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 7:
         v1->unk_00 = sub_0206F658(v1->unk_08);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 8:
         v1->unk_00 = sub_0206F748(v2);
-        sub_020219F8(v1->unk_08->unk_134.unk_00);
+        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 9:
         if (!(gCoreSys.pressedKeys & PAD_BUTTON_A)) {
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index d768dd826c..62ac92b8b3 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -1014,7 +1014,7 @@ static void sub_0207EE14 (GameWindowLayout * param0)
 
     if ((param0->unk_5A4->unk_20 != 2) && (param0->unk_5A4->unk_20 != 17) && (param0->unk_5A4->unk_20 != 23) && (param0->unk_5A4->unk_20 != 22)) {
         GraphicElementData_SetDrawFlag(param0->unk_5B0[8], 0);
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[9], 0);
+        GraphicElementData_SetAnim(param0->unk_5B0[9], 0);
 
         {
             s16 v1, v2;
@@ -1399,7 +1399,7 @@ static void sub_0207F9A0 (GameWindowLayout * param0)
     u8 v0, v1;
 
     sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+    GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
     SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
 }
 
@@ -1469,7 +1469,7 @@ static u8 sub_0207FA24 (GameWindowLayout * param0)
         if ((v0 == 6) || (v0 == 7)) {
             GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
+            GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
             GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
             SpriteActor_SetPositionXY(param0->unk_5B0[6], v2, v3);
         }
@@ -1557,7 +1557,7 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
         }
 
         sub_0201E028(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, 4);
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+        GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
         GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v1, v2);
 
@@ -1584,7 +1584,7 @@ void sub_0207FD68 (GameWindowLayout * param0, u8 param1)
         u8 v0, v1;
 
         sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+        GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
         GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     }
@@ -1988,7 +1988,7 @@ u8 sub_02080488 (GameWindowLayout * param0, u8 param1)
 static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     if (param1 == 6) {
-        u8 v0 = sub_02021E24(param0->unk_5B0[8]);
+        u8 v0 = GraphicElementData_GetActiveAnim(param0->unk_5B0[8]);
 
         if (param2 == 0) {
             v0 = (v0 & 2);
@@ -1996,12 +1996,12 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
             v0 = (v0 & 2) + 1;
         }
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[8], v0);
+        GraphicElementData_SetAnim(param0->unk_5B0[8], v0);
         return;
     }
 
     if (param1 == 7) {
-        u8 v1 = sub_02021E24(param0->unk_5B0[9]);
+        u8 v1 = GraphicElementData_GetActiveAnim(param0->unk_5B0[9]);
 
         if (param2 == 0) {
             v1 = (v1 & 2);
@@ -2009,7 +2009,7 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
             v1 = (v1 & 2) + 1;
         }
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[9], v1);
+        GraphicElementData_SetAnim(param0->unk_5B0[9], v1);
         return;
     }
 
@@ -2017,12 +2017,12 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
         param0->unk_704[param1].unk_16 -= 2;
         param0->unk_704[param1].unk_18 -= 2;
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[0 + param1], 0);
+        GraphicElementData_SetAnim(param0->unk_5B0[0 + param1], 0);
     } else {
         param0->unk_704[param1].unk_16 += 2;
         param0->unk_704[param1].unk_18 += 2;
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[0 + param1], 1);
+        GraphicElementData_SetAnim(param0->unk_5B0[0 + param1], 1);
     }
 
     sub_0207F8F8(param0, param1);
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index 1e5711ee4f..e6183c3d04 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -214,7 +214,7 @@ void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2)
         return;
     }
 
-    SpriteActor_SetSpriteAnimActive(*v0, param2);
+    GraphicElementData_SetAnim(*v0, param2);
     GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
@@ -228,9 +228,9 @@ void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
     }
 
     if (Item_IsMail(param2) == 1) {
-        SpriteActor_SetSpriteAnimActive(*v0, 1);
+        GraphicElementData_SetAnim(*v0, 1);
     } else {
-        SpriteActor_SetSpriteAnimActive(*v0, 0);
+        GraphicElementData_SetAnim(*v0, 0);
     }
 
     GraphicElementData_SetDrawFlag(*v0, 1);
@@ -240,7 +240,7 @@ void sub_02083080 (GameWindowLayout * param0, u8 param1)
 {
     GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
 
-    SpriteActor_SetSpriteAnimActive(*v0, 1);
+    GraphicElementData_SetAnim(*v0, 1);
     GraphicElementData_SetDrawFlag(*v0, 1);
 }
 
@@ -273,12 +273,12 @@ void sub_02083104 (GameWindowLayout * param0, u8 param1)
 
 static void sub_02083138 (GraphicElementData * param0, u8 param1)
 {
-    if (sub_02021E24(param0) == param1) {
+    if (GraphicElementData_GetActiveAnim(param0) == param1) {
         return;
     }
 
     SpriteActor_SetAnimFrame(param0, 0);
-    SpriteActor_SetSpriteAnimActive(param0, param1);
+    GraphicElementData_SetAnim(param0, param1);
 }
 
 static u8 sub_02083158 (StrBufWrapper * param0)
@@ -328,7 +328,7 @@ void sub_020831B4 (GameWindowLayout * param0)
         GraphicElementData_UpdateAnim(v0->unk_24, FX32_ONE);
 
         if ((param0->unk_B11 == v1) && (v2 != 0) && (v2 != 5)) {
-            if (sub_02021E74(v0->unk_24) == 0) {
+            if (GraphicElementData_GetAnimFrame(v0->unk_24) == 0) {
                 SpriteActor_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 - 3);
             } else {
                 SpriteActor_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 + 1);
@@ -346,7 +346,7 @@ void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2)
     u8 v0, v1;
 
     sub_0201E010(&param0->unk_7F4[param1], &v0, &v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+    GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
     GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
     SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     sub_0200D414(param0->unk_5B0[6], param2);
@@ -364,7 +364,7 @@ void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2)
     GraphicElementData_SetPosition(param0->unk_5B0[28], &v0);
     GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 1);
     SpriteActor_SetAnimFrame(param0->unk_5B0[28], 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5B0[28], 0);
+    GraphicElementData_SetAnim(param0->unk_5B0[28], 0);
 }
 
 void sub_02083334 (GameWindowLayout * param0)
@@ -372,7 +372,7 @@ void sub_02083334 (GameWindowLayout * param0)
     if (GraphicElementData_GetDrawFlag(param0->unk_5B0[28]) == 1) {
         GraphicElementData_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
 
-        if (sub_02021E74(param0->unk_5B0[28]) == 2) {
+        if (GraphicElementData_GetAnimFrame(param0->unk_5B0[28]) == 2) {
             GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 0);
         }
     }
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 5d741e6c8e..43c2386aef 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -441,7 +441,7 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
     sub_0200D414(param0->unk_5B0[6], 0);
     sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
     SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
-    SpriteActor_SetSpriteAnimActive(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+    GraphicElementData_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
     GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
     sub_0207F8F8(param0, param0->unk_B0F_0);
     sub_0200E084(&param0->unk_04[33], 1);
@@ -1020,7 +1020,7 @@ static int sub_02084A18 (GameWindowLayout * param0)
         sub_0200D414(param0->unk_5B0[6], 0);
         sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
         SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+        GraphicElementData_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
         GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 36, 1);
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index e64781f643..b94a911a73 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -1029,7 +1029,7 @@ static int sub_02086B64 (OverlayManager * param0, int * param1)
         break;
     }
 
-    sub_020219F8(v0->unk_188);
+    GraphicElementManager_Update(v0->unk_188);
 
     return 0;
 }
@@ -1630,7 +1630,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             param0->unk_390[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_390[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_390[v0], Unk_020F2984[v0][2]);
+            GraphicElementData_SetAnim(param0->unk_390[v0], Unk_020F2984[v0][2]);
             GraphicElementData_SetPriority(param0->unk_390[v0], Unk_020F2984[v0][3]);
         }
 
@@ -1655,7 +1655,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             param0->unk_3C8[v0] = GraphicElementManager_AddElementEx(&v1);
 
             GraphicElementData_SetAnimateFlag(param0->unk_3C8[v0], 1);
-            SpriteActor_SetSpriteAnimActive(param0->unk_3C8[v0], 43);
+            GraphicElementData_SetAnim(param0->unk_3C8[v0], 43);
         }
 
         sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
@@ -1677,29 +1677,29 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
     switch (param0->unk_00) {
     case 0:
         if (param0->unk_04 == 0) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 48);
+            GraphicElementData_SetAnim(param0->unk_3F8[0], 48);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 49);
+            GraphicElementData_SetAnim(param0->unk_3F8[0], 49);
         }
         break;
     case 3:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 51);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 51);
         break;
     case 6:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 55);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 55);
         break;
     case 5:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 54);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 54);
         break;
     case 4:
     case 7:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 53);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 53);
         break;
     case 2:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 47);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 47);
         break;
     case 1:
-        SpriteActor_SetSpriteAnimActive(param0->unk_3F8[0], 50);
+        GraphicElementData_SetAnim(param0->unk_3F8[0], 50);
 
         if (param0->unk_10 != 2) {
             param1->position.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
@@ -1707,9 +1707,9 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
             param0->unk_3F8[1] = GraphicElementManager_AddElementEx(param1);
 
             if (param0->unk_10 == 0) {
-                SpriteActor_SetSpriteAnimActive(param0->unk_3F8[1], 45);
+                GraphicElementData_SetAnim(param0->unk_3F8[1], 45);
             } else {
-                SpriteActor_SetSpriteAnimActive(param0->unk_3F8[1], 46);
+                GraphicElementData_SetAnim(param0->unk_3F8[1], 46);
             }
         }
         break;
@@ -2031,7 +2031,7 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
         VecFx32 v0;
 
         if ((param0->unk_1C.unk_0C == 0) && (param0->unk_1C.unk_0C != param0->unk_1C.unk_04)) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_390[8], 39);
+            GraphicElementData_SetAnim(param0->unk_390[8], 39);
         }
 
         v0.x = FX32_ONE * (26 + param0->unk_1C.unk_00 * 16);
@@ -2044,7 +2044,7 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
         v1.x = FX32_ONE * Unk_020F251C[v2];
         v1.y = FX32_ONE * (88 - 20);
 
-        SpriteActor_SetSpriteAnimActive(param0->unk_390[8], Unk_020F24E8[v2]);
+        GraphicElementData_SetAnim(param0->unk_390[8], Unk_020F24E8[v2]);
         GraphicElementData_SetPosition(param0->unk_390[8], &v1);
     }
 
@@ -2334,10 +2334,10 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
             sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
             Sound_PlayEffect(1515);
             GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
-            sub_02021FE0(param0->unk_390[8], GX_OAM_MODE_XLU);
+            GraphicElementData_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_XLU);
 
             G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2, 8, 8);
-            SpriteActor_SetSpriteAnimActive(param0->unk_390[8], 60);
+            GraphicElementData_SetAnim(param0->unk_390[8], 60);
 
             param0->unk_1C.unk_18 = 1;
 
@@ -2443,11 +2443,11 @@ static void sub_02088E1C (GraphicElementData ** param0, int param1, int param2)
     int v0;
 
     for (v0 = 0; v0 < param2; v0++) {
-        SpriteActor_SetSpriteAnimActive(param0[v0], 43);
+        GraphicElementData_SetAnim(param0[v0], 43);
     }
 
     if (param1 != param2) {
-        SpriteActor_SetSpriteAnimActive(param0[param1], 44);
+        GraphicElementData_SetAnim(param0[param1], 44);
     }
 }
 
@@ -2490,17 +2490,17 @@ static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2
     for (v0 = 0; v0 < 3; v0++) {
         if (param0[v0]) {
             for (v1 = 0; v1 < 3; v1++) {
-                SpriteActor_SetSpriteAnimActive(param1[v1], Unk_020F2984[v1][2]);
+                GraphicElementData_SetAnim(param1[v1], Unk_020F2984[v1][2]);
             }
 
-            SpriteActor_SetSpriteAnimActive(param1[v0], Unk_020F2984[v0][2] - 3);
+            GraphicElementData_SetAnim(param1[v0], Unk_020F2984[v0][2] - 3);
             break;
         }
     }
 
     for (v0 = 5; v0 < 7; v0++) {
         if (param0[v0]) {
-            SpriteActor_SetSpriteAnimActive(param1[v0], Unk_020F2984[v0][2] + 1);
+            GraphicElementData_SetAnim(param1[v0], Unk_020F2984[v0][2] + 1);
         }
     }
 
@@ -2511,13 +2511,13 @@ static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2
 
 static void sub_02088FD0 (UnkStruct_02087A10 * param0)
 {
-    if (!sub_02021FD0(param0->unk_390[8])) {
+    if (!GraphicElementData_IsAnimated(param0->unk_390[8])) {
         if (param0->unk_158 == param0->unk_0C) {
             param0->unk_1C.unk_00 = 12;
             param0->unk_1C.unk_04 = 0;
-            SpriteActor_SetSpriteAnimActive(param0->unk_390[8], 39);
+            GraphicElementData_SetAnim(param0->unk_390[8], 39);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_390[8], 39);
+            GraphicElementData_SetAnim(param0->unk_390[8], 39);
         }
 
         if (param0->unk_1C.unk_14 == 0) {
@@ -2528,7 +2528,7 @@ static void sub_02088FD0 (UnkStruct_02087A10 * param0)
 
         param0->unk_1C.unk_18 = 0;
 
-        sub_02021FE0(param0->unk_390[8], GX_OAM_MODE_NORMAL);
+        GraphicElementData_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_NORMAL);
     }
 }
 
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index f94fe8f668..c00b491710 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -259,15 +259,15 @@ void sub_0208ECF4 (PokemonSummaryApp * param0)
             continue;
         }
 
-        v4 = sub_02021E24(v0[v5]);
+        v4 = GraphicElementData_GetActiveAnim(v0[v5]);
 
         if (param0->page == v5) {
             if (v4 < 8) {
-                SpriteActor_SetSpriteAnimActive(v0[v5], v4 + 8);
+                GraphicElementData_SetAnim(v0[v5], v4 + 8);
             }
         } else {
             if (v4 >= 8) {
-                SpriteActor_SetSpriteAnimActive(v0[v5], v4 - 8);
+                GraphicElementData_SetAnim(v0[v5], v4 - 8);
             }
         }
 
@@ -332,7 +332,7 @@ void sub_0208EE9C (PokemonSummaryApp * param0)
     } else if (param0->monData.status != 0) {
         GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
         GraphicElementData_SetDrawFlag(param0->unk_41C[20], 1);
-        SpriteActor_SetSpriteAnimActive(param0->unk_41C[20], param0->monData.status);
+        GraphicElementData_SetAnim(param0->unk_41C[20], param0->monData.status);
     } else {
         GraphicElementData_SetDrawFlag(param0->unk_41C[76], 1);
         GraphicElementData_SetDrawFlag(param0->unk_41C[20], 0);
@@ -531,7 +531,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
         if (param0->sheenCount == 0) {
             GraphicElementData_SetDrawFlag(param0->unk_41C[29 + param0->sheenPos], 1);
             SpriteActor_SetAnimFrame(param0->unk_41C[29 + param0->sheenPos], 0);
-            SpriteActor_SetSpriteAnimActive(param0->unk_41C[29 + param0->sheenPos], 0);
+            GraphicElementData_SetAnim(param0->unk_41C[29 + param0->sheenPos], 0);
 
             param0->sheenPos++;
 
@@ -557,7 +557,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
             for (v0 = 29; v0 < 29 + param0->sheenMax; v0++) {
                 GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 1);
                 SpriteActor_SetAnimFrame(param0->unk_41C[v0], 0);
-                SpriteActor_SetSpriteAnimActive(param0->unk_41C[v0], 0);
+                GraphicElementData_SetAnim(param0->unk_41C[v0], 0);
             }
 
             param0->sheenCount = 0;
@@ -582,7 +582,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
 
         GraphicElementData_UpdateAnim(param0->unk_41C[v0], FX32_ONE);
 
-        if (sub_02021E74(param0->unk_41C[v0]) == 6) {
+        if (GraphicElementData_GetAnimFrame(param0->unk_41C[v0]) == 6) {
             GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
         }
     }
@@ -594,9 +594,9 @@ void sub_0208F574 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->monData.markings & (1 << v0)) {
-            SpriteActor_SetSpriteAnimActive(param0->unk_41C[23 + v0], 1);
+            GraphicElementData_SetAnim(param0->unk_41C[23 + v0], 1);
         } else {
-            SpriteActor_SetSpriteAnimActive(param0->unk_41C[23 + v0], 0);
+            GraphicElementData_SetAnim(param0->unk_41C[23 + v0], 0);
         }
     }
 
@@ -619,7 +619,7 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 
     GraphicElementData_SetDrawFlag(param0->unk_41C[41], 1);
     SpriteActor_SetAnimFrame(param0->unk_41C[41], 0);
-    SpriteActor_SetSpriteAnimActive(param0->unk_41C[41], 0);
+    GraphicElementData_SetAnim(param0->unk_41C[41], 0);
 
     sub_02092368(param0, &v0, &v1);
 
@@ -632,7 +632,7 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 
 void sub_0208F684 (PokemonSummaryApp * param0)
 {
-    if (sub_02021E74(param0->unk_41C[41]) == 2) {
+    if (GraphicElementData_GetAnimFrame(param0->unk_41C[41]) == 2) {
         GraphicElementData_SetDrawFlag(param0->unk_41C[41], 0);
     }
 }
@@ -758,7 +758,7 @@ void sub_0208FA04 (PokemonSummaryApp * param0)
         }
     }
 
-    SpriteActor_SetSpriteAnimActive(param0->unk_41C[70], 0);
+    GraphicElementData_SetAnim(param0->unk_41C[70], 0);
 }
 
 void sub_0208FAA4 (PokemonSummaryApp * param0)
@@ -856,7 +856,7 @@ static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, c
 
     SpriteActor_SetPositionXY(param0, v0, v1);
     SpriteActor_SetAnimFrame(param0, 0);
-    SpriteActor_SetSpriteAnimActive(param0, 0);
+    GraphicElementData_SetAnim(param0, 0);
 }
 
 void sub_0208FCD4 (PokemonSummaryApp * param0)
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 22a0b254ee..96ed7487dd 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -99,7 +99,7 @@ static void sub_02099118 (UnkStruct_0209903C * param0)
 
 void sub_02099160 (UnkStruct_0209903C * param0)
 {
-    sub_020219F8(param0->unk_10);
+    GraphicElementManager_Update(param0->unk_10);
 }
 
 UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7)
@@ -163,7 +163,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v4->unk_00 = GraphicElementManager_AddElementEx(&v5);
 
     if (v4->unk_00 != NULL) {
-        SpriteActor_SetSpriteAnimActive(v4->unk_00, 0);
+        GraphicElementData_SetAnim(v4->unk_00, 0);
         v2 = sub_0200A760(
             v6, v0);
         GraphicElementData_SetExplicitPalette(v4->unk_00, v2);

From a870c20218fb9e1fdd7b06d8f17ee34f0db17ed6 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 15:54:15 +0200
Subject: [PATCH 14/19] Gfx elem cleanup

---
 include/unk_020218BC.h | 108 ++++++++++++++++++++---------------------
 src/unk_020218BC.c     |  13 +++--
 2 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 5481808568..4924838042 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -23,59 +23,59 @@ enum AffineOverwriteMode {
     AFFINE_OVERWRITE_MODE_DOUBLE, // Extends the cell actor's drawable area by 2x, use when the cell actor is scaled up
 };
 
-GraphicElementManager * GraphicElementManager_New(const GraphicElementManagerParams * param0);
-BOOL GraphicElementManager_Delete(GraphicElementManager * param0);
-BOOL GraphicElementManager_SetActive(GraphicElementManager * param0, u8 param1);
-BOOL GraphicElementManager_DeleteAll(GraphicElementManager * param0);
-void GraphicElementManager_Update(const GraphicElementManager * param0);
-void GraphicElementData_Reset(GraphicElementData * param0);
-GraphicElementData * GraphicElementManager_AddElementEx(const CellActorInitParamsEx * param0);
-GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams * param0);
-void GraphicElementData_Delete(GraphicElementData * param0);
-void GraphicElementData_SetPosition(GraphicElementData * param0, const VecFx32 * param1);
-void GraphicElementData_SetAffineTranslation(GraphicElementData * param0, const VecFx32 * param1);
-void GraphicElementData_SetAffineScale(GraphicElementData * param0, const VecFx32 * param1);
-void GraphicElementData_SetAffineScaleEx(GraphicElementData * param0, const VecFx32 * param1, enum AffineOverwriteMode param2);
-void GraphicElementData_SetAffineZRotation(GraphicElementData * param0, u16 param1);
-void GraphicElementData_SetAffineZRotationEx(GraphicElementData * param0, u16 param1, enum AffineOverwriteMode param2);
-void GraphicElementData_SetDrawFlag(GraphicElementData * param0, BOOL param1);
-void GraphicElementData_SetAnimateFlag(GraphicElementData * param0, BOOL param1);
-void GraphicElementData_SetAnimSpeed(GraphicElementData * param0, fx32 param1);
-void GraphicElementData_SetAffineOverwriteMode(GraphicElementData * param0, enum AffineOverwriteMode param1);
-void GraphicElementData_SetFlipMode(GraphicElementData * param0, u32 param1);
-const VecFx32 * GraphicElementData_GetPosition(const GraphicElementData * param0);
-const VecFx32 * GraphicElementData_GetAffineScale(const GraphicElementData * param0);
-u16 GraphicElementData_GetAffineZRotation(const GraphicElementData * param0);
-BOOL GraphicElementData_GetDrawFlag(const GraphicElementData * param0);
-BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData * param0);
-u32 GraphicElementData_GetAnimCount(const GraphicElementData * param0);
-void GraphicElementData_SetAnim(GraphicElementData * param0, u32 param1);
-void GraphicElementData_SetAnimNoRestart(GraphicElementData * param0, u32 param1);
-void GraphicElementData_RestartAnim(GraphicElementData * param0);
-u32 GraphicElementData_GetActiveAnim(const GraphicElementData * param0);
-void GraphicElementData_UpdateAnim(GraphicElementData * param0, fx32 param1);
-void SpriteActor_SetAnimFrame(GraphicElementData * param0, u16 param1);
-u16 GraphicElementData_GetAnimFrame(const GraphicElementData * param0);
-void GraphicElementData_SetExplicitPriority(GraphicElementData * param0, u8 param1);
-u8 GraphicElementData_GetExplicitPriority(const GraphicElementData * param0);
-void GraphicElementData_SetExplicitPalette(GraphicElementData * param0, u32 param1);
-void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData * param0, u32 param1);
-u32 GraphicElementData_GetExplicitPalette(const GraphicElementData * param0);
-void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData * param0, u32 param1);
-void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData * param0, u32 param1);
-u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData * param0);
-void GraphicElementData_SetPriority(GraphicElementData * param0, u32 param1);
-u32 GraphicElementData_GetPriority(const GraphicElementData * param0);
-void GraphicElementData_SetImageProxy(GraphicElementData * param0, const NNSG2dImageProxy * param1);
-NNSG2dImageProxy * SpriteActor_ImageProxy(GraphicElementData * param0);
-NNSG2dImagePaletteProxy * GraphicElementData_GetPaletteProxy(GraphicElementData * param0);
-void GraphicElementData_SetPixelated(GraphicElementData * param0, BOOL param1);
-NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData * param0);
-BOOL GraphicElementData_IsAnimated(GraphicElementData * param0);
-void GraphicElementData_SetExplicitOAMMode(GraphicElementData * param0, GXOamMode param1);
-void Utility_Clear2DMainOAM(enum HeapId param0);
-void Utility_Clear2DSubOAM(enum HeapId param0);
-u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData * param0, u32 param1, u32 param2);
-u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData * param0);
+GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params);
+BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr);
+BOOL GraphicElementManager_SetActive(GraphicElementManager *gfxElemMgr, u8 active);
+BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr);
+void GraphicElementManager_Update(const GraphicElementManager *gfxElemMgr);
+void GraphicElementData_Reset(GraphicElementData *elem);
+GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParamsEx *params);
+GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParams *params);
+void GraphicElementData_Delete(GraphicElementData *gfxElem);
+void GraphicElementData_SetPosition(GraphicElementData *elem, const VecFx32 *position);
+void GraphicElementData_SetAffineTranslation(GraphicElementData *elem, const VecFx32 *translation);
+void GraphicElementData_SetAffineScale(GraphicElementData *elem, const VecFx32 *scale);
+void GraphicElementData_SetAffineScaleEx(GraphicElementData *elem, const VecFx32 *scale, enum AffineOverwriteMode mode);
+void GraphicElementData_SetAffineZRotation(GraphicElementData *elem, u16 angle);
+void GraphicElementData_SetAffineZRotationEx(GraphicElementData *elem, u16 angle, enum AffineOverwriteMode mode);
+void GraphicElementData_SetDrawFlag(GraphicElementData *elem, BOOL draw);
+void GraphicElementData_SetAnimateFlag(GraphicElementData *elem, BOOL animate);
+void GraphicElementData_SetAnimSpeed(GraphicElementData *elem, fx32 speed);
+void GraphicElementData_SetAffineOverwriteMode(GraphicElementData *elem, enum AffineOverwriteMode mode);
+void GraphicElementData_SetFlipMode(GraphicElementData *elem, u32 mode);
+const VecFx32 *GraphicElementData_GetPosition(const GraphicElementData *elem);
+const VecFx32 *GraphicElementData_GetAffineScale(const GraphicElementData *elem);
+u16 GraphicElementData_GetAffineZRotation(const GraphicElementData *elem);
+BOOL GraphicElementData_GetDrawFlag(const GraphicElementData *elem);
+BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData *elem);
+u32 GraphicElementData_GetAnimCount(const GraphicElementData *elem);
+void GraphicElementData_SetAnim(GraphicElementData *elem, u32 animID);
+void GraphicElementData_SetAnimNoRestart(GraphicElementData *elem, u32 animID);
+void GraphicElementData_RestartAnim(GraphicElementData *elem);
+u32 GraphicElementData_GetActiveAnim(const GraphicElementData *elem);
+void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames);
+void SpriteActor_SetAnimFrame(GraphicElementData *elem, u16 frame);
+u16 GraphicElementData_GetAnimFrame(const GraphicElementData *elem);
+void GraphicElementData_SetExplicitPriority(GraphicElementData *elem, u8 priority);
+u8 GraphicElementData_GetExplicitPriority(const GraphicElementData *elem);
+void GraphicElementData_SetExplicitPalette(GraphicElementData *elem, u32 palette);
+void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData *elem, u32 palette);
+u32 GraphicElementData_GetExplicitPalette(const GraphicElementData *elem);
+void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData *elem, u32 paletteOffset);
+void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData *elem, u32 paletteOffset);
+u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData *elem);
+void GraphicElementData_SetPriority(GraphicElementData *elem, u32 priority);
+u32 GraphicElementData_GetPriority(const GraphicElementData *elem);
+void GraphicElementData_SetImageProxy(GraphicElementData *elem, const NNSG2dImageProxy *imageProxy);
+NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *elem);
+NNSG2dImagePaletteProxy *GraphicElementData_GetPaletteProxy(GraphicElementData *paletteProxy);
+void GraphicElementData_SetPixelated(GraphicElementData *elem, BOOL pixelated);
+NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData *elem);
+BOOL GraphicElementData_IsAnimated(GraphicElementData *elem);
+void GraphicElementData_SetExplicitOAMMode(GraphicElementData *elem, GXOamMode mode);
+void Utility_Clear2DMainOAM(enum HeapId heapID);
+void Utility_Clear2DSubOAM(enum HeapId heapID);
+u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData *elem, u32 animID, u32 frame);
+u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData *elem);
 
 #endif // POKEPLATINUM_UNK_020218BC_H
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index ee409ce1be..b145e446a3 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -13,8 +13,8 @@
 #include "heap.h"
 #include "unk_020218BC.h"
 
-#define GRAPHIC_ELEMENT_ANIM_DATA_SIZE 29
-#define MAX_SIMULTANEOUS_SPRITES 128
+#define GRAPHIC_ELEMENT_ANIM_DATA_SIZE  29
+#define MAX_SIMULTANEOUS_SPRITES        128
 
 enum CellType {
     CELL_TYPE_NONE = 0,
@@ -62,6 +62,9 @@ typedef struct GraphicElementData {
     u8 animate;
     fx32 animSpeed;
     GraphicElementManager *manager;
+
+    // This field is supposed to be a union between CellAnimationData, VRamCellAnimationData, and MultiCellAnimationData
+    // but it's actually too small to hold the largest of these types. This should really be u32 animData[31].
     u32 animData[GRAPHIC_ELEMENT_ANIM_DATA_SIZE];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
@@ -297,7 +300,7 @@ GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParams
     return elem;
 }
 
-GraphicElementData * GraphicElementManager_AddElement(const CellActorInitParams *params)
+GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParams *params)
 {
     CellActorInitParamsEx paramsEx;
 
@@ -611,9 +614,9 @@ void GraphicElementData_SetImageProxy(GraphicElementData *elem, const NNSG2dImag
     elem->imageProxy = *imageProxy;
 }
 
-NNSG2dImageProxy * SpriteActor_ImageProxy (GraphicElementData * param0)
+NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *elem)
 {
-    return &param0->imageProxy;
+    return &elem->imageProxy;
 }
 
 NNSG2dImagePaletteProxy *GraphicElementData_GetPaletteProxy(GraphicElementData *paletteProxy)

From d23322852ca54e78e5c765cfba7e061618dd6ce6 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 16:10:46 +0200
Subject: [PATCH 15/19] Rename GraphicElement* -> CellActor*

---
 include/overlay005/encounter_effect.h         |   4 +-
 include/overlay005/ov5_021D2F14.h             |   2 +-
 include/overlay005/struct_ov5_021D30A8.h      |   2 +-
 include/overlay005/struct_ov5_021DE47C.h      |   2 +-
 include/overlay007/struct_ov7_0224D008.h      |   2 +-
 include/overlay012/funcptr_ov12_02239E64_1.h  |   2 +-
 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     |   2 +-
 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/overlay063/ov63_0222AE60.h            |   4 +-
 include/overlay063/ov63_0222CCE4.h            |   4 +-
 include/overlay065/struct_ov65_0222EBE0_t.h   |   2 +-
 include/overlay065/struct_ov65_02234E50.h     |   2 +-
 include/overlay065/struct_ov65_022358CC.h     |   2 +-
 .../overlay065/struct_ov65_022358CC_sub1.h    |   4 +-
 include/overlay071/struct_ov71_0223D238.h     |   4 +-
 include/overlay072/struct_ov72_0223DB98_t.h   |   8 +-
 include/overlay077/ov77_021D6670.h            |   2 +-
 include/overlay079/struct_ov79_021D0E1C.h     |   6 +-
 include/overlay080/struct_ov80_021D2C5C.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/overlay094/ov94_0223BCB0.h            |   2 +-
 include/overlay094/struct_ov94_0223FD4C.h     |  18 +-
 include/overlay095/ov95_02246C20.h            |   2 +-
 include/overlay096/struct_ov96_0223BF40_t.h   |   4 +-
 include/overlay097/ov97_02237694.h            |   2 +-
 include/overlay097/struct_ov97_0222D04C.h     |   4 +-
 include/overlay097/struct_ov97_02237AEC.h     |   2 +-
 include/overlay101/ov101_021D7E48.h           |   4 +-
 include/overlay101/struct_ov101_021D8544.h    |   2 +-
 include/overlay104/ov104_0222DCE0.h           |   4 +-
 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    |   6 +-
 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/struct_decls/struct_020218BC_decl.h   |   2 +-
 include/struct_decls/struct_02022550_decl.h   |   2 +-
 include/struct_defs/pokemon_summary_app.h     |   2 +-
 include/struct_defs/struct_020095C4.h         |   2 +-
 include/struct_defs/struct_0200D0F4.h         |   2 +-
 include/struct_defs/struct_020127E8.h         |   4 +-
 include/struct_defs/struct_0207F248.h         |   2 +-
 include/struct_defs/struct_020831B4.h         |   2 +-
 include/struct_defs/struct_02095E80_t.h       |  14 +-
 include/struct_defs/struct_02095EAC_t.h       |   8 +-
 include/struct_defs/struct_020961E8_t.h       |   6 +-
 include/struct_defs/struct_0209903C.h         |   2 +-
 include/unk_020093B4.h                        |   2 +-
 include/unk_0200C6E4.h                        |  60 +-
 include/unk_02012744.h                        |   2 +-
 include/unk_020218BC.h                        | 110 +--
 src/battle/battle_script.c                    |   2 +-
 src/battle/healthbar.c                        |   4 +-
 src/battle/ov16_0226871C.c                    |   6 +-
 src/battle/party_gauge.c                      |   8 +-
 src/choose_starter/choose_starter_app.c       |  20 +-
 src/field_menu.c                              |  32 +-
 src/overlay005/encounter_effect.c             |  18 +-
 src/overlay005/encounter_effect_core.c        | 338 ++++----
 src/overlay005/ov5_021D2F14.c                 |  26 +-
 src/overlay005/ov5_021D5EB8.c                 |  34 +-
 src/overlay006/ov6_022426AC.c                 |  16 +-
 src/overlay006/ov6_02243258.c                 | 326 +++----
 src/overlay007/ov7_0224BE9C.c                 |  34 +-
 src/overlay007/ov7_0224CD28.c                 |  50 +-
 src/overlay009/ov9_02249960.c                 |  28 +-
 src/overlay010/ov10_0221F800.c                |   2 +-
 src/overlay012/ov12_0221FC20.c                |   4 +-
 src/overlay012/ov12_02225864.c                |   2 +-
 src/overlay012/ov12_022269C0.c                |   2 +-
 src/overlay012/ov12_02226B84.c                |   2 +-
 src/overlay012/ov12_0222AC70.c                |  10 +-
 src/overlay012/ov12_0222E91C.c                |  10 +-
 src/overlay012/ov12_0222F700.c                |   2 +-
 src/overlay017/ov17_0224A0FC.c                |   2 +-
 src/overlay017/ov17_02250744.c                |   2 +-
 src/overlay019/ov19_021D61B0.c                |  22 +-
 src/overlay019/ov19_021D79F8.c                |  14 +-
 src/overlay019/ov19_021D8B54.c                | 156 ++--
 src/overlay019/ov19_021DA270.c                |  26 +-
 src/overlay019/ov19_021DA814.c                |  10 +-
 src/overlay019/ov19_021DA92C.c                |  32 +-
 src/overlay019/ov19_021DB2FC.c                |   2 +-
 src/overlay019/ov19_021DB8E4.c                |  16 +-
 src/overlay019/ov19_021DC5F0.c                |  24 +-
 src/overlay019/ov19_021DCF88.c                |  60 +-
 src/overlay019/ov19_021DE3E8.c                |  72 +-
 src/overlay019/ov19_021DEC04.c                |  66 +-
 src/overlay020/ov20_021D2098.c                |  20 +-
 src/overlay020/ov20_021D2EA4.c                |  46 +-
 src/overlay020/ov20_021D3864.c                |  20 +-
 src/overlay020/ov20_021D3A54.c                |  18 +-
 src/overlay020/ov20_021D40E8.c                |  42 +-
 src/overlay020/ov20_021D4728.c                |  48 +-
 src/overlay021/ov21_021D0D80.c                |  32 +-
 src/overlay021/ov21_021D1FA4.c                |  76 +-
 src/overlay021/ov21_021D4C0C.c                |   2 +-
 src/overlay021/ov21_021D57B4.c                |  10 +-
 src/overlay021/ov21_021D5AEC.c                | 102 +--
 src/overlay021/ov21_021D76B0.c                |  54 +-
 src/overlay021/ov21_021D85B0.c                |  62 +-
 src/overlay021/ov21_021D94BC.c                |  98 +--
 src/overlay021/ov21_021DC9BC.c                |  40 +-
 src/overlay021/ov21_021DDD2C.c                |  18 +-
 src/overlay021/ov21_021DE668.c                |  40 +-
 src/overlay021/ov21_021DF734.c                |  40 +-
 src/overlay021/ov21_021E0C68.c                |  14 +-
 src/overlay021/ov21_021E1924.c                |  80 +-
 src/overlay021/ov21_021E29DC.c                |  12 +-
 src/overlay021/ov21_021E3FFC.c                |  50 +-
 src/overlay021/ov21_021E4CA4.c                | 102 +--
 src/overlay021/ov21_021E6014.c                |  28 +-
 src/overlay021/ov21_021E68F4.c                |  30 +-
 src/overlay021/ov21_021E737C.c                |  86 +-
 src/overlay021/ov21_021E8484.c                |  28 +-
 src/overlay021/ov21_021E8D48.c                |  52 +-
 src/overlay022/ov22_02255094.c                |  10 +-
 src/overlay022/ov22_02255D44.c                |   4 +-
 src/overlay022/ov22_02259C58.c                |  10 +-
 src/overlay022/ov22_0225A428.c                |  40 +-
 src/overlay022/ov22_0225B660.c                |  12 +-
 src/overlay023/ov23_0223E140.c                |  82 +-
 src/overlay023/ov23_0224340C.c                | 150 ++--
 src/overlay023/ov23_02248F1C.c                |  52 +-
 src/overlay023/ov23_0224F294.c                |  32 +-
 src/overlay056/ov56_022561C0.c                |  38 +-
 src/overlay058/ov58_021D0D80.c                |  74 +-
 src/overlay059/ov59_021D0D80.c                |  34 +-
 src/overlay063/ov63_0222AE60.c                |  82 +-
 src/overlay063/ov63_0222CCE4.c                |   6 +-
 src/overlay064/ov64_0222DCE0.c                |  48 +-
 src/overlay065/ov65_0222DCE0.c                |  32 +-
 src/overlay065/ov65_02235060.c                |  36 +-
 src/overlay065/ov65_0223648C.c                |   6 +-
 src/overlay068/ov68_0225C700.c                |  22 +-
 src/overlay069/ov69_0225C700.c                |  28 +-
 src/overlay070/ov70_0225D9A4.c                |  64 +-
 src/overlay071/ov71_0223B140.c                |  18 +-
 src/overlay071/ov71_0223CF0C.c                |  38 +-
 src/overlay072/ov72_0223D7A0.c                |  32 +-
 src/overlay076/ov76_0223B870.c                |   2 +-
 src/overlay077/ov77_021D54B0.c                | 210 ++---
 src/overlay077/ov77_021D6670.c                |  48 +-
 src/overlay079/ov79_021D0D80.c                |  22 +-
 src/overlay079/ov79_021D183C.c                |  30 +-
 src/overlay079/ov79_021D20F4.c                |  12 +-
 src/overlay079/ov79_021D2268.c                |  22 +-
 src/overlay080/ov80_021D1458.c                |  38 +-
 src/overlay080/ov80_021D2AF4.c                |  20 +-
 src/overlay083/ov83_0223B5A0.c                |   2 +-
 src/overlay083/ov83_0223C958.c                |   2 +-
 src/overlay083/ov83_0223D6A8.c                | 120 +--
 src/overlay084/ov84_022403F4.c                |  10 +-
 src/overlay086/ov86_0223B140.c                |  52 +-
 src/overlay087/ov87_021D106C.c                |  34 +-
 src/overlay088/ov88_0223B140.c                | 184 ++--
 src/overlay090/ov90_021D0D80.c                |  42 +-
 src/overlay091/ov91_021D0D80.c                |   2 +-
 src/overlay094/ov94_0223BCB0.c                |  10 +-
 src/overlay094/ov94_0223C610.c                |  20 +-
 src/overlay094/ov94_0223D0C4.c                |   8 +-
 src/overlay094/ov94_0223DC04.c                |  10 +-
 src/overlay094/ov94_0223E46C.c                |  14 +-
 src/overlay094/ov94_0223FB48.c                |  92 +-
 src/overlay094/ov94_02243EF8.c                |  42 +-
 src/overlay095/ov95_02246C20.c                |  18 +-
 src/overlay095/ov95_02247B6C.c                |  20 +-
 src/overlay095/ov95_02248590.c                |  24 +-
 src/overlay095/ov95_02249740.c                |  12 +-
 src/overlay095/ov95_0224A390.c                |  12 +-
 src/overlay095/ov95_0224B3D8.c                |  18 +-
 src/overlay096/ov96_0223B6A0.c                |  14 +-
 src/overlay096/ov96_0223BCE0.c                |   4 +-
 src/overlay097/ov97_0222AE60.c                |  14 +-
 src/overlay097/ov97_0222C174.c                |  10 +-
 src/overlay097/ov97_0222D30C.c                | 110 +--
 src/overlay097/ov97_02230410.c                |  30 +-
 src/overlay097/ov97_02233B18.c                | 140 +--
 src/overlay097/ov97_02237694.c                |  34 +-
 src/overlay101/ov101_021D59AC.c               | 324 +++----
 src/overlay101/ov101_021D7E48.c               |  24 +-
 src/overlay104/ov104_0222DCE0.c               |  18 +-
 src/overlay104/ov104_02231F74.c               |   4 +-
 src/overlay104/ov104_02237378.c               |  26 +-
 src/overlay104/ov104_02237DD8.c               |  28 +-
 src/overlay104/ov104_0223DC7C.c               |   8 +-
 src/overlay105/ov105_02241AE0.c               |   2 +-
 src/overlay105/ov105_02245AAC.c               |  16 +-
 src/overlay105/ov105_02245DC4.c               |   8 +-
 src/overlay105/ov105_02245E54.c               |  26 +-
 src/overlay105/ov105_02245FB8.c               |  24 +-
 src/overlay106/ov106_02241AE0.c               |   2 +-
 src/overlay106/ov106_02243310.c               |  18 +-
 src/overlay106/ov106_022435FC.c               |  20 +-
 src/overlay107/ov107_02241AE0.c               |   2 +-
 src/overlay107/ov107_02245EB0.c               |   2 +-
 src/overlay107/ov107_02249604.c               |  18 +-
 src/overlay107/ov107_02249B1C.c               |  22 +-
 src/overlay108/ov108_02241AE0.c               |   2 +-
 src/overlay108/ov108_02243030.c               |  18 +-
 src/overlay108/ov108_0224351C.c               |  20 +-
 src/overlay109/ov109_021D3D50.c               |  24 +-
 src/overlay111/ov111_021D0D80.c               |   2 +-
 src/overlay111/ov111_021D2F80.c               |  18 +-
 src/overlay111/ov111_021D33F4.c               |  32 +-
 src/overlay112/ov112_0225C700.c               |   6 +-
 src/overlay114/ov114_0225C700.c               | 116 +--
 src/overlay115/ov115_02260CEC.c               | 140 +--
 src/overlay119/ov119_021D191C.c               |   4 +-
 src/pokemon.c                                 |   2 +-
 src/pokemon_summary_app.c                     |  34 +-
 src/unk_020093B4.c                            |   6 +-
 src/unk_0200C6E4.c                            | 194 ++---
 src/unk_0200DA60.c                            |  10 +-
 src/unk_02012744.c                            |  44 +-
 src/unk_020218BC.c                            | 796 +++++++++---------
 src/unk_0205CA94.c                            |  84 +-
 src/unk_0206A780.c                            |   4 +-
 src/unk_0206F314.c                            |  14 +-
 src/unk_0207E0B8.c                            |  36 +-
 src/unk_02082C2C.c                            |  66 +-
 src/unk_02083370.c                            |  18 +-
 src/unk_0208694C.c                            | 152 ++--
 src/unk_0208EA44.c                            | 170 ++--
 src/unk_02098FFC.c                            |  12 +-
 275 files changed, 4141 insertions(+), 4141 deletions(-)

diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h
index 1d793a1b21..d4f2a69be7 100644
--- a/include/overlay005/encounter_effect.h
+++ b/include/overlay005/encounter_effect.h
@@ -141,8 +141,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(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);
+void ov5_021DE5D0(CellActor *param0, u32 param1, u32 param2, u8 param3, u16 param4);
+CellActor *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5);
 VecFx32 VecFx32_FromXYZ(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/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h
index dbaea2be5b..d13295fcd1 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);
-GraphicElementData * ov5_021D3104(UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1);
+CellActor * 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/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h
index e71f7fc94f..ebb76c1340 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 7832ecf8d9..684eb2fcb8 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
 } UnkStruct_ov5_021DE47C;
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
index e8c0541279..c359c508c6 100644
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -33,7 +33,7 @@ typedef struct {
     StringTemplate * unk_8C;
     Camera * camera;
     UnkStruct_ov5_021D30A8 unk_94;
-    GraphicElementData * unk_25C[4];
+    CellActor * unk_25C[4];
     u16 unk_26C[2];
     TrainerInfo * unk_270;
     void * unk_274;
diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h
index a5fbef222b..85debc46a8 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 *, SpriteRenderer *, SpriteGfxHandler *, GraphicElementData *);
+typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, CellActor *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H
diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index 43ba8f4d10..b89f4f7820 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -35,8 +35,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(CellActorResourceData * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, NNSG2dCellDataBank * param3, NNSG2dCellAnimBankData * param4, u32 param5);
-GraphicElementData * ov19_021D785C(GraphicElementManager * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
-void ov19_021D78AC(GraphicElementData * param0, u32 param1);
+CellActor * ov19_021D785C(CellActorCollection * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov19_021D78AC(CellActor * 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 4879a9251b..3af15ff15e 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, GraphicElementManager * param4);
+BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 969770cde1..8d5a0e06e7 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, GraphicElementManager * param3, NARC * param4);
+BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * 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 a302100490..d2d3f1a90f 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, GraphicElementManager * param3, NARC * param4);
+BOOL ov19_021DA270(UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * 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 9f69724964..2677d19059 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, GraphicElementManager * param3, NARC * param4);
+BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * 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 ae7381a24a..26b97ba62d 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, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6);
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 74795ba93c..220b279ecd 100644
--- a/include/overlay019/ov19_021DB2FC.h
+++ b/include/overlay019/ov19_021DB2FC.h
@@ -10,7 +10,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, GraphicElementManager * param4, MessageLoader * param5, const StringTemplate * param6, int param7, NARC * param8);
+BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, MessageLoader * param5, const StringTemplate * 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 54084319ae..e11d85962c 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, GraphicElementManager * param4, NARC * param5);
+BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 53037e930e..6f43390c33 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, GraphicElementManager * param4, NARC * param5);
+BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 a006d23371..871adbb355 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, GraphicElementManager * param4);
+BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 6f0a377760..ce2191d5d1 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, GraphicElementManager * param4);
+BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 ff0bbe1b79..d917468dfa 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, GraphicElementManager * param4, MessageLoader * param5, NARC * param6);
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * 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 ccf269cf33..8d3275d31b 100644
--- a/include/overlay019/struct_ov19_021D8E00.h
+++ b/include/overlay019/struct_ov19_021D8E00.h
@@ -14,11 +14,11 @@
 #include <nnsys.h>
 
 typedef struct {
-    GraphicElementManager * unk_00;
-    GraphicElementData * unk_04;
-    GraphicElementData * unk_08;
-    GraphicElementData * unk_0C;
-    GraphicElementData * unk_10;
+    CellActorCollection * unk_00;
+    CellActor * unk_04;
+    CellActor * unk_08;
+    CellActor * unk_0C;
+    CellActor * 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 eecdeb7b3f..779cc7ad3f 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;
-    GraphicElementManager * unk_24;
+    CellActorCollection * 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 3b331e9f1d..f296904436 100644
--- a/include/overlay019/struct_ov19_021DA8D8.h
+++ b/include/overlay019/struct_ov19_021DA8D8.h
@@ -9,14 +9,14 @@
 #include <nnsys.h>
 
 typedef struct {
-    GraphicElementManager * unk_00;
-    GraphicElementData * unk_04;
+    CellActorCollection * unk_00;
+    CellActor * unk_04;
     void * unk_08;
     void * unk_0C;
     NNSG2dCellDataBank * unk_10;
     NNSG2dAnimBankData * unk_14;
     NNSG2dImageProxy unk_18;
-    GraphicElementManager * unk_3C;
+    CellActorCollection * 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 0460c0c5a0..16f36e22fc 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;
-    GraphicElementManager * unk_0C;
+    CellActorCollection * 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;
-    GraphicElementData * unk_30;
+    CellActor * unk_30;
     void * unk_34;
     NNSG2dCellDataBank * unk_38;
-    GraphicElementData * unk_3C[2];
+    CellActor * 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 265ec8815b..e1655060ce 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;
-    GraphicElementManager * unk_08;
+    CellActorCollection * 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;
-    GraphicElementData * unk_48[18];
-    GraphicElementData * unk_90;
+    CellActor * unk_48[18];
+    CellActor * 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 8ef8940911..6c191aa53b 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;
-    GraphicElementManager * unk_08;
+    CellActorCollection * 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 e028b20df2..492f7813a3 100644
--- a/include/overlay019/struct_ov19_021DCD18.h
+++ b/include/overlay019/struct_ov19_021DCD18.h
@@ -6,7 +6,7 @@
 #include <nnsys.h>
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * 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 fe4efc557f..737f857442 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -18,8 +18,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);
-GraphicElementManager * ov20_021D2E08(UnkStruct_ov20_021D2128 * param0);
+CellActorCollection * ov20_021D2E08(UnkStruct_ov20_021D2128 * param0);
 void ov20_021D2E0C(UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3);
-GraphicElementData * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
+CellActor * ov20_021D2E50(UnkStruct_ov20_021D2128 * param0, CellActorResourceData * 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 c90cff0b82..356e66268f 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(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_021D144C(CellActor * param0, int param1);
+void ov21_021D1498(CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2);
+void ov21_021D1524(CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
 void ov21_021D154C(TouchScreenHitTable *hitTable, 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 b6839ce363..583c6a85b0 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);
-GraphicElementData * ov21_021D22A8(const UnkStruct_ov21_021D13FC * param0);
-GraphicElementData * ov21_021D22C4(const UnkStruct_ov21_021D13FC * param0);
+CellActor * ov21_021D22A8(const UnkStruct_ov21_021D13FC * param0);
+CellActor * 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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4);
+void ov21_021D2D88(UnkStruct_ov21_021D22F8 * param0, CellActorCollection * 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 e85d6f25e2..cafa85a09f 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(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);
+void ov21_021D59D8(CellActor * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7);
+int ov21_021D5A20(CellActor ** 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 b05f1ce22e..37132b6dd0 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;
-    GraphicElementManager * unk_138;
+    CellActorCollection * 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 7c74ac02e3..7ff9908a6b 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 3559048968..cdac8bb411 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 {
-    GraphicElementData * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_00;
+    CellActor * 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 4bcc71dc3c..ce7c58089f 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 {
-    GraphicElementData * unk_00[4];
+    CellActor * 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 7e28f70125..55935ac0ce 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 GraphicElementData * unk_0C;
+    const CellActor * 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 479bffd416..e6a8bcc2b6 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);
-GraphicElementData * ov22_022551E4(UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5);
+CellActor * 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 b8744c8d5f..7b2a1d4974 100644
--- a/include/overlay022/struct_ov22_02256BAC.h
+++ b/include/overlay022/struct_ov22_02256BAC.h
@@ -10,7 +10,7 @@
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     UnkStruct_02009714 ** unk_08;
     const Options * unk_0C;
     int unk_10;
diff --git a/include/overlay022/struct_ov22_02259C58.h b/include/overlay022/struct_ov22_02259C58.h
index dbb2e12bfc..dd5a0d8c21 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 {
-    GraphicElementData * unk_00;
+    CellActor * 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 7f561ae42b..d01e303cf5 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;
-    GraphicElementManager * unk_44;
+    CellActorCollection * 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 c8c1680898..2c147515a0 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;
-    GraphicElementManager * unk_30;
+    CellActorCollection * 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 e8ae739c3e..1a42517800 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];
-    GraphicElementData * unk_10[20];
+    CellActor * 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 f26dd18453..2a91be9b7f 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];
-    GraphicElementData * unk_10[2];
+    CellActor * 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 0b1e0de398..033ef35ff7 100644
--- a/include/overlay022/struct_ov22_0225AE9C.h
+++ b/include/overlay022/struct_ov22_0225AE9C.h
@@ -8,7 +8,7 @@
 
 typedef struct {
     BOOL unk_00;
-    GraphicElementData * unk_04[2];
+    CellActor * unk_04[2];
     VecFx32 unk_0C[2];
     UnkStruct_ov22_0225AD68 unk_24;
     UnkStruct_ov22_0225AD68 unk_38;
diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h
index 61589df613..23ca4bb663 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(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3);
+UnkStruct_ov63_0222AE60 * ov63_0222AE60(CellActorCollection * param0, PaletteData * 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 GraphicElementData * ov63_0222B234(const UnkStruct_ov63_0222BB38 * param0);
+const CellActor * 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 8aa69a1b95..840cf396c0 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(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4);
-UnkStruct_ov63_0222CD2C * ov63_0222CD2C(GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6);
+UnkStruct_ov63_0222CD2C * ov63_0222CCE4(CellActorCollection * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov63_0222CD2C * ov63_0222CD2C(CellActorCollection * param0, PaletteData * 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 2f2638f7f9..f8adc448fe 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -47,7 +47,7 @@ struct UnkStruct_ov65_0222EBE0_t {
     int unk_180;
     UIControlData * unk_184;
     void * unk_188;
-    GraphicElementManager * unk_18C;
+    CellActorCollection * 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 4baa601339..39c747c5e2 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];
-    GraphicElementData * unk_21C[3];
+    CellActor * 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 72691051e3..3b0175e2eb 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 e4ac2da77d..3fd7055d15 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];
     CellActorResourceData unk_10;
-    GraphicElementData * unk_34;
-    GraphicElementData * unk_38;
+    CellActor * unk_34;
+    CellActor * unk_38;
 } UnkStruct_ov65_022358CC_sub1;
 
 #endif // POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H
diff --git a/include/overlay071/struct_ov71_0223D238.h b/include/overlay071/struct_ov71_0223D238.h
index d4f5dd4692..f007ec48fd 100644
--- a/include/overlay071/struct_ov71_0223D238.h
+++ b/include/overlay071/struct_ov71_0223D238.h
@@ -10,11 +10,11 @@
 #include <nnsys.h>
 
 typedef struct {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[2][4];
-    GraphicElementData * unk_1C0[25];
+    CellActor * 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 b9c05df33a..819d8d905f 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -31,15 +31,15 @@ struct UnkStruct_ov72_0223DB98_t {
     Strbuf* unk_30;
     Strbuf* unk_34;
     int unk_38;
-    GraphicElementManager * unk_3C;
+    CellActorCollection * unk_3C;
     UnkStruct_0200C738 unk_40;
     UnkStruct_02009714 * unk_1CC[4];
     UnkStruct_02009DC8 * unk_1DC[2][4];
     CellActorResourceData unk_1FC;
     CellActorResourceData unk_220;
-    GraphicElementData * unk_244[14];
-    GraphicElementData * unk_27C[14];
-    GraphicElementData * unk_2B4[9];
+    CellActor * unk_244[14];
+    CellActor * unk_27C[14];
+    CellActor * unk_2B4[9];
     Window unk_2D8[5];
     Window unk_328;
     Window unk_338;
diff --git a/include/overlay077/ov77_021D6670.h b/include/overlay077/ov77_021D6670.h
index e6b633ca0d..4c83c29e13 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);
-GraphicElementData ** ov77_021D6794(UnkStruct_ov77_021D6734 * param0, const int param1);
+CellActor ** 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 32c90bba8b..4237ae7da1 100644
--- a/include/overlay079/struct_ov79_021D0E1C.h
+++ b/include/overlay079/struct_ov79_021D0E1C.h
@@ -55,9 +55,9 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
     Window unk_E8[13];
     SpriteRenderer * unk_1B8;
     SpriteGfxHandler * unk_1BC;
-    GraphicElementData * unk_1C0[3];
-    GraphicElementData * unk_1CC[5];
-    GraphicElementData * unk_1E0[6];
+    CellActor * unk_1C0[3];
+    CellActor * unk_1CC[5];
+    CellActor * unk_1E0[6];
     UnkStruct_0209903C * unk_1F8;
     UnkStruct_0209916C * unk_1FC;
 } UnkStruct_ov79_021D0E1C;
diff --git a/include/overlay080/struct_ov80_021D2C5C.h b/include/overlay080/struct_ov80_021D2C5C.h
index 84ed4d5ea6..8b20381a43 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;
-    GraphicElementData * unk_18;
+    CellActor * unk_18;
 } UnkStruct_ov80_021D2C5C;
 
 #endif // POKEPLATINUM_STRUCT_OV80_021D2C5C_H
diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h
index 969f247f5e..05259169ff 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);
-GraphicElementData * ov83_0223D9A8(UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6);
+CellActor * 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 c77ae774ec..adb57acfa3 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 4527bb5aa6..4c6f34a3a1 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 {
-    GraphicElementManager * manager;
+    CellActorCollection * collection;
     const CellActorResourceData * resourceData;
     VecFx32 position;
     u32 priority;
diff --git a/include/overlay083/struct_ov83_0223DB30.h b/include/overlay083/struct_ov83_0223DB30.h
index 354de6073c..a5fd0eddf0 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;
-    GraphicElementData * unk_08[4];
-    GraphicElementData * unk_18[4];
+    CellActor * unk_08[4];
+    CellActor * 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 00ec229faa..49c0e39a20 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;
-    GraphicElementData * unk_08;
+    CellActor * 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 96822f7270..c90e051143 100644
--- a/include/overlay083/struct_ov83_0223E5C0.h
+++ b/include/overlay083/struct_ov83_0223E5C0.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     BOOL unk_00;
-    GraphicElementData * unk_04[4];
+    CellActor * 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 082422efb6..fe8953d3b6 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;
-    GraphicElementData * unk_78;
+    CellActor * 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 3f23e28a19..e62ef51720 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 {
-    GraphicElementData * unk_00;
+    CellActor * 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 0914a44b03..da84c30171 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;
-    GraphicElementData * unk_44;
+    CellActor * unk_44;
 } UnkStruct_ov83_0223F670;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223F670_H
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index 751ee2e9a2..4cb43b12d3 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -14,7 +14,7 @@ int ov94_0223BF54(OverlayManager * param0, int * param1);
 void ov94_0223C300(CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * param1, CellActorResourceData * param2, int param3);
 UIControlData * ov94_0223C3C0(BGL * param0, int param1, int param2);
 void ov94_0223C3F4(UnkStruct_ov94_0223FD4C * param0, int param1, int param2);
-void ov94_0223C3FC(GraphicElementData * param0, int param1, int param2);
+void ov94_0223C3FC(CellActor * 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/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index 29bd1960f7..98ee45b2d6 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;
-    GraphicElementManager * unk_BE4;
+    CellActorCollection * unk_BE4;
     UnkStruct_0200C738 unk_BE8;
     UnkStruct_02009714 * unk_D74[4];
     UnkStruct_02009DC8 * unk_D84[3][4];
     CellActorResourceData unk_DB4;
     CellActorResourceData unk_DD8;
     CellActorResourceData unk_DFC;
-    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];
+    CellActor * unk_E20;
+    CellActor * unk_E24;
+    CellActor * unk_E28[30];
+    CellActor * unk_EA0[30];
+    CellActor * unk_F18[6];
+    CellActor * unk_F30;
+    CellActor * unk_F34[8];
+    CellActor * unk_F54[2];
     Window unk_F5C;
     Window unk_F6C;
     Window unk_F7C;
diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h
index 2da8f19d14..491a4bc0de 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(CellActorResourceData * param0, UnkStruct_ov95_02247568 * param1, NNSG2dImageProxy * param2, NNSG2dImagePaletteProxy * param3, u32 param4);
-GraphicElementData * ov95_022475E4(UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
+CellActor * ov95_022475E4(UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5);
 BGL * ov95_02247628(UnkStruct_ov95_02247628 * param0);
 StringTemplate * ov95_0224762C(UnkStruct_ov95_02247628 * param0);
 MessageLoader * ov95_02247630(UnkStruct_ov95_02247628 * param0);
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index 39bf60d091..3403e9933b 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;
-    GraphicElementManager * unk_BF4;
+    CellActorCollection * unk_BF4;
     UnkStruct_0200C738 unk_BF8;
     UnkStruct_02009714 * unk_D84[4];
     UnkStruct_02009DC8 * unk_D94[3][4];
     CellActorResourceData unk_DC4;
     CellActorResourceData unk_DE8;
     CellActorResourceData unk_E0C;
-    GraphicElementData * unk_E30[2];
+    CellActor * unk_E30[2];
     Window unk_E38;
     Window unk_E48;
     Window unk_E58;
diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h
index c377527523..1155df9d31 100644
--- a/include/overlay097/ov97_02237694.h
+++ b/include/overlay097/ov97_02237694.h
@@ -32,7 +32,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);
-GraphicElementData * ov97_02237D14(int param0, GraphicElementData * param1, int param2, int param3, int param4);
+CellActor * ov97_02237D14(int param0, CellActor * 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 bb54ab84c4..7c26eab628 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -45,12 +45,12 @@ typedef struct {
     int unk_438;
     int unk_43C;
     int unk_440;
-    GraphicElementManager * unk_444;
+    CellActorCollection * unk_444;
     UnkStruct_0200C738 unk_448;
     UnkStruct_02009714 * unk_5D4[6];
     UnkStruct_02009DC8 * unk_5EC[6];
     CellActorResourceData unk_604;
-    GraphicElementData * unk_628;
+    CellActor * 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 37e57fb4a6..5237137337 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[6];
     UnkStruct_02009DC8 * unk_1A8[2][6];
diff --git a/include/overlay101/ov101_021D7E48.h b/include/overlay101/ov101_021D7E48.h
index 3a95211363..3e482a9d97 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(GraphicElementData * param0, VecFx32 * param1);
-void ov101_021D8574(GraphicElementData * param0, VecFx32 * param1);
+void ov101_021D8560(CellActor * param0, VecFx32 * param1);
+void ov101_021D8574(CellActor * 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 e65b043b0f..65c27c7c4b 100644
--- a/include/overlay101/struct_ov101_021D8544.h
+++ b/include/overlay101/struct_ov101_021D8544.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     int unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
     const NNSG2dImageProxy * unk_08;
 } UnkStruct_ov101_021D8544;
 
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index 2a24a8d0b7..a4cbb843a6 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(GraphicElementData * param0, u8 param1);
-void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(CellActor * param0, u8 param1);
+void ov104_0222E204(CellActor * 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/overlay105/ov105_02245AAC.h b/include/overlay105/ov105_02245AAC.h
index 4feb596677..5e605f6561 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);
-GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+CellActor * 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 edc6310d77..deb8bb4b27 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 481601b434..ed715e65b3 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);
-GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
+CellActor * 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 f90f0f6260..67536bd8be 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 0691a06a81..e34ca36702 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);
-GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+CellActor * 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 2d9b7ccf70..898c049359 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 39569bb153..6ecd76e1ec 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);
-GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+CellActor * 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 66f67c1444..b47d6c8da9 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 cb7fbb875d..bc761cded3 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -40,15 +40,15 @@ typedef struct UnkStruct_ov109_021D5140_t {
     Strbuf* unk_54;
     Strbuf* unk_58;
     int unk_5C;
-    GraphicElementManager * unk_60;
+    CellActorCollection * unk_60;
     UnkStruct_0200C738 unk_64;
     UnkStruct_02009714 * unk_1F0[4];
     UnkStruct_02009DC8 * unk_200[3][4];
     CellActorResourceData unk_230;
     CellActorResourceData unk_254;
     CellActorResourceData unk_278;
-    GraphicElementData * unk_29C[14];
-    GraphicElementData * unk_2D4[14];
+    CellActor * unk_29C[14];
+    CellActor * unk_2D4[14];
     Window unk_30C[5];
     Window unk_35C;
     Window unk_36C;
diff --git a/include/overlay111/ov111_021D2F80.h b/include/overlay111/ov111_021D2F80.h
index 51b3dfcda5..1dbfb13485 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);
-GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+CellActor * 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 9f62e8ee55..5817cac83e 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * 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 af40d759df..a5fd569d9d 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(GraphicElementManager * param0, u32 param1);
+UnkStruct_ov114_0225CAD4 * ov114_0225CAD4(CellActorCollection * 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 1c006df6d3..71a4e5a323 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 {
-    GraphicElementManager * manager;
+    CellActorCollection * collection;
     const CellActorResourceData * resourceData;
     VecFx32 position;
     VecFx32 affineScale;
diff --git a/include/struct_decls/struct_020218BC_decl.h b/include/struct_decls/struct_020218BC_decl.h
index f0db683c00..f34fb28204 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 GraphicElementManager GraphicElementManager;
+typedef struct CellActorCollection CellActorCollection;
 
 #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 6b68557017..cb7fbf9649 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 GraphicElementData GraphicElementData;
+typedef struct CellActor CellActor;
 
 #endif // POKEPLATINUM_STRUCT_02022550_DECL_H
diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h
index 187869a09d..374a72a870 100644
--- a/include/struct_defs/pokemon_summary_app.h
+++ b/include/struct_defs/pokemon_summary_app.h
@@ -102,7 +102,7 @@ typedef struct PokemonSummaryApp {
 
     SpriteRenderer *renderer;
     SpriteGfxHandler *gfxHandler;
-    GraphicElementData * unk_41C[77];
+    CellActor * unk_41C[77];
     CellActorData *actor[77];
 
     UnkStruct_0200C440 *unk_684;
diff --git a/include/struct_defs/struct_020095C4.h b/include/struct_defs/struct_020095C4.h
index 634c546d90..e12898a42d 100644
--- a/include/struct_defs/struct_020095C4.h
+++ b/include/struct_defs/struct_020095C4.h
@@ -8,6 +8,6 @@ typedef struct {
     int maxElements;
     NNSG2dRendererInstance * renderer;
     int heapID;
-} GraphicElementManagerParams;
+} CellActorCollectionParams;
 
 #endif // POKEPLATINUM_STRUCT_020095C4_H
diff --git a/include/struct_defs/struct_0200D0F4.h b/include/struct_defs/struct_0200D0F4.h
index 4ddb911218..13a313181e 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 {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     CellActorResourceData * 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 6ec5ea096a..cf78e332b9 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;
-    GraphicElementManager * unk_08;
+    CellActorCollection * unk_08;
     const NNSG2dImagePaletteProxy * unk_0C;
-    const GraphicElementData * unk_10;
+    const CellActor * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index 462db2f0a7..fb673bca9c 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -34,7 +34,7 @@ typedef struct {
     PartyManagementData * unk_5A4;
     SpriteRenderer * unk_5A8;
     SpriteGfxHandler * unk_5AC;
-    GraphicElementData * unk_5B0[29];
+    CellActor * unk_5B0[29];
     CellActorData * unk_624[29];
     UnkStruct_0200C440 * unk_698;
     MessageLoader * unk_69C;
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index ceeecfcf48..77066e219a 100644
--- a/include/struct_defs/struct_020831B4.h
+++ b/include/struct_defs/struct_020831B4.h
@@ -26,7 +26,7 @@ typedef struct {
     s16 unk_1C;
     s16 unk_1E;
     s16 unk_20;
-    GraphicElementData * unk_24;
+    CellActor * unk_24;
     u8 unk_28;
     u8 unk_29;
 } StrBufWrapper;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index 3c3390b498..08f665a995 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -71,18 +71,18 @@ struct UnkStruct_02095E80_t {
     Strbuf* unk_188;
     Strbuf* unk_18C;
     Strbuf* unk_190;
-    GraphicElementManager * unk_194;
+    CellActorCollection * unk_194;
     UnkStruct_0200C738 unk_198;
     UnkStruct_02009714 * unk_324[4];
     UnkStruct_02009DC8 * unk_334[2][4];
     CellActorResourceData unk_354;
     CellActorResourceData unk_378;
-    GraphicElementData * unk_39C[14];
-    GraphicElementData * unk_3D4[12];
-    GraphicElementData * unk_404[12];
-    GraphicElementData * unk_434[12];
-    GraphicElementData * unk_464[6];
-    GraphicElementData * unk_47C;
+    CellActor * unk_39C[14];
+    CellActor * unk_3D4[12];
+    CellActor * unk_404[12];
+    CellActor * unk_434[12];
+    CellActor * unk_464[6];
+    CellActor * unk_47C;
     SysTask * unk_480[7];
     Window unk_49C[34];
     UIControlData * unk_6BC;
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 0c883ba275..65b47504bc 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;
-    GraphicElementManager * unk_34;
+    CellActorCollection * unk_34;
     UnkStruct_0200C738 unk_38;
     UnkStruct_02009714 * unk_1C4[4];
     UnkStruct_02009DC8 * unk_1D4[2][4];
     CellActorResourceData unk_1F4;
     CellActorResourceData unk_218;
-    GraphicElementData * unk_23C[14];
-    GraphicElementData * unk_274[14];
-    GraphicElementData * unk_2AC[12];
+    CellActor * unk_23C[14];
+    CellActor * unk_274[14];
+    CellActor * 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 a21aefdbc1..79141627ad 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -36,15 +36,15 @@ struct UnkStruct_020961E8_t {
     Strbuf* unk_44;
     Strbuf* unk_48;
     int unk_4C;
-    GraphicElementManager * unk_50;
+    CellActorCollection * unk_50;
     UnkStruct_0200C738 unk_54;
     UnkStruct_02009714 * unk_1E0[4];
     UnkStruct_02009DC8 * unk_1F0[3][4];
     CellActorResourceData unk_220;
     CellActorResourceData unk_244;
     CellActorResourceData unk_268;
-    GraphicElementData * unk_28C[14];
-    GraphicElementData * unk_2C4[14];
+    CellActor * unk_28C[14];
+    CellActor * unk_2C4[14];
     Window unk_2FC[5];
     Window unk_34C;
     Window unk_35C;
diff --git a/include/struct_defs/struct_0209903C.h b/include/struct_defs/struct_0209903C.h
index b6596f3587..d5b92736fd 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;
-    GraphicElementManager * unk_10;
+    CellActorCollection * unk_10;
     UnkStruct_0200C738 unk_14;
     UnkStruct_02009508 * unk_1A0;
     UnkStruct_02009714 * unk_1A4[4];
diff --git a/include/unk_020093B4.h b/include/unk_020093B4.h
index d041698c69..3668a1ba06 100644
--- a/include/unk_020093B4.h
+++ b/include/unk_020093B4.h
@@ -14,7 +14,7 @@ void sub_020093B4(CellActorResourceData * param0, int param1, int param2, int pa
 void sub_020094F0(CellActorResourceData * 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);
-GraphicElementManager * sub_020095C4(int param0, UnkStruct_0200C738 * param1, int param2);
+CellActorCollection * 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 106782a4e5..08341f86c2 100644
--- a/include/unk_0200C6E4.h
+++ b/include/unk_0200C6E4.h
@@ -26,7 +26,7 @@ SpriteGfxHandler * sub_0200C704(SpriteRenderer * param0);
 UnkStruct_0200C738 * sub_0200C738(SpriteRenderer * param0);
 BOOL sub_0200C73C(SpriteRenderer * param0, const UnkStruct_ov104_0224133C * param1, const UnkStruct_ov104_022412F4 * param2, int param3);
 BOOL sub_0200C7C0(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2);
-void sub_0200C7E4(GraphicElementData * param0);
+void sub_0200C7E4(CellActor * param0);
 void sub_0200C7EC(SpriteGfxHandler * param0);
 void sub_0200C800(void);
 void sub_0200C808(void);
@@ -38,8 +38,8 @@ void sub_0200C8A0(SpriteRenderer * param0, SpriteGfxHandler * param1);
 void sub_0200C8B0(SpriteRenderer * param0, SpriteGfxHandler * param1);
 void sub_0200C8D4(SpriteRenderer * param0);
 BOOL sub_0200C8F0(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F2EC * param2);
-GraphicElementData * sub_0200CA08(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2);
-GraphicElementData * sub_0200CA44(SpriteRenderer * param0, SpriteGfxHandler * 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);
+CellActor * sub_0200CA08(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2);
+CellActor * sub_0200CA44(SpriteRenderer * param0, SpriteGfxHandler * 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(SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov104_02241308 * param2);
 BOOL sub_0200CBDC(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6);
 BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileID, BOOL compressed, int vram, int resID);
@@ -60,7 +60,7 @@ BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler * param0, int param1);
 BOOL SpriteGfxHandler_UnloadAnimObjById(SpriteGfxHandler * param0, int param1);
 void sub_0200D0B0(SpriteRenderer * param0, SpriteGfxHandler * param1);
 void sub_0200D0F4(CellActorData * param0);
-void SpriteActor_UpdateObject(GraphicElementData * param0);
+void SpriteActor_UpdateObject(CellActor * param0);
 void sub_0200D330(CellActorData * param0);
 void sub_0200D33C(CellActorData * param0);
 void sub_0200D34C(CellActorData * param0, fx32 param1);
@@ -68,64 +68,64 @@ 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(GraphicElementData * param0, int param1);
+void sub_0200D388(CellActor * param0, int param1);
 void sub_0200D390(CellActorData * param0, int param1);
-void sub_0200D39C(GraphicElementData * param0, fx32 param1);
+void sub_0200D39C(CellActor * param0, fx32 param1);
 void sub_0200D3A4(CellActorData * param0, fx32 param1);
-BOOL sub_0200D3B0(GraphicElementData * param0);
+BOOL sub_0200D3B0(CellActor * param0);
 BOOL sub_0200D3B8(CellActorData * param0);
-void sub_0200D3C4(GraphicElementData * param0, u16 param1);
+void sub_0200D3C4(CellActor * param0, u16 param1);
 void sub_0200D3CC(CellActorData * param0, u16 param1);
-u16 sub_0200D3D8(GraphicElementData * param0);
+u16 sub_0200D3D8(CellActor * param0);
 u16 sub_0200D3E0(CellActorData * param0);
-void SpriteActor_DrawSprite(GraphicElementData * param0, int param1);
+void SpriteActor_DrawSprite(CellActor * param0, int param1);
 void SpriteActor_EnableObject(CellActorData * param0, int param1);
-int sub_0200D400(GraphicElementData * param0);
+int sub_0200D400(CellActor * param0);
 int sub_0200D408(CellActorData * param0);
-void sub_0200D414(GraphicElementData * param0, int param1);
+void sub_0200D414(CellActor * param0, int param1);
 void sub_0200D41C(CellActorData * param0, int param1);
-void sub_0200D428(GraphicElementData * param0, int param1);
+void sub_0200D428(CellActor * param0, int param1);
 void sub_0200D430(CellActorData * param0, int param1);
 int sub_0200D43C(CellActorData * param0);
-void sub_0200D448(GraphicElementData * param0, int param1);
+void sub_0200D448(CellActor * param0, int param1);
 int  sub_0200D454(CellActorData * param0);
 void sub_0200D460(CellActorData * param0, int param1);
-void sub_0200D46C(GraphicElementData * param0, int param1);
+void sub_0200D46C(CellActor * param0, int param1);
 void sub_0200D474(CellActorData * param0, int param1);
-u32 sub_0200D480(GraphicElementData * param0);
+u32 sub_0200D480(CellActor * param0);
 u32 sub_0200D488(CellActorData * param0);
-void SpriteActor_SetPositionXY(GraphicElementData * param0, s16 param1, s16 param2);
+void SpriteActor_SetPositionXY(CellActor * param0, s16 param1, s16 param2);
 void SpriteActor_SetSpritePositionXY(CellActorData * param0, s16 param1, s16 param2);
-void sub_0200D4D0(GraphicElementData * param0, s16 param1, s16 param2, fx32 param3);
+void sub_0200D4D0(CellActor * param0, s16 param1, s16 param2, fx32 param3);
 void sub_0200D500(CellActorData * param0, s16 param1, s16 param2, fx32 param3);
-void sub_0200D50C(GraphicElementData * param0, s16 * param1, s16 * param2);
+void sub_0200D50C(CellActor * param0, s16 * param1, s16 * param2);
 void SpriteActor_GetSpritePositionXY(CellActorData * param0, s16 * param1, s16 * param2);
-void sub_0200D55C(GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3);
+void sub_0200D55C(CellActor * param0, s16 * param1, s16 * param2, fx32 param3);
 void sub_0200D5A0(CellActorData * param0, s16 * param1, s16 * param2, fx32 param3);
-void sub_0200D5AC(GraphicElementData * param0, s16 param1, s16 param2);
+void sub_0200D5AC(CellActor * 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(GraphicElementData * param0, int param1);
+void sub_0200D69C(CellActor * param0, int param1);
 void sub_0200D6A4(CellActorData * param0, int param1);
-void sub_0200D6B0(GraphicElementData * param0, f32 param1, f32 param2);
+void sub_0200D6B0(CellActor * param0, f32 param1, f32 param2);
 void sub_0200D6E8(CellActorData * param0, f32 param1, f32 param2);
-void sub_0200D6F4(GraphicElementData * param0, f32 param1, f32 param2);
+void sub_0200D6F4(CellActor * param0, f32 param1, f32 param2);
 void sub_0200D74C(CellActorData * param0, f32 param1, f32 param2);
-void sub_0200D758(GraphicElementData * param0, f32 * param1, f32 * param2);
+void sub_0200D758(CellActor * param0, f32 * param1, f32 * param2);
 void sub_0200D788(CellActorData * param0, f32 * param1, f32 * param2);
-void sub_0200D794(GraphicElementData * param0, u16 param1);
+void sub_0200D794(CellActor * param0, u16 param1);
 void sub_0200D79C(CellActorData * param0, u16 param1);
-void sub_0200D7A8(GraphicElementData * param0, s32 param1);
+void sub_0200D7A8(CellActor * param0, s32 param1);
 void sub_0200D7C0(CellActorData * param0, s32 param1);
-void sub_0200D7CC(GraphicElementData * param0, int param1);
+void sub_0200D7CC(CellActor * 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(GraphicElementData * param0, GXOamMode param1);
+void sub_0200D808(CellActor * param0, GXOamMode param1);
 void SpriteActor_SetOAMMode(CellActorData * param0, GXOamMode param1);
 u32 sub_0200D81C(CellActorData * param0);
 BOOL sub_0200D828(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6);
@@ -133,7 +133,7 @@ BOOL sub_0200D888(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2
 BOOL sub_0200D8E8(SpriteRenderer * param0, SpriteGfxHandler * param1, NARC * param2, int param3, BOOL param4, int param5, int param6);
 void sub_0200D948(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5);
 void sub_0200D97C(SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5);
-GraphicElementManager * sub_0200D9B0(SpriteGfxHandler * param0);
+CellActorCollection * sub_0200D9B0(SpriteGfxHandler * param0);
 void sub_0200D9B4(SpriteRenderer * param0, SpriteGfxHandler * 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 9a174e94eb..75a1d19254 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 GraphicElementData * param1);
+void sub_020131E0(FontOAM * param0, const CellActor * param1);
 
 #endif // POKEPLATINUM_UNK_02012744_H
diff --git a/include/unk_020218BC.h b/include/unk_020218BC.h
index 4924838042..18e1660142 100644
--- a/include/unk_020218BC.h
+++ b/include/unk_020218BC.h
@@ -13,9 +13,9 @@
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
 
-#define GRAPHIC_ELEMENT_DATA_FLIP_NONE  0
-#define GRAPHIC_ELEMENT_DATA_FLIP_H     1
-#define GRAPHIC_ELEMENT_DATA_FLIP_V     2
+#define CELL_ACTOR_FLIP_NONE  0
+#define CELL_ACTOR_FLIP_H     1
+#define CELL_ACTOR_FLIP_V     2
 
 enum AffineOverwriteMode {
     AFFINE_OVERWRITE_MODE_NONE = 0,
@@ -23,59 +23,59 @@ enum AffineOverwriteMode {
     AFFINE_OVERWRITE_MODE_DOUBLE, // Extends the cell actor's drawable area by 2x, use when the cell actor is scaled up
 };
 
-GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params);
-BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr);
-BOOL GraphicElementManager_SetActive(GraphicElementManager *gfxElemMgr, u8 active);
-BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr);
-void GraphicElementManager_Update(const GraphicElementManager *gfxElemMgr);
-void GraphicElementData_Reset(GraphicElementData *elem);
-GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParamsEx *params);
-GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParams *params);
-void GraphicElementData_Delete(GraphicElementData *gfxElem);
-void GraphicElementData_SetPosition(GraphicElementData *elem, const VecFx32 *position);
-void GraphicElementData_SetAffineTranslation(GraphicElementData *elem, const VecFx32 *translation);
-void GraphicElementData_SetAffineScale(GraphicElementData *elem, const VecFx32 *scale);
-void GraphicElementData_SetAffineScaleEx(GraphicElementData *elem, const VecFx32 *scale, enum AffineOverwriteMode mode);
-void GraphicElementData_SetAffineZRotation(GraphicElementData *elem, u16 angle);
-void GraphicElementData_SetAffineZRotationEx(GraphicElementData *elem, u16 angle, enum AffineOverwriteMode mode);
-void GraphicElementData_SetDrawFlag(GraphicElementData *elem, BOOL draw);
-void GraphicElementData_SetAnimateFlag(GraphicElementData *elem, BOOL animate);
-void GraphicElementData_SetAnimSpeed(GraphicElementData *elem, fx32 speed);
-void GraphicElementData_SetAffineOverwriteMode(GraphicElementData *elem, enum AffineOverwriteMode mode);
-void GraphicElementData_SetFlipMode(GraphicElementData *elem, u32 mode);
-const VecFx32 *GraphicElementData_GetPosition(const GraphicElementData *elem);
-const VecFx32 *GraphicElementData_GetAffineScale(const GraphicElementData *elem);
-u16 GraphicElementData_GetAffineZRotation(const GraphicElementData *elem);
-BOOL GraphicElementData_GetDrawFlag(const GraphicElementData *elem);
-BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData *elem);
-u32 GraphicElementData_GetAnimCount(const GraphicElementData *elem);
-void GraphicElementData_SetAnim(GraphicElementData *elem, u32 animID);
-void GraphicElementData_SetAnimNoRestart(GraphicElementData *elem, u32 animID);
-void GraphicElementData_RestartAnim(GraphicElementData *elem);
-u32 GraphicElementData_GetActiveAnim(const GraphicElementData *elem);
-void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames);
-void SpriteActor_SetAnimFrame(GraphicElementData *elem, u16 frame);
-u16 GraphicElementData_GetAnimFrame(const GraphicElementData *elem);
-void GraphicElementData_SetExplicitPriority(GraphicElementData *elem, u8 priority);
-u8 GraphicElementData_GetExplicitPriority(const GraphicElementData *elem);
-void GraphicElementData_SetExplicitPalette(GraphicElementData *elem, u32 palette);
-void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData *elem, u32 palette);
-u32 GraphicElementData_GetExplicitPalette(const GraphicElementData *elem);
-void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData *elem, u32 paletteOffset);
-void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData *elem, u32 paletteOffset);
-u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData *elem);
-void GraphicElementData_SetPriority(GraphicElementData *elem, u32 priority);
-u32 GraphicElementData_GetPriority(const GraphicElementData *elem);
-void GraphicElementData_SetImageProxy(GraphicElementData *elem, const NNSG2dImageProxy *imageProxy);
-NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *elem);
-NNSG2dImagePaletteProxy *GraphicElementData_GetPaletteProxy(GraphicElementData *paletteProxy);
-void GraphicElementData_SetPixelated(GraphicElementData *elem, BOOL pixelated);
-NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData *elem);
-BOOL GraphicElementData_IsAnimated(GraphicElementData *elem);
-void GraphicElementData_SetExplicitOAMMode(GraphicElementData *elem, GXOamMode mode);
+CellActorCollection *CellActorCollection_New(const CellActorCollectionParams *params);
+BOOL CellActorCollection_Delete(CellActorCollection *collection);
+BOOL CellActorCollection_SetActive(CellActorCollection *collection, u8 active);
+BOOL CellActorCollection_DeleteAll(CellActorCollection *collection);
+void CellActorCollection_Update(const CellActorCollection *collection);
+void CellActor_Reset(CellActor *actor);
+CellActor *CellActorCollection_AddEx(const CellActorInitParamsEx *params);
+CellActor *CellActorCollection_Add(const CellActorInitParams *params);
+void CellActor_Delete(CellActor *gfxElem);
+void CellActor_SetPosition(CellActor *actor, const VecFx32 *position);
+void CellActor_SetAffineTranslation(CellActor *actor, const VecFx32 *translation);
+void CellActor_SetAffineScale(CellActor *actor, const VecFx32 *scale);
+void CellActor_SetAffineScaleEx(CellActor *actor, const VecFx32 *scale, enum AffineOverwriteMode mode);
+void CellActor_SetAffineZRotation(CellActor *actor, u16 angle);
+void CellActor_SetAffineZRotationEx(CellActor *actor, u16 angle, enum AffineOverwriteMode mode);
+void CellActor_SetDrawFlag(CellActor *actor, BOOL draw);
+void CellActor_SetAnimateFlag(CellActor *actor, BOOL animate);
+void CellActor_SetAnimSpeed(CellActor *actor, fx32 speed);
+void CellActor_SetAffineOverwriteMode(CellActor *actor, enum AffineOverwriteMode mode);
+void CellActor_SetFlipMode(CellActor *actor, u32 mode);
+const VecFx32 *CellActor_GetPosition(const CellActor *actor);
+const VecFx32 *CellActor_GetAffineScale(const CellActor *actor);
+u16 CellActor_GetAffineZRotation(const CellActor *actor);
+BOOL CellActor_GetDrawFlag(const CellActor *actor);
+BOOL CellActor_GetAnimateFlag(const CellActor *actor);
+u32 CellActor_GetAnimCount(const CellActor *actor);
+void CellActor_SetAnim(CellActor *actor, u32 animID);
+void CellActor_SetAnimNoRestart(CellActor *actor, u32 animID);
+void CellActor_RestartAnim(CellActor *actor);
+u32 CellActor_GetActiveAnim(const CellActor *actor);
+void CellActor_UpdateAnim(CellActor *actor, fx32 frames);
+void SpriteActor_SetAnimFrame(CellActor *actor, u16 frame);
+u16 CellActor_GetAnimFrame(const CellActor *actor);
+void CellActor_SetExplicitPriority(CellActor *actor, u8 priority);
+u8 CellActor_GetExplicitPriority(const CellActor *actor);
+void CellActor_SetExplicitPalette(CellActor *actor, u32 palette);
+void CellActor_SetExplicitPaletteWithOffset(CellActor *actor, u32 palette);
+u32 CellActor_GetExplicitPalette(const CellActor *actor);
+void CellActor_SetExplicitPaletteOffset(CellActor *actor, u32 paletteOffset);
+void CellActor_SetExplicitPaletteOffsetAutoAdjust(CellActor *actor, u32 paletteOffset);
+u32 CellActor_GetExplicitPaletteOffset(const CellActor *actor);
+void CellActor_SetPriority(CellActor *actor, u32 priority);
+u32 CellActor_GetPriority(const CellActor *actor);
+void CellActor_SetImageProxy(CellActor *actor, const NNSG2dImageProxy *imageProxy);
+NNSG2dImageProxy *SpriteActor_ImageProxy(CellActor *actor);
+NNSG2dImagePaletteProxy *CellActor_GetPaletteProxy(CellActor *paletteProxy);
+void CellActor_SetPixelated(CellActor *actor, BOOL pixelated);
+NNS_G2D_VRAM_TYPE CellActor_GetVRamType(const CellActor *actor);
+BOOL CellActor_IsAnimated(CellActor *actor);
+void CellActor_SetExplicitOAMMode(CellActor *actor, GXOamMode mode);
 void Utility_Clear2DMainOAM(enum HeapId heapID);
 void Utility_Clear2DSubOAM(enum HeapId heapID);
-u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData *elem, u32 animID, u32 frame);
-u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData *elem);
+u32 CellActor_GetUserAttrForAnimFrame(const CellActor *actor, u32 animID, u32 frame);
+u32 CellActor_GetUserAttrForCurrentAnimFrame(const CellActor *actor);
 
 #endif // POKEPLATINUM_UNK_020218BC_H
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index 42513ae5bb..dfda6113c9 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -12248,7 +12248,7 @@ static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScri
 
     param1->cellActorData[1] = SpriteActor_LoadResources(v1, v2, &Unk_ov16_0226E6F8);
 
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param1->cellActorData[1]->unk_00, Pokemon_IconPaletteIndex(param2));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(param1->cellActorData[1]->unk_00, Pokemon_IconPaletteIndex(param2));
     sub_0200D330(param1->cellActorData[1]);
 
     param1->tmpPtr[0] = sub_02012744(1, 5);
diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c
index ab97b26ae3..25c19148ec 100644
--- a/src/battle/healthbar.c
+++ b/src/battle/healthbar.c
@@ -897,7 +897,7 @@ s32 ov16_02267560 (Healthbar * param0)
 void ov16_0226757C (Healthbar * param0)
 {
     if (param0->arrowActor != NULL) {
-        GraphicElementData_SetAnimateFlag(param0->arrowActor->unk_00, 1);
+        CellActor_SetAnimateFlag(param0->arrowActor->unk_00, 1);
         Healthbar_EnableArrow(param0, 1);
     }
 
@@ -909,7 +909,7 @@ void ov16_0226757C (Healthbar * param0)
 void ov16_022675AC (Healthbar * param0)
 {
     if (param0->arrowActor != NULL) {
-        GraphicElementData_SetAnimateFlag(param0->arrowActor->unk_00, 0);
+        CellActor_SetAnimateFlag(param0->arrowActor->unk_00, 0);
         SpriteActor_SetAnimFrame(param0->arrowActor->unk_00, 0);
         Healthbar_EnableArrow(param0, 0);
     }
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index acffd8631f..bdd83fd3be 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -1513,12 +1513,12 @@ void ov16_02269168 (UnkStruct_ov16_02268A14 * param0, u8 param1[], u8 param2[])
     for (v0 = 0; v0 < 6; v0++) {
         v1 = ov16_0226A934(param1[v0]);
 
-        GraphicElementData_SetAnim(param0->unk_5BC[v0]->unk_00, v1);
+        CellActor_SetAnim(param0->unk_5BC[v0]->unk_00, v1);
         SpriteActor_UpdateObject(param0->unk_5BC[v0]->unk_00);
 
         v1 = ov16_0226A934(param2[v0]);
 
-        GraphicElementData_SetAnim(param0->unk_5D4[v0]->unk_00, v1);
+        CellActor_SetAnim(param0->unk_5D4[v0]->unk_00, v1);
         SpriteActor_UpdateObject(param0->unk_5D4[v0]->unk_00);
     }
 }
@@ -2528,7 +2528,7 @@ static CellActorData * ov16_0226A7A4 (UnkStruct_ov16_02268A14 * param0, Pokemon
     v4 = SpriteActor_LoadResources(v0, v1, &v3);
 
     sub_0200D500(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(param1));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->unk_00, Pokemon_IconPaletteIndex(param1));
 
     {
         int v6 = 0;
diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c
index e1f7e0ad57..8bd42767d1 100644
--- a/src/battle/party_gauge.c
+++ b/src/battle/party_gauge.c
@@ -323,10 +323,10 @@ static void ShowArrow(PartyGaugeArrow *arrow, enum PartyGaugeSide side, enum Par
 
     if (side == PARTY_GAUGE_OURS) {
         SpriteActor_SetSpritePositionXY(arrow->cells, ARROW_X_START_OURS, sArrowYPosOurs[pos]);
-        GraphicElementData_SetAnim(arrow->cells->unk_00, PGANM_ARROW_OURS);
+        CellActor_SetAnim(arrow->cells->unk_00, PGANM_ARROW_OURS);
     } else {
         SpriteActor_SetSpritePositionXY(arrow->cells, ARROW_X_START_THEIRS, sArrowYPosTheirs[pos]);
-        GraphicElementData_SetAnim(arrow->cells->unk_00, PGANM_ARROW_THEIRS);
+        CellActor_SetAnim(arrow->cells->unk_00, PGANM_ARROW_THEIRS);
     }
 
     SpriteActor_UpdateObject(arrow->cells->unk_00);
@@ -479,7 +479,7 @@ static void ShowPokeballs(PartyGaugePokeballs *pokeballs, s8 *numBalls, enum Par
         SpriteActor_SetSpritePositionXY(pokeballs->cells, POKEBALL_X_START_THEIRS, sPokeballYPosTheirs[pos]);
     }
 
-    GraphicElementData_SetAnim(pokeballs->cells->unk_00, frame);
+    CellActor_SetAnim(pokeballs->cells->unk_00, frame);
     SpriteActor_UpdateObject(pokeballs->cells->unk_00);
 
     pokeballs->side = side;
@@ -579,7 +579,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
             break;
         }
 
-        GraphicElementData_SetAnim(pokeballs->cells->unk_00, pokeballs->flipAnimation);
+        CellActor_SetAnim(pokeballs->cells->unk_00, pokeballs->flipAnimation);
         pokeballs->delay = 0;
         pokeballs->state++;
         // fall-through
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index b1cf510b4d..d93b1a1893 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -173,7 +173,7 @@ typedef struct ChooseStarterRotation {
 } ChooseStarterRotation;
 
 typedef struct ChooseStarterCursor {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_02009DC8 * unk_04[6];
     VecFx32 unk_1C;
     SysTask * unk_28;
@@ -223,7 +223,7 @@ typedef struct ChooseStarterApp {
     UnkStruct_ov61_0222C884 unk_B0;
     UIControlData * unk_B8;
     UnkStruct_0200C738 unk_BC;
-    GraphicElementManager * unk_248;
+    CellActorCollection * unk_248;
     UnkStruct_02009714 * unk_24C[6];
     UnkStruct_02007768 *spriteManager;
     Sprite *sprites[NUM_STARTER_OPTIONS];
@@ -781,7 +781,7 @@ static void MakeCellActors (ChooseStarterApp * param0, int param1)
 
 static void ov78_021D1594 (ChooseStarterApp * param0)
 {
-    GraphicElementManager_Delete(param0->unk_248);
+    CellActorCollection_Delete(param0->unk_248);
     sub_02009754(param0->unk_24C[0]);
     sub_02009754(param0->unk_24C[1]);
     sub_02009754(param0->unk_24C[2]);
@@ -1064,7 +1064,7 @@ static void DrawScene (ChooseStarterApp * param0)
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    GraphicElementManager_Update(param0->unk_248);
+    CellActorCollection_Update(param0->unk_248);
 }
 
 static void MakeCamera (ChooseStarterApp * param0, int param1)
@@ -1481,7 +1481,7 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
 
     sub_020093B4(&v0, 10, 11, 12, 13, 0xffffffff, 0xffffffff, 0, 1, param0->unk_24C[0], param0->unk_24C[1], param0->unk_24C[2], param0->unk_24C[3], NULL, NULL);
 
-    v1.manager = param0->unk_248;
+    v1.collection = param0->unk_248;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -1490,8 +1490,8 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param1->unk_00 = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetDrawFlag(param1->unk_00, 0);
+    param1->unk_00 = CellActorCollection_Add(&v1);
+    CellActor_SetDrawFlag(param1->unk_00, 0);
 
     param1->unk_1C.x = 0;
     param1->unk_1C.y = 0;
@@ -1499,7 +1499,7 @@ static void AttachCursorCellActor (ChooseStarterApp * param0, ChooseStarterCurso
 
 static void ov78_021D2350 (ChooseStarterCursor * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
 }
 
 static void ov78_021D235C (ChooseStarterRotation * param0, fx32 param1, int param2)
@@ -1541,7 +1541,7 @@ static void ov78_021D23E8 (SysTask * param0, void * param1)
     v1 = v0->unk_1C;
     v1.y += v0->unk_2C.unk_00;
 
-    GraphicElementData_SetPosition(v0->unk_00, &v1);
+    CellActor_SetPosition(v0->unk_00, &v1);
 }
 
 static void ov78_021D241C (ChooseStarterCursor * param0)
@@ -1554,7 +1554,7 @@ static void ov78_021D241C (ChooseStarterCursor * param0)
 
 static void ov78_021D2430 (ChooseStarterCursor * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_00, param1);
+    CellActor_SetDrawFlag(param0->unk_00, param1);
 }
 
 static void ov78_021D243C (ChooseStarterCursor * param0, int param1, int param2)
diff --git a/src/field_menu.c b/src/field_menu.c
index 7d0fccba01..c1e5045c1b 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -151,10 +151,10 @@ static u32 sub_0203AC3C(FieldSystem * fieldSystem);
 static void sub_0203B318(FieldMenu * menu, u8 * param1, u32 param2, u8 param3);
 static void sub_0203B4E8(FieldMenu * menu);
 static void sub_0203B520(FieldMenu * menu);
-static void sub_0203B558(GraphicElementData * graphicElement, u32 param1);
-static void sub_0203B588(GraphicElementData * graphicElement, u16 param1, u16 param2);
+static void sub_0203B558(CellActor * graphicElement, u32 param1);
+static void sub_0203B588(CellActor * graphicElement, u16 param1, u16 param2);
 static void sub_0203B5B4(FieldMenu * menu, u16 param1, u16 param2);
-static void sub_0203B5E8(GraphicElementData * graphicElement);
+static void sub_0203B5E8(CellActor * graphicElement);
 static BOOL sub_0203AC44(TaskManager * taskMan);
 static void sub_0203ADFC(TaskManager * taskMan);
 static BOOL FieldMenu_Select(TaskManager * taskMan);
@@ -513,7 +513,7 @@ static BOOL sub_0203AC44 (TaskManager * taskMan)
 
     if (menu->unk_20 != NULL) {
         sub_0203B520(menu);
-        GraphicElementManager_Update(menu->unk_38.unk_00);
+        CellActorCollection_Update(menu->unk_38.unk_00);
     }
 
     return FALSE;
@@ -821,7 +821,7 @@ static void sub_0203B318 (FieldMenu * menu, u8 * param1, u32 param2, u8 param3)
 
         {
             VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE};
-            GraphicElementData_SetAffineScaleEx(menu->unk_200[1 + i]->unk_00, &v4, 1);
+            CellActor_SetAffineScaleEx(menu->unk_200[1 + i]->unk_00, &v4, 1);
         }
     }
 
@@ -849,26 +849,26 @@ static void sub_0203B520 (FieldMenu * menu)
     u16 v0;
 
     for (v0 = 0; v0 < menu->unk_220; v0++) {
-        GraphicElementData_UpdateAnim(menu->unk_200[v0]->unk_00, FX32_ONE);
+        CellActor_UpdateAnim(menu->unk_200[v0]->unk_00, FX32_ONE);
     }
 }
 
-static void sub_0203B558 (GraphicElementData * graphicElement, u32 param1)
+static void sub_0203B558 (CellActor * graphicElement, u32 param1)
 {
     VecFx32 vec;
 
-    vec = *(GraphicElementData_GetPosition(graphicElement));
+    vec = *(CellActor_GetPosition(graphicElement));
     vec.y = (20 + 24 * param1) * FX32_ONE;
 
-    GraphicElementData_SetPosition(graphicElement, &vec);
+    CellActor_SetPosition(graphicElement, &vec);
 }
 
-static void sub_0203B588 (GraphicElementData * graphicElement, u16 param1, u16 param2)
+static void sub_0203B588 (CellActor * graphicElement, u16 param1, u16 param2)
 {
-    u32 v0 = GraphicElementData_GetActiveAnim(graphicElement);
+    u32 v0 = CellActor_GetActiveAnim(graphicElement);
 
-    GraphicElementData_SetAnim(graphicElement, (v0 / 3) * 3 + param1);
-    GraphicElementData_SetExplicitPaletteWithOffset(graphicElement, param2);
+    CellActor_SetAnim(graphicElement, (v0 / 3) * 3 + param1);
+    CellActor_SetExplicitPaletteWithOffset(graphicElement, param2);
 }
 
 static void sub_0203B5B4 (FieldMenu * menu, u16 param1, u16 param2)
@@ -877,13 +877,13 @@ static void sub_0203B5B4 (FieldMenu * menu, u16 param1, u16 param2)
     sub_0203B588(menu->unk_200[1 + param2]->unk_00, 1, 1);
 }
 
-static void sub_0203B5E8 (GraphicElementData * graphicElement)
+static void sub_0203B5E8 (CellActor * graphicElement)
 {
-    if ((GraphicElementData_GetActiveAnim(graphicElement) % 3) != 1) {
+    if ((CellActor_GetActiveAnim(graphicElement) % 3) != 1) {
         return;
     }
 
-    if (GraphicElementData_IsAnimated(graphicElement) == 0) {
+    if (CellActor_IsAnimated(graphicElement) == 0) {
         sub_0203B588(graphicElement, 2, 1);
     }
 }
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index ffceb927ae..f9fb815078 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -111,7 +111,7 @@ static void ov5_021DEDE8(SysTask *param0, void *param1);
 static void ov5_021DEE24(SysTask *param0, void *param1);
 static void ov5_021DEE50(HBlankTask *param0, void *param1);
 static void ov5_021DEE84(UnkStruct_ov5_021DED04 *param0);
-static void ov5_021DE67C(GraphicElementData *param0, void *param1, u32 param2);
+static void ov5_021DE67C(CellActor *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(FieldSystem *fieldSystem);
@@ -749,7 +749,7 @@ void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_190[v0]);
@@ -781,7 +781,7 @@ void ov5_021DE5A4(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1
     }
 }
 
-void ov5_021DE5D0(GraphicElementData *param0, u32 param1, u32 param2, u8 param3, u16 param4)
+void ov5_021DE5D0(CellActor *param0, u32 param1, u32 param2, u8 param3, u16 param4)
 {
     UnkStruct_ov5_021DE5D0 v0;
     NNSG2dPaletteData *v1;
@@ -799,12 +799,12 @@ void ov5_021DE5D0(GraphicElementData *param0, u32 param1, u32 param2, u8 param3,
     Heap_FreeToHeap(v2);
 }
 
-GraphicElementData *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5)
+CellActor *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5)
 {
     CellActorInitParams v0;
-    GraphicElementData *v1;
+    CellActor *v1;
 
-    v0.manager = param0->unk_00;
+    v0.collection = param0->unk_00;
     v0.resourceData = &param1->unk_10;
     v0.position.x = param2;
     v0.position.y = param3;
@@ -813,7 +813,7 @@ GraphicElementData *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_0
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = 4;
 
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = CellActorCollection_Add(&v0);
     GF_ASSERT(v1);
     return v1;
 }
@@ -823,11 +823,11 @@ VecFx32 VecFx32_FromXYZ(fx32 x, fx32 y, fx32 z)
     return (VecFx32){ x, y, z };
 }
 
-static void ov5_021DE67C(GraphicElementData *param0, void *param1, u32 param2)
+static void ov5_021DE67C(CellActor *param0, void *param1, u32 param2)
 {
     NNSG2dImagePaletteProxy *v0;
 
-    v0 = GraphicElementData_GetPaletteProxy(param0);
+    v0 = CellActor_GetPaletteProxy(param0);
 
     DC_FlushRange(param1, param2);
     GX_LoadOBJPltt(param1, NNS_G2dGetImagePaletteLocation(v0, NNS_G2D_VRAM_TYPE_2DMAIN), param2);
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index 814d423b75..f129af8e9d 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -600,7 +600,7 @@ typedef struct TrainerGrassEncounterEffect {
     ScreenSliceEffect * screenSliceEfx;
     UnkStruct_ov5_021DE47C unk_48;
     UnkStruct_ov5_021DE5A4 unk_1E8;
-    GraphicElementData * pokeballSprites[2];
+    CellActor * pokeballSprites[2];
     Camera * camera;
     QuadraticInterpolationTaskFX32 unk_228;
     s32 unk_240;
@@ -612,7 +612,7 @@ typedef struct {
     ScreenSplitEffect * unk_28;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    GraphicElementData * unk_200[2];
+    CellActor * unk_200[2];
     Camera * camera;
     QuadraticInterpolationTaskFX32 unk_20C;
     s32 unk_224;
@@ -626,7 +626,7 @@ typedef struct {
     BOOL unk_4C;
     UnkStruct_ov5_021DE47C unk_50;
     UnkStruct_ov5_021DE5A4 unk_1F0;
-    GraphicElementData * unk_224[2];
+    CellActor * unk_224[2];
     Camera * camera;
     QuadraticInterpolationTaskFX32 unk_230;
     s32 unk_248;
@@ -635,7 +635,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    GraphicElementData * unk_1D4[3];
+    CellActor * unk_1D4[3];
     LinearInterpolationTaskS32 unk_1E0[3];
     LinearInterpolationTaskS32 unk_21C[3];
     UnkStruct_ov5_021DE6BC * unk_258[3];
@@ -655,7 +655,7 @@ typedef struct {
     LinearInterpolationTaskS32 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC;
-    GraphicElementData * unk_230;
+    CellActor * unk_230;
     Camera * camera;
     QuadraticInterpolationTaskFX32 unk_238;
     s32 unk_250;
@@ -664,7 +664,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    GraphicElementData * unk_1D4[3];
+    CellActor * unk_1D4[3];
     LinearInterpolationTaskS32 unk_1E0[3];
     LinearInterpolationTaskS32 unk_21C[3];
     BOOL unk_258[3];
@@ -702,8 +702,8 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         for (i = 0; i < 2; i++) {
             trainerEffect->pokeballSprites[i] = ov5_021DE62C(
                 &trainerEffect->unk_48, &trainerEffect->unk_1E8, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            GraphicElementData_SetDrawFlag(trainerEffect->pokeballSprites[i], 0);
-            GraphicElementData_SetPriority(trainerEffect->pokeballSprites[i], i * 2);
+            CellActor_SetDrawFlag(trainerEffect->pokeballSprites[i], 0);
+            CellActor_SetPriority(trainerEffect->pokeballSprites[i], i * 2);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -733,11 +733,11 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         );
 
         for (i = 0; i < 2; i++) {
-            GraphicElementData_SetDrawFlag(
+            CellActor_SetDrawFlag(
                 trainerEffect->pokeballSprites[i], 1);
-            GraphicElementData_SetAffineOverwriteMode(
+            CellActor_SetAffineOverwriteMode(
                 trainerEffect->pokeballSprites[i], 2);
-            GraphicElementData_SetAffineScale(
+            CellActor_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
@@ -754,14 +754,14 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         LinearInterpolationTaskS32_Update(&trainerEffect->pokeballRotation);
 
         for (i = 0; i < 2; i++) {
-            GraphicElementData_SetAffineScale(
+            CellActor_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & trainerEffect->pokeballRotation.currentValue);
 
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & (trainerEffect->pokeballRotation.currentValue - 0x100));
 
         if (done == TRUE) {
@@ -774,9 +774,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
 
         EncounterEffect_ScreenSlice(encEffect, trainerEffect->screenSliceEfx, 96, 6, 0, (255 * FX32_ONE), (FX32_ONE * 10));
 
-        GraphicElementData_SetAnim(
+        CellActor_SetAnim(
             trainerEffect->pokeballSprites[0], 1);
-        GraphicElementData_SetAnim(
+        CellActor_SetAnim(
             trainerEffect->pokeballSprites[1], 2);
 
         QuadraticInterpolationTaskFX32_Init(&trainerEffect->unk_2C, 0, (255 * FX32_ONE), (FX32_ONE * 10), 6);
@@ -784,9 +784,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         v3 = Camera_GetDistance(trainerEffect->camera);
         QuadraticInterpolationTaskFX32_Init(&trainerEffect->unk_228, v3, v3 + (-FX32_CONST(500)), (-FX32_CONST(10)), 6);
 
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & 0);
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & 0);
 
         encEffect->state++;
@@ -799,9 +799,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             VecFx32 v7 = VecFx32_FromXYZ((128 * FX32_ONE) - trainerEffect->unk_2C.currentValue, (96 * FX32_ONE), 0);
             VecFx32 v8 = VecFx32_FromXYZ((128 * FX32_ONE) + trainerEffect->unk_2C.currentValue, (96 * FX32_ONE), 0);
 
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 trainerEffect->pokeballSprites[0], &v7);
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 trainerEffect->pokeballSprites[1], &v8);
         }
 
@@ -825,7 +825,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                GraphicElementData_Delete(trainerEffect->pokeballSprites[v9]);
+                CellActor_Delete(trainerEffect->pokeballSprites[v9]);
             }
         }
         ov5_021DE5A4(&trainerEffect->unk_48, &trainerEffect->unk_1E8);
@@ -836,7 +836,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
     }
 
     if (encEffect->state != 7) {
-        GraphicElementManager_Update(trainerEffect->unk_48.unk_00);
+        CellActorCollection_Update(trainerEffect->unk_48.unk_00);
     }
 }
 
@@ -868,8 +868,8 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             for (v4 = 0; v4 < 2; v4++) {
                 v1->unk_200[v4] = ov5_021DE62C(
                     &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), 0, 0, 0);
-                GraphicElementData_SetDrawFlag(v1->unk_200[v4], 0);
-                GraphicElementData_SetAffineOverwriteMode(v1->unk_200[v4], 2);
+                CellActor_SetDrawFlag(v1->unk_200[v4], 0);
+                CellActor_SetAffineOverwriteMode(v1->unk_200[v4], 2);
             }
         }
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -892,18 +892,18 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
 
     case 3:
         LinearInterpolationTaskFX32_Init(&v1->unk_00, (-192 * FX32_ONE), (192 * FX32_ONE), 8);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetDrawFlag(
             v1->unk_200[0], 1);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetDrawFlag(
             v1->unk_200[1], 1);
 
         {
             VecFx32 v5 = VecFx32_FromXYZ((128 * FX32_ONE) - v1->unk_00.currentValue, (64 * FX32_ONE), 0);
             VecFx32 v6 = VecFx32_FromXYZ((128 * FX32_ONE) + v1->unk_00.currentValue, (128 * FX32_ONE), 0);
 
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 v1->unk_200[0], &v5);
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 v1->unk_200[1], &v6);
         }
 
@@ -919,16 +919,16 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             VecFx32 v7 = VecFx32_FromXYZ((128 * FX32_ONE) - v1->unk_00.currentValue, (64 * FX32_ONE), 0);
             VecFx32 v8 = VecFx32_FromXYZ((128 * FX32_ONE) + v1->unk_00.currentValue, (128 * FX32_ONE), 0);
 
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 v1->unk_200[0], &v7);
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 v1->unk_200[1], &v8);
         }
 
         LinearInterpolationTaskS32_Update(&v1->unk_14);
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             v1->unk_200[0], v1->unk_14.currentValue);
-        GraphicElementData_SetAffineZRotation(
+        CellActor_SetAffineZRotation(
             v1->unk_200[1], -v1->unk_14.currentValue);
 
         if (v2 == 1) {
@@ -969,7 +969,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                GraphicElementData_Delete(v1->unk_200[v9]);
+                CellActor_Delete(v1->unk_200[v9]);
             }
         }
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
@@ -980,7 +980,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel (SysTask * param0, void * param1)
     }
 
     if (encEffect->state != 7) {
-        GraphicElementManager_Update(v1->unk_2C.unk_00);
+        CellActorCollection_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -1013,8 +1013,8 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         for (v5 = 0; v5 < 2; v5++) {
             v1->unk_224[v5] = ov5_021DE62C(
                 &v1->unk_50, &v1->unk_1F0, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            GraphicElementData_SetDrawFlag(v1->unk_224[v5], 0);
-            GraphicElementData_SetPriority(v1->unk_224[v5], v5);
+            CellActor_SetDrawFlag(v1->unk_224[v5], 0);
+            CellActor_SetPriority(v1->unk_224[v5], v5);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1047,12 +1047,12 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_18.currentValue, 16 - v1->unk_18.currentValue);
 
         for (v5 = 0; v5 < 2; v5++) {
-            GraphicElementData_SetDrawFlag(
+            CellActor_SetDrawFlag(
                 v1->unk_224[v5], 1);
 
-            GraphicElementData_SetAffineOverwriteMode(
+            CellActor_SetAffineOverwriteMode(
                 v1->unk_224[v5], 2);
-            GraphicElementData_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_XLU);
+            CellActor_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_XLU);
         }
 
         LinearInterpolationTaskS32_Init(&v1->unk_2C, 0, 0xffff, 8);
@@ -1068,18 +1068,18 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         v3 = LinearInterpolationTaskS32_Update(&v1->unk_2C);
 
         if (v3 == 0) {
-            GraphicElementData_SetAffineZRotation(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
-            GraphicElementData_SetAffineZRotation(v1->unk_224[1], 0xffff & v6);
+            CellActor_SetAffineZRotation(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
+            CellActor_SetAffineZRotation(v1->unk_224[1], 0xffff & v6);
         } else {
-            GraphicElementData_SetAffineZRotation(v1->unk_224[0], 0);
-            GraphicElementData_SetAffineZRotation(v1->unk_224[1], 0);
+            CellActor_SetAffineZRotation(v1->unk_224[0], 0);
+            CellActor_SetAffineZRotation(v1->unk_224[1], 0);
         }
 
         if (v2 == 1) {
             G2_BlendNone();
 
             for (v5 = 0; v5 < 2; v5++) {
-                GraphicElementData_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
+                CellActor_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
             }
 
             v0->state++;
@@ -1095,7 +1095,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
             VecFx32 v7 = VecFx32_FromXYZ(v1->unk_00.currentValue, v1->unk_00.currentValue, v1->unk_00.currentValue);
 
             for (v5 = 0; v5 < 2; v5++) {
-                GraphicElementData_SetAffineScale(
+                CellActor_SetAffineScale(
                     v1->unk_224[v5], &v7);
             }
         }
@@ -1113,7 +1113,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
             VecFx32 v8 = VecFx32_FromXYZ(v1->unk_00.currentValue, v1->unk_00.currentValue, v1->unk_00.currentValue);
 
             for (v5 = 0; v5 < 2; v5++) {
-                GraphicElementData_SetAffineScale(
+                CellActor_SetAffineScale(
                     v1->unk_224[v5], &v8);
             }
         }
@@ -1138,7 +1138,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
         v1->unk_4C = 0;
 
         for (v5 = 0; v5 < 2; v5++) {
-            GraphicElementData_Delete(v1->unk_224[v5]);
+            CellActor_Delete(v1->unk_224[v5]);
         }
 
         ov5_021DE5A4(&v1->unk_50, &v1->unk_1F0);
@@ -1152,7 +1152,7 @@ void EncounterEffect_Trainer_Water_LowerLevel (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_50.unk_00);
+        CellActorCollection_Update(v1->unk_50.unk_00);
     }
 }
 
@@ -1184,8 +1184,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 3; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, 0, 0, 0);
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
-            GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
+            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
+            CellActor_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
 
             v1->unk_258[v3] = ov5_021DE6A4(4);
         }
@@ -1246,8 +1246,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
 
         v4 = VecFx32_FromXYZ(
             43 * FX32_ONE, 231 * FX32_ONE, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[0], &v4);
-        GraphicElementData_SetDrawFlag(v1->unk_1D4[0], 1);
+        CellActor_SetPosition(v1->unk_1D4[0], &v4);
+        CellActor_SetDrawFlag(v1->unk_1D4[0], 1);
         v1->unk_264[0] = 1;
         v0->state++;
         v1->unk_2A0 = 4;
@@ -1267,8 +1267,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         ov5_021DE6C4(v1->unk_258[1], 215, 215, 312, 0, 6, v1->unk_270, 86, 64, 15);
         v4 = VecFx32_FromXYZ(
             215 * FX32_ONE, 231 * FX32_ONE, 1);
-        GraphicElementData_SetPosition(v1->unk_1D4[1], &v4);
-        GraphicElementData_SetDrawFlag(v1->unk_1D4[1], 1);
+        CellActor_SetPosition(v1->unk_1D4[1], &v4);
+        CellActor_SetDrawFlag(v1->unk_1D4[1], 1);
         v1->unk_264[1] = 1;
         v0->state++;
         v1->unk_2A0 = 2;
@@ -1288,8 +1288,8 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         ov5_021DE6C4(v1->unk_258[2], 129, 129, 312, 0, 6, v1->unk_270, 86, 64, 15);
         v4 = VecFx32_FromXYZ(
             129 * FX32_ONE, 231 * FX32_ONE, 2);
-        GraphicElementData_SetPosition(v1->unk_1D4[2], &v4);
-        GraphicElementData_SetDrawFlag(v1->unk_1D4[2], 1);
+        CellActor_SetPosition(v1->unk_1D4[2], &v4);
+        CellActor_SetDrawFlag(v1->unk_1D4[2], 1);
         v1->unk_264[2] = 1;
 
         v0->state++;
@@ -1317,7 +1317,7 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
         v1->unk_280 = 0;
 
         for (v3 = 0; v3 < 3; v3++) {
-            GraphicElementData_Delete(v1->unk_1D4[v3]);
+            CellActor_Delete(v1->unk_1D4[v3]);
             ov5_021DE6BC(v1->unk_258[v3]);
         }
 
@@ -1353,19 +1353,19 @@ void EncounterEffect_Trainer_Water_HigherLevel (SysTask * param0, void * param1)
             LinearInterpolationTaskS32_Update(&v1->unk_1E0[v3]);
             LinearInterpolationTaskS32_Update(&v1->unk_21C[v3]);
 
-            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
+            CellActor_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
 
-            v7 = GraphicElementData_GetPosition(v1->unk_1D4[v3]);
+            v7 = CellActor_GetPosition(v1->unk_1D4[v3]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v3].currentValue * FX32_ONE;
-            GraphicElementData_SetPosition(v1->unk_1D4[v3], &v8);
+            CellActor_SetPosition(v1->unk_1D4[v3], &v8);
         }
     }
 
     sub_0201A9A4(v1->unk_270);
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_00.unk_00);
+        CellActorCollection_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1392,7 +1392,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
 
         v1->unk_230 = ov5_021DE62C(
             &v1->unk_5C, &v1->unk_1FC, (128 * FX32_ONE), (-32 * FX32_ONE), 0, 0);
-        GraphicElementData_SetDrawFlag(v1->unk_230, 0);
+        CellActor_SetDrawFlag(v1->unk_230, 0);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1413,7 +1413,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
 
     case 3:
         QuadraticInterpolationTaskFX32_Init(&v1->unk_00, 0, (256 * FX32_ONE), (2 * FX32_ONE), 12);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetDrawFlag(
             v1->unk_230, 1);
 
         QuadraticInterpolationTaskFX32_Init(&v1->unk_18, (FX32_CONST(0.10f)), (FX32_CONST(2.0f)), (FX32_CONST(0.0f)), 12);
@@ -1421,7 +1421,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
         QuadraticInterpolationTaskFX32_Init(&v1->unk_30, (FX32_CONST(0.10f)), (FX32_CONST(2.0f)), (FX32_CONST(0.0f)), 12);
 
         v4 = VecFx32_FromXYZ(v1->unk_18.currentValue, v1->unk_30.currentValue, 0);
-        GraphicElementData_SetAffineScaleEx(v1->unk_230, &v4, 2);
+        CellActor_SetAffineScaleEx(v1->unk_230, &v4, 2);
 
         LinearInterpolationTaskS32_Init(&v1->unk_48, 0, (0xffff * 1), 12);
         v0->state++;
@@ -1432,19 +1432,19 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
         {
             VecFx32 v5 = VecFx32_FromXYZ((128 * FX32_ONE), (-32 * FX32_ONE) + (v1->unk_00.currentValue), 0);
 
-            GraphicElementData_SetPosition(
+            CellActor_SetPosition(
                 v1->unk_230, &v5);
         }
         QuadraticInterpolationTaskFX32_Update(&v1->unk_18);
         QuadraticInterpolationTaskFX32_Update(&v1->unk_30);
         v4 = VecFx32_FromXYZ(v1->unk_18.currentValue, v1->unk_30.currentValue, 0);
-        GraphicElementData_SetAffineScale(v1->unk_230, &v4);
+        CellActor_SetAffineScale(v1->unk_230, &v4);
 
         LinearInterpolationTaskS32_Update(&v1->unk_48);
-        GraphicElementData_SetAffineZRotation(v1->unk_230, v1->unk_48.currentValue);
+        CellActor_SetAffineZRotation(v1->unk_230, v1->unk_48.currentValue);
 
         if (v2 == 1) {
-            GraphicElementData_SetDrawFlag(
+            CellActor_SetDrawFlag(
                 v1->unk_230, 0);
             v0->state++;
         }
@@ -1482,7 +1482,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        GraphicElementData_Delete(v1->unk_230);
+        CellActor_Delete(v1->unk_230);
         ov5_021DE5A4(&v1->unk_5C, &v1->unk_1FC);
         ov5_021DE4AC(&v1->unk_5C);
         EncounterEffect_Finish(v0, param0);
@@ -1490,7 +1490,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_5C.unk_00);
+        CellActorCollection_Update(v1->unk_5C.unk_00);
     }
 }
 
@@ -1519,7 +1519,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         for (v4 = 0; v4 < 3; v4++) {
             v1->unk_1D4[v4] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, -32, 0, 0);
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v4], 0);
+            CellActor_SetDrawFlag(v1->unk_1D4[v4], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1565,12 +1565,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[0], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             128 * FX32_ONE, -32 * FX32_ONE, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[0], &v2);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetPosition(v1->unk_1D4[0], &v2);
+        CellActor_SetDrawFlag(
             v1->unk_1D4[0], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[0], 0, (0xffff * 1), 5);
-        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[0], 2);
+        CellActor_SetAffineOverwriteMode(v1->unk_1D4[0], 2);
 
         v1->unk_258[0] = 1;
         v0->state++;
@@ -1587,13 +1587,13 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[1], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             208 * FX32_ONE, -32 * FX32_ONE, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[1], &v2);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetPosition(v1->unk_1D4[1], &v2);
+        CellActor_SetDrawFlag(
             v1->unk_1D4[1], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[1], 0, (0xffff * -1), 5);
 
-        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[1], 2);
+        CellActor_SetAffineOverwriteMode(v1->unk_1D4[1], 2);
         v1->unk_258[1] = 1;
         v0->state++;
         v1->unk_288 = 3;
@@ -1609,12 +1609,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_1E0[2], -32, 224, 5);
         v2 = VecFx32_FromXYZ(
             48 * FX32_ONE, -32 * FX32_ONE, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[2], &v2);
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetPosition(v1->unk_1D4[2], &v2);
+        CellActor_SetDrawFlag(
             v1->unk_1D4[2], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[2], 0, (0xffff * 1), 5);
-        GraphicElementData_SetAffineOverwriteMode(v1->unk_1D4[2], 2);
+        CellActor_SetAffineOverwriteMode(v1->unk_1D4[2], 2);
 
         v1->unk_258[2] = 1;
         v0->state++;
@@ -1624,7 +1624,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
 
         if ((v1->unk_258[0] == 0) && (v1->unk_258[1] == 0) && (v1->unk_258[2] == 0)) {
             for (v4 = 0; v4 < 3; v4++) {
-                GraphicElementData_SetDrawFlag(
+                CellActor_SetDrawFlag(
                     v1->unk_1D4[v4], 0);
             }
 
@@ -1663,7 +1663,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
         }
 
         for (v4 = 0; v4 < 3; v4++) {
-            GraphicElementData_Delete(v1->unk_1D4[v4]);
+            CellActor_Delete(v1->unk_1D4[v4]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -1694,16 +1694,16 @@ void EncounterEffect_Trainer_Cave_HigherLevel (SysTask * param0, void * param1)
                 v1->unk_258[v4] = 0;
             }
 
-            v7 = GraphicElementData_GetPosition(v1->unk_1D4[v4]);
+            v7 = CellActor_GetPosition(v1->unk_1D4[v4]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v4].currentValue * FX32_ONE;
-            GraphicElementData_SetPosition(v1->unk_1D4[v4], &v8);
-            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
+            CellActor_SetPosition(v1->unk_1D4[v4], &v8);
+            CellActor_SetAffineZRotation(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
         }
     }
 
     if (v0->state != 9) {
-        GraphicElementManager_Update(v1->unk_00.unk_00);
+        CellActorCollection_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1712,14 +1712,14 @@ typedef struct {
     QuadraticInterpolationTaskFX32 unk_14;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    GraphicElementData * unk_200;
+    CellActor * unk_200;
     s32 unk_204;
 } UnkStruct_ov5_021E4260;
 
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    GraphicElementData * unk_1D4[4];
+    CellActor * unk_1D4[4];
     QuadraticInterpolationTaskFX32 unk_1E4[2];
 } UnkStruct_ov5_021E44C0;
 
@@ -1742,8 +1742,8 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
 
         v1->unk_200 = ov5_021DE62C(
             &v1->unk_2C, &v1->unk_1CC, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-        GraphicElementData_SetDrawFlag(v1->unk_200, 0);
-        GraphicElementData_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_XLU);
+        CellActor_SetDrawFlag(v1->unk_200, 0);
+        CellActor_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_XLU);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1766,7 +1766,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
         LinearInterpolationTaskS32_Init(&v1->unk_00, 0, 16, 12);
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_00.currentValue, 16 - v1->unk_00.currentValue);
 
-        GraphicElementData_SetDrawFlag(
+        CellActor_SetDrawFlag(
             v1->unk_200, 1);
         v0->state++;
         break;
@@ -1777,7 +1777,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            GraphicElementData_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_NORMAL);
             v0->state++;
         }
 
@@ -1786,12 +1786,12 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
     case 5:
         QuadraticInterpolationTaskFX32_Init(&v1->unk_14, (FX32_CONST(1.0f)), (FX32_CONST(0.1f)), 1, 6);
 
-        GraphicElementData_SetAffineOverwriteMode(
+        CellActor_SetAffineOverwriteMode(
             v1->unk_200, 2);
         {
             VecFx32 v3 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            GraphicElementData_SetAffineScale(
+            CellActor_SetAffineScale(
                 v1->unk_200, &v3);
         }
 
@@ -1805,7 +1805,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
         {
             VecFx32 v4 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            GraphicElementData_SetAffineScale(
+            CellActor_SetAffineScale(
                 v1->unk_200, &v4);
         }
 
@@ -1824,7 +1824,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        GraphicElementData_Delete(v1->unk_200);
+        CellActor_Delete(v1->unk_200);
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
         ov5_021DE4AC(&v1->unk_2C);
         EncounterEffect_Finish(v0, param0);
@@ -1832,7 +1832,7 @@ void EncounterEffect_Frontier (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_2C.unk_00);
+        CellActorCollection_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -1858,7 +1858,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 4; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
+            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1884,7 +1884,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         QuadraticInterpolationTaskFX32_Init(&v1->unk_1E4[1], 0, (160 * FX32_ONE), (FX32_CONST(0.1f)), 4);
 
         for (v3 = 0; v3 < 4; v3++) {
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 1);
+            CellActor_SetDrawFlag(v1->unk_1D4[v3], 1);
         }
 
         v0->state++;
@@ -1897,19 +1897,19 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) - v1->unk_1E4[0].currentValue, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[0], &v4);
+        CellActor_SetPosition(v1->unk_1D4[0], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) + v1->unk_1E4[0].currentValue, 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[1], &v4);
+        CellActor_SetPosition(v1->unk_1D4[1], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) - v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[2], &v4);
+        CellActor_SetPosition(v1->unk_1D4[2], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) + v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v1->unk_1D4[3], &v4);
+        CellActor_SetPosition(v1->unk_1D4[3], &v4);
 
         if (v2 == 1) {
             v0->state++;
@@ -1941,7 +1941,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
         }
 
         for (v3 = 0; v3 < 4; v3++) {
-            GraphicElementData_Delete(v1->unk_1D4[v3]);
+            CellActor_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -1951,7 +1951,7 @@ void EncounterEffect_Double (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_00.unk_00);
+        CellActorCollection_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1974,7 +1974,7 @@ static const s32 Unk_ov5_021F9E94[6][8] = {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    GraphicElementData * unk_1D4[6];
+    CellActor * unk_1D4[6];
     QuadraticInterpolationTaskFX32 unk_1EC[6];
     QuadraticInterpolationTaskFX32 unk_27C[6];
     QuadraticInterpolationTaskFX32 unk_30C[6];
@@ -1989,7 +1989,7 @@ typedef struct {
     UnkStruct_ov5_021DEC18 * unk_04;
     UnkStruct_ov5_021DE47C unk_08;
     UnkStruct_ov5_021DE5A4 unk_1A8;
-    GraphicElementData * unk_1DC;
+    CellActor * unk_1DC;
     LinearInterpolationTaskS32 unk_1E0;
     LinearInterpolationTaskS32 unk_1F4;
     LinearInterpolationTaskS32 unk_208;
@@ -2019,7 +2019,7 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
         for (v3 = 0; v3 < 6; v3++) {
             v1->unk_1D4[v3] = ov5_021DE62C(
                 &v1->unk_00, &v1->unk_1A0, 0, 0, 0, 0);
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
+            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -2054,13 +2054,13 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
 
             LinearInterpolationTaskS32_Init(&v1->unk_39C[v1->unk_42C], 0, Unk_ov5_021F9E94[v1->unk_42C][7], 8);
 
-            GraphicElementData_SetDrawFlag(v1->unk_1D4[v1->unk_42C], 1);
+            CellActor_SetDrawFlag(v1->unk_1D4[v1->unk_42C], 1);
             v4 = VecFx32_FromXYZ(
                 Unk_ov5_021F9E94[v1->unk_42C][0], Unk_ov5_021F9E94[v1->unk_42C][3], 0);
-            GraphicElementData_SetPosition(v1->unk_1D4[v1->unk_42C], &v4);
+            CellActor_SetPosition(v1->unk_1D4[v1->unk_42C], &v4);
             v5 = VecFx32_FromXYZ(
                 (FX32_CONST(2.0f)), (FX32_CONST(2.0f)), 0);
-            GraphicElementData_SetAffineScaleEx(v1->unk_1D4[v1->unk_42C], &v5, 2);
+            CellActor_SetAffineScaleEx(v1->unk_1D4[v1->unk_42C], &v5, 2);
 
             v1->unk_414[v1->unk_42C] = 1;
 
@@ -2108,7 +2108,7 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
         }
 
         for (v3 = 0; v3 < 6; v3++) {
-            GraphicElementData_Delete(v1->unk_1D4[v3]);
+            CellActor_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -2127,21 +2127,21 @@ void EncounterEffect_GalacticGrunt (SysTask * param0, void * param1)
 
             if (v2) {
                 v1->unk_414[v3] = 0;
-                GraphicElementData_SetDrawFlag(v1->unk_1D4[v3], 0);
+                CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
             }
 
             v4 = VecFx32_FromXYZ(
                 v1->unk_27C[v3].currentValue, v1->unk_30C[v3].currentValue, 0);
-            GraphicElementData_SetPosition(v1->unk_1D4[v3], &v4);
+            CellActor_SetPosition(v1->unk_1D4[v3], &v4);
             v5 = VecFx32_FromXYZ(
                 v1->unk_1EC[v3].currentValue, v1->unk_1EC[v3].currentValue, 0);
-            GraphicElementData_SetAffineScale(v1->unk_1D4[v3], &v5);
-            GraphicElementData_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
+            CellActor_SetAffineScale(v1->unk_1D4[v3], &v5);
+            CellActor_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
         }
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_00.unk_00);
+        CellActorCollection_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -2164,9 +2164,9 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
         v1->unk_1DC = ov5_021DE62C(
             &v1->unk_08, &v1->unk_1A8, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0);
-        GraphicElementData_SetDrawFlag(v1->unk_1DC, 0);
-        GraphicElementData_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_XLU);
-        GraphicElementData_SetExplicitPriority(v1->unk_1DC, 1);
+        CellActor_SetDrawFlag(v1->unk_1DC, 0);
+        CellActor_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_XLU);
+        CellActor_SetExplicitPriority(v1->unk_1DC, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_04 = ov5_021DEBEC(4);
@@ -2201,7 +2201,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
     case 3:
         LinearInterpolationTaskS32_Init(&v1->unk_1F4, 0, 16, 15);
-        GraphicElementData_SetDrawFlag(v1->unk_1DC, 1);
+        CellActor_SetDrawFlag(v1->unk_1DC, 1);
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3, v1->unk_1F4.currentValue, 16 - v1->unk_1F4.currentValue);
         v0->state++;
         break;
@@ -2212,7 +2212,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            GraphicElementData_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_NORMAL);
             v0->state++;
             v1->unk_21C = 16;
         }
@@ -2251,7 +2251,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
             *(v0->done) = 1;
         }
 
-        GraphicElementData_Delete(v1->unk_1DC);
+        CellActor_Delete(v1->unk_1DC);
         ov5_021DE5A4(&v1->unk_08, &v1->unk_1A8);
         ov5_021DE4AC(&v1->unk_08);
 
@@ -2269,7 +2269,7 @@ void EncounterEffect_GalacticBoss (SysTask * param0, void * param1)
     }
 
     if (v0->state != 7) {
-        GraphicElementManager_Update(v1->unk_08.unk_00);
+        CellActorCollection_Update(v1->unk_08.unk_00);
     }
 }
 
@@ -2791,7 +2791,7 @@ static const EliterFourChampionEncounterParam sEliteFourChampionEncounterParams[
 typedef struct {
     s16 unk_00;
     s16 unk_02;
-    GraphicElementData * unk_04[4];
+    CellActor * unk_04[4];
     LinearInterpolationTaskFX32 unk_14[4];
 } UnkStruct_ov5_021E5128;
 
@@ -2802,7 +2802,7 @@ typedef struct {
     UnkStruct_ov5_021DED04 * unk_40;
     UnkStruct_ov5_021DE47C unk_44;
     UnkStruct_ov5_021DE5A4 unk_1E4[2];
-    GraphicElementData * unk_24C;
+    CellActor * unk_24C;
     UnkStruct_ov5_021E5128 unk_250;
     UnkStruct_ov5_021E52A8_sub1 unk_2B4;
     UnkStruct_ov5_021E52A8_sub2 unk_2BC;
@@ -2819,7 +2819,7 @@ typedef struct {
     LinearInterpolationTaskS32 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC[4];
-    GraphicElementData * unk_2CC[4];
+    CellActor * unk_2CC[4];
     VecFx32 unk_2DC;
     VecFx32 unk_2E8;
     UnkStruct_ov5_021E5128 unk_2F4;
@@ -2839,11 +2839,11 @@ static void ov5_021E5128 (UnkStruct_ov5_021E5128 * param0, UnkStruct_ov5_021DE47
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov5_021DE62C(
             param1, param2, param3, param4, 0, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
 
         if (v0 != 3) {
-            GraphicElementData_SetAffineOverwriteMode(param0->unk_04[v0], 2);
-            GraphicElementData_SetAnim(param0->unk_04[v0], 1);
+            CellActor_SetAffineOverwriteMode(param0->unk_04[v0], 2);
+            CellActor_SetAnim(param0->unk_04[v0], 1);
 
             LinearInterpolationTaskFX32_Init(&param0->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
@@ -2857,7 +2857,7 @@ static void ov5_021E519C (UnkStruct_ov5_021E5128 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(param0->unk_04[v0]);
+        CellActor_Delete(param0->unk_04[v0]);
     }
 }
 
@@ -2883,8 +2883,8 @@ static BOOL ov5_021E51B4 (UnkStruct_ov5_021E5128 * param0)
 
         v3 = VecFx32_FromXYZ(
             param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue);
-        GraphicElementData_SetAffineScale(param0->unk_04[v0], &v3);
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 1);
+        CellActor_SetAffineScale(param0->unk_04[v0], &v3);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 1);
 
         if (v1 == 0) {
             v2 = 0;
@@ -2951,7 +2951,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 
         v0->unk_24C = ov5_021DE62C(
             &v0->unk_44, &v0->unk_1E4[0], (272 * FX32_ONE), (66 * FX32_ONE), 0, 0);
-        GraphicElementData_SetDrawFlag(v0->unk_24C, 0);
+        CellActor_SetDrawFlag(v0->unk_24C, 0);
         ov5_021E5128(&v0->unk_250, &v0->unk_44, &v0->unk_1E4[1], (FX32_CONST(72)), (FX32_CONST(74)), heapID);
 
         ov5_021DE5D0(v0->unk_24C, heapID, param->trainerClass, 14, (GX_RGB(0, 0, 0)));
@@ -3020,12 +3020,12 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
     case 6:
 
         QuadraticInterpolationTaskFX32_Init(&v0->unk_00, (272 * FX32_ONE), param->endX, (-64 * FX32_ONE), 4);
-        GraphicElementData_SetDrawFlag(v0->unk_24C, 1);
-        GraphicElementData_SetExplicitPriority(v0->unk_24C, 0);
+        CellActor_SetDrawFlag(v0->unk_24C, 1);
+        CellActor_SetExplicitPriority(v0->unk_24C, 0);
 
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (66 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v0->unk_24C, &v3);
+        CellActor_SetPosition(v0->unk_24C, &v3);
 
         encEffect->state++;
         break;
@@ -3035,7 +3035,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
         v1 = QuadraticInterpolationTaskFX32_Update(&v0->unk_00);
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (66 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v0->unk_24C, &v3);
+        CellActor_SetPosition(v0->unk_24C, &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3118,7 +3118,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
             *(encEffect->done) = 1;
         }
 
-        GraphicElementData_Delete(v0->unk_24C);
+        CellActor_Delete(v0->unk_24C);
         ov5_021E519C(&v0->unk_250);
         ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[0]);
         ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[1]);
@@ -3142,7 +3142,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
     }
 
     if (encEffect->state != 15) {
-        GraphicElementManager_Update(v0->unk_44.unk_00);
+        CellActorCollection_Update(v0->unk_44.unk_00);
     }
 
     return 0;
@@ -3291,9 +3291,9 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             v0->unk_2CC[v5] = ov5_021DE62C(
                 &v0->unk_5C, v7, 0, 0, 0, 0);
-            GraphicElementData_SetDrawFlag(v0->unk_2CC[v5], 0);
-            GraphicElementData_SetAnim(v0->unk_2CC[v5], v8);
-            GraphicElementData_SetExplicitPriority(v0->unk_2CC[v5], 1);
+            CellActor_SetDrawFlag(v0->unk_2CC[v5], 0);
+            CellActor_SetAnim(v0->unk_2CC[v5], v8);
+            CellActor_SetExplicitPriority(v0->unk_2CC[v5], 1);
         }
 
         if (v0->unk_368) {
@@ -3347,22 +3347,22 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         QuadraticInterpolationTaskFX32_Init(&v0->unk_00, (-128 * FX32_ONE), (56 * FX32_ONE), (80 * FX32_ONE), 6);
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (92 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
+        CellActor_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
-        GraphicElementData_SetDrawFlag(v0->unk_2CC[0], 1);
-        GraphicElementData_SetDrawFlag(v0->unk_2CC[2], 1);
+        CellActor_SetPosition(v0->unk_2CC[2], &v3);
+        CellActor_SetDrawFlag(v0->unk_2CC[0], 1);
+        CellActor_SetDrawFlag(v0->unk_2CC[2], 1);
 
         QuadraticInterpolationTaskFX32_Init(&v0->unk_30, (384 * FX32_ONE), (200 * FX32_ONE), (-80 * FX32_ONE), 6);
         v3 = VecFx32_FromXYZ(
             v0->unk_30.currentValue, (92 * FX32_ONE), 0);
-        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
+        CellActor_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
-        GraphicElementData_SetDrawFlag(v0->unk_2CC[1], 1);
-        GraphicElementData_SetDrawFlag(v0->unk_2CC[3], 1);
+        CellActor_SetPosition(v0->unk_2CC[3], &v3);
+        CellActor_SetDrawFlag(v0->unk_2CC[1], 1);
+        CellActor_SetDrawFlag(v0->unk_2CC[3], 1);
 
         {
             Strbuf* v9;
@@ -3401,19 +3401,19 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (92 * FX32_ONE), 0);
         v0->unk_2DC = v3;
-        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
+        CellActor_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
+        CellActor_SetPosition(v0->unk_2CC[2], &v3);
 
         v1 = QuadraticInterpolationTaskFX32_Update(&v0->unk_30);
         v3 = VecFx32_FromXYZ(
             v0->unk_30.currentValue, (92 * FX32_ONE), 0);
         v0->unk_2E8 = v3;
-        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
+        CellActor_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
+        CellActor_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3445,10 +3445,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             ov5_021DE5D0(v0->unk_2CC[1], heapID, param->trainerClass, 0, (GX_RGB(0, 0, 0)));
 
-            GraphicElementData_SetAnimateFlag(v0->unk_2CC[2], 1);
-            GraphicElementData_SetAnimSpeed(v0->unk_2CC[2], FX32_ONE * 2);
-            GraphicElementData_SetAnimateFlag(v0->unk_2CC[3], 1);
-            GraphicElementData_SetAnimSpeed(v0->unk_2CC[3], FX32_ONE * 2);
+            CellActor_SetAnimateFlag(v0->unk_2CC[2], 1);
+            CellActor_SetAnimSpeed(v0->unk_2CC[2], FX32_ONE * 2);
+            CellActor_SetAnimateFlag(v0->unk_2CC[3], 1);
+            CellActor_SetAnimSpeed(v0->unk_2CC[3], FX32_ONE * 2);
 
             ov5_021DF0CC(encEffect->narc, 108);
 
@@ -3512,10 +3512,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2DC = v3;
         }
 
-        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
+        CellActor_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
+        CellActor_SetPosition(v0->unk_2CC[2], &v3);
 
         if (((encEffect->effectComplete / 2) % 2) == 0) {
             v3 = VecFx32_FromXYZ(
@@ -3529,10 +3529,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2E8 = v3;
         }
 
-        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
+        CellActor_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
+        CellActor_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1) {
             encEffect->state++;
@@ -3553,17 +3553,17 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
         v3 = VecFx32_FromXYZ(
             v0->unk_2DC.x - v0->unk_00.currentValue, v0->unk_2DC.y - v0->unk_18.currentValue, 0);
-        GraphicElementData_SetPosition(v0->unk_2CC[0], &v3);
+        CellActor_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[2], &v3);
+        CellActor_SetPosition(v0->unk_2CC[2], &v3);
 
         v3 = VecFx32_FromXYZ(
             v0->unk_2E8.x + v0->unk_00.currentValue, v0->unk_2E8.y + v0->unk_18.currentValue, 0);
-        GraphicElementData_SetPosition(v0->unk_2CC[1], &v3);
+        CellActor_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        GraphicElementData_SetPosition(v0->unk_2CC[3], &v3);
+        CellActor_SetPosition(v0->unk_2CC[3], &v3);
 
         if (ScreenWipe_Done()) {
             encEffect->state++;
@@ -3583,7 +3583,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         BGL_DeleteWindow(&v0->unk_358);
 
         for (v5 = 0; v5 < 4; v5++) {
-            GraphicElementData_Delete(v0->unk_2CC[v5]);
+            CellActor_Delete(v0->unk_2CC[v5]);
         }
 
         for (v5 = 0; v5 < 4; v5++) {
@@ -3602,7 +3602,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
     }
 
     if (encEffect->state != 14) {
-        GraphicElementManager_Update(v0->unk_5C.unk_00);
+        CellActorCollection_Update(v0->unk_5C.unk_00);
 
         if (4 < encEffect->state) {
             sub_020241B4();
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index 4e81b87bca..e4ffc5ae2d 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -88,7 +88,7 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
 {
     u32 v0;
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_020095A8(param0->unk_190);
     sub_0200A508(param0->unk_1AC[0]);
     sub_0200A700(param0->unk_1AC[1]);
@@ -99,10 +99,10 @@ void ov5_021D30A8 (UnkStruct_ov5_021D30A8 * param0)
     }
 }
 
-GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1)
+CellActor * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStruct_ov7_0224F358 * param1)
 {
     CellActorInitParamsEx v0;
-    GraphicElementData * v1;
+    CellActor * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
     VecFx32 v3;
 
@@ -110,7 +110,7 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v3.y = param1->unk_06 * FX32_ONE;
     v3.z = param1->unk_08 * FX32_ONE;
 
-    v0.manager = param0->unk_00;
+    v0.collection = param0->unk_00;
     v0.resourceData = &param0->unk_190->unk_00[param1->unk_00];
     v0.position = v3;
     v0.affineScale = v2;
@@ -119,11 +119,11 @@ GraphicElementData * ov5_021D3104 (UnkStruct_ov5_021D30A8 * param0, const UnkStr
     v0.vramType = param1->unk_14;
     v0.heapID = param0->unk_1C6;
 
-    v1 = GraphicElementManager_AddElementEx(&v0);
+    v1 = CellActorCollection_AddEx(&v0);
     GF_ASSERT(v1);
 
-    GraphicElementData_SetAnim(v1, param1->unk_0A);
-    GraphicElementData_SetExplicitPaletteWithOffset(v1, param1->unk_10);
+    CellActor_SetAnim(v1, param1->unk_0A);
+    CellActor_SetExplicitPaletteWithOffset(v1, param1->unk_10);
 
     return v1;
 }
@@ -367,7 +367,7 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
 
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->transferToVRAM, param1->bgPriority, param0->unk_194[0], param0->unk_194[1], param0->unk_194[2], param0->unk_194[3], param0->unk_194[4], param0->unk_194[5]);
 
-    v3.manager = param0->unk_00;
+    v3.collection = param0->unk_00;
     v3.resourceData = v2->unk_04;
     v3.position.x = FX32_CONST(param1->x);
     v3.position.y = FX32_CONST(param1->y);
@@ -385,12 +385,12 @@ CellActorData * ov5_021D3584 (UnkStruct_ov5_021D30A8 * param0, const SpriteTempl
     v3.vramType = param1->vramType;
     v3.heapID = param0->unk_1C6;
 
-    v2->unk_00 = GraphicElementManager_AddElementEx(&v3);
+    v2->unk_00 = CellActorCollection_AddEx(&v3);
 
     if (v2->unk_00 != NULL) {
-        v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
-        GraphicElementData_SetAnim(v2->unk_00, param1->animIdx);
-        GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param1->plttIdx);
+        v1 = CellActor_GetExplicitPalette(v2->unk_00);
+        CellActor_SetAnim(v2->unk_00, param1->animIdx);
+        CellActor_SetExplicitPalette(v2->unk_00, v1 + param1->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -402,7 +402,7 @@ void ov5_021D375C (UnkStruct_ov5_021D30A8 * param0)
 {
     u32 v0;
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A508(param0->unk_1AC[0]);
     sub_0200A700(param0->unk_1AC[1]);
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 6b16f330d5..43f0889cbf 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -71,7 +71,7 @@ typedef struct {
 
 typedef struct UnkStruct_ov5_021D6FA8_tag {
     UnkStruct_ov5_021D6594 * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
     void * unk_08;
     s32 unk_0C[10];
     struct UnkStruct_ov5_021D6FA8_tag * unk_34;
@@ -115,7 +115,7 @@ typedef struct {
     UnkStruct_02009F38 * unk_10;
     NNSG2dRendererInstance unk_14;
     NNSG2dRenderSurface unk_C0;
-    GraphicElementManager * unk_130;
+    CellActorCollection * unk_130;
     SysTask * unk_134;
 } UnkStruct_ov5_021D61D0;
 
@@ -255,7 +255,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(GraphicElementData * param0, VecFx32 * param1);
+static void ov5_021D630C(CellActor * 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);
@@ -800,13 +800,13 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
     ov5_021D6290(param0->unk_10, 3, 62);
 
     {
-        GraphicElementManagerParams v3;
+        CellActorCollectionParams v3;
 
         v3.maxElements = 96;
         v3.renderer = &param0->unk_14;
         v3.heapID = 4;
 
-        param0->unk_130 = GraphicElementManager_New(&v3);
+        param0->unk_130 = CellActorCollection_New(&v3);
         param0->unk_134 = SysTask_Start(ov5_021D6284, param0, 10);
     }
 }
@@ -814,7 +814,7 @@ static void ov5_021D61D0 (UnkStruct_ov5_021D61D0 * param0)
 static void ov5_021D6284 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021D61D0 * v0 = param1;
-    GraphicElementManager_Update(v0->unk_130);
+    CellActorCollection_Update(v0->unk_130);
 }
 
 static void ov5_021D6290 (UnkStruct_02009F38 * param0, int param1, int param2)
@@ -844,14 +844,14 @@ static void ov5_021D62BC (UnkStruct_ov5_021D61D0 * param0)
     Heap_FreeToHeap(param0->unk_10);
     param0->unk_10 = NULL;
 
-    GraphicElementManager_Delete(param0->unk_130);
+    CellActorCollection_Delete(param0->unk_130);
     param0->unk_130 = NULL;
 
     SysTask_Done(param0->unk_134);
     param0->unk_134 = NULL;
 }
 
-static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1)
+static void ov5_021D630C (CellActor * param0, VecFx32 * param1)
 {
     if (param1->x > ((255 << FX32_SHIFT) + 64 * FX32_ONE)) {
         param1->x %= ((255 << FX32_SHIFT) + 64 * FX32_ONE);
@@ -869,7 +869,7 @@ static void ov5_021D630C (GraphicElementData * param0, VecFx32 * param1)
         }
     }
 
-    GraphicElementData_SetPosition(param0, param1);
+    CellActor_SetPosition(param0, param1);
 }
 
 UnkStruct_ov5_021D6594 * ov5_021D6364 (FieldSystem * fieldSystem)
@@ -1463,7 +1463,7 @@ static void ov5_021D6CDC (UnkStruct_ov5_021D6594 * param0, UnkStruct_ov5_021D69B
     if (param1->unk_00 != 0xffff) {
         ov5_021D6F4C(&param1->unk_0C->unk_40, param0, param1->unk_0C, 0, 1);
         memset(&param1->unk_0C->unk_10, 0, sizeof(CellActorInitParamsEx));
-        param1->unk_0C->unk_10.manager = param0->unk_08.unk_130;
+        param1->unk_0C->unk_10.collection = param0->unk_08.unk_130;
         param1->unk_0C->unk_10.resourceData = &param1->unk_0C->unk_40;
         param1->unk_0C->unk_10.affineScale.x = FX32_ONE;
         param1->unk_0C->unk_10.affineScale.y = FX32_ONE;
@@ -1477,8 +1477,8 @@ static void ov5_021D6D34 (UnkStruct_ov5_021DB4B8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 48; v0++) {
-        param0->unk_48[v0].unk_04 = GraphicElementManager_AddElementEx(&param0->unk_08->unk_10);
-        GraphicElementData_SetDrawFlag(param0->unk_48[v0].unk_04, 0);
+        param0->unk_48[v0].unk_04 = CellActorCollection_AddEx(&param0->unk_08->unk_10);
+        CellActor_SetDrawFlag(param0->unk_48[v0].unk_04, 0);
         GF_ASSERT(param0->unk_48[v0].unk_04);
     }
 }
@@ -1489,7 +1489,7 @@ static void ov5_021D6D64 (UnkStruct_ov5_021DB4B8 * param0)
 
     for (v0 = 0; v0 < 48; v0++) {
         if (param0->unk_48[v0].unk_04) {
-            GraphicElementData_Delete(param0->unk_48[v0].unk_04);
+            CellActor_Delete(param0->unk_48[v0].unk_04);
             param0->unk_48[v0].unk_04 = NULL;
         }
     }
@@ -1589,7 +1589,7 @@ static UnkStruct_ov5_021D6FA8 * ov5_021D6F00 (UnkStruct_ov5_021DB4B8 * param0, i
     }
 
     GF_ASSERT(v0->unk_04);
-    GraphicElementData_SetDrawFlag(v0->unk_04, 1);
+    CellActor_SetDrawFlag(v0->unk_04, 1);
 
     return v0;
 }
@@ -1608,12 +1608,12 @@ static void ov5_021D6F4C (CellActorResourceData * param0, UnkStruct_ov5_021D6594
 
 static void ov5_021D6FA8 (UnkStruct_ov5_021D6FA8 * param0)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
 
     param0->unk_38->unk_34 = param0->unk_34;
     param0->unk_34->unk_38 = param0->unk_38;
 
-    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
+    CellActor_SetDrawFlag(param0->unk_04, 0);
     ov5_021D6EF0(param0);
 
     v0 = param0->unk_04;
@@ -1659,7 +1659,7 @@ static void ov5_021D700C (UnkStruct_ov5_021DB4B8 * param0)
 
 static VecFx32 ov5_021D7010 (UnkStruct_ov5_021D6FA8 * param0)
 {
-    const VecFx32 * v0 = GraphicElementData_GetPosition(param0->unk_04);
+    const VecFx32 * v0 = CellActor_GetPosition(param0->unk_04);
     return *v0;
 }
 
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 10016580dc..036fd5c8fd 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;
-    GraphicElementManager * unk_38;
+    CellActorCollection * unk_38;
     UnkStruct_0200C738 unk_3C;
-    GraphicElementData * unk_1C8;
+    CellActor * unk_1C8;
     BOOL unk_1CC;
     BOOL unk_1D0;
 } UnkStruct_ov6_022426B8;
@@ -148,7 +148,7 @@ void ov6_02242828 (UnkStruct_ov6_022426B8 * param0)
         sub_02009754(param0->unk_00[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_38);
+    CellActorCollection_Delete(param0->unk_38);
     Heap_FreeToHeap(param0->unk_20);
     Heap_FreeToHeap(param0->unk_24);
 }
@@ -158,7 +158,7 @@ static void ov6_02242860 (SysTask * param0, void * param1)
     UnkStruct_ov6_022426B8 * v0 = param1;
 
     if (v0->unk_1CC) {
-        GraphicElementManager_Update(v0->unk_38);
+        CellActorCollection_Update(v0->unk_38);
     } else {
         v0->unk_1D0 = 1;
         SysTask_Done(param0);
@@ -205,7 +205,7 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
     {
         CellActorInitParamsEx v2;
 
-        v2.manager = param0->unk_38;
+        v2.collection = param0->unk_38;
         v2.resourceData = &v1;
         v2.position.x = 0;
         v2.position.y = 0;
@@ -220,9 +220,9 @@ static void ov6_022428F8 (UnkStruct_ov6_022426B8 * param0)
         v2.position.x = FX32_ONE * (256 / 2);
         v2.position.y = FX32_ONE * (192 / 2);
 
-        param0->unk_1C8 = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_1C8 = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_1C8, 0);
-        GraphicElementData_SetAnim(param0->unk_1C8, 0);
+        CellActor_SetAnimateFlag(param0->unk_1C8, 0);
+        CellActor_SetAnim(param0->unk_1C8, 0);
     }
 }
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index ba596d0ec9..8aa4002176 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -71,7 +71,7 @@ typedef struct {
     NNSG2dScreenData * unk_64;
     NNSG2dCharacterData * unk_68;
     NNSG2dPaletteData * unk_6C;
-    GraphicElementManager * unk_70;
+    CellActorCollection * unk_70;
     UnkStruct_0200C738 unk_74;
     UnkStruct_02009714 * unk_200;
     UnkStruct_02009714 * unk_204;
@@ -82,8 +82,8 @@ typedef struct {
     UnkStruct_02009DC8 * unk_22C[4];
     UnkStruct_02009DC8 * unk_23C[2];
     UnkStruct_020711EC * unk_244;
-    GraphicElementData * unk_248;
-    GraphicElementData * unk_24C;
+    CellActor * unk_248;
+    CellActor * unk_24C;
     UnkStruct_ov101_021D5D90 * unk_250;
     UnkStruct_ov101_021D5D90 * unk_254;
     ArchivedSprite unk_258;
@@ -122,7 +122,7 @@ typedef struct {
     fx32 unk_4C;
     fx32 unk_50;
     fx32 unk_54;
-    GraphicElementData * unk_58;
+    CellActor * unk_58;
     UnkStruct_ov6_0224543C unk_5C;
     UnkStruct_ov101_021D5D90 * unk_60;
     SysTask * unk_64;
@@ -130,7 +130,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov6_02243FFC * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
 } UnkStruct_ov6_02245B4C;
 
 typedef struct {
@@ -140,7 +140,7 @@ typedef struct {
     int unk_0C;
     VecFx32 unk_10;
     UnkStruct_ov6_02243FFC * unk_1C;
-    GraphicElementData * unk_20;
+    CellActor * unk_20;
 } UnkStruct_ov6_02245B74;
 
 typedef struct {
@@ -158,7 +158,7 @@ typedef struct {
     s8 unk_05;
     s8 unk_06;
     s8 unk_07;
-    GraphicElementManager * unk_08;
+    CellActorCollection * unk_08;
     UnkStruct_0200C738 unk_0C;
     UnkStruct_02009714 * unk_198;
     UnkStruct_02009714 * unk_19C;
@@ -178,7 +178,7 @@ typedef struct {
     int unk_10;
     FieldSystem * fieldSystem;
     UnkStruct_ov6_02243258 unk_18;
-    GraphicElementData * unk_1D0;
+    CellActor * unk_1D0;
     UnkStruct_020711EC * unk_1D4;
     UnkStruct_ov101_021D5D90 * unk_1D8;
     SysTask * unk_1DC;
@@ -187,7 +187,7 @@ typedef struct {
 typedef struct {
     UnkStruct_020711EC * unk_00;
     FieldSystem * fieldSystem;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     UnkStruct_ov6_02243258 * unk_0C;
 } UnkStruct_ov6_02243888;
 
@@ -210,7 +210,7 @@ typedef struct {
     fx32 unk_50;
     fx32 unk_54;
     UnkStruct_ov6_02243888 unk_58;
-    GraphicElementData * unk_68;
+    CellActor * unk_68;
     UnkStruct_ov101_021D5D90 * unk_6C;
     SysTask * unk_70;
 } UnkStruct_ov6_02249110;
@@ -225,7 +225,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     UnkStruct_ov6_02245328 unk_0C;
 } UnkStruct_ov6_02245364;
 
@@ -250,7 +250,7 @@ typedef struct {
 } UnkStruct_ov100_021D4890;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_ov6_02243FFC * unk_04;
 } UnkStruct_ov6_02245F80;
 
@@ -271,11 +271,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 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 CellActor * ov6_02244C20(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static CellActor * ov6_02244CD4(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3);
+static CellActor * ov6_02244CFC(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
+static void ov6_02244D34(CellActor * param0);
+static CellActor * 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);
@@ -298,7 +298,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 GraphicElementData * ov6_0224529C(UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1);
+static CellActor * 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);
@@ -307,7 +307,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, GraphicElementData * param1);
+static UnkStruct_ov101_021D5D90 * ov6_02245B4C(UnkStruct_020711EC * param0, CellActor * 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);
@@ -411,8 +411,8 @@ static void ov6_0224339C (UnkStruct_ov6_02243258 * param0)
     Heap_FreeToHeap(param0->unk_1AC);
     Heap_FreeToHeap(param0->unk_1B0);
     Heap_FreeToHeap(param0->unk_1B4);
-    GraphicElementManager_DeleteAll(param0->unk_08);
-    GraphicElementManager_Delete(param0->unk_08);
+    CellActorCollection_DeleteAll(param0->unk_08);
+    CellActorCollection_Delete(param0->unk_08);
 }
 
 static void ov6_022434B0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int param2, int param3)
@@ -538,11 +538,11 @@ static void ov6_022436D0 (UnkStruct_ov6_02243258 * param0, NARC * param1, int pa
     GF_ASSERT(FALSE);
 }
 
-static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static CellActor * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
-    GraphicElementData * v2;
+    CellActor * v2;
 
     if (param5 == param0->unk_07) {
         param5 = 0xffffffff;
@@ -551,45 +551,45 @@ static GraphicElementData * ov6_02243740 (UnkStruct_ov6_02243258 * param0, const
     sub_020093B4(
         &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_198, param0->unk_19C, param0->unk_1A0, param0->unk_1A4, NULL, NULL);
 
-    v1.manager = param0->unk_08;
+    v1.collection = param0->unk_08;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
-    v2 = GraphicElementManager_AddElement(&v1);
+    v2 = CellActorCollection_Add(&v1);
 
     GF_ASSERT(v2 != NULL);
     return v2;
 }
 
-static void ov6_022437C8 (GraphicElementData * param0, VecFx32 * param1)
+static void ov6_022437C8 (CellActor * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = GraphicElementData_GetPosition(param0);
+    const VecFx32 * v0 = CellActor_GetPosition(param0);
     *param1 = *v0;
 }
 
-static GraphicElementData * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
+static CellActor * ov6_022437DC (UnkStruct_ov6_02243258 * param0)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
     VecFx32 v1 = {0, 0, 0};
     VecFx32 v2 = {0, 0, 0};
     VecFx32 v3 = {0x1000, 0x1000, 0};
 
     v0 = ov6_02243740(param0, &v1, 0, 0, 0, 2, 0, 132);
 
-    GraphicElementData_SetAffineOverwriteMode(v0, 2);
-    GraphicElementData_SetAffineTranslation(v0, &v2);
-    GraphicElementData_SetAffineScale(v0, &v3);
-    GraphicElementData_SetAffineZRotation(v0, sub_0201D2A4(0));
+    CellActor_SetAffineOverwriteMode(v0, 2);
+    CellActor_SetAffineTranslation(v0, &v2);
+    CellActor_SetAffineScale(v0, &v3);
+    CellActor_SetAffineZRotation(v0, sub_0201D2A4(0));
 
     return v0;
 }
 
-static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int param1)
+static CellActor * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int param1)
 {
     VecFx32 v0 = {0, 0, 0};
-    GraphicElementData * v1;
+    CellActor * v1;
     u32 v2 = 0;
 
     if (param1 == 1) {
@@ -598,8 +598,8 @@ static GraphicElementData * ov6_02243848 (UnkStruct_ov6_02243258 * param0, int p
 
     v1 = ov6_02243740(param0, &v0, 2, v2, 2, 1, 0, 131);
 
-    GraphicElementData_SetDrawFlag(v1, 0);
-    GraphicElementData_SetAnim(v1, 6);
+    CellActor_SetDrawFlag(v1, 0);
+    CellActor_SetAnim(v1, 6);
 
     return v1;
 }
@@ -607,7 +607,7 @@ static GraphicElementData * 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 (FieldSystem * fieldSystem, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, GraphicElementData * param3)
+static UnkStruct_ov101_021D5D90 * ov6_02243888 (FieldSystem * fieldSystem, UnkStruct_020711EC * param1, UnkStruct_ov6_02243258 * param2, CellActor * param3)
 {
     UnkStruct_ov101_021D5D90 * v0;
     VecFx32 v1 = {0, 0, 0};
@@ -658,7 +658,7 @@ static void ov6_022438EC (UnkStruct_ov101_021D5D90 * param0)
 static void ov6_02243914 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02249110 * v0 = param1;
-    GraphicElementData_Delete(v0->unk_68);
+    CellActor_Delete(v0->unk_68);
 }
 
 static void ov6_02243920 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -684,7 +684,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C = {
 static int ov6_02243940 (UnkStruct_ov6_02249110 * param0)
 {
     param0->unk_02 = 0;
-    GraphicElementData_SetDrawFlag(param0->unk_68, 0);
+    CellActor_SetDrawFlag(param0->unk_68, 0);
     return 0;
 }
 
@@ -716,11 +716,11 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
     v0.x = v2->unk_08.x + v2->unk_14.x;
     v0.y = v2->unk_08.y + v2->unk_14.y;
 
-    GraphicElementData_SetPosition(v2->unk_68, &v0);
-    GraphicElementData_SetAffineScale(v2->unk_68, &v1);
-    GraphicElementData_SetAffineZRotation(v2->unk_68, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    GraphicElementData_SetPriority(v2->unk_68, 132);
-    GraphicElementData_SetDrawFlag(v2->unk_68, 1);
+    CellActor_SetPosition(v2->unk_68, &v0);
+    CellActor_SetAffineScale(v2->unk_68, &v1);
+    CellActor_SetAffineZRotation(v2->unk_68, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    CellActor_SetPriority(v2->unk_68, 132);
+    CellActor_SetDrawFlag(v2->unk_68, 1);
 
     v2->unk_6C = ov6_02245B4C(v2->unk_58.unk_00, v2->unk_58.unk_08);
     v2->unk_70 = ov5_021F0EB0(v2->unk_58.fieldSystem, 4);
@@ -728,17 +728,17 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
     ov5_021F0F10(v2->unk_70, 1, -((FX32_ONE * 120)), 12);
 
     {
-        GraphicElementData * v3;
+        CellActor * v3;
         VecFx32 v4 = {0, 0, 0};
         VecFx32 v5 = {0x2000, 0x2000, 0};
 
         v3 = v2->unk_58.unk_08;
 
-        GraphicElementData_SetAffineOverwriteMode(v3, 2);
-        GraphicElementData_SetAffineTranslation(v3, &v4);
-        GraphicElementData_SetAffineScale(v3, &v5);
-        GraphicElementData_SetAffineZRotation(v3, sub_0201D2A4(0));
-        GraphicElementData_SetAnim(v3, 2);
+        CellActor_SetAffineOverwriteMode(v3, 2);
+        CellActor_SetAffineTranslation(v3, &v4);
+        CellActor_SetAffineScale(v3, &v5);
+        CellActor_SetAffineZRotation(v3, sub_0201D2A4(0));
+        CellActor_SetAnim(v3, 2);
     }
 
     ov6_02243F2C();
@@ -747,8 +747,8 @@ static void ov6_02243950 (UnkStruct_ov101_021D5D90 * param0)
 static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_68;
-    GraphicElementData * v2 = param0->unk_58.unk_08;
+    CellActor * v1 = param0->unk_68;
+    CellActor * v2 = param0->unk_58.unk_08;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -783,15 +783,15 @@ static int ov6_02243AB8 (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
-    GraphicElementData_SetAffineScale(v2, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v2, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
     v0.y -= (FX32_ONE * 18);
-    GraphicElementData_SetPosition(v2, &v0);
+    CellActor_SetPosition(v2, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -820,7 +820,7 @@ static int ov6_02243BB8 (UnkStruct_ov6_02249110 * param0)
 static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_68;
+    CellActor * v1 = param0->unk_68;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -837,7 +837,7 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
     }
 
     param0->unk_38 += 0x2000;
-    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    CellActor_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
     param0->unk_2C.x += param0->unk_50;
 
     if (param0->unk_2C.x > 0x1000) {
@@ -850,12 +850,12 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y - param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 
     if (((v0.y) / FX32_ONE) <= -16) {
         param0->unk_01++;
@@ -866,8 +866,8 @@ static int ov6_02243BEC (UnkStruct_ov6_02249110 * param0)
 
 static int ov6_02243CD8 (UnkStruct_ov6_02249110 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_68, 0);
-    GraphicElementData_SetAnim(param0->unk_58.unk_08, 1);
+    CellActor_SetDrawFlag(param0->unk_68, 0);
+    CellActor_SetAnim(param0->unk_58.unk_08, 1);
 
     param0->unk_04 = 0;
     param0->unk_01++;
@@ -897,12 +897,12 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
         param0->unk_48 = (FX32_ONE * 128);
         param0->unk_4C = 0x2000;
 
-        GraphicElementData_SetPosition(param0->unk_68, &v0);
-        GraphicElementData_SetAffineScale(param0->unk_68, &v1);
-        GraphicElementData_SetAffineZRotation(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
-        GraphicElementData_SetDrawFlag(param0->unk_68, 1);
-        GraphicElementData_SetAnim(param0->unk_58.unk_08, 6);
-        GraphicElementData_SetAnimateFlag(param0->unk_58.unk_08, 1);
+        CellActor_SetPosition(param0->unk_68, &v0);
+        CellActor_SetAffineScale(param0->unk_68, &v1);
+        CellActor_SetAffineZRotation(param0->unk_68, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+        CellActor_SetDrawFlag(param0->unk_68, 1);
+        CellActor_SetAnim(param0->unk_58.unk_08, 6);
+        CellActor_SetAnimateFlag(param0->unk_58.unk_08, 1);
     }
 
     param0->unk_01++;
@@ -912,7 +912,7 @@ static int ov6_02243CFC (UnkStruct_ov6_02249110 * param0)
 static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_68;
+    CellActor * v1 = param0->unk_68;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -943,22 +943,22 @@ static int ov6_02243DC0 (UnkStruct_ov6_02249110 * param0)
         param0->unk_2C.y = 0x400;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) > 60) {
         param0->unk_38 = (FX32_ONE * 60);
     }
 
-    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    CellActor_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 
     if (param0->unk_48 <= 0) {
-        GraphicElementData_SetDrawFlag(v1, 0);
+        CellActor_SetDrawFlag(v1, 0);
         param0->unk_01++;
     }
 
@@ -970,12 +970,12 @@ static int ov6_02243ECC (UnkStruct_ov6_02249110 * param0)
     param0->unk_04++;
 
     if (param0->unk_04 == 8) {
-        GraphicElementData_SetAnim(param0->unk_58.unk_08, 1);
+        CellActor_SetAnim(param0->unk_58.unk_08, 1);
         ov6_02243F74(param0->unk_58.fieldSystem, 0);
     }
 
     if (param0->unk_04 == 10) {
-        GraphicElementData_SetDrawFlag(param0->unk_58.unk_08, 0);
+        CellActor_SetDrawFlag(param0->unk_58.unk_08, 0);
     }
 
     if ((param0->unk_04 > 15) && (ov5_021F0EF0(param0->unk_70) == 1)) {
@@ -1207,7 +1207,7 @@ static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_24C);
+    v0 = CellActor_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
@@ -1216,7 +1216,7 @@ static int ov6_022441DC (UnkStruct_ov6_02243FFC * param0)
         param0->unk_00++;
     }
 
-    GraphicElementData_SetPosition(param0->unk_24C, &v1);
+    CellActor_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1236,11 +1236,11 @@ static int ov6_02244228 (UnkStruct_ov6_02243FFC * param0)
         }
     }
 
-    v0 = GraphicElementData_GetPosition(param0->unk_24C);
+    v0 = CellActor_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    GraphicElementData_SetPosition(param0->unk_24C, &v1);
+    CellActor_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1268,11 +1268,11 @@ static int ov6_022442A4 (UnkStruct_ov6_02243FFC * param0)
         param0->unk_58 = (FX32_ONE * -64);
     }
 
-    v0 = GraphicElementData_GetPosition(param0->unk_24C);
+    v0 = CellActor_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    GraphicElementData_SetPosition(param0->unk_24C, &v1);
+    CellActor_SetPosition(param0->unk_24C, &v1);
 
     if (v1.x <= (FX32_ONE * -40)) {
         param0->unk_54 = 0x1000;
@@ -1434,7 +1434,7 @@ static int ov6_022444D0 (UnkStruct_ov6_02243FFC * param0)
         return 0;
     }
 
-    GraphicElementData_SetAnim(param0->unk_248, 1);
+    CellActor_SetAnim(param0->unk_248, 1);
     param0->unk_00++;
 
     return 0;
@@ -1828,22 +1828,22 @@ static void ov6_02244B6C (UnkStruct_ov6_02243FFC * param0)
     sub_02009754(param0->unk_204);
     sub_02009754(param0->unk_208);
     sub_02009754(param0->unk_20C);
-    GraphicElementManager_DeleteAll(param0->unk_70);
-    GraphicElementManager_Delete(param0->unk_70);
+    CellActorCollection_DeleteAll(param0->unk_70);
+    CellActorCollection_Delete(param0->unk_70);
 }
 
 static void ov6_02244C10 (UnkStruct_ov6_02243FFC * param0)
 {
     if (param0->unk_70 != NULL) {
-        GraphicElementManager_Update(param0->unk_70);
+        CellActorCollection_Update(param0->unk_70);
     }
 }
 
-static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static CellActor * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
-    GraphicElementData * v2;
+    CellActor * v2;
 
     if (param5 == 4) {
         sub_020093B4(
@@ -1853,32 +1853,32 @@ static GraphicElementData * ov6_02244C20 (UnkStruct_ov6_02243FFC * param0, const
             &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_200, param0->unk_204, param0->unk_208, param0->unk_20C, NULL, NULL);
     }
 
-    v1.manager = param0->unk_70;
+    v1.collection = param0->unk_70;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = GraphicElementManager_AddElement(&v1);
+    v2 = CellActorCollection_Add(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
 }
 
-static GraphicElementData * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
+static CellActor * ov6_02244CD4 (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
 
     v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2);
-    GraphicElementData_SetAnim(v0, param3);
+    CellActor_SetAnim(v0, param3);
 
     return v0;
 }
 
-static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
+static CellActor * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
     u32 v1 = 0;
 
     if (param0->unk_0C == 1) {
@@ -1887,30 +1887,30 @@ static GraphicElementData * ov6_02244CFC (UnkStruct_ov6_02243FFC * param0, const
 
     v0 = ov6_02244C20(param0, param1, 2, v1, 2, 1, 0, 131);
 
-    GraphicElementData_SetDrawFlag(v0, 0);
-    GraphicElementData_SetAnim(v0, 6);
+    CellActor_SetDrawFlag(v0, 0);
+    CellActor_SetAnim(v0, 6);
 
     return v0;
 }
 
-static void ov6_02244D34 (GraphicElementData * param0)
+static void ov6_02244D34 (CellActor * param0)
 {
-    GraphicElementData_SetAnimateFlag(param0, 1);
-    GraphicElementData_SetAnimSpeed(param0, FX32_ONE);
+    CellActor_SetAnimateFlag(param0, 1);
+    CellActor_SetAnimSpeed(param0, FX32_ONE);
 }
 
-static GraphicElementData * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
+static CellActor * ov6_02244D4C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1, int param2, int param3)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
     VecFx32 v1 = {0, 0, 0};
     VecFx32 v2 = {0x1000, 0x1000, 0};
 
     v0 = ov6_02244C20(param0, param1, 0, 0, 0, 0xffffffff, 0, param2);
 
-    GraphicElementData_SetAffineOverwriteMode(v0, 2);
-    GraphicElementData_SetAffineTranslation(v0, &v1);
-    GraphicElementData_SetAffineScale(v0, &v2);
-    GraphicElementData_SetAffineZRotation(v0, sub_0201D2A4(0));
+    CellActor_SetAffineOverwriteMode(v0, 2);
+    CellActor_SetAffineTranslation(v0, &v1);
+    CellActor_SetAffineScale(v0, &v2);
+    CellActor_SetAffineZRotation(v0, sub_0201D2A4(0));
 
     return v0;
 }
@@ -2173,9 +2173,9 @@ static void ov6_022451B8 (UnkStruct_ov6_02243FFC * param0)
     GF_ASSERT(v0 < 4);
 }
 
-static GraphicElementData * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
+static CellActor * ov6_0224529C (UnkStruct_ov6_02243FFC * param0, const VecFx32 * param1)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
 
     v0 = ov6_02244C20(param0, param1, 3, 2, 3, 0xffffffff, 0, 129);
     return v0;
@@ -2247,7 +2247,7 @@ static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
 
     v1->unk_08 = ov6_02244CD4(v1->unk_0C.unk_08, &v0, v1->unk_0C.unk_00, v1->unk_04);
-    GraphicElementData_SetDrawFlag(v1->unk_08, 0);
+    CellActor_SetDrawFlag(v1->unk_08, 0);
 
     return 1;
 }
@@ -2255,7 +2255,7 @@ static int ov6_02245364 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov6_022453AC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02245364 * v0 = param1;
-    GraphicElementData_Delete(v0->unk_08);
+    CellActor_Delete(v0->unk_08);
 }
 
 static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2269,7 +2269,7 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v0.x %= (FX32_ONE * 512);
 
     sub_020715D4(param0, &v0);
-    GraphicElementData_SetPosition(v1->unk_08, &v0);
+    CellActor_SetPosition(v1->unk_08, &v0);
 
     if (v1->unk_0C.unk_04 == 1) {
         UnkStruct_ov6_02243FFC * v2 = v1->unk_0C.unk_08;
@@ -2282,9 +2282,9 @@ static void ov6_022453B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
                 v3 = 1;
             }
 
-            GraphicElementData_SetDrawFlag(v1->unk_08, v3);
+            CellActor_SetDrawFlag(v1->unk_08, v3);
         } else if (v2->unk_14 == 1) {
-            GraphicElementData_SetDrawFlag(v1->unk_08, 0);
+            CellActor_SetDrawFlag(v1->unk_08, 0);
         }
     }
 }
@@ -2348,7 +2348,7 @@ static int ov6_022454B0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov6_022454DC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov6_02249198 * v0 = param1;
-    GraphicElementData_Delete(v0->unk_58);
+    CellActor_Delete(v0->unk_58);
 }
 
 static void ov6_022454E8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2383,7 +2383,7 @@ static int(*const * const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *) = {
 static int ov6_0224550C (UnkStruct_ov6_02249198 * param0)
 {
     param0->unk_02 = 0;
-    GraphicElementData_SetDrawFlag(param0->unk_58, 0);
+    CellActor_SetDrawFlag(param0->unk_58, 0);
     return 0;
 }
 
@@ -2409,16 +2409,16 @@ static void ov6_0224551C (UnkStruct_ov6_02243FFC * param0)
     v2->unk_48 = 0;
     v2->unk_4C = 0x2000;
 
-    GraphicElementData_SetPosition(v2->unk_58, &v0);
-    GraphicElementData_SetAffineScale(v2->unk_58, &v1);
-    GraphicElementData_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    GraphicElementData_SetDrawFlag(v2->unk_58, 1);
+    CellActor_SetPosition(v2->unk_58, &v0);
+    CellActor_SetAffineScale(v2->unk_58, &v1);
+    CellActor_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    CellActor_SetDrawFlag(v2->unk_58, 1);
 }
 
 static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_58;
+    CellActor * v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
 
@@ -2445,22 +2445,22 @@ static int ov6_022455C4 (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 -= 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) < 0) {
         param0->unk_38 = 0;
     }
 
-    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    CellActor_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 
     if (v0.y < (FX32_ONE * -64)) {
-        GraphicElementData_SetDrawFlag(v1, 0);
+        CellActor_SetDrawFlag(v1, 0);
         param0->unk_02 = 2;
         param0->unk_01++;
     }
@@ -2502,10 +2502,10 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
     v0.x = v2->unk_08.x + v2->unk_14.x;
     v0.y = v2->unk_08.y + v2->unk_14.y;
 
-    GraphicElementData_SetPosition(v2->unk_58, &v0);
-    GraphicElementData_SetAffineScale(v2->unk_58, &v1);
-    GraphicElementData_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
-    GraphicElementData_SetDrawFlag(v2->unk_58, 1);
+    CellActor_SetPosition(v2->unk_58, &v0);
+    CellActor_SetAffineScale(v2->unk_58, &v1);
+    CellActor_SetAffineZRotation(v2->unk_58, sub_0201D2A4(((v2->unk_38) / FX32_ONE)));
+    CellActor_SetDrawFlag(v2->unk_58, 1);
 
     v2->unk_60 = ov6_02245B4C(param0->unk_244, param0->unk_248);
     param0->unk_1C = 1;
@@ -2514,23 +2514,23 @@ static void ov6_022456D4 (UnkStruct_ov6_02243FFC * param0)
     ov5_021F0F10(v2->unk_64, 1, -((FX32_ONE * 120)), 12);
 
     {
-        GraphicElementData * v3;
+        CellActor * v3;
         VecFx32 v4 = {0, 0, 0};
         VecFx32 v5 = {0x1000, 0x1000, 0};
 
         v3 = v2->unk_5C.unk_00->unk_248;
 
-        GraphicElementData_SetAffineOverwriteMode(v3, 2);
-        GraphicElementData_SetAffineTranslation(v3, &v4);
-        GraphicElementData_SetAffineScale(v3, &v5);
-        GraphicElementData_SetAffineZRotation(v3, sub_0201D2A4(0));
+        CellActor_SetAffineOverwriteMode(v3, 2);
+        CellActor_SetAffineTranslation(v3, &v4);
+        CellActor_SetAffineScale(v3, &v5);
+        CellActor_SetAffineZRotation(v3, sub_0201D2A4(0));
     }
 }
 
 static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_58;
+    CellActor * v1 = param0->unk_58;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -2565,19 +2565,19 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x1800;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x8000;
 
     if (((param0->unk_38) / FX32_ONE) > 360) {
         param0->unk_38 = (FX32_ONE * 360);
     }
 
-    GraphicElementData_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
+    CellActor_SetAffineZRotation(v1, sub_0201D2A4(((param0->unk_38) / FX32_ONE)));
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -2591,8 +2591,8 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
     }
 
     {
-        GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 * v3 = GraphicElementData_GetAffineScale(v2);
+        CellActor * v2 = param0->unk_5C.unk_00->unk_248;
+        const VecFx32 * v3 = CellActor_GetAffineScale(v2);
         VecFx32 v4 = *v3;
 
         v4.x += 0x80;
@@ -2607,7 +2607,7 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
             v4.y = 0x1400;
         }
 
-        GraphicElementData_SetAffineScale(v2, &v4);
+        CellActor_SetAffineScale(v2, &v4);
     }
 
     return 0;
@@ -2615,16 +2615,16 @@ static int ov6_02245840 (UnkStruct_ov6_02249198 * param0)
 
 static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 {
-    GraphicElementData * v0 = param0->unk_5C.unk_00->unk_248;
+    CellActor * v0 = param0->unk_5C.unk_00->unk_248;
 
-    GraphicElementData_SetAnim(v0, 3);
+    CellActor_SetAnim(v0, 3);
 
     {
         fx32 v1, v2;
-        const VecFx32 * v3 = GraphicElementData_GetPosition(v0);
+        const VecFx32 * v3 = CellActor_GetPosition(v0);
 
         v1 = v3->y;
-        v3 = GraphicElementData_GetPosition(param0->unk_58);
+        v3 = CellActor_GetPosition(param0->unk_58);
         v2 = v3->y;
 
         param0->unk_54 = v1 - v2;
@@ -2646,7 +2646,7 @@ static int ov6_022459B0 (UnkStruct_ov6_02249198 * param0)
 static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1 = param0->unk_58;
+    CellActor * v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -2674,23 +2674,23 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
         param0->unk_2C.y = 0x2000;
     }
 
-    GraphicElementData_SetAffineScale(v1, &param0->unk_2C);
+    CellActor_SetAffineScale(v1, &param0->unk_2C);
 
     v0.x = param0->unk_08.x + param0->unk_14.x;
     v0.y = param0->unk_08.y + param0->unk_14.y;
 
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 
     {
-        GraphicElementData * v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 * v3 = GraphicElementData_GetAffineScale(v2);
+        CellActor * v2 = param0->unk_5C.unk_00->unk_248;
+        const VecFx32 * v3 = CellActor_GetAffineScale(v2);
         VecFx32 v4 = v0;
         VecFx32 v5 = *v3;
 
         param0->unk_54 -= 0x1000;
 
         v4.y += param0->unk_54;
-        GraphicElementData_SetPosition(v2, &v4);
+        CellActor_SetPosition(v2, &v4);
         v5.x += 0x100;
 
         if (v5.x > 0x2000) {
@@ -2703,7 +2703,7 @@ static int ov6_02245A0C (UnkStruct_ov6_02249198 * param0)
             v5.y = 0x2000;
         }
 
-        GraphicElementData_SetAffineScale(v2, &v5);
+        CellActor_SetAffineScale(v2, &v5);
     }
 
     if (((v0.y) / FX32_ONE) >= 240) {
@@ -2726,7 +2726,7 @@ static int(*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *) = {
     ov6_02245B48
 };
 
-static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, GraphicElementData * param1)
+static UnkStruct_ov101_021D5D90 * ov6_02245B4C (UnkStruct_020711EC * param0, CellActor * param1)
 {
     UnkStruct_ov101_021D5D90 * v0;
     UnkStruct_ov6_02245B4C v1;
@@ -2755,11 +2755,11 @@ static void ov6_02245B80 (UnkStruct_ov101_021D5D90 * param0)
     v2->unk_0C = 0;
     v2->unk_08 = 0;
     v2->unk_10.x = 0; v2->unk_10.y = 0; v2->unk_10.z = 0;
-    v1 = GraphicElementData_GetPosition(v2->unk_20);
+    v1 = CellActor_GetPosition(v2->unk_20);
     v0 = *v1;
 
     sub_020715D4(param0, &v0);
-    GraphicElementData_SetAnim(v2->unk_20, 5);
+    CellActor_SetAnim(v2->unk_20, 5);
 }
 
 static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
@@ -2776,7 +2776,7 @@ static void ov6_02245BC8 (UnkStruct_ov101_021D5D90 * param0)
     ov6_022437C8(v1->unk_20, &v0);
 
     sub_020715D4(param0, &v0);
-    GraphicElementData_SetAnim(v1->unk_20, 4);
+    CellActor_SetAnim(v1->unk_20, 4);
 }
 
 static int ov6_02245C04 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2821,7 +2821,7 @@ static void ov6_02245C18 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245
         param1->unk_10.y = Unk_ov6_022492A8[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        GraphicElementData_SetPosition(param1->unk_20, &v0);
+        CellActor_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 12) {
@@ -2841,7 +2841,7 @@ static void ov6_02245C64 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov6_02245
         param1->unk_10.y = Unk_ov6_022491FC[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        GraphicElementData_SetPosition(param1->unk_20, &v0);
+        CellActor_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 4) {
@@ -2922,7 +2922,7 @@ static void ov6_02245D10 (SysTask * param0, void * param1)
         }
 
         if (v1->unk_18.unk_08 != NULL) {
-            GraphicElementManager_Update(v1->unk_18.unk_08);
+            CellActorCollection_Update(v1->unk_18.unk_08);
         }
     }
 }
@@ -2980,7 +2980,7 @@ static int ov6_02245D60 (UnkStruct_ov6_02249270 * param0)
 static int ov6_02245EA4 (UnkStruct_ov6_02249270 * param0)
 {
     param0->unk_1D0 = ov6_02243848(&param0->unk_18, param0->unk_0C);
-    GraphicElementData_SetDrawFlag(param0->unk_1D0, 1);
+    CellActor_SetDrawFlag(param0->unk_1D0, 1);
 
     param0->unk_1D8 = ov6_02243888(param0->fieldSystem, param0->unk_1D4, &param0->unk_18, param0->unk_1D0);
     ov6_02243950(param0->unk_1D8);
@@ -3062,19 +3062,19 @@ static void ov6_02245F94 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     const VecFx32 * v3;
     UnkStruct_ov6_02245F80 * v4 = param1;
 
-    v3 = GraphicElementData_GetPosition(v4->unk_00);
+    v3 = CellActor_GetPosition(v4->unk_00);
     v0 = v3->y;
     v1 = v4->unk_04->unk_4C;
     v2 = v4->unk_04->unk_50;
 
     if (v4->unk_04->unk_1C == 0) {
         if (((v0 - (FX32_ONE * 8)) >= v1) && ((v0 + (FX32_ONE * 8)) <= v2)) {
-            GraphicElementData_SetDrawFlag(v4->unk_00, 1);
+            CellActor_SetDrawFlag(v4->unk_00, 1);
         } else {
-            GraphicElementData_SetDrawFlag(v4->unk_00, 0);
+            CellActor_SetDrawFlag(v4->unk_00, 0);
         }
     } else {
-        GraphicElementData_SetDrawFlag(v4->unk_00, 1);
+        CellActor_SetDrawFlag(v4->unk_00, 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index 9419dfb57b..eda9f99e29 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -112,7 +112,7 @@ typedef struct {
     void (* unk_134)(void *, u32);
     UnkStruct_02009714 * unk_138[4];
     UnkStruct_02009DC8 * unk_148[4];
-    GraphicElementData * unk_158[2];
+    CellActor * unk_158[2];
 } UnkStruct_ov7_0224C768;
 
 typedef void (* UnkFuncPtr_ov7_0224C768)(void *, u32);
@@ -139,7 +139,7 @@ typedef struct UnkStruct_ov7_0224BEFC_t {
     Bag * unk_10;
     BGL * unk_14;
     u32 unk_18;
-    GraphicElementManager * unk_1C;
+    CellActorCollection * unk_1C;
     UnkStruct_0200C738 unk_20;
     MessageLoader * unk_1AC;
     u32 unk_1B0;
@@ -165,7 +165,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, GraphicElementManager * 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, CellActorCollection * 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);
@@ -362,7 +362,7 @@ BOOL ov7_0224BF2C (UnkStruct_ov7_0224BEFC * param0)
         break;
     }
 
-    GraphicElementManager_Update(param0->unk_1C);
+    CellActorCollection_Update(param0->unk_1C);
 
     return 0;
 }
@@ -397,7 +397,7 @@ static void ov7_0224C3CC (UnkStruct_ov7_0224BEFC * param0)
 
 static void ov7_0224C3E0 (UnkStruct_ov7_0224BEFC * param0)
 {
-    GraphicElementManager_Delete(param0->unk_1C);
+    CellActorCollection_Delete(param0->unk_1C);
 }
 
 static void ov7_0224C3EC (UnkStruct_ov7_0224C3EC * param0, BGL * param1, u32 param2, u32 param3)
@@ -568,7 +568,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, GraphicElementManager * 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, CellActorCollection * param8)
 {
     int v0;
     Strbuf* v1;
@@ -647,7 +647,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
 
     ov7_0224CA54(&v2, param0, param2);
 
-    v3.manager = param8;
+    v3.collection = param8;
     v3.resourceData = &v2;
     v3.priority = 0;
     v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -656,10 +656,10 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par
 
     for (v0 = 0; v0 < 2; v0++) {
         v3.position.y = v4[v0] * FX32_ONE;
-        param0->unk_158[v0] = GraphicElementManager_AddElement(&v3);
+        param0->unk_158[v0] = CellActorCollection_Add(&v3);
 
-        GraphicElementData_SetAnim(param0->unk_158[v0], v0);
-        GraphicElementData_SetAnimateFlag(param0->unk_158[v0], 1);
+        CellActor_SetAnim(param0->unk_158[v0], v0);
+        CellActor_SetAnimateFlag(param0->unk_158[v0], 1);
     }
 }
 
@@ -672,7 +672,7 @@ static void ov7_0224C934 (UnkStruct_ov7_0224C768 * param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_158[v0]);
+        CellActor_Delete(param0->unk_158[v0]);
     }
 
     ov7_0224CB40(param0);
@@ -725,8 +725,8 @@ static void ov7_0224CA0C (UnkStruct_ov7_0224C768 * param0)
 
 static void ov7_0224CA34 (UnkStruct_ov7_0224C768 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_158[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_158[1], 0);
+    CellActor_SetDrawFlag(param0->unk_158[0], 0);
+    CellActor_SetDrawFlag(param0->unk_158[1], 0);
 }
 
 static void ov7_0224CA54 (CellActorResourceData * param0, UnkStruct_ov7_0224C768 * param1, u32 param2)
@@ -763,15 +763,15 @@ static void ov7_0224CB70 (UnkStruct_ov7_0224C768 * param0)
     sub_020014DC(param0->unk_08, &v0, NULL);
 
     if ((v0 <= 0)) {
-        GraphicElementData_SetDrawFlag(param0->unk_158[0], 0);
+        CellActor_SetDrawFlag(param0->unk_158[0], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_158[0], 1);
+        CellActor_SetDrawFlag(param0->unk_158[0], 1);
     }
 
     if (v0 >= (param0->unk_120 - 7)) {
-        GraphicElementData_SetDrawFlag(param0->unk_158[1], 0);
+        CellActor_SetDrawFlag(param0->unk_158[1], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_158[1], 1);
+        CellActor_SetDrawFlag(param0->unk_158[1], 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index 5a81ed04e9..bae38647ee 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -303,9 +303,9 @@ BOOL ov7_0224CEAC (TaskManager * param0)
     }
 
     if ((v1->unk_297 >= 4) && (v1->unk_297 <= 11)) {
-        GraphicElementData_UpdateAnim(v1->unk_25C[0], FX32_ONE);
-        GraphicElementData_UpdateAnim(v1->unk_25C[1], FX32_ONE);
-        GraphicElementManager_Update(v1->unk_94.unk_00);
+        CellActor_UpdateAnim(v1->unk_25C[0], FX32_ONE);
+        CellActor_UpdateAnim(v1->unk_25C[1], FX32_ONE);
+        CellActorCollection_Update(v1->unk_94.unk_00);
     }
 
     return 0;
@@ -703,17 +703,17 @@ static void ov7_0224D85C (BmpList * param0, u32 param1, u8 param2)
         sub_020014DC(param0, &v5, &v6);
 
         if (v5 == 0) {
-            GraphicElementData_SetDrawFlag(v0->unk_25C[0], 0);
+            CellActor_SetDrawFlag(v0->unk_25C[0], 0);
         } else {
-            GraphicElementData_SetDrawFlag(v0->unk_25C[0], 1);
+            CellActor_SetDrawFlag(v0->unk_25C[0], 1);
         }
 
         v4 = sub_02001504(param0, 2);
 
         if ((v4 > 7) && (v4 > v5 + 7)) {
-            GraphicElementData_SetDrawFlag(v0->unk_25C[1], 1);
+            CellActor_SetDrawFlag(v0->unk_25C[1], 1);
         } else {
-            GraphicElementData_SetDrawFlag(v0->unk_25C[1], 0);
+            CellActor_SetDrawFlag(v0->unk_25C[1], 0);
         }
     }
     sub_0201A9A4(&v0->unk_08[1]);
@@ -850,11 +850,11 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0)
         Strbuf* v3;
         u32 v4;
 
-        param0->unk_26C[0] = (u16)GraphicElementData_GetDrawFlag(param0->unk_25C[0]);
-        param0->unk_26C[1] = (u16)GraphicElementData_GetDrawFlag(param0->unk_25C[1]);
+        param0->unk_26C[0] = (u16)CellActor_GetDrawFlag(param0->unk_25C[0]);
+        param0->unk_26C[1] = (u16)CellActor_GetDrawFlag(param0->unk_25C[1]);
 
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], 0);
+        CellActor_SetDrawFlag(param0->unk_25C[0], 0);
+        CellActor_SetDrawFlag(param0->unk_25C[1], 0);
 
         ov7_0224EC10(param0, 1);
 
@@ -926,8 +926,8 @@ static u8 ov7_0224DE94 (UnkStruct_ov7_0224D008 * param0)
     ov7_0224DED4(param0);
     ov7_0224E28C(param0, 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_25C[0], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_25C[1], 1);
+    CellActor_SetDrawFlag(param0->unk_25C[0], 1);
+    CellActor_SetDrawFlag(param0->unk_25C[1], 1);
 
     return 6;
 }
@@ -971,8 +971,8 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], 0);
+        CellActor_SetDrawFlag(param0->unk_25C[0], 0);
+        CellActor_SetDrawFlag(param0->unk_25C[1], 0);
         Window_Clear(&param0->unk_08[4], 1);
         Window_Clear(&param0->unk_08[3], 1);
         BGL_FillWindow(&param0->unk_08[5], 15);
@@ -988,8 +988,8 @@ static u8 ov7_0224DFB0 (UnkStruct_ov7_0224D008 * param0)
 
         ov7_0224EB38(param0, 0);
 
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
 
         ov7_0224EC10(param0, 0);
 
@@ -1169,8 +1169,8 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0)
     case 0xfffffffe:
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
         return 4;
@@ -1249,8 +1249,8 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0)
 
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
 
@@ -1269,8 +1269,8 @@ static u8 ov7_0224E7C8 (UnkStruct_ov7_0224D008 * param0)
     if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         sub_0200E084(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        GraphicElementData_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         sub_0201A9A4(&param0->unk_08[1]);
 
@@ -1482,7 +1482,7 @@ static void ov7_0224EB14 (UnkStruct_ov7_0224D008 * param0)
     u32 v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(param0->unk_25C[v0]);
+        CellActor_Delete(param0->unk_25C[v0]);
     }
 
     ov5_021D30A8(&param0->unk_94);
@@ -1504,7 +1504,7 @@ static void ov7_0224EB7C (UnkStruct_ov7_0224D008 * param0, u16 param1)
     UnkStruct_02009DC8 * v0;
 
     if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3)) {
-        GraphicElementData_SetDrawFlag(param0->unk_25C[3], 0);
+        CellActor_SetDrawFlag(param0->unk_25C[3], 0);
         return;
     }
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 641db0997c..6dfdae73c7 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -100,7 +100,7 @@ typedef struct {
 } UnkStruct_ov9_02251EC8;
 
 typedef struct {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190;
     UnkStruct_02009714 * unk_194;
@@ -152,7 +152,7 @@ typedef struct {
     fx32 unk_00;
     fx32 unk_04;
     UnkStruct_ov9_0224B1B4 unk_08;
-    GraphicElementData * unk_40;
+    CellActor * unk_40;
 } UnkStruct_ov9_0224B2C0;
 
 typedef struct {
@@ -930,7 +930,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 GraphicElementData * ov9_0224B130(UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static CellActor * 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);
@@ -2744,32 +2744,32 @@ static void ov9_0224B064 (UnkStruct_ov9_0224B064 * param0)
     sub_02009754(param0->unk_198);
     sub_02009754(param0->unk_19C);
 
-    GraphicElementManager_DeleteAll(param0->unk_00);
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_DeleteAll(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
 }
 
 static void ov9_0224B124 (SysTask * param0, void * param1)
 {
     UnkStruct_ov9_0224B064 * v0 = param1;
-    GraphicElementManager_Update(v0->unk_00);
+    CellActorCollection_Update(v0->unk_00);
 }
 
-static GraphicElementData * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static CellActor * ov9_0224B130 (UnkStruct_ov9_0224B064 * param0, const VecFx32 * param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
-    v1.manager = param0->unk_00;
+    v1.collection = param0->unk_00;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = GraphicElementManager_AddElement(&v1);
+    v2 = CellActorCollection_Add(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
@@ -2819,14 +2819,14 @@ static int ov9_0224B23C (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v1 = &Unk_ov9_02251EC8[v3->unk_08.unk_04.unk_00];
     v3->unk_40 = ov9_0224B130(v3->unk_08.unk_34, &v0, v1->unk_00, v1->unk_01, v1->unk_02, v1->unk_03, 3, 0xffff);
 
-    GraphicElementData_SetAffineScaleEx(v3->unk_40, &v3->unk_08.unk_04.unk_24, 2);
+    CellActor_SetAffineScaleEx(v3->unk_40, &v3->unk_08.unk_04.unk_24, 2);
     return 1;
 }
 
 static void ov9_0224B2C0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov9_0224B2C0 * v0 = param1;
-    GraphicElementData_Delete(v0->unk_40);
+    CellActor_Delete(v0->unk_40);
 }
 
 static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -2863,8 +2863,8 @@ static void ov9_0224B2CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v3.y += ((FX32_ONE * -512)) + (sub_0201D15C(((v4->unk_00) / FX32_ONE)) * v4->unk_08.unk_04.unk_10);
 
     sub_020715D4(param0, &v3);
-    GraphicElementData_SetPosition(v4->unk_40, &v3);
-    GraphicElementData_SetAffineZRotation(v4->unk_40, sub_0201D2A4(((v0) / FX32_ONE)));
+    CellActor_SetPosition(v4->unk_40, &v3);
+    CellActor_SetAffineZRotation(v4->unk_40, sub_0201D2A4(((v0) / FX32_ONE)));
 }
 
 static void ov9_0224B3A4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index e5e8988376..4fb0651873 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -1259,7 +1259,7 @@ static void ov10_02220C2C (UnkStruct_ov10_0221FB28 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_210; v0++) {
-        GraphicElementData_UpdateAnim(param0->unk_198[v0]->unk_00, FX32_ONE);
+        CellActor_UpdateAnim(param0->unk_198[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c
index 3f478eb283..e0b685f424 100644
--- a/src/overlay012/ov12_0221FC20.c
+++ b/src/overlay012/ov12_0221FC20.c
@@ -2240,7 +2240,7 @@ static void ov12_02221580 (UnkStruct_ov12_0221FCDC * param0)
         NNSG2dImagePaletteProxy * v19;
         int v20;
 
-        v19 = GraphicElementData_GetPaletteProxy(v1->unk_00);
+        v19 = CellActor_GetPaletteProxy(v1->unk_00);
         v20 = sub_0201FAB4(v19, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteSys_LoadPalette(param0->unk_C4, v8, v9, param0->unk_00, 2, 0x20, v20 * 16);
@@ -4332,7 +4332,7 @@ UnkStruct_ov12_02223764 * ov12_022234F8 (BattleSystem * param0, int param1, int
                     NNSG2dImagePaletteProxy * v18;
                     int v19;
 
-                    v18 = GraphicElementData_GetPaletteProxy(v10->unk_00);
+                    v18 = CellActor_GetPaletteProxy(v10->unk_00);
                     v19 = sub_0201FAB4(v18, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                     PaletteSys_LoadPalette(v2->unk_08.unk_08, v6, v7, v2->unk_00, 2, 0x20, v19 * 16);
diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c
index 9bbb71b9e8..8215c65cc6 100644
--- a/src/overlay012/ov12_02225864.c
+++ b/src/overlay012/ov12_02225864.c
@@ -150,7 +150,7 @@ s16 ov12_022258E0 (UnkStruct_ov12_0221FCDC * param0, int param1, int param2)
 
 u8 ov12_02225950 (CellActorData * param0)
 {
-    return sub_0201FAB4(GraphicElementData_GetPaletteProxy(param0->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+    return sub_0201FAB4(CellActor_GetPaletteProxy(param0->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 }
 
 int ov12_02225964 (UnkStruct_ov12_0221FCDC * param0, int param1)
diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c
index 59b589a91b..623b60efa2 100644
--- a/src/overlay012/ov12_022269C0.c
+++ b/src/overlay012/ov12_022269C0.c
@@ -38,7 +38,7 @@ typedef struct {
     SpriteGfxHandler * unk_0C;
     CellActorData * unk_10;
     CellActorData * unk_14[100];
-    GraphicElementData * unk_1A4[10];
+    CellActor * unk_1A4[10];
 } UnkStruct_ov12_02226AAC;
 
 void ov12_022269C0 (UnkStruct_ov12_0221FCDC * param0)
diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c
index e1eb8dc79c..09d10c1ecb 100644
--- a/src/overlay012/ov12_02226B84.c
+++ b/src/overlay012/ov12_02226B84.c
@@ -2422,7 +2422,7 @@ void ov12_022291AC (UnkStruct_ov12_0221FCDC * param0)
 
         ov12_02235D74(param0, v3, &(v1->unk_1C), &v0);
 
-        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_1C.unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v1->unk_1C.unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v1->unk_30 = ov12_02226870(v1->unk_00.unk_18, ov12_0221FDE4(param0), 2, v2 * 16, 16, v4, v5, v6, v7, v8, 1100);
     }
 
diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c
index 4c12213c19..84249693c8 100644
--- a/src/overlay012/ov12_0222AC70.c
+++ b/src/overlay012/ov12_0222AC70.c
@@ -737,10 +737,10 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0)
             sub_0200D460(v0->unk_18[2], v4);
             sub_0200D460(v0->unk_18[3], v4);
 
-            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
 
-            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
         } else {
             sub_0200D474(v0->unk_18[0], 20);
@@ -756,10 +756,10 @@ void ov12_0222B68C (UnkStruct_ov12_0221FCDC * param0)
             sub_0200D460(v0->unk_18[2], v4);
             sub_0200D460(v0->unk_18[3], v4);
 
-            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_18[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
 
-            v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_18[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
             sub_02003B08(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
         }
     }
@@ -1142,7 +1142,7 @@ void ov12_0222C0C0 (UnkStruct_ov12_0221FCDC * param0)
         int v2 = ov12_02223334(v0->unk_04, ov12_02220240(v0->unk_04));
         int v3 = ov12_02223344(v0->unk_04, ov12_02220240(v0->unk_04));
 
-        v1 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v1 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_0C->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         sub_02003B08(ov12_0222332C(v0->unk_04), v3, v2, ov12_0221FDE4(param0), 2, 0x20, v1 * 16, 256, 256, 256);
     }
 
diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c
index 1e67e366f4..0362ad1692 100644
--- a/src/overlay012/ov12_0222E91C.c
+++ b/src/overlay012/ov12_0222E91C.c
@@ -175,14 +175,14 @@ void ov12_0222EAA0 (UnkStruct_ov12_0221FCDC * param0)
 
         v1 = v0->unk_1C.unk_0C;
         sub_0200D460(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
         SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
 
         v1 = v0->unk_30;
         sub_0200D460(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = sub_0201FAB4(CellActor_GetPaletteProxy(v1->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         sub_02003B08(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
         SpriteActor_SetOAMMode(v1, GX_OAM_MODE_XLU);
@@ -362,7 +362,7 @@ static void ov12_0222EE50 (SysTask * param0, void * param1)
             ov12_02226858(v0->unk_38[0]);
             ov12_02226858(v0->unk_38[1]);
 
-            v1 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v1 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
 
             v0->unk_38[1] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(v0->unk_00.unk_04), 2, v1 * 16, 16, 0, 1, 15, 0, 0xFFFFFF, 1100);
             v0->unk_00.unk_00++;
@@ -425,10 +425,10 @@ void ov12_0222EFB0 (UnkStruct_ov12_0221FCDC * param0)
     {
         int v6;
 
-        v6 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_1C[0]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v0->unk_38[0] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(param0), 2, v6 * 16, 16, 0, 1, 0, 15, 0xFFFFFF, 1100);
 
-        v6 = sub_0201FAB4(GraphicElementData_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = sub_0201FAB4(CellActor_GetPaletteProxy(v0->unk_1C[2]->unk_00), NNS_G2D_VRAM_TYPE_2DMAIN);
         v0->unk_38[1] = ov12_02226870(v0->unk_00.unk_18, ov12_0221FDE4(param0), 2, v6 * 16, 16, 0, 1, 0, 15, 0xFFFFFF, 1100);
     }
 
diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c
index 595a618e9a..d0e78e6d1e 100644
--- a/src/overlay012/ov12_0222F700.c
+++ b/src/overlay012/ov12_0222F700.c
@@ -785,7 +785,7 @@ static void ov12_0222FC44 (SysTask * param0, void * param1)
     case 4:
         sub_0200D330(v0->unk_0C.unk_00);
 
-        if (GraphicElementData_IsAnimated(v0->unk_0C.unk_00->unk_00) == 0) {
+        if (CellActor_IsAnimated(v0->unk_0C.unk_00->unk_00) == 0) {
             SpriteActor_SetOAMMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
             v0->unk_EC++;
         }
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 37549e022e..872fb7deba 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -977,7 +977,7 @@ BOOL ov17_0224AD70 (UnkStruct_ov17_0224DF54 * param0, int param1, int param2)
 
     sub_0200D364(v0, param2);
     sub_0200D500(v0, v5, v6, (256 * FX32_ONE));
-    GraphicElementData_SetAnimateFlag(v0->unk_00, 1);
+    CellActor_SetAnimateFlag(v0->unk_00, 1);
     SpriteActor_UpdateObject(v0->unk_00);
 
     v1 = sub_02094E98(param0->unk_00);
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index d3b99ca214..a46e897530 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -420,7 +420,7 @@ void ov17_02250DB0 (UnkStruct_ov17_0224FCA0 * param0)
         param0->unk_10.unk_128[v2] = SpriteActor_LoadResources(param0->unk_10.unk_18, param0->unk_10.unk_1C, &v0);
 
         sub_0200D364(param0->unk_10.unk_128[v2], 1);
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10.unk_128[v2]->unk_00, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10.unk_128[v2]->unk_00, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
         sub_0200D330(param0->unk_10.unk_128[v2]);
     }
 
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 6adbd2d55d..ec531bbcca 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -64,7 +64,7 @@ struct UnkStruct_ov19_021D61B0_t {
     SysTask * unk_00;
     SysTask * unk_04;
     SysTask * unk_08[4];
-    GraphicElementManager * unk_18;
+    CellActorCollection * unk_18;
     UnkStruct_0200C738 unk_1C;
     NNSG2dImagePaletteProxy unk_1A8;
     UnkStruct_02007768 * unk_1BC;
@@ -259,7 +259,7 @@ void ov19_021D64A0 (UnkStruct_ov19_021D61B0 * param0)
     ov19_021D7A74(&(param0->unk_494));
     ov19_021DA384(&(param0->unk_1C8));
 
-    GraphicElementManager_Delete(param0->unk_18);
+    CellActorCollection_Delete(param0->unk_18);
     sub_02019044(param0->unk_1C0, 3);
     sub_02019044(param0->unk_1C0, 2);
     sub_02019044(param0->unk_1C0, 1);
@@ -405,7 +405,7 @@ static void ov19_021D6664 (SysTask * param0, void * param1)
 
     ov19_021DAA80(&v0->unk_6604);
 
-    GraphicElementManager_Update(v0->unk_18);
+    CellActorCollection_Update(v0->unk_18);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -1938,12 +1938,12 @@ void ov19_021D783C (CellActorResourceData * param0, NNSG2dImageProxy * param1, N
     param0->isVRamTransfer = 0;
 }
 
-GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
+CellActor * ov19_021D785C (CellActorCollection * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     CellActorInitParams v0;
-    GraphicElementData * v1;
+    CellActor * v1;
 
-    v0.manager = param0;
+    v0.collection = param0;
     v0.resourceData = param1;
     v0.position.x = param2 * FX32_ONE;
     v0.position.y = param3 * FX32_ONE;
@@ -1955,23 +1955,23 @@ GraphicElementData * ov19_021D785C (GraphicElementManager * param0, CellActorRes
     {
         OSIntrMode v2 = OS_DisableInterrupts();
 
-        v1 = GraphicElementManager_AddElement(&v0);
+        v1 = CellActorCollection_Add(&v0);
         OS_RestoreInterrupts(v2);
     }
 
     if (v1) {
-        GraphicElementData_SetAnimateFlag(v1, 1);
-        GraphicElementData_SetAnimSpeed(v1, (FX32_ONE * (2 / 2)));
+        CellActor_SetAnimateFlag(v1, 1);
+        CellActor_SetAnimSpeed(v1, (FX32_ONE * (2 / 2)));
     }
 
     return v1;
 }
 
-void ov19_021D78AC (GraphicElementData * param0, u32 param1)
+void ov19_021D78AC (CellActor * param0, u32 param1)
 {
     OSIntrMode v0 = OS_DisableInterrupts();
 
-    GraphicElementData_SetPriority(param0, param1);
+    CellActor_SetPriority(param0, param1);
     OS_RestoreInterrupts(v0);
 }
 
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index a3caa522cf..93ca6acac9 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, GraphicElementManager * param4)
+BOOL ov19_021D79F8 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4)
 {
     param0->unk_00 = param2->unk_40.unk_00;
     param0->unk_01 = 11;
@@ -415,7 +415,7 @@ static void ov19_021D8114 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_00 != NULL) {
-            GraphicElementData_Delete(param1->unk_00);
+            CellActor_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
@@ -686,9 +686,9 @@ static void ov19_021D865C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(GraphicElementData_GetPosition(param1->unk_00));
+                v0 = *(CellActor_GetPosition(param1->unk_00));
                 v0.x = param0->unk_68[param2][v1];
-                GraphicElementData_SetPosition(param1->unk_00, &v0);
+                CellActor_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -704,9 +704,9 @@ static void ov19_021D86B4 (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(GraphicElementData_GetPosition(param1->unk_00));
+                v0 = *(CellActor_GetPosition(param1->unk_00));
                 v0.x = param0->unk_38[param2][v1];
-                GraphicElementData_SetPosition(param1->unk_00, &v0);
+                CellActor_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -728,7 +728,7 @@ static void ov19_021D870C (UnkStruct_ov19_021D8318 * param0, UnkStruct_ov19_021D
             v0.x = (112 + param0->unk_585C + v1 * 24) * FX32_ONE;
 
             if (param1->unk_00 != NULL) {
-                GraphicElementData_SetPosition(param1->unk_00, &v0);
+                CellActor_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index f8a71df1db..201f8bd001 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -27,7 +27,7 @@
 #include "overlay019/ov19_021DE3E8.h"
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * 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, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4);
+static void ov19_021D9554(UnkStruct_ov19_021D8E00 * param0, CellActor * 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 GraphicElementData * ov19_021DA224(UnkStruct_ov19_021D8E00 * param0);
+static CellActor * ov19_021DA224(UnkStruct_ov19_021D8E00 * param0);
 
-BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, GraphicElementManager * param3, NARC * param4)
+BOOL ov19_021D8B54 (UnkStruct_ov19_021D8E00 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * param3, NARC * param4)
 {
     param0->unk_794 = param1;
     param0->unk_790 = param2;
@@ -126,30 +126,30 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
         param0->unk_10 = ov19_021D785C(param0->unk_00, &v0, v4, 20, 43, NNS_G2D_VRAM_TYPE_2DMAIN);
     }
 
-    GraphicElementData_SetAnim(param0->unk_08, 5);
-    GraphicElementData_SetExplicitPriority(param0->unk_08, 2);
+    CellActor_SetAnim(param0->unk_08, 5);
+    CellActor_SetExplicitPriority(param0->unk_08, 2);
 
     v1 = ov19_021D5E10(param0->unk_790);
 
     if (v1 != 2) {
-        GraphicElementData_SetAnim(param0->unk_0C, 6);
-        GraphicElementData_SetAnim(param0->unk_10, 7);
+        CellActor_SetAnim(param0->unk_0C, 6);
+        CellActor_SetAnim(param0->unk_10, 7);
     } else {
-        GraphicElementData_SetAnim(param0->unk_0C, 8);
-        GraphicElementData_SetAnim(param0->unk_10, 9);
+        CellActor_SetAnim(param0->unk_0C, 8);
+        CellActor_SetAnim(param0->unk_10, 9);
     }
 
     if (v1 != 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_08, 0);
+        CellActor_SetDrawFlag(param0->unk_08, 0);
     }
 
     if (v2 != 3) {
         if (ov19_021D5E38(param0->unk_790) == 1) {
-            GraphicElementData_SetAnim(param0->unk_04, 0);
+            CellActor_SetAnim(param0->unk_04, 0);
             ov19_021DA3CC(param0->unk_48, param0->unk_4C, (5 * 6));
             param0->unk_78C = 0;
         } else {
-            GraphicElementData_SetAnim(param0->unk_04, 2);
+            CellActor_SetAnim(param0->unk_04, 2);
             ov19_021D8E00(param0);
             param0->unk_78C = 1;
         }
@@ -157,10 +157,10 @@ void ov19_021D8C1C (UnkStruct_ov19_021D8E00 * param0, NARC * param1)
         param0->unk_78D = 0;
     } else {
         if (ov19_021D5F7C(param0->unk_790) == 0) {
-            GraphicElementData_SetAnim(param0->unk_04, 0);
+            CellActor_SetAnim(param0->unk_04, 0);
             param0->unk_78D = 0;
         } else {
-            GraphicElementData_SetAnim(param0->unk_04, 2);
+            CellActor_SetAnim(param0->unk_04, 2);
             param0->unk_78D = 1;
         }
 
@@ -178,12 +178,12 @@ static void ov19_021D8E00 (UnkStruct_ov19_021D8E00 * param0)
     VecFx32 v0;
     s32 v1, v2;
 
-    v0 = *GraphicElementData_GetPosition(param0->unk_04);
+    v0 = *CellActor_GetPosition(param0->unk_04);
     v1 = (v0.x >> FX32_SHIFT) - 0;
     v2 = (v0.y >> FX32_SHIFT) - -4;
 
     ov19_021DA3CC(param0->unk_48, param0->unk_4C, 1);
-    ov19_021DA428(param0->unk_48, ov19_021D5E9C(param0->unk_790), v1, v2, GraphicElementData_GetExplicitPriority(param0->unk_04), 2, 1240, param0->unk_4C);
+    ov19_021DA428(param0->unk_48, ov19_021D5E9C(param0->unk_790), v1, v2, CellActor_GetExplicitPriority(param0->unk_04), 2, 1240, param0->unk_4C);
 
     param0->unk_664[0].unk_00 = (0 * FX32_ONE);
     param0->unk_664[0].unk_04 = (-4 * FX32_ONE);
@@ -204,22 +204,22 @@ void ov19_021D8E84 (UnkStruct_ov19_021D8E00 * param0)
     }
 
     if (param0->unk_04 != NULL) {
-        GraphicElementData_Delete(param0->unk_04);
+        CellActor_Delete(param0->unk_04);
         param0->unk_04 = NULL;
     }
 
     if (param0->unk_08 != NULL) {
-        GraphicElementData_Delete(param0->unk_08);
+        CellActor_Delete(param0->unk_08);
         param0->unk_08 = NULL;
     }
 
     if (param0->unk_0C != NULL) {
-        GraphicElementData_Delete(param0->unk_0C);
+        CellActor_Delete(param0->unk_0C);
         param0->unk_0C = NULL;
     }
 
     if (param0->unk_10 != NULL) {
-        GraphicElementData_Delete(param0->unk_10);
+        CellActor_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 }
@@ -263,7 +263,7 @@ void ov19_021D8F60 (UnkStruct_ov19_021D8E00 * param0)
     ov19_021D8EE0(param0, &v0, &v1);
 
     if (param0->unk_786 != 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_08, 0);
+        CellActor_SetDrawFlag(param0->unk_08, 0);
     }
 
     param0->unk_774 = param0->unk_764 << FX32_SHIFT;
@@ -366,15 +366,15 @@ static void ov19_021D9088 (SysTask * param0, void * param1)
     v0->unk_78B = ov19_021D5E2C(v0->unk_790);
 
     if (v0->unk_786 == 0) {
-        GraphicElementData_SetDrawFlag(v0->unk_08, 1);
+        CellActor_SetDrawFlag(v0->unk_08, 1);
     }
 
     if (v0->unk_786 != 2) {
-        GraphicElementData_SetAnim(v0->unk_0C, 6);
-        GraphicElementData_SetAnim(v0->unk_10, 7);
+        CellActor_SetAnim(v0->unk_0C, 6);
+        CellActor_SetAnim(v0->unk_10, 7);
     } else {
-        GraphicElementData_SetAnim(v0->unk_0C, 8);
-        GraphicElementData_SetAnim(v0->unk_10, 9);
+        CellActor_SetAnim(v0->unk_0C, 8);
+        CellActor_SetAnim(v0->unk_10, 9);
     }
 
     SysTask_Done(param0);
@@ -382,7 +382,7 @@ static void ov19_021D9088 (SysTask * param0, void * param1)
 
 void ov19_021D9230 (UnkStruct_ov19_021D8E00 * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_04, 1);
+    CellActor_SetAnim(param0->unk_04, 1);
 
     param0->unk_780 = (12 << FX32_SHIFT) / 6;
     param0->unk_770 = (param0->unk_768 + 12);
@@ -401,7 +401,7 @@ BOOL ov19_021D9278 (UnkStruct_ov19_021D8E00 * param0)
 static void ov19_021D928C (SysTask * param0, void * param1)
 {
     UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    VecFx32 v1 = *(GraphicElementData_GetPosition(v0->unk_04));
+    VecFx32 v1 = *(CellActor_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -417,7 +417,7 @@ static void ov19_021D928C (SysTask * param0, void * param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        GraphicElementData_SetAnim(v0->unk_04, 2);
+        CellActor_SetAnim(v0->unk_04, 2);
         ov19_021DA038(v0);
 
         v0->unk_787 = 6;
@@ -463,7 +463,7 @@ BOOL ov19_021D939C (UnkStruct_ov19_021D8E00 * param0)
 static void ov19_021D93D0 (SysTask * param0, void * param1)
 {
     UnkStruct_ov19_021D8E00 * v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    VecFx32 v1 = *(GraphicElementData_GetPosition(v0->unk_04));
+    VecFx32 v1 = *(CellActor_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -479,7 +479,7 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        GraphicElementData_SetAnim(v0->unk_04, 1);
+        CellActor_SetAnim(v0->unk_04, 1);
         ov19_021DA1F8(v0);
 
         v0->unk_787 = 6;
@@ -495,7 +495,7 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
         v1.y = v0->unk_768 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        GraphicElementData_SetAnim(v0->unk_04, 0);
+        CellActor_SetAnim(v0->unk_04, 0);
 
         v0->unk_784 = 255;
         v0->unk_78E = 1;
@@ -507,18 +507,18 @@ static void ov19_021D93D0 (SysTask * param0, void * param1)
 void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
 {
     VecFx32 v0;
-    GraphicElementData * v1;
+    CellActor * v1;
 
-    GraphicElementData_SetAnim(param0->unk_04, 1);
+    CellActor_SetAnim(param0->unk_04, 1);
 
     param0->unk_788 = 0;
 
     v1 = ov19_021DA224(param0);
-    v0 = *(GraphicElementData_GetPosition(v1));
-    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, GraphicElementData_GetPriority(v1));
+    v0 = *(CellActor_GetPosition(v1));
+    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, CellActor_GetPriority(v1));
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_4C->unk_00));
-    ov19_021D9554(param0, v1, v0.y, -1, GraphicElementData_GetPriority(param0->unk_4C->unk_00));
+    v0 = *(CellActor_GetPosition(param0->unk_4C->unk_00));
+    ov19_021D9554(param0, v1, v0.y, -1, CellActor_GetPriority(param0->unk_4C->unk_00));
 
     param0->unk_784 = 0;
 }
@@ -526,7 +526,7 @@ void ov19_021D94B4 (UnkStruct_ov19_021D8E00 * param0)
 BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (ov19_021D95E0(param0)) {
-        GraphicElementData_SetAnim(param0->unk_04, 2);
+        CellActor_SetAnim(param0->unk_04, 2);
         ov19_021DA110(param0);
         return 1;
     }
@@ -534,14 +534,14 @@ BOOL ov19_021D9530 (UnkStruct_ov19_021D8E00 * param0)
     return 0;
 }
 
-static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, GraphicElementData * param1, fx32 param2, s32 param3, u32 param4)
+static void ov19_021D9554 (UnkStruct_ov19_021D8E00 * param0, CellActor * param1, fx32 param2, s32 param3, u32 param4)
 {
     UnkStruct_ov19_021D9554 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D9554));
 
     if (v0) {
         VecFx32 v1;
 
-        v1 = *GraphicElementData_GetPosition(param1);
+        v1 = *CellActor_GetPosition(param1);
 
         v0->unk_00 = param1;
         v0->unk_04 = 12;
@@ -581,7 +581,7 @@ static void ov19_021D9600 (SysTask * param0, void * param1)
     UnkStruct_ov19_021D9554 * v0 = (UnkStruct_ov19_021D9554 *)param1;
     VecFx32 v1;
 
-    v1 = *GraphicElementData_GetPosition(v0->unk_00);
+    v1 = *CellActor_GetPosition(v0->unk_00);
 
     if (v0->unk_04) {
         fx32 v2;
@@ -598,12 +598,12 @@ static void ov19_021D9600 (SysTask * param0, void * param1)
         v2 = v0->unk_24 * sub_0201D15C(v0->unk_18 >> FX32_SHIFT);
         v1.x = v0->unk_14 + v2;
 
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
     } else {
         v1.x = v0->unk_14;
         v1.y = v0->unk_10;
 
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
         ov19_021D79B8(param1, ov19_021D95F4, v0->unk_28);
         SysTask_Done(param0);
     }
@@ -614,10 +614,10 @@ void ov19_021D9690 (UnkStruct_ov19_021D8E00 * param0)
     VecFx32 v0;
 
     if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-        GraphicElementData_SetAnim(param0->unk_04, 3);
+        CellActor_SetAnim(param0->unk_04, 3);
     }
 
-    v0 = *GraphicElementData_GetPosition(param0->unk_04);
+    v0 = *CellActor_GetPosition(param0->unk_04);
     v0.y += (-2 * FX32_ONE);
 
     ov19_021D9E04(param0, &v0);
@@ -642,14 +642,14 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
     switch (v0->unk_784) {
     case 0:
         if (++(v0->unk_787) >= 4) {
-            VecFx32 v1 = *GraphicElementData_GetPosition(v0->unk_04);
+            VecFx32 v1 = *CellActor_GetPosition(v0->unk_04);
 
             v0->unk_770 = (v1.y >> FX32_SHIFT) + 6;
             v0->unk_780 = (6 * FX32_ONE) / 2;
             v0->unk_787 = 2;
 
             if ((v0->unk_78C == 0) && (v0->unk_78D == 0)) {
-                GraphicElementData_SetAnim(v0->unk_04, 4);
+                CellActor_SetAnim(v0->unk_04, 4);
             }
 
             v0->unk_784++;
@@ -657,7 +657,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
         break;
     case 1:
     {
-        VecFx32 v2 = *GraphicElementData_GetPosition(v0->unk_04);
+        VecFx32 v2 = *CellActor_GetPosition(v0->unk_04);
 
         if (v0->unk_787) {
             v2.y += v0->unk_780;
@@ -676,7 +676,7 @@ static void ov19_021D9718 (SysTask * param0, void * param1)
 
 void ov19_021D97FC (UnkStruct_ov19_021D8E00 * param0)
 {
-    VecFx32 v0 = *GraphicElementData_GetPosition(param0->unk_04);
+    VecFx32 v0 = *CellActor_GetPosition(param0->unk_04);
 
     param0->unk_770 = (v0.y >> FX32_SHIFT) + -4;
     param0->unk_780 = (-4 * FX32_ONE) / 4;
@@ -692,8 +692,8 @@ BOOL ov19_021D9858 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_788 == 0) {
         if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-            if (GraphicElementData_GetActiveAnim(param0->unk_04) != 0) {
-                GraphicElementData_SetAnim(param0->unk_04, 0);
+            if (CellActor_GetActiveAnim(param0->unk_04) != 0) {
+                CellActor_SetAnim(param0->unk_04, 0);
             }
         }
 
@@ -709,7 +709,7 @@ static void ov19_021D9894 (SysTask * param0, void * param1)
     VecFx32 v1;
 
     v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    v1 = *GraphicElementData_GetPosition(v0->unk_04);
+    v1 = *CellActor_GetPosition(v0->unk_04);
 
     if (v0->unk_787) {
         v1.y += v0->unk_780;
@@ -730,12 +730,12 @@ void ov19_021D9900 (UnkStruct_ov19_021D8E00 * param0)
     }
 
     ov19_021DA204(param0);
-    GraphicElementData_SetAnim(param0->unk_04, 0);
+    CellActor_SetAnim(param0->unk_04, 0);
 }
 
 void ov19_021D9938 (UnkStruct_ov19_021D8E00 * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_04, 1);
+    CellActor_SetAnim(param0->unk_04, 1);
     ov19_021DA7B8(param0->unk_48, param0->unk_4C, 1);
 
     param0->unk_784 = 0;
@@ -754,7 +754,7 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
     case 1:
         if (ov19_021D3B18(v0)) {
             if (ov19_021D3B20(v0)) {
-                GraphicElementData_SetAnim(param0->unk_04, 0);
+                CellActor_SetAnim(param0->unk_04, 0);
                 ov19_021DA204(param0);
                 return 1;
             } else {
@@ -765,7 +765,7 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
         break;
     case 2:
         if (ov19_021DA7E0(param0->unk_48, param0->unk_4C)) {
-            GraphicElementData_SetAnim(param0->unk_04, 2);
+            CellActor_SetAnim(param0->unk_04, 2);
             return 1;
         }
 
@@ -777,10 +777,10 @@ BOOL ov19_021D995C (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0)
 {
-    GraphicElementData_SetExplicitPriority(param0->unk_04, 1);
+    CellActor_SetExplicitPriority(param0->unk_04, 1);
 
     if (param0->unk_78C) {
-        GraphicElementData_SetExplicitPriority(param0->unk_4C->unk_00, 1);
+        CellActor_SetExplicitPriority(param0->unk_4C->unk_00, 1);
     }
 
     if (param0->unk_78D) {
@@ -790,10 +790,10 @@ void ov19_021D99F4 (UnkStruct_ov19_021D8E00 * param0)
 
 void ov19_021D9A2C (UnkStruct_ov19_021D8E00 * param0)
 {
-    GraphicElementData_SetExplicitPriority(param0->unk_04, 2);
+    CellActor_SetExplicitPriority(param0->unk_04, 2);
 
     if (param0->unk_78C) {
-        GraphicElementData_SetExplicitPriority(param0->unk_4C->unk_00, 2);
+        CellActor_SetExplicitPriority(param0->unk_4C->unk_00, 2);
     }
 
     if (param0->unk_78D) {
@@ -830,20 +830,20 @@ void ov19_021D9AB0 (UnkStruct_ov19_021D8E00 * param0, u32 param1)
 void ov19_021D9AEC (UnkStruct_ov19_021D8E00 * param0)
 {
     if (ov19_021D5EE0(param0->unk_790)) {
-        GraphicElementData_SetExplicitPalette(param0->unk_04, 1);
+        CellActor_SetExplicitPalette(param0->unk_04, 1);
     } else {
-        GraphicElementData_SetExplicitPalette(param0->unk_04, 0);
+        CellActor_SetExplicitPalette(param0->unk_04, 0);
     }
 }
 
 void ov19_021D9B10 (UnkStruct_ov19_021D8E00 * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_04, 1);
+    CellActor_SetAnim(param0->unk_04, 1);
 }
 
 void ov19_021D9B1C (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
 {
-    *param1 = *(GraphicElementData_GetPosition(param0->unk_04));
+    *param1 = *(CellActor_GetPosition(param0->unk_04));
 }
 
 void ov19_021D9B34 (UnkStruct_ov19_021D8E00 * param0)
@@ -867,13 +867,13 @@ static void ov19_021D9B78 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        GraphicElementData_SetAnim(v0->unk_04, 1);
+        CellActor_SetAnim(v0->unk_04, 1);
         ov19_021DE954(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DE9A8(v0->unk_760)) {
-            GraphicElementData_SetAnim(v0->unk_04, 2);
+            CellActor_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -901,13 +901,13 @@ static void ov19_021D9C18 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        GraphicElementData_SetAnim(v0->unk_04, 1);
+        CellActor_SetAnim(v0->unk_04, 1);
         ov19_021DEA18(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEA64(v0->unk_760)) {
-            GraphicElementData_SetAnim(v0->unk_04, 0);
+            CellActor_SetAnim(v0->unk_04, 0);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -934,13 +934,13 @@ static void ov19_021D9CB4 (SysTask * param0, void * param1)
 
     switch (v0->unk_784) {
     case 0:
-        GraphicElementData_SetAnim(v0->unk_04, 1);
+        CellActor_SetAnim(v0->unk_04, 1);
         ov19_021DEA74(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEB08(v0->unk_760)) {
-            GraphicElementData_SetAnim(v0->unk_04, 2);
+            CellActor_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -950,14 +950,14 @@ static void ov19_021D9CB4 (SysTask * param0, void * param1)
 void ov19_021D9D10 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_78D) {
-        GraphicElementData_SetAnim(param0->unk_04, 1);
+        CellActor_SetAnim(param0->unk_04, 1);
     }
 }
 
 void ov19_021D9D28 (UnkStruct_ov19_021D8E00 * param0)
 {
     if (param0->unk_78D) {
-        GraphicElementData_SetAnim(param0->unk_04, 0);
+        CellActor_SetAnim(param0->unk_04, 0);
         param0->unk_78D = 0;
     }
 }
@@ -999,7 +999,7 @@ static void ov19_021D9D48 (s32 * param0, s32 * param1, u8 * param2, UnkStruct_ov
 
 static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
 {
-    GraphicElementData_SetPosition(param0->unk_04, param1);
+    CellActor_SetPosition(param0->unk_04, param1);
 
     if (param0->unk_78C) {
         VecFx32 v0;
@@ -1010,7 +1010,7 @@ static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
         for (v1 = 0; v1 < param0->unk_754; v1++) {
             v0.x = param1->x + param0->unk_664[v1].unk_00;
             v0.y = param1->y - param0->unk_664[v1].unk_04;
-            GraphicElementData_SetPosition(param0->unk_4C[v1].unk_00, &v0);
+            CellActor_SetPosition(param0->unk_4C[v1].unk_00, &v0);
         }
     }
 
@@ -1022,7 +1022,7 @@ static void ov19_021D9E04 (UnkStruct_ov19_021D8E00 * param0, VecFx32 * param1)
         VecFx32 v2 = *param1;
 
         v2.y += (24 << FX32_SHIFT);
-        GraphicElementData_SetPosition(param0->unk_08, &v2);
+        CellActor_SetPosition(param0->unk_08, &v2);
     }
 }
 
@@ -1149,7 +1149,7 @@ static void ov19_021DA204 (UnkStruct_ov19_021D8E00 * param0)
     param0->unk_754 = 0;
 }
 
-static GraphicElementData * ov19_021DA224 (UnkStruct_ov19_021D8E00 * param0)
+static CellActor * 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 7a16c78094..45d7b30f6b 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, GraphicElementManager * param3, NARC * param4)
+BOOL ov19_021DA270 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * param3, NARC * param4)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dPaletteData * v1;
@@ -107,7 +107,7 @@ void ov19_021DA3F0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 {
     while (param2--) {
         if (param1->unk_00 != NULL) {
-            GraphicElementData_Delete(param1->unk_00);
+            CellActor_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
@@ -154,7 +154,7 @@ void ov19_021DA428 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, s32 p
 
     GF_ASSERT(param7->unk_00 != NULL);
 
-    GraphicElementData_SetExplicitPalette(param7->unk_00, 2 + param7->unk_2C);
+    CellActor_SetExplicitPalette(param7->unk_00, 2 + param7->unk_2C);
     ov19_021DA63C(param0, param7, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v5);
 }
@@ -190,7 +190,7 @@ void ov19_021DA548 (UnkStruct_ov19_021DA384 * param0, BoxPokemon * param1, u32 p
 
     GF_ASSERT(param10->unk_00 != NULL);
 
-    GraphicElementData_SetExplicitPalette(param10->unk_00, 2 + param10->unk_2C);
+    CellActor_SetExplicitPalette(param10->unk_00, 2 + param10->unk_2C);
     ov19_021DA63C(param0, param10, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v2);
 }
@@ -202,20 +202,20 @@ void ov19_021DA63C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 
         if ((param2 & 1)) {
             if (param1->unk_30 == 0) {
-                GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
+                CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
                 return;
             }
         }
 
         for (v0 = 0; v0 < 6; v0++) {
             if ((param2 & (2 << v0)) && ((param1->unk_2E & (1 << v0)) == 0)) {
-                GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
+                CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
                 return;
             }
         }
     }
 
-    GraphicElementData_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_NORMAL);
 }
 
 void ov19_021DA68C (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2)
@@ -270,31 +270,31 @@ void ov19_021DA754 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 *
 
         NNS_G2dLoadImage1DMapping(v0, param2 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param1->unk_04));
 
-        GraphicElementData_SetImageProxy(param1->unk_00, &(param1->unk_04));
+        CellActor_SetImageProxy(param1->unk_00, &(param1->unk_04));
     }
 }
 
 void ov19_021DA7B8 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, u32 param2)
 {
     if ((param2 == 1) || (param2 == 2)) {
-        GraphicElementData_SetAffineOverwriteMode(param1->unk_00, 1);
+        CellActor_SetAffineOverwriteMode(param1->unk_00, 1);
     } else {
-        GraphicElementData_SetAffineOverwriteMode(param1->unk_00, 0);
+        CellActor_SetAffineOverwriteMode(param1->unk_00, 0);
     }
 
-    GraphicElementData_SetAnim(param1->unk_00, param2);
+    CellActor_SetAnim(param1->unk_00, param2);
 }
 
 BOOL ov19_021DA7E0 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1)
 {
-    return GraphicElementData_IsAnimated(param1->unk_00) == 0;
+    return CellActor_IsAnimated(param1->unk_00) == 0;
 }
 
 void ov19_021DA7F4 (UnkStruct_ov19_021DA384 * param0, UnkStruct_ov19_021DCD18 * param1, BOOL param2)
 {
     u32 v0 = ((param2) ? 6 : 2) + param1->unk_2C;
 
-    GraphicElementData_SetExplicitPalette(param1->unk_00, v0);
+    CellActor_SetExplicitPalette(param1->unk_00, v0);
 }
 
 NNSG2dCellDataBank * ov19_021DA80C (UnkStruct_ov19_021DA384 * param0)
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index 8f4c6695bf..14fd41f7c2 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, GraphicElementManager * param3, NARC * param4)
+BOOL ov19_021DA814 (UnkStruct_ov19_021DA8D8 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, CellActorCollection * param3, NARC * param4)
 {
     param0->unk_44 = param1;
     param0->unk_3C = param3;
@@ -41,7 +41,7 @@ void ov19_021DA864 (UnkStruct_ov19_021DA8D8 * param0, NARC * param1)
     sub_0200718C(param1, 9, 1, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1256 * 0x20, 10, &(param0->unk_18));
     ov19_021D783C(&v0, &(param0->unk_18), ov19_021D77D0(param0->unk_44), param0->unk_10, param0->unk_14, 2);
     param0->unk_04 = ov19_021D785C(param0->unk_00, &v0, 183 + ov19_021D7820(param0->unk_44), 176, 44, NNS_G2D_VRAM_TYPE_2DMAIN);
-    GraphicElementData_SetExplicitPalette(param0->unk_04, 1);
+    CellActor_SetExplicitPalette(param0->unk_04, 1);
 }
 
 void ov19_021DA8D8 (UnkStruct_ov19_021DA8D8 * param0)
@@ -61,13 +61,13 @@ void ov19_021DA8FC (UnkStruct_ov19_021DA8D8 * param0, int param1)
 {
     switch (param1) {
     case 0:
-        GraphicElementData_SetAnim(param0->unk_04, 0);
+        CellActor_SetAnim(param0->unk_04, 0);
         break;
     case 1:
-        GraphicElementData_SetAnim(param0->unk_04, 1);
+        CellActor_SetAnim(param0->unk_04, 1);
         break;
     case 2:
-        GraphicElementData_SetAnim(param0->unk_04, 2);
+        CellActor_SetAnim(param0->unk_04, 2);
         break;
     }
 }
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 60dc56805d..53c876c803 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -61,7 +61,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, GraphicElementManager * param4, const MessageLoader * param5, NARC * param6)
+BOOL ov19_021DA92C (UnkStruct_ov19_021DA9E0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, const MessageLoader * param5, NARC * param6)
 {
     int v0;
 
@@ -138,7 +138,7 @@ void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0)
     }
 
     if (param0->unk_30) {
-        GraphicElementData_Delete(param0->unk_30);
+        CellActor_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
@@ -147,7 +147,7 @@ void ov19_021DA9E0 (UnkStruct_ov19_021DA9E0 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0] != NULL) {
-            GraphicElementData_Delete(param0->unk_3C[v0]);
+            CellActor_Delete(param0->unk_3C[v0]);
         }
     }
 
@@ -234,7 +234,7 @@ static void ov19_021DAB44 (UnkStruct_ov19_021DA9E0 * param0)
         param0->unk_3C[v4] = ov19_021D785C(param0->unk_0C, &v1, 24 + 36 * v4, 176, 46, NNS_G2D_VRAM_TYPE_2DMAIN);
         GF_ASSERT(param0->unk_3C[v4] != NULL);
 
-        GraphicElementData_SetDrawFlag(param0->unk_3C[v4], 0);
+        CellActor_SetDrawFlag(param0->unk_3C[v4], 0);
     }
 
     NNS_G2dInitImageProxy(&v0);
@@ -355,12 +355,12 @@ static void ov19_021DADCC (UnkStruct_ov19_021DA9E0 * param0, fx32 param1)
     VecFx32 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = *GraphicElementData_GetPosition(param0->unk_3C[v0]);
+        v1 = *CellActor_GetPosition(param0->unk_3C[v0]);
         v1.y -= param1;
 
-        GraphicElementData_SetPosition(param0->unk_3C[v0], &v1);
+        CellActor_SetPosition(param0->unk_3C[v0], &v1);
 
-        if ((v0 == 0) && GraphicElementData_GetDrawFlag(param0->unk_3C[v0])) {
+        if ((v0 == 0) && CellActor_GetDrawFlag(param0->unk_3C[v0])) {
             u32 v2, v3;
 
             v2 = v1.x >> FX32_SHIFT;
@@ -374,7 +374,7 @@ static void ov19_021DAE10 (UnkStruct_ov19_021DA9E0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_3C[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -425,23 +425,23 @@ static void ov19_021DAE60 (Window * param0, UnkStruct_ov19_021DA9E0 * param1, u3
 
         sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10);
 
-        v2 = *GraphicElementData_GetPosition(param1->unk_3C[0]);
+        v2 = *CellActor_GetPosition(param1->unk_3C[0]);
         v2.y = (176 + (16 * param3)) << FX32_SHIFT;
 
-        GraphicElementData_SetPosition(param1->unk_3C[0], &v2);
-        GraphicElementData_SetExplicitPalette(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C));
-        GraphicElementData_SetDrawFlag(param1->unk_3C[0], 1);
+        CellActor_SetPosition(param1->unk_3C[0], &v2);
+        CellActor_SetExplicitPalette(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C));
+        CellActor_SetDrawFlag(param1->unk_3C[0], 1);
 
         if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) {
             sub_02006EC0(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10);
 
             v2.x += (36 << FX32_SHIFT);
 
-            GraphicElementData_SetPosition(param1->unk_3C[1], &v2);
-            GraphicElementData_SetExplicitPalette(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D));
-            GraphicElementData_SetDrawFlag(param1->unk_3C[1], 1);
+            CellActor_SetPosition(param1->unk_3C[1], &v2);
+            CellActor_SetExplicitPalette(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D));
+            CellActor_SetDrawFlag(param1->unk_3C[1], 1);
         } else {
-            GraphicElementData_SetDrawFlag(param1->unk_3C[1], 0);
+            CellActor_SetDrawFlag(param1->unk_3C[1], 0);
         }
     }
         return;
diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c
index 3add66af06..0c648339b0 100644
--- a/src/overlay019/ov19_021DB2FC.c
+++ b/src/overlay019/ov19_021DB2FC.c
@@ -33,7 +33,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, GraphicElementManager * param4, MessageLoader * param5, const StringTemplate * param6, int param7, NARC * param8)
+BOOL ov19_021DB2FC (UnkStruct_ov19_021DB6F0 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, MessageLoader * param5, const StringTemplate * 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 54b198c989..acc477fc96 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -72,7 +72,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, GraphicElementManager * param4, NARC * param5)
+BOOL ov19_021DB8E4 (UnkStruct_ov19_021DBA9C * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, NARC * param5)
 {
     int v0;
 
@@ -370,9 +370,9 @@ static void ov19_021DBDF4 (UnkStruct_ov19_021DBA9C * param0)
 
         GF_ASSERT(param0->unk_48[v4] != NULL);
 
-        GraphicElementData_SetDrawFlag(param0->unk_48[v4], 0);
+        CellActor_SetDrawFlag(param0->unk_48[v4], 0);
         VEC_Set(&v3, FX32_CONST(32 + v4 * 32), FX32_CONST(88), 0);
-        GraphicElementData_SetPosition(param0->unk_48[v4], &v3);
+        CellActor_SetPosition(param0->unk_48[v4], &v3);
         ov19_021DBD68(param0, v5);
 
         if (++v5 >= 18) {
@@ -391,7 +391,7 @@ static void ov19_021DBEF8 (UnkStruct_ov19_021DBA9C * param0)
 
     for (v0 = 0; v0 < 7; v0++) {
         if (param0->unk_48[v0] != NULL) {
-            GraphicElementData_Delete(param0->unk_48[v0]);
+            CellActor_Delete(param0->unk_48[v0]);
             param0->unk_48[v0] = NULL;
         }
     }
@@ -405,7 +405,7 @@ static void ov19_021DBF18 (UnkStruct_ov19_021DBA9C * param0)
 
     for (v1 = 0; v1 < 7; v1++) {
         ov19_021DBD9C(param0, v1, v0);
-        GraphicElementData_SetDrawFlag(param0->unk_48[v1], 1);
+        CellActor_SetDrawFlag(param0->unk_48[v1], 1);
 
         if (++v0 >= 18) {
             v0 = 0;
@@ -720,7 +720,7 @@ static void ov19_021DC4F8 (UnkStruct_ov19_021DBA9C * param0, u32 param1)
         param0->unk_90 = ov19_021D785C(param0->unk_08, &v0, 18, 224, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         if (param0->unk_90) {
-            GraphicElementData_SetExplicitPalette(param0->unk_90, 6);
+            CellActor_SetExplicitPalette(param0->unk_90, 6);
         }
 
         Heap_FreeToHeap(v4);
@@ -736,13 +736,13 @@ static void ov19_021DC5B8 (UnkStruct_ov19_021DBA9C * param0, fx32 param1)
         v0.y = param1;
         v0.z = 0;
 
-        GraphicElementData_SetPosition(param0->unk_90, &v0);
+        CellActor_SetPosition(param0->unk_90, &v0);
     }
 }
 
 static void ov19_021DC5E0 (UnkStruct_ov19_021DBA9C * param0)
 {
     if (param0->unk_90) {
-        GraphicElementData_Delete(param0->unk_90);
+        CellActor_Delete(param0->unk_90);
     }
 }
diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c
index 29d29ca866..a11444836f 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, GraphicElementManager * param4, NARC * param5)
+BOOL ov19_021DC5F0 (UnkStruct_ov19_021DC680 * param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, NARC * param5)
 {
     param0->unk_00 = param1;
     param0->unk_0C = param2;
@@ -224,7 +224,7 @@ static void ov19_021DC8E8 (SysTask * param0, void * param1)
 
     for (v3 = 0; v3 < v4; v3++) {
         if (v0->unk_3C[v2].unk_00 != NULL) {
-            GraphicElementData_SetPosition(v0->unk_3C[v2].unk_00, v1);
+            CellActor_SetPosition(v0->unk_3C[v2].unk_00, v1);
         }
 
         v2++;
@@ -249,7 +249,7 @@ void ov19_021DC96C (UnkStruct_ov19_021DC680 * param0)
     if (param0->unk_28 > v0) {
         VecFx32 v1;
 
-        v1 = *GraphicElementData_GetPosition(param0->unk_3C[v0].unk_00);
+        v1 = *CellActor_GetPosition(param0->unk_3C[v0].unk_00);
         param0->unk_20 = (((Unk_ov19_021E0234[v0].unk_00 + param0->unk_34) << FX32_SHIFT) - v1.x) / 8;
         param0->unk_24 = ((Unk_ov19_021E0234[v0].unk_02 << FX32_SHIFT) - v1.y) / 8;
         param0->unk_2A = 0;
@@ -272,7 +272,7 @@ static void ov19_021DCA18 (SysTask * param0, void * param1)
     BOOL v2;
 
     v0 = (UnkStruct_ov19_021DC680 *)param1;
-    v1 = *GraphicElementData_GetPosition(v0->unk_3C[v0->unk_28].unk_00);
+    v1 = *CellActor_GetPosition(v0->unk_3C[v0->unk_28].unk_00);
 
     if (++(v0->unk_2A) >= 8) {
         v1.x = (Unk_ov19_021E0234[v0->unk_28].unk_00 + v0->unk_34) << FX32_SHIFT;
@@ -284,7 +284,7 @@ static void ov19_021DCA18 (SysTask * param0, void * param1)
         v2 = 0;
     }
 
-    GraphicElementData_SetPosition(v0->unk_3C[v0->unk_28].unk_00, &v1);
+    CellActor_SetPosition(v0->unk_3C[v0->unk_28].unk_00, &v1);
 
     if (v2) {
         v0->unk_2C = 0;
@@ -400,7 +400,7 @@ void ov19_021DCC80 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    GraphicElementData_SetExplicitPriority(v2->unk_00, 1);
+    CellActor_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -418,7 +418,7 @@ void ov19_021DCCD4 (UnkStruct_ov19_021DC680 * param0, u32 param1, const UnkStruc
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    GraphicElementData_SetExplicitPriority(v2->unk_00, 1);
+    CellActor_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -493,17 +493,17 @@ static void ov19_021DCE50 (UnkStruct_ov19_021DC680 * param0, fx32 param1)
 
     for (v1 = 0; v1 < 6; v1++) {
         if (param0->unk_3C[v1].unk_00 != NULL) {
-            v0 = *GraphicElementData_GetPosition(param0->unk_3C[v1].unk_00);
+            v0 = *CellActor_GetPosition(param0->unk_3C[v1].unk_00);
             v0.y += param1;
-            GraphicElementData_SetPosition(param0->unk_3C[v1].unk_00, &v0);
+            CellActor_SetPosition(param0->unk_3C[v1].unk_00, &v0);
 
             if (param1 < 0) {
                 if (v0.y < 851968) {
-                    GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, 1);
+                    CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, 1);
                 }
             } else {
                 if (v0.y >= 851968) {
-                    GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, 0);
+                    CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, 0);
                 }
             }
         } else {
@@ -523,7 +523,7 @@ static void ov19_021DCEB8 (UnkStruct_ov19_021DC680 * param0, BOOL param1)
     for (v1 = 0; v1 < v2; v1++) {
         v0 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, v1);
         ov19_021DA428(param0->unk_38, (BoxPokemon *)v0, Unk_ov19_021E0234[v1].unk_00 + param0->unk_34, Unk_ov19_021E0234[v1].unk_02 + v3, 1, 4 + v1, 1048 + 32 * v1, &param0->unk_3C[v1]);
-        GraphicElementData_SetDrawFlag(param0->unk_3C[v1].unk_00, param1);
+        CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, param1);
     }
 }
 
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index ca72c5f77a..f50ade5088 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -34,7 +34,7 @@
 typedef struct {
     UnkStruct_ov19_021DCF88 * unk_00;
     u32 unk_04;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     u16 unk_0C;
     s16 unk_0E;
     fx32 unk_10;
@@ -44,7 +44,7 @@ typedef struct {
 
 typedef struct {
     void * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
     fx32 unk_08;
     fx32 unk_0C;
     fx32 unk_10;
@@ -60,7 +60,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov19_021DCF88 * unk_00;
-    GraphicElementData ** unk_04;
+    CellActor ** unk_04;
     UnkStruct_ov19_021DDBD0 unk_08[10];
     u8 unk_1C0[10];
     u8 unk_1CA;
@@ -73,14 +73,14 @@ struct UnkStruct_ov19_021DCF88_t {
     UnkStruct_ov19_021D61B0 * unk_00;
     const UnkStruct_ov19_021D4DF0 * unk_04;
     BGL * unk_08;
-    GraphicElementManager * unk_0C;
+    CellActorCollection * unk_0C;
     u32 unk_10;
     SysTask * unk_14;
     NNSG2dImagePaletteProxy unk_18;
-    GraphicElementData * unk_2C;
-    GraphicElementData * unk_30;
-    GraphicElementData * unk_34[8];
-    GraphicElementData * unk_54[10];
+    CellActor * unk_2C;
+    CellActor * unk_30;
+    CellActor * unk_34[8];
+    CellActor * unk_54[10];
     int unk_7C;
     int unk_80;
     Strbuf* unk_84;
@@ -118,7 +118,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, GraphicElementData * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7);
+static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 * param0, CellActor * 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);
@@ -306,7 +306,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, GraphicElementManager * param4)
+BOOL ov19_021DCF88 (UnkStruct_ov19_021DCF88 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4)
 {
     if (ov19_021D5E08(param2) == 4) {
         *param0 = NULL;
@@ -395,11 +395,11 @@ void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0)
         }
 
         if (param0->unk_2C) {
-            GraphicElementData_Delete(param0->unk_2C);
+            CellActor_Delete(param0->unk_2C);
         }
 
         if (param0->unk_30) {
-            GraphicElementData_Delete(param0->unk_30);
+            CellActor_Delete(param0->unk_30);
         }
 
         if (param0->unk_84 != NULL) {
@@ -408,13 +408,13 @@ void ov19_021DD078 (UnkStruct_ov19_021DCF88 * param0)
 
         for (v0 = 0; v0 < 8; v0++) {
             if (param0->unk_34[v0]) {
-                GraphicElementData_Delete(param0->unk_34[v0]);
+                CellActor_Delete(param0->unk_34[v0]);
             }
         }
 
         for (v0 = 0; v0 < 10; v0++) {
             if (param0->unk_54[v0]) {
-                GraphicElementData_Delete(param0->unk_54[v0]);
+                CellActor_Delete(param0->unk_54[v0]);
             }
         }
 
@@ -457,10 +457,10 @@ static void ov19_021DD224 (UnkStruct_ov19_021DCF88 * param0, NARC * param1)
     param0->unk_2C = ov19_021D785C(param0->unk_0C, &v0, 0, 568, 49, NNS_G2D_VRAM_TYPE_2DSUB);
     param0->unk_30 = ov19_021D785C(param0->unk_0C, &v0, 256, 568, 49, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    GraphicElementData_SetFlipMode(param0->unk_30, 1);
+    CellActor_SetFlipMode(param0->unk_30, 1);
 
     if (ov19_021D5E08(param0->unk_04) == 3) {
-        GraphicElementData_SetAnim(param0->unk_30, 1);
+        CellActor_SetAnim(param0->unk_30, 1);
     }
 }
 
@@ -551,7 +551,7 @@ void ov19_021DD378 (UnkStruct_ov19_021DCF88 * param0)
             v2->unk_18 = Unk_ov19_021E0258[v0] >> FX32_SHIFT;
 
             if (v2->unk_08 != NULL) {
-                GraphicElementData_SetAnim(v2->unk_08, 1);
+                CellActor_SetAnim(v2->unk_08, 1);
             }
 
             ov19_021DD344(param0, v1, v2);
@@ -575,7 +575,7 @@ static void ov19_021DD46C (SysTask * param0, void * param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (GraphicElementData_IsAnimated(v0->unk_08) == 0) {
+        if (CellActor_IsAnimated(v0->unk_08) == 0) {
             v0->unk_04++;
         }
         break;
@@ -599,7 +599,7 @@ static void ov19_021DD46C (SysTask * param0, void * param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (++(v0->unk_0E) >= 16) {
-            GraphicElementData_SetAnim(v0->unk_08, 0);
+            CellActor_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -613,7 +613,7 @@ static void ov19_021DD544 (SysTask * param0, void * param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (GraphicElementData_IsAnimated(v0->unk_08) == 0) {
+        if (CellActor_IsAnimated(v0->unk_08) == 0) {
             G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 16, 0);
             v0->unk_0E = (16 - 1);
             v0->unk_04++;
@@ -648,7 +648,7 @@ static void ov19_021DD544 (SysTask * param0, void * param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (++(v0->unk_0E) >= 16) {
-            GraphicElementData_SetAnim(v0->unk_08, 0);
+            CellActor_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -911,7 +911,7 @@ static void ov19_021DD998 (UnkStruct_ov19_021DCF88 * param0)
 
     for (v0 = 0; v0 < 10; v0++) {
         if (param0->unk_54[v0]) {
-            GraphicElementData_Delete(param0->unk_54[v0]);
+            CellActor_Delete(param0->unk_54[v0]);
             param0->unk_54[v0] = NULL;
         }
     }
@@ -948,7 +948,7 @@ static void ov19_021DD9DC (UnkStruct_ov19_021DCF88 * param0)
         param0->unk_34[v3] = ov19_021D785C(param0->unk_0C, &v0, 240, 368, 48, NNS_G2D_VRAM_TYPE_2DSUB);
         GF_ASSERT(param0->unk_34[v3] != NULL);
 
-        GraphicElementData_SetAnim(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
+        CellActor_SetAnim(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
     }
 
     param0->unk_80 = ov19_021D5EC0(param0->unk_04);
@@ -960,7 +960,7 @@ static void ov19_021DDA7C (UnkStruct_ov19_021DCF88 * param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if (param0->unk_34[v0]) {
-            GraphicElementData_Delete(param0->unk_34[v0]);
+            CellActor_Delete(param0->unk_34[v0]);
             param0->unk_34[v0] = NULL;
         }
     }
@@ -985,7 +985,7 @@ static void ov19_021DDA9C (SysTask * param0, void * param1)
         v1.x = Unk_ov19_021E028C[v2].x << FX32_SHIFT;
         v1.y = Unk_ov19_021E028C[v2].y << FX32_SHIFT;
         v1.z = 0;
-        GraphicElementData_SetPosition(v0->unk_04, &v1);
+        CellActor_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -993,7 +993,7 @@ static void ov19_021DDA9C (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        GraphicElementData_SetPosition(v0->unk_04, &v1);
+        CellActor_SetPosition(v0->unk_04, &v1);
         ov19_021DDBD0(param0, v0);
     }
 }
@@ -1018,7 +1018,7 @@ static void ov19_021DDB20 (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v2].y << FX32_SHIFT;
         v1.z = 0;
 
-        GraphicElementData_SetPosition(v0->unk_04, &v1);
+        CellActor_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -1026,7 +1026,7 @@ static void ov19_021DDB20 (SysTask * param0, void * param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        GraphicElementData_SetPosition(v0->unk_04, &v1);
+        CellActor_SetPosition(v0->unk_04, &v1);
 
         if (v0->unk_18) {
             v0->unk_14 = v0->unk_28;
@@ -1050,7 +1050,7 @@ static void ov19_021DDBD0 (SysTask * param0, UnkStruct_ov19_021DDBD0 * param1)
     SysTask_Done(param0);
 }
 
-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_021DDBF8 (UnkStruct_ov19_021DDBF8 * param0, CellActor * param1, UnkStruct_ov19_021DDBD0 * param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7)
 {
     SysTaskFunc v0;
 
@@ -1485,7 +1485,7 @@ void ov19_021DE2F4 (UnkStruct_ov19_021DCF88 * param0)
             u32 v1 = ov19_021D5EC8(param0->unk_04);
 
             for (v0 = 0; v0 < 8; v0++) {
-                GraphicElementData_SetAnim(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
+                CellActor_SetAnim(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
             }
         }
     }
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 2ba86fa2e9..0c4572d735 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;
-    GraphicElementManager * unk_10;
+    CellActorCollection * unk_10;
     UnkStruct_ov19_021DA384 * unk_14;
     UnkStruct_ov19_021D8E00 * unk_18;
-    GraphicElementData * unk_1C[3];
+    CellActor * 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;
-    GraphicElementData * unk_04;
+    CellActor * 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, GraphicElementManager * param4)
+BOOL ov19_021DE3E8 (UnkStruct_ov19_021DE3E8 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4)
 {
     UnkStruct_ov19_021DE3E8 * v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8));
 
@@ -123,9 +123,9 @@ static void ov19_021DE450 (UnkStruct_ov19_021DE3E8 * param0)
 
                 param0->unk_1C[v5] = ov19_021D785C(param0->unk_10, &v0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-                GraphicElementData_SetExplicitPalette(param0->unk_1C[v5], Unk_ov19_021E04CC[v5].unk_04);
-                GraphicElementData_SetDrawFlag(param0->unk_1C[v5], 0);
-                GraphicElementData_SetAffineOverwriteMode(param0->unk_1C[v5], 1);
+                CellActor_SetExplicitPalette(param0->unk_1C[v5], Unk_ov19_021E04CC[v5].unk_04);
+                CellActor_SetDrawFlag(param0->unk_1C[v5], 0);
+                CellActor_SetAffineOverwriteMode(param0->unk_1C[v5], 1);
 
                 param0->unk_28[v5] = 0;
             }
@@ -148,7 +148,7 @@ static void ov19_021DE51C (UnkStruct_ov19_021DE3E8 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_1C[v0]) {
-            GraphicElementData_Delete(param0->unk_1C[v0]);
+            CellActor_Delete(param0->unk_1C[v0]);
         }
     }
 }
@@ -203,8 +203,8 @@ static void ov19_021DE59C (UnkStruct_ov19_021DE3E8 * param0)
         int v1 = ov19_021DE538(param0, 1);
 
         ov19_021DE718(param0, v1, v0);
-        GraphicElementData_SetAnim(param0->unk_1C[v1], 6);
-        GraphicElementData_SetDrawFlag(param0->unk_1C[v1], 1);
+        CellActor_SetAnim(param0->unk_1C[v1], 6);
+        CellActor_SetDrawFlag(param0->unk_1C[v1], 1);
     }
 }
 
@@ -230,13 +230,13 @@ static void ov19_021DE5D4 (UnkStruct_ov19_021DE3E8 * param0)
 
         sub_02006EC0(16, Item_FileID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10);
         sub_02006E84(16, Item_FileID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10);
-        GraphicElementData_SetExplicitPriority(param0->unk_1C[v3], v2);
+        CellActor_SetExplicitPriority(param0->unk_1C[v3], v2);
 
         ov19_021D78AC(param0->unk_1C[v3], 2);
 
-        GraphicElementData_SetPosition(param0->unk_1C[v3], &v1);
-        GraphicElementData_SetAnim(param0->unk_1C[v3], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_1C[v3], 1);
+        CellActor_SetPosition(param0->unk_1C[v3], &v1);
+        CellActor_SetAnim(param0->unk_1C[v3], 0);
+        CellActor_SetDrawFlag(param0->unk_1C[v3], 1);
     }
 }
 
@@ -271,10 +271,10 @@ static void ov19_021DE718 (UnkStruct_ov19_021DE3E8 * param0, int param1, int par
 
         sub_02006EC0(16, Item_FileID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10);
         sub_02006E84(16, Item_FileID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10);
-        GraphicElementData_SetExplicitPriority(param0->unk_1C[param1], v1);
+        CellActor_SetExplicitPriority(param0->unk_1C[param1], v1);
 
         ov19_021D78AC(param0->unk_1C[param1], 3);
-        GraphicElementData_SetPosition(param0->unk_1C[param1], &v0);
+        CellActor_SetPosition(param0->unk_1C[param1], &v0);
     }
 }
 
@@ -287,7 +287,7 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
+            CellActor_SetAnim(param0->unk_1C[v0], 2);
         }
 
         v1 = ov19_021D5E74(param0->unk_08);
@@ -297,8 +297,8 @@ void ov19_021DE7A0 (UnkStruct_ov19_021DE3E8 * param0)
 
             if (v0 >= 0) {
                 ov19_021DE718(param0, v0, v1);
-                GraphicElementData_SetAnim(param0->unk_1C[v0], 1);
-                GraphicElementData_SetDrawFlag(param0->unk_1C[v0], 1);
+                CellActor_SetAnim(param0->unk_1C[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_1C[v0], 1);
             }
         }
     }
@@ -312,7 +312,7 @@ BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
+            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
         }
@@ -320,7 +320,7 @@ BOOL ov19_021DE800 (UnkStruct_ov19_021DE3E8 * param0)
         v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
+            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -338,7 +338,7 @@ static void ov19_021DE858 (UnkStruct_ov19_021DE3E8 * param0, int param1, const V
     if (v0) {
         v0->unk_00 = param0;
         v0->unk_04 = param0->unk_1C[param1];
-        v0->unk_08 = *(GraphicElementData_GetPosition(v0->unk_04));
+        v0->unk_08 = *(CellActor_GetPosition(v0->unk_04));
         v0->unk_14 = *param2;
         v0->unk_20 = (v0->unk_14.x - v0->unk_08.x) / param4;
         v0->unk_24 = (v0->unk_14.y - v0->unk_08.y) / param4;
@@ -363,15 +363,15 @@ static void ov19_021DE8E0 (SysTask * param0, void * param1)
         if (v0->unk_2C) {
             v0->unk_08.x += v0->unk_20;
             v0->unk_08.y += v0->unk_24;
-            GraphicElementData_SetPosition(v0->unk_04, &v0->unk_08);
+            CellActor_SetPosition(v0->unk_04, &v0->unk_08);
             v0->unk_2C--;
         } else {
-            GraphicElementData_SetPosition(v0->unk_04, &v0->unk_14);
+            CellActor_SetPosition(v0->unk_04, &v0->unk_14);
             v0->unk_30++;
         }
         break;
     case 1:
-        if (GraphicElementData_IsAnimated(v0->unk_04) == 0) {
+        if (CellActor_IsAnimated(v0->unk_04) == 0) {
             ov19_021D78AC(v0->unk_04, v0->unk_28);
             v0->unk_00->unk_34--;
             SysTask_Done(param0);
@@ -395,7 +395,7 @@ void ov19_021DE954 (UnkStruct_ov19_021DE3E8 * param0)
             v1.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v0, 3);
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 3);
+            CellActor_SetAnim(param0->unk_1C[v0], 3);
             ov19_021DE858(param0, v0, &v1, 2, 12);
         }
     }
@@ -413,7 +413,7 @@ void ov19_021DE9B8 (UnkStruct_ov19_021DE3E8 * param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
+            CellActor_SetAnim(param0->unk_1C[v0], 2);
         }
     }
 }
@@ -424,7 +424,7 @@ BOOL ov19_021DE9E4 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (GraphicElementData_IsAnimated(param0->unk_1C[v0])) {
+            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -446,7 +446,7 @@ void ov19_021DEA18 (UnkStruct_ov19_021DE3E8 * param0)
 
             ov19_021DE694(param0, &v1, &v2);
             ov19_021DE57C(param0, v0, 1);
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 4);
+            CellActor_SetAnim(param0->unk_1C[v0], 4);
             ov19_021DE858(param0, v0, &v1, 3, 12);
         }
     }
@@ -469,7 +469,7 @@ void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0)
 
             ov19_021DE694(param0, &v2, &v3);
             ov19_021DE57C(param0, v0, 1);
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 4);
+            CellActor_SetAnim(param0->unk_1C[v0], 4);
 
             ov19_021DE858(param0, v0, &v2, 3, 12);
             ov19_021D9B1C(param0->unk_18, &v2);
@@ -478,7 +478,7 @@ void ov19_021DEA74 (UnkStruct_ov19_021DE3E8 * param0)
             v2.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v1, 3);
-            GraphicElementData_SetAnim(param0->unk_1C[v1], 3);
+            CellActor_SetAnim(param0->unk_1C[v1], 3);
             ov19_021DE858(param0, v1, &v2, 2, 12);
         }
     }
@@ -495,7 +495,7 @@ void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 5);
+            CellActor_SetAnim(param0->unk_1C[v0], 5);
             param0->unk_38 = v0;
             return;
         }
@@ -503,7 +503,7 @@ void ov19_021DEB18 (UnkStruct_ov19_021DE3E8 * param0)
         v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            GraphicElementData_SetAnim(param0->unk_1C[v0], 2);
+            CellActor_SetAnim(param0->unk_1C[v0], 2);
             param0->unk_38 = v0;
             return;
         }
@@ -516,7 +516,7 @@ BOOL ov19_021DEB60 (UnkStruct_ov19_021DE3E8 * param0)
 {
     if (param0->unk_00) {
         if (param0->unk_38 != -1) {
-            if (GraphicElementData_IsAnimated(param0->unk_1C[param0->unk_38])) {
+            if (CellActor_IsAnimated(param0->unk_1C[param0->unk_38])) {
                 return 0;
             }
 
@@ -539,7 +539,7 @@ void ov19_021DEB9C (UnkStruct_ov19_021DE3E8 * param0, const VecFx32 * param1)
             v1.x += (0 << FX32_SHIFT);
             v1.y += (8 << FX32_SHIFT);
 
-            GraphicElementData_SetPosition(param0->unk_1C[v0], &v1);
+            CellActor_SetPosition(param0->unk_1C[v0], &v1);
         }
     }
 }
@@ -550,7 +550,7 @@ void ov19_021DEBDC (UnkStruct_ov19_021DE3E8 * param0, u32 param1)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            GraphicElementData_SetExplicitPriority(param0->unk_1C[v0], param1);
+            CellActor_SetExplicitPriority(param0->unk_1C[v0], param1);
         }
     }
 }
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 72f7689a53..53924bad9e 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;
-    GraphicElementManager * unk_10;
+    CellActorCollection * unk_10;
     UnkStruct_ov19_021DA384 * unk_14;
     u32 unk_18[2];
-    GraphicElementData * unk_20[2];
-    GraphicElementData * unk_28[2];
-    GraphicElementData * unk_30;
-    GraphicElementData * unk_34[2][5];
+    CellActor * unk_20[2];
+    CellActor * unk_28[2];
+    CellActor * unk_30;
+    CellActor * 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, GraphicElementManager * param4, MessageLoader * param5, NARC * param6)
+BOOL ov19_021DEC04 (UnkStruct_ov19_021DEC04 ** param0, UnkStruct_ov19_021D61B0 * param1, const UnkStruct_ov19_021D4DF0 * param2, BGL * param3, CellActorCollection * param4, MessageLoader * param5, NARC * param6)
 {
     if (ov19_021D5E08(param2) != 4) {
         *param0 = NULL;
@@ -161,11 +161,11 @@ void ov19_021DEDDC (UnkStruct_ov19_021DEC04 * param0, BOOL param1)
         int v0 = ov19_021D5F9C(param0->unk_08);
 
         if (param1) {
-            GraphicElementData_SetAnim(param0->unk_28[v0 ^ 1], 2);
-            GraphicElementData_SetAnim(param0->unk_28[v0], 0);
+            CellActor_SetAnim(param0->unk_28[v0 ^ 1], 2);
+            CellActor_SetAnim(param0->unk_28[v0], 0);
         } else {
-            GraphicElementData_SetAnim(param0->unk_28[v0 ^ 1], 1);
-            GraphicElementData_SetAnim(param0->unk_28[v0], 0);
+            CellActor_SetAnim(param0->unk_28[v0 ^ 1], 1);
+            CellActor_SetAnim(param0->unk_28[v0], 0);
         }
 
         ov19_021DEEFC(param0);
@@ -418,10 +418,10 @@ static void ov19_021DF178 (UnkStruct_ov19_021DEC04 * param0, int param1)
         for (v5 = 0; v5 < 5; v5++) {
             v6.x = v0[v5].unk_00 + (((v0[v5].unk_08 - v0[v5].unk_00) / 256) * (int)(*v7));
             v6.y = v0[v5].unk_04 + (((v0[v5].unk_0C - v0[v5].unk_04) / 256) * (int)(*v7));
-            GraphicElementData_SetPosition(param0->unk_34[param1][v5], &v6);
+            CellActor_SetPosition(param0->unk_34[param1][v5], &v6);
             ov19_021D78AC(param0->unk_34[param1][v5], 0);
             ov19_021D78AC(param0->unk_34[param1 ^ 1][v5], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_34[param1][v5], 1);
+            CellActor_SetDrawFlag(param0->unk_34[param1][v5], 1);
             v7++;
         }
     } else {
@@ -437,7 +437,7 @@ static void ov19_021DF250 (UnkStruct_ov19_021DEC04 * param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_34[param1][v0], 0);
+        CellActor_SetDrawFlag(param0->unk_34[param1][v0], 0);
     }
 }
 
@@ -606,21 +606,21 @@ static void ov19_021DF5D0 (UnkStruct_ov19_021DEC04 * param0, NARC * param1)
     for (v4 = 0; v4 < 2; v4++) {
         param0->unk_28[v4] = ov19_021D785C(param0->unk_10, &v2, v0[v4].unk_00, v0[v4].unk_02, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-        GraphicElementData_SetExplicitPalette(param0->unk_28[v4], v4);
-        GraphicElementData_SetAnim(param0->unk_28[v4], 0);
+        CellActor_SetExplicitPalette(param0->unk_28[v4], v4);
+        CellActor_SetAnim(param0->unk_28[v4], 0);
 
         for (v5 = 0; v5 < 5; v5++) {
             param0->unk_34[v4][v5] = ov19_021D785C(param0->unk_10, &v2, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DSUB);
-            GraphicElementData_SetAnim(param0->unk_34[v4][v5], 5 + v4);
-            GraphicElementData_SetExplicitPalette(param0->unk_34[v4][v5], v4);
-            GraphicElementData_SetDrawFlag(param0->unk_34[v4][v5], 0);
+            CellActor_SetAnim(param0->unk_34[v4][v5], 5 + v4);
+            CellActor_SetExplicitPalette(param0->unk_34[v4][v5], v4);
+            CellActor_SetDrawFlag(param0->unk_34[v4][v5], 0);
         }
     }
 
-    GraphicElementData_SetFlipMode(param0->unk_28[1], 1);
+    CellActor_SetFlipMode(param0->unk_28[1], 1);
     param0->unk_30 = ov19_021D785C(param0->unk_10, &v2, 128, 176 + 384, 0, NNS_G2D_VRAM_TYPE_2DSUB);
-    GraphicElementData_SetAnim(param0->unk_30, 3);
-    GraphicElementData_SetExplicitPalette(param0->unk_30, 2);
+    CellActor_SetAnim(param0->unk_30, 3);
+    CellActor_SetExplicitPalette(param0->unk_30, 2);
     param0->unk_380 = SysTask_Start(ov19_021DF930, param0, 1);
 
     ov19_021DF730(param0, v3);
@@ -647,7 +647,7 @@ static void ov19_021DF730 (UnkStruct_ov19_021DEC04 * param0, u32 param1)
         NNS_G2dSetImageLocation(&v1, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_18[v3]);
         v1.attr.mappingType = GXS_GetOBJVRamModeChar();
         param0->unk_20[v3] = ov19_021D785C(param0->unk_10, &v2, v0[v3].unk_00, v0[v3].unk_02, 1 - v3, NNS_G2D_VRAM_TYPE_2DSUB);
-        GraphicElementData_SetDrawFlag(param0->unk_20[v3], 0);
+        CellActor_SetDrawFlag(param0->unk_20[v3], 0);
     }
 }
 
@@ -660,15 +660,15 @@ static void ov19_021DF7D0 (UnkStruct_ov19_021DEC04 * param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_20[v0]);
-        GraphicElementData_Delete(param0->unk_28[v0]);
+        CellActor_Delete(param0->unk_20[v0]);
+        CellActor_Delete(param0->unk_28[v0]);
 
         for (v1 = 0; v1 < 5; v1++) {
-            GraphicElementData_Delete(param0->unk_34[v0][v1]);
+            CellActor_Delete(param0->unk_34[v0][v1]);
         }
     }
 
-    GraphicElementData_Delete(param0->unk_30);
+    CellActor_Delete(param0->unk_30);
     Heap_FreeToHeap(param0->unk_5C);
     Heap_FreeToHeap(param0->unk_64);
 }
@@ -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);
-    GraphicElementData * v2 = param0->unk_20[v0];
+    CellActor * v2 = param0->unk_20[v0];
     BoxPokemon * v3 = (BoxPokemon *)(v1->unk_00);
     NNSG2dCharacterData * v4;
 
@@ -690,10 +690,10 @@ static void ov19_021DF834 (UnkStruct_ov19_021DEC04 * param0)
         DC_FlushRange(v4->pRawData, (4 * 4) * 0x20);
         GXS_LoadOBJ(v4->pRawData, param0->unk_18[v0], (4 * 4) * 0x20);
 
-        GraphicElementData_SetExplicitPalette(v2, v5);
-        GraphicElementData_SetDrawFlag(v2, 1);
+        CellActor_SetExplicitPalette(v2, v5);
+        CellActor_SetDrawFlag(v2, 1);
     } else {
-        GraphicElementData_SetDrawFlag(v2, 0);
+        CellActor_SetDrawFlag(v2, 0);
     }
 }
 
@@ -719,13 +719,13 @@ static void ov19_021DF930 (SysTask * param0, void * param1)
     UnkStruct_ov19_021DEC04 * v0 = param1;
     BOOL v1 = ov19_021D5FC0(v0->unk_08);
 
-    if (GraphicElementData_GetActiveAnim(v0->unk_30) == 3) {
+    if (CellActor_GetActiveAnim(v0->unk_30) == 3) {
         if (v1) {
-            GraphicElementData_SetAnim(v0->unk_30, 4);
+            CellActor_SetAnim(v0->unk_30, 4);
         }
     } else {
         if (v1 == 0) {
-            GraphicElementData_SetAnim(v0->unk_30, 3);
+            CellActor_SetAnim(v0->unk_30, 3);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index 611a66dadf..b6b57e4e76 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -47,7 +47,7 @@ typedef struct UnkStruct_ov20_021D2128_t {
     const UnkStruct_ov20_021D16E8 * unk_18;
     const UnkStruct_020998EC * unk_1C;
     BGL * unk_20;
-    GraphicElementManager * unk_24;
+    CellActorCollection * unk_24;
     UnkStruct_0200C738 unk_28;
     NNSG2dImageProxy unk_1B4[2];
     NNSG2dImagePaletteProxy unk_1FC[2];
@@ -152,7 +152,7 @@ void ov20_021D2128 (UnkStruct_ov20_021D2128 * param0)
         SysTask_Done(param0->unk_04);
 
         sub_0200A878();
-        GraphicElementManager_Delete(param0->unk_24);
+        CellActorCollection_Delete(param0->unk_24);
 
         Heap_FreeToHeap(param0->unk_20);
         Heap_FreeToHeap(param0);
@@ -173,7 +173,7 @@ static void ov20_021D217C (SysTask * param0, void * param1)
 {
     UnkStruct_ov20_021D2128 * v0 = param1;
 
-    GraphicElementManager_Update(v0->unk_24);
+    CellActorCollection_Update(v0->unk_24);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -964,7 +964,7 @@ BGL * ov20_021D2E04 (UnkStruct_ov20_021D2128 * param0)
     return param0->unk_20;
 }
 
-GraphicElementManager * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
+CellActorCollection * ov20_021D2E08 (UnkStruct_ov20_021D2128 * param0)
 {
     return param0->unk_24;
 }
@@ -982,13 +982,13 @@ void ov20_021D2E0C (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * pa
     param1->isVRamTransfer = 0;
 }
 
-GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
+CellActor * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
     CellActorInitParams v0;
-    GraphicElementData * v1;
+    CellActor * v1;
     OSIntrMode v2;
 
-    v0.manager = param0->unk_24;
+    v0.collection = param0->unk_24;
     v0.resourceData = param1;
     v0.position.x = param2 * FX32_ONE;
     v0.position.y = param3 * FX32_ONE;
@@ -998,13 +998,13 @@ GraphicElementData * ov20_021D2E50 (UnkStruct_ov20_021D2128 * param0, CellActorR
     v0.heapID = 35;
 
     v2 = OS_DisableInterrupts();
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = CellActorCollection_Add(&v0);
 
     OS_RestoreInterrupts(v2);
 
     if (v1) {
-        GraphicElementData_SetAnimateFlag(v1, 1);
-        GraphicElementData_SetAnimSpeed(v1, ((FX32_ONE * 2) / 2));
+        CellActor_SetAnimateFlag(v1, 1);
+        CellActor_SetAnimSpeed(v1, ((FX32_ONE * 2) / 2));
     }
 
     return v1;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 1804d6380a..1cf529f231 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -49,9 +49,9 @@ typedef struct UnkStruct_ov20_021D30F8_t {
     Window unk_0C;
     Window unk_1C;
     Window unk_2C;
-    GraphicElementData * unk_3C;
-    GraphicElementData * unk_40;
-    GraphicElementData * unk_44;
+    CellActor * unk_3C;
+    CellActor * unk_40;
+    CellActor * unk_44;
     MessageLoader * unk_48;
     Strbuf* unk_4C;
     UnkStruct_020149F0 * unk_50;
@@ -100,15 +100,15 @@ void ov20_021D2EF0 (UnkStruct_ov20_021D30F8 * param0)
     }
 
     if (param0->unk_3C) {
-        GraphicElementData_Delete(param0->unk_3C);
+        CellActor_Delete(param0->unk_3C);
     }
 
     if (param0->unk_40) {
-        GraphicElementData_Delete(param0->unk_40);
+        CellActor_Delete(param0->unk_40);
     }
 
     if (param0->unk_44) {
-        GraphicElementData_Delete(param0->unk_44);
+        CellActor_Delete(param0->unk_44);
     }
 
     if (param0->unk_48) {
@@ -229,14 +229,14 @@ static void ov20_021D3184 (UnkStruct_ov20_021D30F8 * param0)
     ov20_021D375C(param0, 1);
     param0->unk_40 = ov20_021D2E50(param0->unk_00, &v0, 6, 24, 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetAnim(param0->unk_40, 13);
+    CellActor_SetAnim(param0->unk_40, 13);
     param0->unk_44 = ov20_021D2E50(param0->unk_00, &v0, 250, 24, 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetAnim(param0->unk_44, 12);
+    CellActor_SetAnim(param0->unk_44, 12);
 
     if (ov20_021D1F84(param0->unk_04) != 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_44, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_40, 0);
+        CellActor_SetDrawFlag(param0->unk_44, 0);
+        CellActor_SetDrawFlag(param0->unk_40, 0);
     }
 }
 
@@ -475,26 +475,26 @@ void ov20_021D3690 (UnkStruct_ov20_021D30F8 * param0)
 
 void ov20_021D369C (UnkStruct_ov20_021D30F8 * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_3C, param1);
+    CellActor_SetDrawFlag(param0->unk_3C, param1);
     ov20_021D375C(param0, 1);
 }
 
 void ov20_021D36B0 (UnkStruct_ov20_021D30F8 * param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_40, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_44, 0);
+        CellActor_SetDrawFlag(param0->unk_40, 0);
+        CellActor_SetDrawFlag(param0->unk_44, 0);
     }
 }
 
 void ov20_021D36D0 (UnkStruct_ov20_021D30F8 * param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_40, 1);
-        GraphicElementData_SetDrawFlag(param0->unk_44, 1);
+        CellActor_SetDrawFlag(param0->unk_40, 1);
+        CellActor_SetDrawFlag(param0->unk_44, 1);
 
-        GraphicElementData_SetAnim(param0->unk_40, 13);
-        GraphicElementData_SetAnim(param0->unk_44, 12);
+        CellActor_SetAnim(param0->unk_40, 13);
+        CellActor_SetAnim(param0->unk_44, 12);
     }
 }
 
@@ -514,10 +514,10 @@ void ov20_021D3700 (UnkStruct_ov20_021D30F8 * param0, int param1)
         v0.y = 24 * FX32_ONE;
         v0.z = 0;
 
-        GraphicElementData_SetPosition(param0->unk_3C, &v0);
+        CellActor_SetPosition(param0->unk_3C, &v0);
     }
 
-    GraphicElementData_SetPosition(param0->unk_3C, &v0);
+    CellActor_SetPosition(param0->unk_3C, &v0);
     ov20_021D375C(param0, 1);
 }
 
@@ -525,15 +525,15 @@ static void ov20_021D375C (UnkStruct_ov20_021D30F8 * param0, BOOL param1)
 {
     if (param0->unk_5C != 0) {
         if (param1) {
-            GraphicElementData_SetAnim(param0->unk_3C, 0);
+            CellActor_SetAnim(param0->unk_3C, 0);
         } else {
-            GraphicElementData_SetAnim(param0->unk_3C, 1);
+            CellActor_SetAnim(param0->unk_3C, 1);
         }
     } else {
         if (param1) {
-            GraphicElementData_SetAnim(param0->unk_3C, 14);
+            CellActor_SetAnim(param0->unk_3C, 14);
         } else {
-            GraphicElementData_SetAnim(param0->unk_3C, 15);
+            CellActor_SetAnim(param0->unk_3C, 15);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index 67548e3e46..c763beeedd 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;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
 } UnkStruct_ov20_021D3980;
 
 static void ov20_021D390C(BGL * param0, const UnkStruct_ov61_0222C884 * param1, u32 param2);
@@ -49,7 +49,7 @@ UnkStruct_ov20_021D3980 * ov20_021D3864 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D3880 (UnkStruct_ov20_021D3980 * param0)
 {
     if (param0->unk_0C) {
-        GraphicElementData_Delete(param0->unk_0C);
+        CellActor_Delete(param0->unk_0C);
     }
 
     Heap_FreeToHeap(param0);
@@ -103,28 +103,28 @@ static void ov20_021D3980 (UnkStruct_ov20_021D3980 * param0)
     ov20_021D2E0C(param0->unk_00, &v0, 0, 3);
     param0->unk_0C = ov20_021D2E50(param0->unk_00, &v0, 64, 56, 5, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetAnim(param0->unk_0C, 2);
-    GraphicElementData_SetDrawFlag(param0->unk_0C, 0);
+    CellActor_SetAnim(param0->unk_0C, 2);
+    CellActor_SetDrawFlag(param0->unk_0C, 0);
 }
 
 void ov20_021D39BC (UnkStruct_ov20_021D3980 * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_0C, 3);
+    CellActor_SetAnim(param0->unk_0C, 3);
 }
 
 void ov20_021D39C8 (UnkStruct_ov20_021D3980 * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_0C, 2);
+    CellActor_SetAnim(param0->unk_0C, 2);
 }
 
 void ov20_021D39D4 (UnkStruct_ov20_021D3980 * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
+    CellActor_SetDrawFlag(param0->unk_0C, param1);
 }
 
 BOOL ov20_021D39E0 (UnkStruct_ov20_021D3980 * param0)
 {
-    return GraphicElementData_GetDrawFlag(param0->unk_0C);
+    return CellActor_GetDrawFlag(param0->unk_0C);
 }
 
 void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1)
@@ -145,8 +145,8 @@ void ov20_021D39EC (UnkStruct_ov20_021D3980 * param0, int param1)
         break;
     }
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
-    GraphicElementData_SetAnim(param0->unk_0C, 2);
+    CellActor_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetAnim(param0->unk_0C, 2);
 }
 
 void ov20_021D3A2C (UnkStruct_ov20_021D3980 * param0)
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index 031011a1bf..c89cb6ea6d 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;
-    GraphicElementData * unk_5C;
+    CellActor * unk_5C;
 } UnkStruct_ov20_021D3E0C;
 
 static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C * param0, BGL * param1, u32 param2);
@@ -69,7 +69,7 @@ UnkStruct_ov20_021D3E0C * ov20_021D3A54 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D3A80 (UnkStruct_ov20_021D3E0C * param0)
 {
     if (param0->unk_5C) {
-        GraphicElementData_Delete(param0->unk_5C);
+        CellActor_Delete(param0->unk_5C);
     }
 
     Heap_FreeToHeap(param0);
@@ -234,19 +234,19 @@ static void ov20_021D3E0C (UnkStruct_ov20_021D3E0C * param0)
 
     ov20_021D2E0C(param0->unk_00, &v0, 0, 1);
     param0->unk_5C = ov20_021D2E50(param0->unk_00, &v0, 48, 54, 2, NNS_G2D_VRAM_TYPE_2DMAIN);
-    GraphicElementData_SetAnim(param0->unk_5C, 4);
-    GraphicElementData_SetDrawFlag(param0->unk_5C, 0);
+    CellActor_SetAnim(param0->unk_5C, 4);
+    CellActor_SetDrawFlag(param0->unk_5C, 0);
 }
 
 void ov20_021D3E48 (UnkStruct_ov20_021D3E0C * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_5C, param1);
+    CellActor_SetDrawFlag(param0->unk_5C, param1);
 
     if (param1) {
         if (ov20_021D1F94(param0->unk_04) == 0) {
-            GraphicElementData_SetAnim(param0->unk_5C, 4);
+            CellActor_SetAnim(param0->unk_5C, 4);
         } else {
-            GraphicElementData_SetAnim(param0->unk_5C, 6);
+            CellActor_SetAnim(param0->unk_5C, 6);
         }
     }
 }
@@ -282,8 +282,8 @@ void ov20_021D3E74 (UnkStruct_ov20_021D3E0C * param0, u32 param1)
     v0.x *= FX32_ONE;
     v0.y *= FX32_ONE;
 
-    GraphicElementData_SetPosition(param0->unk_5C, &v0);
-    GraphicElementData_SetAnim(param0->unk_5C, v2);
+    CellActor_SetPosition(param0->unk_5C, &v0);
+    CellActor_SetAnim(param0->unk_5C, v2);
 }
 
 void ov20_021D3EF8 (UnkStruct_ov20_021D3E0C * param0)
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 36f3950629..47e5c3797e 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;
-    GraphicElementData * unk_30;
-    GraphicElementData * unk_34;
-    GraphicElementData * unk_38;
+    CellActor * unk_30;
+    CellActor * unk_34;
+    CellActor * unk_38;
     Strbuf* unk_3C;
     UnkStruct_ov20_021D4FF0 unk_40;
     UnkStruct_ov20_021D4E8C unk_60;
@@ -73,15 +73,15 @@ UnkStruct_ov20_021D4210 * ov20_021D40E8 (UnkStruct_ov20_021D2128 * param0, const
 void ov20_021D4164 (UnkStruct_ov20_021D4210 * param0)
 {
     if (param0->unk_30) {
-        GraphicElementData_Delete(param0->unk_30);
+        CellActor_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
-        GraphicElementData_Delete(param0->unk_34);
+        CellActor_Delete(param0->unk_34);
     }
 
     if (param0->unk_38) {
-        GraphicElementData_Delete(param0->unk_38);
+        CellActor_Delete(param0->unk_38);
     }
 
     if (param0->unk_3C) {
@@ -120,16 +120,16 @@ static void ov20_021D4210 (UnkStruct_ov20_021D4210 * param0)
     ov20_021D2E0C(param0->unk_00, &v0, 0, 2);
     param0->unk_30 = ov20_021D2E50(param0->unk_00, &v0, 72, 56, 3, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetAnim(param0->unk_30, 8);
-    GraphicElementData_SetDrawFlag(param0->unk_30, 0);
+    CellActor_SetAnim(param0->unk_30, 8);
+    CellActor_SetDrawFlag(param0->unk_30, 0);
 
     param0->unk_34 = ov20_021D2E50(param0->unk_00, &v0, 240, 64, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    GraphicElementData_SetAnim(param0->unk_34, 11);
-    GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+    CellActor_SetAnim(param0->unk_34, 11);
+    CellActor_SetDrawFlag(param0->unk_34, 0);
 
     param0->unk_38 = ov20_021D2E50(param0->unk_00, &v0, 240, 144, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    GraphicElementData_SetAnim(param0->unk_38, 10);
-    GraphicElementData_SetDrawFlag(param0->unk_38, 0);
+    CellActor_SetAnim(param0->unk_38, 10);
+    CellActor_SetDrawFlag(param0->unk_38, 0);
 }
 
 void ov20_021D4294 (UnkStruct_ov20_021D4210 * param0)
@@ -216,14 +216,14 @@ BOOL ov20_021D43D8 (UnkStruct_ov20_021D4210 * param0)
 
 void ov20_021D4440 (UnkStruct_ov20_021D4210 * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_30, param1);
+    CellActor_SetDrawFlag(param0->unk_30, param1);
 
     if (param1) {
-        GraphicElementData_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
-        GraphicElementData_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_38, 0);
+        CellActor_SetDrawFlag(param0->unk_34, 0);
+        CellActor_SetDrawFlag(param0->unk_38, 0);
     }
 }
 
@@ -239,8 +239,8 @@ void ov20_021D4480 (UnkStruct_ov20_021D4210 * param0, u32 param1)
     v0.y = (56 + 24 * v2) * FX32_ONE;
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0->unk_30, &v0);
-    GraphicElementData_SetAnim(param0->unk_30, 8);
+    CellActor_SetPosition(param0->unk_30, &v0);
+    CellActor_SetAnim(param0->unk_30, 8);
 }
 
 void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1)
@@ -287,8 +287,8 @@ void ov20_021D44BC (UnkStruct_ov20_021D4210 * param0, int param1)
 BOOL ov20_021D4578 (UnkStruct_ov20_021D4210 * param0)
 {
     if (ov20_021D4E8C(&param0->unk_60)) {
-        GraphicElementData_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
-        GraphicElementData_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
         return 1;
     }
 
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index b521c1d8bf..b03fa0a918 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;
-    GraphicElementManager * unk_10;
-    GraphicElementData * unk_14;
-    GraphicElementData * unk_18;
+    CellActorCollection * unk_10;
+    CellActor * unk_14;
+    CellActor * 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 GraphicElementData * ov20_021D4B40(UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7);
+static CellActor * 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)
 {
@@ -312,22 +312,22 @@ static void ov20_021D4A24 (UnkStruct_ov20_021D4AD4 * param0, NARC * param1)
     ov20_021D4AF8(&(param0->unk_1C), param1, 22, 23);
 
     param0->unk_14 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 56, 0, 0);
-    GraphicElementData_SetAnim(param0->unk_14, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_14, 0);
+    CellActor_SetAnim(param0->unk_14, 0);
+    CellActor_SetDrawFlag(param0->unk_14, 0);
 
     param0->unk_18 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 136, 0, 0);
-    GraphicElementData_SetAnim(param0->unk_18, 2);
-    GraphicElementData_SetDrawFlag(param0->unk_18, 0);
+    CellActor_SetAnim(param0->unk_18, 2);
+    CellActor_SetDrawFlag(param0->unk_18, 0);
 }
 
 static void ov20_021D4AD4 (UnkStruct_ov20_021D4AD4 * param0)
 {
     if (param0->unk_14) {
-        GraphicElementData_Delete(param0->unk_14);
+        CellActor_Delete(param0->unk_14);
     }
 
     if (param0->unk_18) {
-        GraphicElementData_Delete(param0->unk_18);
+        CellActor_Delete(param0->unk_18);
     }
 
     ov20_021D4B2C(&param0->unk_1C);
@@ -345,11 +345,11 @@ static void ov20_021D4B2C (UnkStruct_ov20_021D4B2C * param0)
     Heap_FreeToHeap(param0->unk_08);
 }
 
-static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7)
+static CellActor * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNSG2dImageProxy * param1, NNSG2dImagePaletteProxy * param2, UnkStruct_ov20_021D4B2C * param3, int param4, int param5, int param6, int param7)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
-    GraphicElementData * v2;
+    CellActor * v2;
 
     v0.imageProxy = param1;
     v0.paletteProxy = param2;
@@ -361,7 +361,7 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v0.multiCellAnimBank = NULL;
     v0.isVRamTransfer = 0;
 
-    v1.manager = param0->unk_10;
+    v1.collection = param0->unk_10;
     v1.resourceData = &v0;
     v1.position.x = param4 * FX32_ONE;
     v1.position.y = (param5 + 192) * FX32_ONE;
@@ -370,11 +370,11 @@ static GraphicElementData * ov20_021D4B40 (UnkStruct_ov20_021D4AD4 * param0, NNS
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.heapID = 35;
 
-    v2 = GraphicElementManager_AddElement(&v1);
+    v2 = CellActorCollection_Add(&v1);
 
     if (v2) {
-        GraphicElementData_SetAnimateFlag(v2, 1);
-        GraphicElementData_SetAnimSpeed(v2, ((FX32_ONE * 2) / 2));
+        CellActor_SetAnimateFlag(v2, 1);
+        CellActor_SetAnimSpeed(v2, ((FX32_ONE * 2) / 2));
     }
 
     return v2;
@@ -461,11 +461,11 @@ static void ov20_021D4C40 (SysTask * param0, void * param1)
 void ov20_021D4DBC (UnkStruct_ov20_021D4AD4 * param0, BOOL param1)
 {
     if (param1) {
-        GraphicElementData_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04));
-        GraphicElementData_SetDrawFlag(param0->unk_18, ov20_021D2060(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04));
+        CellActor_SetDrawFlag(param0->unk_18, ov20_021D2060(param0->unk_04));
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_18, 0);
+        CellActor_SetDrawFlag(param0->unk_14, 0);
+        CellActor_SetDrawFlag(param0->unk_18, 0);
     }
 }
 
@@ -475,20 +475,20 @@ void ov20_021D4DF4 (UnkStruct_ov20_021D4AD4 * param0, int param1, int param2)
     case 0:
         switch (param2) {
         case 1:
-            GraphicElementData_SetAnim(param0->unk_14, 1);
+            CellActor_SetAnim(param0->unk_14, 1);
             break;
         case 0:
-            GraphicElementData_SetAnim(param0->unk_14, 0);
+            CellActor_SetAnim(param0->unk_14, 0);
             break;
         }
         break;
     case 1:
         switch (param2) {
         case 1:
-            GraphicElementData_SetAnim(param0->unk_18, 3);
+            CellActor_SetAnim(param0->unk_18, 3);
             break;
         case 0:
-            GraphicElementData_SetAnim(param0->unk_18, 2);
+            CellActor_SetAnim(param0->unk_18, 2);
             break;
         }
         break;
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 588a747e8d..9f4a6d09da 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -540,7 +540,7 @@ UnkStruct_ov21_021E68F4 * ov21_021D1430 (UnkStruct_ov21_021D0F60 * param0, int p
     return &param0->unk_1C24[param1];
 }
 
-void ov21_021D144C (GraphicElementData * param0, int param1)
+void ov21_021D144C (CellActor * param0, int param1)
 {
     switch (param1) {
     case 0:
@@ -554,8 +554,8 @@ void ov21_021D144C (GraphicElementData * param0, int param1)
         break;
     case 3:
     case (3 + 1):
-        if (GraphicElementData_GetAnimFrame(param0) > 0) {
-            GraphicElementData_UpdateAnim(param0, -(FX32_ONE * 2));
+        if (CellActor_GetAnimFrame(param0) > 0) {
+            CellActor_UpdateAnim(param0, -(FX32_ONE * 2));
         }
         break;
     default:
@@ -563,9 +563,9 @@ void ov21_021D144C (GraphicElementData * param0, int param1)
     }
 }
 
-void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2)
+void ov21_021D1498 (CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2)
 {
-    int v0 = GraphicElementData_GetAnimFrame(param0);
+    int v0 = CellActor_GetAnimFrame(param0);
     int v1, v2;
 
     switch (v0) {
@@ -592,12 +592,12 @@ void ov21_021D1498 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param
     }
 }
 
-void ov21_021D1524 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+void ov21_021D1524 (CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = GraphicElementData_GetAnimFrame(param0);
+    v0 = CellActor_GetAnimFrame(param0);
 
     if (v0 < 2) {
         sub_02012AC0(param1->unk_00, param3);
@@ -720,8 +720,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)
 {
-    GraphicElementData * v0;
-    GraphicElementData * v1;
+    CellActor * v0;
+    CellActor * v1;
     UnkStruct_ov21_021D4CB8 v2;
     Window * v3;
     UnkStruct_02009DC8 * v4;
@@ -736,17 +736,17 @@ void ov21_021D1778 (UnkStruct_ov21_021D13FC * param0, const UnkStruct_ov21_021D3
     v5.x = param4;
     v5.y = param5;
 
-    GraphicElementData_SetPosition(v0, &v5);
-    GraphicElementData_SetDrawFlag(v0, 1);
+    CellActor_SetPosition(v0, &v5);
+    CellActor_SetDrawFlag(v0, 1);
 
     if (v6->unk_04 == 2) {
         v5.x = param4 + (-54 * FX32_ONE);
         v5.y = param5;
 
-        GraphicElementData_SetPosition(v1, &v5);
-        GraphicElementData_SetDrawFlag(v1, 1);
+        CellActor_SetPosition(v1, &v5);
+        CellActor_SetDrawFlag(v1, 1);
     } else {
-        GraphicElementData_SetDrawFlag(v1, 0);
+        CellActor_SetDrawFlag(v1, 0);
     }
 
     v4 = ov21_021D2344(param0, 1);
@@ -780,9 +780,9 @@ void ov21_021D1858 (UnkStruct_ov21_021D22F8 * param0, int param1, int param2)
     v0.x = param1 << FX32_SHIFT;
     v0.y = param2 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_00, &v0);
+    CellActor_SetPosition(param0->unk_00, &v0);
     v0.x += (-54 * FX32_ONE);
-    GraphicElementData_SetPosition(param0->unk_04, &v0);
+    CellActor_SetPosition(param0->unk_04, &v0);
 
     if (param0->unk_08->unk_00) {
         sub_02012938(param0->unk_08->unk_00);
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index cbd304ea23..0f389e0a89 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -120,7 +120,7 @@ void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0)
     ov21_021D299C(param0->unk_00);
 
     Heap_FreeToHeap(param0->unk_00);
-    GraphicElementManager_Delete(param0->unk_138);
+    CellActorCollection_Delete(param0->unk_138);
     sub_02009754(param0->unk_13C[0]);
     sub_02009754(param0->unk_13C[1]);
     sub_02009754(param0->unk_13C[2]);
@@ -136,7 +136,7 @@ void ov21_021D2098 (UnkStruct_ov21_021D13FC * param0)
 
 void ov21_021D2124 (UnkStruct_ov21_021D13FC * param0)
 {
-    GraphicElementManager_Update(param0->unk_138);
+    CellActorCollection_Update(param0->unk_138);
 
     NNS_G2dSetupSoftwareSpriteCamera();
 
@@ -221,13 +221,13 @@ void ov21_021D2280 (const UnkStruct_ov21_021D13FC * param0, BOOL param1, int par
     }
 }
 
-GraphicElementData * ov21_021D22A8 (const UnkStruct_ov21_021D13FC * param0)
+CellActor * ov21_021D22A8 (const UnkStruct_ov21_021D13FC * param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_00);
     return param0->unk_1B0.unk_00;
 }
 
-GraphicElementData * ov21_021D22C4 (const UnkStruct_ov21_021D13FC * param0)
+CellActor * ov21_021D22C4 (const UnkStruct_ov21_021D13FC * param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_04);
     return param0->unk_1B0.unk_04;
@@ -267,26 +267,26 @@ UnkStruct_02009DC8 * ov21_021D2344 (const UnkStruct_ov21_021D13FC * param0, int
 
 void ov21_021D2360 (const UnkStruct_ov21_021D13FC * param0, GXOamMode param1)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_1B0.unk_00, param1);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_1B0.unk_04, param1);
+    CellActor_SetExplicitOAMMode(param0->unk_1B0.unk_00, param1);
+    CellActor_SetExplicitOAMMode(param0->unk_1B0.unk_04, param1);
     sub_02012AF0(param0->unk_1B0.unk_08->unk_00, param1);
 }
 
 void ov21_021D238C (const UnkStruct_ov21_021D13FC * param0, int param1)
 {
-    GraphicElementData_SetExplicitPriority(param0->unk_1B0.unk_00, param1);
-    GraphicElementData_SetExplicitPriority(param0->unk_1B0.unk_04, param1);
+    CellActor_SetExplicitPriority(param0->unk_1B0.unk_00, param1);
+    CellActor_SetExplicitPriority(param0->unk_1B0.unk_04, param1);
     sub_02012A00(param0->unk_1B0.unk_08->unk_00, param1);
 }
 
 void ov21_021D23C0 (const UnkStruct_ov21_021D13FC * param0, BOOL param1)
 {
     if (param0->unk_1B0.unk_00) {
-        GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_00, param1);
+        CellActor_SetDrawFlag(param0->unk_1B0.unk_00, param1);
     }
 
     if (param0->unk_1B0.unk_04) {
-        GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_04, param1);
+        CellActor_SetDrawFlag(param0->unk_1B0.unk_04, param1);
     }
 
     if (param0->unk_1B0.unk_08->unk_00) {
@@ -397,13 +397,13 @@ void ov21_021D2584 (UnkStruct_ov21_021D2584 * param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[v0], param1);
+        CellActor_SetDrawFlag(param0->unk_00[v0], param1);
     }
 }
 
 BOOL ov21_021D25A0 (UnkStruct_ov21_021D2584 * param0)
 {
-    return GraphicElementData_GetDrawFlag(param0->unk_00[0]);
+    return CellActor_GetDrawFlag(param0->unk_00[0]);
 }
 
 void ov21_021D25AC (UnkStruct_ov21_021D2584 * param0, BOOL param1)
@@ -864,7 +864,7 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL);
 
-    v1.manager = param0->unk_138;
+    v1.collection = param0->unk_138;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -872,18 +872,18 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_1B0.unk_00 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_00, 0);
-    GraphicElementData_SetPriority(param0->unk_1B0.unk_00, 1);
+    CellActor_SetDrawFlag(param0->unk_1B0.unk_00, 0);
+    CellActor_SetPriority(param0->unk_1B0.unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_04 = GraphicElementManager_AddElement(&v1);
+    param0->unk_1B0.unk_04 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetDrawFlag(param0->unk_1B0.unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_1B0.unk_04, 1);
+    CellActor_SetDrawFlag(param0->unk_1B0.unk_04, 0);
+    CellActor_SetAnim(param0->unk_1B0.unk_04, 1);
 
     param0->unk_1B0.unk_08 = NULL;
     param0->unk_1B0.unk_28 = 0;
@@ -892,10 +892,10 @@ static void ov21_021D2C8C (UnkStruct_ov21_021D13FC * param0, int param1)
 
 static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
 {
-    GraphicElementData_Delete(param0->unk_1B0.unk_00);
+    CellActor_Delete(param0->unk_1B0.unk_00);
     param0->unk_1B0.unk_00 = NULL;
 
-    GraphicElementData_Delete(param0->unk_1B0.unk_04);
+    CellActor_Delete(param0->unk_1B0.unk_04);
     param0->unk_1B0.unk_04 = NULL;
 
     if (param0->unk_1B0.unk_08) {
@@ -904,14 +904,14 @@ static void ov21_021D2D4C (UnkStruct_ov21_021D13FC * param0)
     }
 }
 
-void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
+void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
 
     sub_020093B4(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, param4, param2[0], param2[1], param2[2], param2[3], NULL, NULL);
 
-    v1.manager = param1;
+    v1.collection = param1;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -919,18 +919,18 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_00 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
-    GraphicElementData_SetPriority(param0->unk_00, 1);
+    CellActor_SetDrawFlag(param0->unk_00, 0);
+    CellActor_SetPriority(param0->unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_04 = GraphicElementManager_AddElement(&v1);
+    param0->unk_04 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_04, 1);
+    CellActor_SetDrawFlag(param0->unk_04, 0);
+    CellActor_SetAnim(param0->unk_04, 1);
 
     param0->unk_08 = NULL;
     param0->unk_28 = 0;
@@ -939,10 +939,10 @@ void ov21_021D2D88 (UnkStruct_ov21_021D22F8 * param0, GraphicElementManager * pa
 
 void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
-    GraphicElementData_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 
     if (param0->unk_08) {
@@ -954,11 +954,11 @@ void ov21_021D2E1C (UnkStruct_ov21_021D22F8 * param0)
 void ov21_021D2E44 (UnkStruct_ov21_021D22F8 * param0, BOOL param1)
 {
     if (param0->unk_00) {
-        GraphicElementData_SetDrawFlag(param0->unk_00, param1);
+        CellActor_SetDrawFlag(param0->unk_00, param1);
     }
 
     if (param0->unk_04) {
-        GraphicElementData_SetDrawFlag(param0->unk_04, param1);
+        CellActor_SetDrawFlag(param0->unk_04, param1);
     }
 
     if (param0->unk_08->unk_00) {
@@ -1007,7 +1007,7 @@ static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
 
     sub_020093B4(&v0, 12000, 12000, 12000, 12000, 0xffffffff, 0xffffffff, 0, 0, param0->unk_13C[0], param0->unk_13C[1], param0->unk_13C[2], param0->unk_13C[3], NULL, NULL);
 
-    v1.manager = param0->unk_138;
+    v1.collection = param0->unk_138;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -1016,8 +1016,8 @@ static void ov21_021D2F5C (UnkStruct_ov21_021D13FC * param0, int param1)
     v1.position.x = (100 * FX32_ONE);
 
     for (v2 = 0; v2 < 4; v2++) {
-        v3->unk_00[v2] = GraphicElementManager_AddElement(&v1);
-        GraphicElementData_SetAnim(v3->unk_00[v2], v2);
+        v3->unk_00[v2] = CellActorCollection_Add(&v1);
+        CellActor_SetAnim(v3->unk_00[v2], v2);
     }
 
     ov21_021D2584(v3, 0);
@@ -1034,7 +1034,7 @@ static void ov21_021D300C (UnkStruct_ov21_021D13FC * param0)
     ov21_021D3054(param0);
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(v1->unk_00[v0]);
+        CellActor_Delete(v1->unk_00[v0]);
     }
 }
 
@@ -1089,7 +1089,7 @@ static void ov21_021D30D8 (UnkStruct_ov21_021D2584 * param0, int param1, int par
         v0.x = v1 << FX32_SHIFT;
         v0.y = (v2 << FX32_SHIFT) + (192 << FX32_SHIFT);
 
-        GraphicElementData_SetPosition(param0->unk_00[v3], &v0);
+        CellActor_SetPosition(param0->unk_00[v3], &v0);
     }
 }
 
diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c
index c274ecb4bd..f54d10d041 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;
-    GraphicElementManager * unk_04;
+    CellActorCollection * 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 52434198bb..19eb6a0e28 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 (GraphicElementData * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7)
+void ov21_021D59D8 (CellActor * param0, int param1, int param2, int param3, int param4, const UnkStruct_ov21_021D5868 * param5, int param6, int param7)
 {
     VecFx32 v0;
 
@@ -140,16 +140,16 @@ void ov21_021D59D8 (GraphicElementData * param0, int param1, int param2, int par
     v0.x <<= FX32_SHIFT;
     v0.y <<= FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
-        GraphicElementData_SetAnim(param0, param7);
+        CellActor_SetAnim(param0, param7);
     } else {
-        GraphicElementData_SetAnim(param0, param6);
+        CellActor_SetAnim(param0, param6);
     }
 }
 
-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 ov21_021D5A20 (CellActor ** 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 2862914b64..37a944e00e 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -65,14 +65,14 @@ typedef struct {
 } UnkStruct_ov21_021D7464;
 
 typedef struct {
-    GraphicElementData * unk_00[9];
+    CellActor * unk_00[9];
     int unk_24;
     UnkStruct_ov21_021D4CA0 * unk_28[9];
     int unk_4C;
-    GraphicElementData * unk_50[9];
-    GraphicElementData * unk_74;
+    CellActor * unk_50[9];
+    CellActor * unk_74;
     fx32 unk_78;
-    GraphicElementData * unk_7C;
+    CellActor * unk_7C;
     UnkStruct_02009714 * unk_80[4];
     CellActorResourceData unk_90;
     CellActorResourceData 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(GraphicElementData * param0, int * param1, int * param2);
+static void ov21_021D6CA4(CellActor * 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);
@@ -837,38 +837,38 @@ static void ov21_021D6744 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     int v1;
 
     memset(&v0, 0, sizeof(CellActorInitParams));
-    v0.manager = param1->unk_138;
+    v0.collection = param1->unk_138;
     v0.resourceData = &param0->unk_90;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param2;
     v0.priority = 32;
 
     for (v1 = 0; v1 < 9; v1++) {
-        param0->unk_00[v1] = GraphicElementManager_AddElement(&v0);
-        GraphicElementData_SetAnim(param0->unk_00[v1], 0);
+        param0->unk_00[v1] = CellActorCollection_Add(&v0);
+        CellActor_SetAnim(param0->unk_00[v1], 0);
     }
 
     v0.priority = 0;
 
     for (v1 = 0; v1 < 9; v1++) {
-        param0->unk_50[v1] = GraphicElementManager_AddElement(&v0);
-        GraphicElementData_SetAnim(param0->unk_50[v1], 1);
+        param0->unk_50[v1] = CellActorCollection_Add(&v0);
+        CellActor_SetAnim(param0->unk_50[v1], 1);
     }
 
     v0.priority = 0;
-    param0->unk_74 = GraphicElementManager_AddElement(&v0);
+    param0->unk_74 = CellActorCollection_Add(&v0);
 
-    GraphicElementData_SetAnim(param0->unk_74, 2);
+    CellActor_SetAnim(param0->unk_74, 2);
 
     v0.priority = 0;
     v0.position.x = 56 << FX32_SHIFT;
     v0.position.y = 80 << FX32_SHIFT;
     v0.resourceData = &param0->unk_B4;
 
-    param0->unk_7C = GraphicElementManager_AddElement(&v0);
+    param0->unk_7C = CellActorCollection_Add(&v0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_7C, 0);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_7C, GX_OAM_MODE_XLU);
+    CellActor_SetDrawFlag(param0->unk_7C, 0);
+    CellActor_SetExplicitOAMMode(param0->unk_7C, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021D67EC (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D13FC * param1, const UnkStruct_ov21_021D5B68 * param2, int param3)
@@ -937,14 +937,14 @@ static void ov21_021D68C8 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
         ov21_021D217C(param1, 0);
 
         if (param0->unk_7C) {
-            GraphicElementData_SetDrawFlag(param0->unk_7C, 1);
+            CellActor_SetDrawFlag(param0->unk_7C, 1);
         }
     } else {
         ov21_021D1890(param1, param2->unk_04, v2->unk_00, 2, 56, 80);
         ov21_021D217C(param1, 1);
 
         if (param0->unk_7C) {
-            GraphicElementData_SetDrawFlag(param0->unk_7C, 0);
+            CellActor_SetDrawFlag(param0->unk_7C, 0);
         }
     }
 }
@@ -965,15 +965,15 @@ static void ov21_021D695C (UnkStruct_ov21_021D71A8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 9; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        GraphicElementData_Delete(param0->unk_50[v0]);
+        CellActor_Delete(param0->unk_50[v0]);
     }
 
-    GraphicElementData_Delete(param0->unk_74);
-    GraphicElementData_Delete(param0->unk_7C);
+    CellActor_Delete(param0->unk_74);
+    CellActor_Delete(param0->unk_7C);
 }
 
 static void ov21_021D6994 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov21_021D5B68 * param1)
@@ -1006,7 +1006,7 @@ static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
         v1.x = ov21_021D6BF8(Unk_ov21_021E9D14[v3], Unk_ov21_021E9D14[v4], (64 * 10), (64 * 10) - param1->unk_0C);
         v1.y = ov21_021D6BF8(Unk_ov21_021E9D40[v3], Unk_ov21_021E9D40[v4], (64 * 10), (64 * 10) - param1->unk_0C);
 
-        GraphicElementData_SetPosition(param0->unk_00[v0], &v1);
+        CellActor_SetPosition(param0->unk_00[v0], &v1);
 
         v5 = 4 - v2;
 
@@ -1022,15 +1022,15 @@ static void ov21_021D69A0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
 
         v6 += 32;
 
-        GraphicElementData_SetPriority(param0->unk_00[v0], v6);
+        CellActor_SetPriority(param0->unk_00[v0], v6);
 
         if (v2 == 4) {
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 0);
         } else {
             if (7 + (v5 - 1) < 9) {
-                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 7 + (v5 - 1));
+                CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 7 + (v5 - 1));
             } else {
-                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 9);
+                CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 9);
             }
         }
 
@@ -1058,9 +1058,9 @@ static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
         v0 %= 9;
 
         if ((v1 + 4) >= v2) {
-            GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
+            CellActor_SetDrawFlag(param0->unk_00[v0], 0);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_00[v0], 1);
+            CellActor_SetDrawFlag(param0->unk_00[v0], 1);
         }
     } else {
         if (param1->unk_08 == 2) {
@@ -1073,9 +1073,9 @@ static void ov21_021D6A58 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
             v0 = param0->unk_24;
 
             if ((v1 - 4) < 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
+                CellActor_SetDrawFlag(param0->unk_00[v0], 0);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_00[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_00[v0], 1);
             }
         } else {
             ov21_021D6ED0(param0, param1);
@@ -1119,22 +1119,22 @@ static void ov21_021D6AE4 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
             }
         }
 
-        GraphicElementData_SetDrawFlag(param0->unk_50[v3], v4);
+        CellActor_SetDrawFlag(param0->unk_50[v3], v4);
 
         if (v4) {
-            v0 = GraphicElementData_GetPosition(param0->unk_00[v3]);
+            v0 = CellActor_GetPosition(param0->unk_00[v3]);
 
             v1.x = v0->x + (-54 * FX32_ONE);
             v1.y = v0->y;
 
-            GraphicElementData_SetPosition(param0->unk_50[v3], &v1);
+            CellActor_SetPosition(param0->unk_50[v3], &v1);
 
-            v10 = GraphicElementData_GetExplicitPaletteOffset(param0->unk_00[v3]);
-            GraphicElementData_SetExplicitPaletteOffset(param0->unk_50[v3], v10);
+            v10 = CellActor_GetExplicitPaletteOffset(param0->unk_00[v3]);
+            CellActor_SetExplicitPaletteOffset(param0->unk_50[v3], v10);
 
-            v9 = GraphicElementData_GetPriority(param0->unk_00[v3]);
+            v9 = CellActor_GetPriority(param0->unk_00[v3]);
             v9--;
-            GraphicElementData_SetPriority(param0->unk_50[v3], v9);
+            CellActor_SetPriority(param0->unk_50[v3], v9);
         }
     }
 }
@@ -1154,7 +1154,7 @@ static void ov21_021D6BB0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
     v0.y += (58 * FX32_ONE);
     v0.x = (248 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_74, &v0);
+    CellActor_SetPosition(param0->unk_74, &v0);
 }
 
 static fx32 ov21_021D6BF8 (fx32 param0, fx32 param1, int param2, int param3)
@@ -1190,11 +1190,11 @@ static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
             ov21_021D6CA4(param0->unk_00[v4], &v1, &v2);
             sub_020128C4(param0->unk_28[v4]->unk_00, v1, v2);
 
-            v5 = GraphicElementData_GetPriority(param0->unk_00[v4]);
+            v5 = CellActor_GetPriority(param0->unk_00[v4]);
             v5--;
             sub_02012A30(param0->unk_28[v4]->unk_00, v5);
 
-            v6 = GraphicElementData_GetExplicitPaletteOffset(param0->unk_00[v4]);
+            v6 = CellActor_GetExplicitPaletteOffset(param0->unk_00[v4]);
             sub_02012A90(param0->unk_28[v4]->unk_00, v6);
         }
 
@@ -1202,11 +1202,11 @@ static void ov21_021D6C44 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     }
 }
 
-static void ov21_021D6CA4 (GraphicElementData * param0, int * param1, int * param2)
+static void ov21_021D6CA4 (CellActor * param0, int * param1, int * param2)
 {
     const VecFx32 * v0;
 
-    v0 = GraphicElementData_GetPosition(param0);
+    v0 = CellActor_GetPosition(param0);
 
     *param1 = v0->x >> FX32_SHIFT;
     *param2 = v0->y >> FX32_SHIFT;
@@ -1343,9 +1343,9 @@ static void ov21_021D6ED0 (UnkStruct_ov21_021D71A8 * param0, const UnkStruct_ov2
 
     for (v2 = 0; v2 < 9; v2++) {
         if ((v0 >= 0) && (v0 < v4)) {
-            GraphicElementData_SetDrawFlag(param0->unk_00[v1], 1);
+            CellActor_SetDrawFlag(param0->unk_00[v1], 1);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_00[v1], 0);
+            CellActor_SetDrawFlag(param0->unk_00[v1], 0);
         }
 
         v1 = (v1 + 1) % 9;
@@ -1482,11 +1482,11 @@ static void ov21_021D70E8 (UnkStruct_ov21_021D71A8 * param0)
 {
     int v0;
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 9; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
-        GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
 
         if (param0->unk_28[v0]) {
             sub_02012AF0(param0->unk_28[v0]->unk_00, GX_OAM_MODE_XLU);
@@ -1498,11 +1498,11 @@ static void ov21_021D7124 (UnkStruct_ov21_021D71A8 * param0)
 {
     int v0;
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 9; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
-        GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
 
         if (param0->unk_28[v0]) {
             sub_02012AF0(param0->unk_28[v0]->unk_00, GX_OAM_MODE_NORMAL);
@@ -1516,7 +1516,7 @@ static void ov21_021D7160 (UnkStruct_ov21_021D71A8 * param0, UnkStruct_ov21_021D
     int v1;
 
     v1 = (param0->unk_24 + 4) % 9;
-    v0 = GraphicElementData_GetPosition(param0->unk_00[v1]);
+    v0 = CellActor_GetPosition(param0->unk_00[v1]);
 
     ov21_021D1778(param1, param2->unk_04, param3, ov21_021D375C(param2->unk_04), v0->x, v0->y);
     ov21_021D238C(param1, 0);
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index 48d0ae294a..66b89bfb91 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -74,11 +74,11 @@ typedef struct {
 } UnkStruct_ov21_021D7B8C;
 
 typedef struct {
-    GraphicElementData * unk_00[3];
+    CellActor * unk_00[3];
     UnkStruct_ov21_021D4CA0 * unk_0C[3];
-    GraphicElementData * unk_18;
-    GraphicElementData * unk_1C;
-    GraphicElementData * unk_20;
+    CellActor * unk_18;
+    CellActor * unk_1C;
+    CellActor * 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(GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4);
+static void ov21_021D84A8(CellActor * 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);
@@ -601,7 +601,7 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 84 + 1000, 3 + 1000, 82 + 1000, 83 + 1000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 8;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -611,67 +611,67 @@ static void ov21_021D7E80 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D
     v1.position.y = 40 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[0] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[0], 2);
+    CellActor_SetAnim(param0->unk_00[0], 2);
 
     if (param2->unk_1C->unk_04->unk_1740 == 1) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[0], 0);
+        CellActor_SetDrawFlag(param0->unk_00[0], 0);
     }
 
     v1.position.x = 48 << FX32_SHIFT;
     v1.position.y = 88 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[1] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[1], 0);
+    CellActor_SetAnim(param0->unk_00[1], 0);
 
     if ((ov21_021D36A4(param2->unk_1C->unk_04, 1) == 0) || (param2->unk_1C->unk_04->unk_1740 == 1)) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[1], 0);
+        CellActor_SetDrawFlag(param0->unk_00[1], 0);
     }
 
     v1.position.x = 48 << FX32_SHIFT;
     v1.position.y = 152 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[2] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[2], 1);
+    CellActor_SetAnim(param0->unk_00[2], 1);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_18 = GraphicElementManager_AddElement(&v1);
+    param0->unk_18 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_18, 3);
+    CellActor_SetAnim(param0->unk_18, 3);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 146 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_1C = GraphicElementManager_AddElement(&v1);
+    param0->unk_1C = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_1C, 4);
+    CellActor_SetAnim(param0->unk_1C, 4);
 
     v1.position.x = 124 << FX32_SHIFT;
     v1.position.y = 8 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_20 = GraphicElementManager_AddElement(&v1);
+    param0->unk_20 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_20, 5);
+    CellActor_SetAnim(param0->unk_20, 5);
 }
 
 static void ov21_021D7FEC (UnkStruct_ov21_021D7C64 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00[0]);
-    GraphicElementData_Delete(param0->unk_00[1]);
-    GraphicElementData_Delete(param0->unk_00[2]);
-    GraphicElementData_Delete(param0->unk_18);
-    GraphicElementData_Delete(param0->unk_1C);
-    GraphicElementData_Delete(param0->unk_20);
+    CellActor_Delete(param0->unk_00[0]);
+    CellActor_Delete(param0->unk_00[1]);
+    CellActor_Delete(param0->unk_00[2]);
+    CellActor_Delete(param0->unk_18);
+    CellActor_Delete(param0->unk_1C);
+    CellActor_Delete(param0->unk_20);
 }
 
 static void ov21_021D8018 (UnkStruct_ov21_021D7C64 * param0, UnkStruct_ov21_021D77E8 * param1, const UnkStruct_ov21_021D77D4 * param2, int param3)
@@ -921,7 +921,7 @@ static void ov21_021D8434 (UnkStruct_ov21_021D7A64 * param0, int param1, int par
     }
 }
 
-static void ov21_021D84A8 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021D84A8 (CellActor * 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 59022807bc..d07644b134 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;
-    GraphicElementData * unk_20;
+    CellActor * unk_20;
     UnkStruct_02009DC8 * unk_24[4];
     UnkStruct_ov21_021D157C unk_34;
-    GraphicElementData * unk_58;
+    CellActor * unk_58;
     void * unk_5C;
     NNSG2dScreenData * unk_60;
 } UnkStruct_ov21_021D9320;
@@ -651,7 +651,7 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 81 + 15000, 3 + 15000, 79 + 15000, 80 + 15000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -659,25 +659,25 @@ static void ov21_021D8D0C (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 164 << FX32_SHIFT;
-    param0->unk_20 = GraphicElementManager_AddElement(&v1);
+    param0->unk_20 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_20, 3);
+    CellActor_SetAnim(param0->unk_20, 3);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 96 << FX32_SHIFT;
 
-    param0->unk_58 = GraphicElementManager_AddElement(&v1);
+    param0->unk_58 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_58, 17);
-    GraphicElementData_SetDrawFlag(param0->unk_58, 0);
-    GraphicElementData_SetAffineOverwriteMode(param0->unk_58, 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_58, 0);
+    CellActor_SetAnim(param0->unk_58, 17);
+    CellActor_SetDrawFlag(param0->unk_58, 0);
+    CellActor_SetAffineOverwriteMode(param0->unk_58, 1);
+    CellActor_SetExplicitPriority(param0->unk_58, 0);
 }
 
 static void ov21_021D8DC0 (UnkStruct_ov21_021D9320 * param0)
 {
-    GraphicElementData_Delete(param0->unk_20);
-    GraphicElementData_Delete(param0->unk_58);
+    CellActor_Delete(param0->unk_20);
+    CellActor_Delete(param0->unk_58);
 }
 
 static void ov21_021D8DD4 (UnkStruct_ov21_021D879C * param0, int param1, int param2)
@@ -986,52 +986,52 @@ static void ov21_021D9240 (UnkStruct_ov21_021D879C * param0, int param1, int par
 static void ov21_021D924C (UnkStruct_ov21_021D9320 * param0, int param1)
 {
     if (param1 == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_20, 0);
+        CellActor_SetDrawFlag(param0->unk_20, 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_20, 1);
+        CellActor_SetDrawFlag(param0->unk_20, 1);
 
         switch (param1) {
         case 1:
-            GraphicElementData_SetAnim(param0->unk_20, 3);
+            CellActor_SetAnim(param0->unk_20, 3);
             break;
         case 2:
-            GraphicElementData_SetAnim(param0->unk_20, 4);
+            CellActor_SetAnim(param0->unk_20, 4);
             break;
         case 3:
-            GraphicElementData_SetAnim(param0->unk_20, 5);
+            CellActor_SetAnim(param0->unk_20, 5);
             break;
         case 4:
-            GraphicElementData_SetAnim(param0->unk_20, 6);
+            CellActor_SetAnim(param0->unk_20, 6);
             break;
         case 5:
-            GraphicElementData_SetAnim(param0->unk_20, 7);
+            CellActor_SetAnim(param0->unk_20, 7);
             break;
         case 6:
-            GraphicElementData_SetAnim(param0->unk_20, 8);
+            CellActor_SetAnim(param0->unk_20, 8);
             break;
         case 7:
-            GraphicElementData_SetAnim(param0->unk_20, 9);
+            CellActor_SetAnim(param0->unk_20, 9);
             break;
         case 8:
-            GraphicElementData_SetAnim(param0->unk_20, 10);
+            CellActor_SetAnim(param0->unk_20, 10);
             break;
         case 9:
-            GraphicElementData_SetAnim(param0->unk_20, 11);
+            CellActor_SetAnim(param0->unk_20, 11);
             break;
         case 10:
-            GraphicElementData_SetAnim(param0->unk_20, 12);
+            CellActor_SetAnim(param0->unk_20, 12);
             break;
         case 11:
-            GraphicElementData_SetAnim(param0->unk_20, 13);
+            CellActor_SetAnim(param0->unk_20, 13);
             break;
         case 12:
-            GraphicElementData_SetAnim(param0->unk_20, 14);
+            CellActor_SetAnim(param0->unk_20, 14);
             break;
         case 13:
-            GraphicElementData_SetAnim(param0->unk_20, 15);
+            CellActor_SetAnim(param0->unk_20, 15);
             break;
         case 14:
-            GraphicElementData_SetAnim(param0->unk_20, 16);
+            CellActor_SetAnim(param0->unk_20, 16);
             break;
         default:
             break;
@@ -1060,10 +1060,10 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     int v1;
 
     if (param2->unk_34 == 32) {
-        GraphicElementData_SetDrawFlag(param0->unk_58, 1);
+        CellActor_SetDrawFlag(param0->unk_58, 1);
         ov21_021D93F4(param1, param3);
     } else if (param2->unk_34 == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_58, 0);
+        CellActor_SetDrawFlag(param0->unk_58, 0);
         BGL_FillWindow(&param1->unk_00->unk_04, 0);
         sub_0201A9A4(&param1->unk_00->unk_04);
     }
@@ -1072,7 +1072,7 @@ static void ov21_021D9390 (UnkStruct_ov21_021D9320 * param0, UnkStruct_ov21_021D
     v0 = (((180 * 0xffff) / 360)) * v1;
     v0 = v0 / 4;
 
-    GraphicElementData_SetAffineZRotation(param0->unk_58, (u16)v0);
+    CellActor_SetAffineZRotation(param0->unk_58, (u16)v0);
 }
 
 static void ov21_021D93F4 (UnkStruct_ov21_021D879C * param0, int param1)
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 097c76e0ac..073b592464 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -87,11 +87,11 @@ typedef struct {
 } UnkStruct_ov21_021D9B24;
 
 typedef struct {
-    GraphicElementData * unk_00[6];
+    CellActor * unk_00[6];
     UnkStruct_ov21_021D4CA0 * unk_18[6];
-    GraphicElementData * unk_30[15];
+    CellActor * unk_30[15];
     UnkStruct_ov21_021D4CA0 * unk_6C[15];
-    GraphicElementData * unk_A8[15];
+    CellActor * unk_A8[15];
     UnkStruct_02009DC8 * unk_E4[4];
     UnkStruct_02009DC8 * unk_F4[4];
     int unk_104;
@@ -2356,7 +2356,7 @@ static void ov21_021DB708 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2381,7 +2381,7 @@ static void ov21_021DB79C (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 125 + 16000, 3 + 16000, 126 + 16000, 124 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2447,20 +2447,20 @@ static void ov21_021DB858 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
             break;
         }
 
-        param0->unk_00[v0] = GraphicElementManager_AddElement(param1);
+        param0->unk_00[v0] = CellActorCollection_Add(param1);
 
         switch (v0) {
         case 0:
-            GraphicElementData_SetAnim(param0->unk_00[v0], 3);
+            CellActor_SetAnim(param0->unk_00[v0], 3);
             break;
         case 1:
         case 2:
         case 3:
         case 4:
-            GraphicElementData_SetAnim(param0->unk_00[v0], 2);
+            CellActor_SetAnim(param0->unk_00[v0], 2);
             break;
         case 5:
-            GraphicElementData_SetAnim(param0->unk_00[v0], 1);
+            CellActor_SetAnim(param0->unk_00[v0], 1);
             break;
         }
     }
@@ -2471,7 +2471,7 @@ static void ov21_021DB90C (UnkStruct_ov21_021DC96C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -2481,7 +2481,7 @@ static void ov21_021DB924 (UnkStruct_ov21_021DC96C * param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            GraphicElementData_Delete(param0->unk_30[v0]);
+            CellActor_Delete(param0->unk_30[v0]);
             param0->unk_30[v0] = NULL;
         }
     }
@@ -2498,8 +2498,8 @@ static void ov21_021DB944 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = CellActorCollection_Add(param1);
+            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
@@ -2515,8 +2515,8 @@ static void ov21_021DB9B4 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = CellActorCollection_Add(param1);
+            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
@@ -2532,8 +2532,8 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = CellActorCollection_Add(param1);
+            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2541,9 +2541,9 @@ static void ov21_021DBA24 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.x = (48 - 24);
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[10] = GraphicElementManager_AddElement(param1);
+    param0->unk_30[10] = CellActorCollection_Add(param1);
 
-    GraphicElementData_SetAnim(param0->unk_30[10], 5);
+    CellActor_SetAnim(param0->unk_30[10], 5);
 }
 
 static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
@@ -2557,8 +2557,8 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 2; v1++) {
             param1->position.x = 48 + (v1 * (128 - 48));
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 2) + v1] = GraphicElementManager_AddElement(param1);
-            GraphicElementData_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = CellActorCollection_Add(param1);
+            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2566,17 +2566,17 @@ static void ov21_021DBAB8 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
     param1->position.x = 128;
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[8] = GraphicElementManager_AddElement(param1);
+    param0->unk_30[8] = CellActorCollection_Add(param1);
 
-    GraphicElementData_SetAnim(param0->unk_30[8], 0);
+    CellActor_SetAnim(param0->unk_30[8], 0);
 
     param1->position.y = 176;
     param1->position.x = (48 - 24);
     param1->position.x <<= FX32_SHIFT;
     param1->position.y = (param1->position.y << FX32_SHIFT) + (192 << FX32_SHIFT);
-    param0->unk_30[9] = GraphicElementManager_AddElement(param1);
+    param0->unk_30[9] = CellActorCollection_Add(param1);
 
-    GraphicElementData_SetAnim(param0->unk_30[9], 4);
+    CellActor_SetAnim(param0->unk_30[9], 4);
 }
 
 static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams * param1)
@@ -2590,9 +2590,9 @@ static void ov21_021DBB74 (UnkStruct_ov21_021DC96C * param0, CellActorInitParams
         for (v1 = 0; v1 < 3; v1++) {
             param1->position.x = 28 + (v1 * 56);
             param1->position.x <<= FX32_SHIFT;
-            param0->unk_30[(v0 * 3) + v1] = GraphicElementManager_AddElement(param1);
+            param0->unk_30[(v0 * 3) + v1] = CellActorCollection_Add(param1);
 
-            GraphicElementData_SetAnim(param0->unk_30[(v0 * 3) + v1], 6);
+            CellActor_SetAnim(param0->unk_30[(v0 * 3) + v1], 6);
         }
     }
 }
@@ -2606,7 +2606,7 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 128 + 16000, 3 + 16000, 129 + 16000, 127 + 16000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 15;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2619,53 +2619,53 @@ static void ov21_021DBBE4 (UnkStruct_ov21_021DC96C * param0, UnkStruct_ov21_021D
         for (v4 = 0; v4 < 3; v4++) {
             v1.position.x = 28 + (v4 * 56);
             v1.position.x <<= FX32_SHIFT;
-            param0->unk_A8[(v3 * 3) + v4] = GraphicElementManager_AddElement(&v1);
+            param0->unk_A8[(v3 * 3) + v4] = CellActorCollection_Add(&v1);
 
             switch ((v3 * 3) + v4) {
             case 0:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 0);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             case 1:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 5);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 5);
                 break;
             case 2:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 10);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 10);
                 break;
             case 3:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 1);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 1);
                 break;
             case 4:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 6);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 6);
                 break;
             case 5:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 11);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 11);
                 break;
             case 6:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 2);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 2);
                 break;
             case 7:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 9);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 9);
                 break;
             case 8:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 12);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 12);
                 break;
             case 9:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 3);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 3);
                 break;
             case 10:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 8);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 8);
                 break;
             case 11:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 13);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 13);
                 break;
             case 12:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 4);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 4);
                 break;
             case 13:
-                GraphicElementData_SetAnim(param0->unk_A8[(v3 * 3) + v4], 7);
+                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 7);
                 break;
             case 14:
-                GraphicElementData_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
+                CellActor_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             }
         }
@@ -2678,7 +2678,7 @@ static void ov21_021DBDA0 (UnkStruct_ov21_021DC96C * param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_A8[v0]) {
-            GraphicElementData_Delete(param0->unk_A8[v0]);
+            CellActor_Delete(param0->unk_A8[v0]);
             param0->unk_A8[v0] = NULL;
         }
     }
@@ -3487,7 +3487,7 @@ static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
+            CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
         }
 
         if (param0->unk_6C[v0]) {
@@ -3495,7 +3495,7 @@ static void ov21_021DC8D0 (UnkStruct_ov21_021DC96C * param0, int param1)
         }
 
         if (param0->unk_A8[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_A8[v0], param1);
+            CellActor_SetExplicitOAMMode(param0->unk_A8[v0], param1);
         }
     }
 }
@@ -3507,7 +3507,7 @@ static void ov21_021DC90C (UnkStruct_ov21_021DC96C * param0, int param1)
     for (v0 = 0; v0 < 15; v0++) {
         if (v0 != 10) {
             if (param0->unk_30[v0]) {
-                GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
+                CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
             }
 
             if (param0->unk_6C[v0]) {
@@ -3524,7 +3524,7 @@ static void ov21_021DC93C (UnkStruct_ov21_021DC96C * param0, int param1)
     for (v0 = 0; v0 < 15; v0++) {
         if (v0 != 9) {
             if (param0->unk_30[v0]) {
-                GraphicElementData_SetExplicitOAMMode(param0->unk_30[v0], param1);
+                CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
             }
 
             if (param0->unk_6C[v0]) {
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 529ae0b868..8ddf3d0677 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -103,10 +103,10 @@ typedef struct {
 
 typedef struct {
     int unk_00;
-    GraphicElementData * unk_04[44];
+    CellActor * unk_04[44];
     UnkStruct_02009DC8 * unk_B4[4];
     int unk_C4;
-    GraphicElementData * unk_C8;
+    CellActor * unk_C8;
     UnkStruct_ov21_021D4CA0 * unk_CC;
     UnkStruct_02009DC8 * unk_D0[4];
     UnkStruct_ov21_021D4CA0 * unk_E0[3];
@@ -582,7 +582,7 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 93 + 6000, 14 + 6000, 91 + 6000, 92 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -590,12 +590,12 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
     v1.position.x = 160 * FX32_ONE;
     v1.position.y = 96 * FX32_ONE;
 
-    param0->unk_C8 = GraphicElementManager_AddElement(&v1);
+    param0->unk_C8 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_C8, 2);
+    CellActor_SetAnim(param0->unk_C8, 2);
     sub_020093B4(&v0, 108 + 6000, 14 + 6000, 106 + 6000, 107 + 6000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -604,9 +604,9 @@ static void ov21_021DD1A8 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
     v1.position.y = 0;
 
     for (v3 = 0; v3 < (22 * 2); v3++) {
-        param0->unk_04[v3] = GraphicElementManager_AddElement(&v1);
-        GraphicElementData_SetDrawFlag(param0->unk_04[v3], 0);
-        GraphicElementData_SetExplicitOAMMode(param0->unk_04[v3], GX_OAM_MODE_XLU);
+        param0->unk_04[v3] = CellActorCollection_Add(&v1);
+        CellActor_SetDrawFlag(param0->unk_04[v3], 0);
+        CellActor_SetExplicitOAMMode(param0->unk_04[v3], GX_OAM_MODE_XLU);
     }
 }
 
@@ -614,11 +614,11 @@ static void ov21_021DD2B8 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    GraphicElementData_Delete(param0->unk_C8);
+    CellActor_Delete(param0->unk_C8);
     param0->unk_C8 = NULL;
 
     for (v0 = 0; v0 < (22 * 2); v0++) {
-        GraphicElementData_Delete(param0->unk_04[v0]);
+        CellActor_Delete(param0->unk_04[v0]);
         param0->unk_04[v0] = NULL;
     }
 }
@@ -689,7 +689,7 @@ static void ov21_021DD420 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_CC->unk_00, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -701,7 +701,7 @@ static void ov21_021DD458 (UnkStruct_ov21_021DD420 * param0)
 {
     int v0;
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_C8, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_CC->unk_00, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -896,7 +896,7 @@ static void ov21_021DD8B4 (UnkStruct_ov21_021DD420 * param0)
     memset(param0->unk_470, 0, sizeof(u8) * (30 * 30));
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
     }
 
     param0->unk_C4 = 0;
@@ -1107,10 +1107,10 @@ static void ov21_021DD964 (UnkStruct_ov21_021DD420 * param0, UnkStruct_ov21_021D
 static void ov21_021DD9E8 (UnkStruct_ov21_021DD420 * param0, const UnkStruct_ov21_021DDABC * param1)
 {
     if ((param0->unk_834 <= 0) && (param0->unk_838 <= 0) && (param0->unk_83C <= 0) && (param0->unk_840 <= 0)) {
-        GraphicElementData_SetDrawFlag(param0->unk_C8, 1);
+        CellActor_SetDrawFlag(param0->unk_C8, 1);
         sub_020129D0(param0->unk_CC->unk_00, 1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_C8, 0);
+        CellActor_SetDrawFlag(param0->unk_C8, 0);
         sub_020129D0(param0->unk_CC->unk_00, 0);
     }
 }
@@ -1193,7 +1193,7 @@ static void ov21_021DDB8C (UnkStruct_ov21_021DD420 * param0)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
     }
 }
 
@@ -1205,7 +1205,7 @@ static void ov21_021DDBCC (UnkStruct_ov21_021DD420 * param0)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 1);
 
     for (v0 = 0; v0 < param0->unk_C4; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
     }
 }
 
@@ -1220,7 +1220,7 @@ static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0)
 
         if (param0->unk_810 == 0) {
             for (v2 = 0; v2 < param0->unk_C4; v2++) {
-                GraphicElementData_SetDrawFlag(param0->unk_04[v2], 1);
+                CellActor_SetDrawFlag(param0->unk_04[v2], 1);
             }
 
             param0->unk_810 = 1;
@@ -1248,7 +1248,7 @@ static void ov21_021DDC14 (UnkStruct_ov21_021DD420 * param0)
             GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
         } else {
             for (v2 = 0; v2 < param0->unk_C4; v2++) {
-                GraphicElementData_SetDrawFlag(param0->unk_04[v2], 0);
+                CellActor_SetDrawFlag(param0->unk_04[v2], 0);
             }
         }
     }
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index fbf12c123c..54f05119e2 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -65,7 +65,7 @@ typedef struct {
 } UnkStruct_ov21_021DDE4C;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_02009DC8 * unk_04[4];
     void * unk_14;
     int unk_18;
@@ -337,12 +337,12 @@ static int ov21_021DDFB4 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021DE040 (UnkStruct_ov21_021DDEC8 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021DE04C (UnkStruct_ov21_021DDEC8 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
 }
 
 static void ov21_021DE058 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, BOOL param3)
@@ -439,7 +439,7 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 105 + 6000, 11 + 2100, 103 + 6000, 104 + 6000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -448,14 +448,14 @@ static void ov21_021DE258 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021D
     v1.position.y = 0;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_00 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00, 0);
+    CellActor_SetAnim(param0->unk_00, 0);
 }
 
 static void ov21_021DE2E0 (UnkStruct_ov21_021DDEC8 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
 }
 
 static void ov21_021DE2EC (UnkStruct_ov21_021DDE4C * param0, UnkStruct_ov21_021DDDA4 * param1, int param2)
@@ -594,8 +594,8 @@ static void ov21_021DE49C (UnkStruct_ov21_021DDEC8 * param0, const UnkStruct_ov2
     v0.y = param2->unk_04 << FX32_SHIFT;
     v0.y += (192 << FX32_SHIFT);
 
-    GraphicElementData_SetPosition(param0->unk_00, &v0);
-    GraphicElementData_SetAnim(param0->unk_00, ov21_021DCA28(param1->unk_00));
+    CellActor_SetPosition(param0->unk_00, &v0);
+    CellActor_SetAnim(param0->unk_00, ov21_021DCA28(param1->unk_00));
 }
 
 static void ov21_021DE4D4 (UnkStruct_ov21_021DDEC8 * param0, UnkStruct_ov21_021DDDF0 * param1, const UnkStruct_ov21_021DDDA4 * param2, int param3)
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 77acc20370..7621677e0e 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -52,8 +52,8 @@ typedef struct {
 } UnkStruct_ov21_021DE760;
 
 typedef struct {
-    GraphicElementData * unk_00[3];
-    GraphicElementData * unk_0C;
+    CellActor * unk_00[3];
+    CellActor * unk_0C;
     UnkStruct_ov21_021D4CA0 * unk_10;
     UnkStruct_02009DC8 * unk_14[4];
     UnkStruct_02009DC8 * unk_24[4];
@@ -554,7 +554,7 @@ static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 4000, 4000, 4000, 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -562,13 +562,13 @@ static void ov21_021DEE80 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.y = (88 * FX32_ONE);
     v1.position.x = (120 * FX32_ONE);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[0] = CellActorCollection_Add(&v1);
 }
 
 static void ov21_021DEEF8 (UnkStruct_ov21_021DF374 * param0)
 {
     if (param0->unk_00[0]) {
-        GraphicElementData_Delete(param0->unk_00[0]);
+        CellActor_Delete(param0->unk_00[0]);
     }
 }
 
@@ -648,7 +648,7 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -656,15 +656,15 @@ static void ov21_021DF098 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.x = (170 * FX32_ONE);
     v1.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[1] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[1], 0 + v4);
+    CellActor_SetAnim(param0->unk_00[1], 0 + v4);
 
     if (v4 != v5) {
         v1.position.x = (220 * FX32_ONE);
         v1.position.y = (72 * FX32_ONE);
-        param0->unk_00[2] = GraphicElementManager_AddElement(&v1);
-        GraphicElementData_SetAnim(param0->unk_00[2], 0 + v5);
+        param0->unk_00[2] = CellActorCollection_Add(&v1);
+        CellActor_SetAnim(param0->unk_00[2], 0 + v5);
     } else {
         param0->unk_00[2] = NULL;
     }
@@ -735,11 +735,11 @@ int ov21_021DF180 (int param0)
 static void ov21_021DF1F8 (UnkStruct_ov21_021DF374 * param0)
 {
     if (param0->unk_00[1]) {
-        GraphicElementData_Delete(param0->unk_00[1]);
+        CellActor_Delete(param0->unk_00[1]);
     }
 
     if (param0->unk_00[2]) {
-        GraphicElementData_Delete(param0->unk_00[2]);
+        CellActor_Delete(param0->unk_00[2]);
     }
 }
 
@@ -755,7 +755,7 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -763,9 +763,9 @@ static void ov21_021DF214 (UnkStruct_ov21_021DF374 * param0, UnkStruct_ov21_021D
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_0C = GraphicElementManager_AddElement(&v1);
+    param0->unk_0C = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_0C, 0x11);
+    CellActor_SetAnim(param0->unk_0C, 0x11);
 
     if (ov21_021D37CC(param2->unk_04) != 2) {
         v3 = 0;
@@ -812,7 +812,7 @@ Window * ov21_021DF30C (UnkStruct_ov21_021D4C0C * param0, int param1, int param2
 
 static void ov21_021DF35C (UnkStruct_ov21_021DF374 * param0)
 {
-    GraphicElementData_Delete(param0->unk_0C);
+    CellActor_Delete(param0->unk_0C);
     param0->unk_0C = NULL;
     ov21_021D4D1C(param0->unk_10);
 }
@@ -973,11 +973,11 @@ static void ov21_021DF64C (UnkStruct_ov21_021DF374 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+            CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         }
     }
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_XLU);
 }
 
@@ -987,11 +987,11 @@ static void ov21_021DF680 (UnkStruct_ov21_021DF374 * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         }
     }
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_NORMAL);
 }
 
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index ff8f3813f1..2038e27369 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -54,13 +54,13 @@ typedef struct {
 } UnkStruct_ov21_021DF858;
 
 typedef struct {
-    GraphicElementData * unk_00[4];
+    CellActor * 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;
-    GraphicElementData * unk_BC;
+    CellActor * unk_BC;
     int unk_C0;
     BOOL unk_C4;
     int unk_C8;
@@ -564,7 +564,7 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
 
     sub_020093B4(&v0, 122 + 14000, 22 + 14000, 123 + 14000, 121 + 14000, 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -577,12 +577,12 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
         v1.position.x = v3 << FX32_SHIFT;
         v1.position.y = (v4 + 8) << FX32_SHIFT;
 
-        param0->unk_00[v5] = GraphicElementManager_AddElement(&v1);
+        param0->unk_00[v5] = CellActorCollection_Add(&v1);
 
         if ((v5 % 2) == 0) {
-            GraphicElementData_SetAnim(param0->unk_00[v5], 0);
+            CellActor_SetAnim(param0->unk_00[v5], 0);
         } else {
-            GraphicElementData_SetAnim(param0->unk_00[v5], 2);
+            CellActor_SetAnim(param0->unk_00[v5], 2);
         }
     }
 
@@ -590,14 +590,14 @@ static void ov21_021DFE0C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
     v1.position.y = 96 << FX32_SHIFT;
     v1.priority = 0;
 
-    param0->unk_BC = GraphicElementManager_AddElement(&v1);
+    param0->unk_BC = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_BC, 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_BC, 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_BC, 0);
+    CellActor_SetAnim(param0->unk_BC, 1);
+    CellActor_SetAnimateFlag(param0->unk_BC, 1);
+    CellActor_SetExplicitPriority(param0->unk_BC, 0);
 
     if (param2->unk_10 <= 1) {
-        GraphicElementData_SetDrawFlag(param0->unk_BC, 0);
+        CellActor_SetDrawFlag(param0->unk_BC, 0);
     }
 }
 
@@ -606,10 +606,10 @@ static void ov21_021DFF18 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 
-    GraphicElementData_Delete(param0->unk_BC);
+    CellActor_Delete(param0->unk_BC);
 }
 
 static void ov21_021DFF38 (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021DF858 * param1, const UnkStruct_ov21_021DF844 * param2, BOOL param3)
@@ -655,10 +655,10 @@ static void ov21_021DFFF8 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
     }
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 2; v0++) {
         sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_XLU);
@@ -670,10 +670,10 @@ static void ov21_021E0038 (UnkStruct_ov21_021DFFF8 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
     }
 
-    GraphicElementData_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 2; v0++) {
         sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_NORMAL);
@@ -745,7 +745,7 @@ static BOOL ov21_021E015C (UnkStruct_ov21_021DFFF8 * param0, UnkStruct_ov21_021D
     v1.x = param0->unk_28[param2].unk_00 << FX32_SHIFT;
     v1.y = (param0->unk_28[param2].unk_04 + 8) << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_00[v2], &v1);
+    CellActor_SetPosition(param0->unk_00[v2], &v1);
 
     return v0;
 }
@@ -1322,7 +1322,7 @@ static void ov21_021E0BF8 (UnkStruct_ov21_021DFFF8 * param0)
 
 static void ov21_021E0C10 (UnkStruct_ov21_021DFFF8 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_BC, 0);
+    CellActor_SetDrawFlag(param0->unk_BC, 0);
 
     param0->unk_C0 = (16 + 8);
     param0->unk_C4 = 1;
@@ -1334,7 +1334,7 @@ static void ov21_021E0C30 (UnkStruct_ov21_021DFFF8 * param0)
         param0->unk_C0--;
 
         if (param0->unk_C0 <= 0) {
-            GraphicElementData_SetDrawFlag(param0->unk_BC, 1);
+            CellActor_SetDrawFlag(param0->unk_BC, 1);
             param0->unk_C4 = 0;
         }
     }
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index ac339b93a4..7c6d9dbee6 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -58,7 +58,7 @@ typedef struct {
 } UnkStruct_ov21_021E0D7C;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_ov21_021D4CA0 * unk_04;
     UnkStruct_02009DC8 * unk_08[4];
     UnkStruct_ov21_021D2648 unk_18;
@@ -533,7 +533,7 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 90 + 4000, 13 + 4000, 88 + 4000, 89 + 4000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -541,9 +541,9 @@ static void ov21_021E136C (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_00 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00, 0x11);
+    CellActor_SetAnim(param0->unk_00, 0x11);
 
     if (ov21_021D37CC(param2->unk_04) != 2) {
         v3 = 0;
@@ -589,7 +589,7 @@ static Window * ov21_021E1460 (UnkStruct_ov21_021E0D7C * param0, int param1, int
 
 static void ov21_021E14BC (UnkStruct_ov21_021E14D4 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
     param0->unk_00 = NULL;
     ov21_021D4D1C(param0->unk_04);
 }
@@ -747,13 +747,13 @@ static BOOL ov21_021E1730 (UnkStruct_ov21_021E14D4 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E17AC (UnkStruct_ov21_021E14D4 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021E17C4 (UnkStruct_ov21_021E14D4 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_04->unk_00, GX_OAM_MODE_NORMAL);
 }
 
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 5eadcb7712..43227ed3ec 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -76,10 +76,10 @@ typedef struct {
 } UnkStruct_ov21_021E1E74;
 
 typedef struct {
-    GraphicElementData * unk_00[8];
+    CellActor * unk_00[8];
     UnkStruct_ov21_021D4CA0 * unk_20[8];
     UnkStruct_02009DC8 * unk_40[4];
-    GraphicElementData * unk_50[8];
+    CellActor * 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, 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_021E26A0(UnkStruct_ov21_021E1A90 * param0, CellActor * 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(CellActor * 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(GraphicElementData * param0, int param1, int param2);
+static void ov21_021E29A4(CellActor * 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);
@@ -713,7 +713,7 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 102 + 5000, 11 + 2100, 100 + 5000, 101 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -723,16 +723,16 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y = 132 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetAnim(param0->unk_00[0], 0);
+    param0->unk_00[0] = CellActorCollection_Add(&v1);
+    CellActor_SetAnim(param0->unk_00[0], 0);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 76 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[1] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[1], 0);
+    CellActor_SetAnim(param0->unk_00[1], 0);
     sub_020093B4(&v0, 99 + 5000, 11 + 2100, 97 + 5000, 98 + 5000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
     v1.resourceData = &v0;
@@ -741,9 +741,9 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
 
     for (v3 = 0; v3 < (7 - 2 + 1); ++v3) {
         v1.position.x = Unk_ov21_021E9D80[v3];
-        param0->unk_00[v3 + 2] = GraphicElementManager_AddElement(&v1);
+        param0->unk_00[v3 + 2] = CellActorCollection_Add(&v1);
 
-        GraphicElementData_SetAnim(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
+        CellActor_SetAnim(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
     }
 
     v1.priority = 31 - 1;
@@ -752,15 +752,15 @@ static void ov21_021E22C8 (UnkStruct_ov21_021E2588 * param0, UnkStruct_ov21_021E
     v1.position.y = (132 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_50[0] = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetAnim(param0->unk_50[0], 13);
+    param0->unk_50[0] = CellActorCollection_Add(&v1);
+    CellActor_SetAnim(param0->unk_50[0], 13);
 
     v1.position.x = (128 + -32) << FX32_SHIFT;
     v1.position.y = (76 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_50[1] = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetAnim(param0->unk_50[1], 12);
+    param0->unk_50[1] = CellActorCollection_Add(&v1);
+    CellActor_SetAnim(param0->unk_50[1], 12);
 
     for (v3 = 1 + 1; v3 < 8; v3++) {
         param0->unk_50[v3] = NULL;
@@ -772,10 +772,10 @@ static void ov21_021E2458 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
 
         if (param0->unk_50[v0]) {
-            GraphicElementData_Delete(param0->unk_50[v0]);
+            CellActor_Delete(param0->unk_50[v0]);
         }
     }
 }
@@ -851,14 +851,14 @@ static void ov21_021E2588 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
 
         if (param0->unk_20[v0]) {
             sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_XLU);
         }
 
         if (param0->unk_50[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
+            CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
         }
     }
 }
@@ -868,14 +868,14 @@ static void ov21_021E25C0 (UnkStruct_ov21_021E2588 * param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
 
         if (param0->unk_20[v0]) {
             sub_02012AF0(param0->unk_20[v0]->unk_00, GX_OAM_MODE_NORMAL);
         }
 
         if (param0->unk_50[v0]) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
         }
     }
 }
@@ -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, 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_021E26A0 (UnkStruct_ov21_021E1A90 * param0, CellActor * 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;
@@ -925,7 +925,7 @@ static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E274C(param1, param2, param4, param8, param9);
 
-    v0 = GraphicElementData_GetAnimFrame(param1);
+    v0 = CellActor_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -964,7 +964,7 @@ static void ov21_021E26A0 (UnkStruct_ov21_021E1A90 * param0, GraphicElementData
     }
 }
 
-static void ov21_021E274C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E274C (CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
@@ -1088,39 +1088,39 @@ static void ov21_021E28A8 (UnkStruct_ov21_021E1E74 * param0)
 static void ov21_021E28D0 (UnkStruct_ov21_021E2588 * param0, const UnkStruct_ov21_021E1E74 * param1)
 {
     if ((param1->unk_38 & 1) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[2], 0);
+        CellActor_SetDrawFlag(param0->unk_00[2], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[2], 1);
+        CellActor_SetDrawFlag(param0->unk_00[2], 1);
     }
 
     if ((param1->unk_38 & 2) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[3], 0);
+        CellActor_SetDrawFlag(param0->unk_00[3], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[3], 1);
+        CellActor_SetDrawFlag(param0->unk_00[3], 1);
     }
 
     if ((param1->unk_38 & 4) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[4], 0);
+        CellActor_SetDrawFlag(param0->unk_00[4], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[4], 1);
+        CellActor_SetDrawFlag(param0->unk_00[4], 1);
     }
 
     if ((param1->unk_38 & 8) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[5], 0);
+        CellActor_SetDrawFlag(param0->unk_00[5], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[5], 1);
+        CellActor_SetDrawFlag(param0->unk_00[5], 1);
     }
 
     if ((param1->unk_38 & 16) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[6], 0);
+        CellActor_SetDrawFlag(param0->unk_00[6], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[6], 1);
+        CellActor_SetDrawFlag(param0->unk_00[6], 1);
     }
 
     if ((param1->unk_38 & 32) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[7], 0);
+        CellActor_SetDrawFlag(param0->unk_00[7], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_00[7], 1);
+        CellActor_SetDrawFlag(param0->unk_00[7], 1);
     }
 }
 
@@ -1143,7 +1143,7 @@ static void ov21_021E2968 (UnkStruct_ov21_021E1E74 * param0, UnkStruct_ov21_021E
     }
 }
 
-static void ov21_021E29A4 (GraphicElementData * param0, int param1, int param2)
+static void ov21_021E29A4 (CellActor * param0, int param1, int param2)
 {
     int v0;
 
@@ -1152,8 +1152,8 @@ static void ov21_021E29A4 (GraphicElementData * param0, int param1, int param2)
     v0 = Unk_ov21_021E9D98[param2 - 2];
 
     if (param1 == 1) {
-        GraphicElementData_SetAnim(param0, v0 + 1);
+        CellActor_SetAnim(param0, v0 + 1);
     } else {
-        GraphicElementData_SetAnim(param0, v0);
+        CellActor_SetAnim(param0, v0);
     }
 }
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index a42df229bc..3931d7edf5 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -109,7 +109,7 @@ typedef struct {
 } UnkStruct_ov21_021E37B4;
 
 typedef struct {
-    GraphicElementData * unk_00[6];
+    CellActor * unk_00[6];
     UnkStruct_02009DC8 * unk_18[4];
 } UnkStruct_ov21_021E3900;
 
@@ -1285,7 +1285,7 @@ static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 96 + 2100, 11 + 2100, 94 + 2100, 95 + 2100, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -1314,8 +1314,8 @@ static void ov21_021E3AF0 (UnkStruct_ov21_021E3900 * param0, UnkStruct_ov21_021E
             break;
         }
 
-        param0->unk_00[v3] = GraphicElementManager_AddElement(&v1);
-        GraphicElementData_SetAnim(param0->unk_00[v3], v3);
+        param0->unk_00[v3] = CellActorCollection_Add(&v1);
+        CellActor_SetAnim(param0->unk_00[v3], v3);
     }
 }
 
@@ -1324,7 +1324,7 @@ static void ov21_021E3BC0 (UnkStruct_ov21_021E3900 * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -1604,6 +1604,6 @@ static void ov21_021E3FC0 (UnkStruct_ov21_021E326C * param0, int param1, int par
 static void ov21_021E3FE4 (UnkStruct_ov21_021E3900 * param0, const UnkStruct_ov21_021E342C * param1)
 {
     if (ov21_021D3954(param1->unk_08) == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[4], 0);
+        CellActor_SetDrawFlag(param0->unk_00[4], 0);
     }
 }
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index ce1b65609f..560a0240e1 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -57,12 +57,12 @@ typedef struct {
 } UnkStruct_ov21_021E4898;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     int unk_04;
 } UnkStruct_ov21_021E4B30_sub1;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * 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(GraphicElementData * param0, int param1);
+static void ov21_021E4C38(CellActor * param0, int param1);
 
 void ov21_021E3FFC (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2)
 {
@@ -389,10 +389,10 @@ static void ov21_021E4360 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
+            CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
         }
 
-        GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
     }
 }
 
@@ -402,10 +402,10 @@ static void ov21_021E4394 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
         }
 
-        GraphicElementData_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
     }
 }
 
@@ -580,7 +580,7 @@ static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 116 + 11000, 19 + 11000, 117 + 11000, 115 + 11000, 0xffffffff, 0xffffffff, 0, 0, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 17;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -590,10 +590,10 @@ static void ov21_021E47CC (UnkStruct_ov21_021E4360 * param0, UnkStruct_ov21_021E
 
     for (v3 = 0; v3 < 9; v3++) {
         for (v4 = 0; v4 < 9; v4++) {
-            param0->unk_20[v3].unk_00[v4].unk_00 = GraphicElementManager_AddElement(&v1);
+            param0->unk_20[v3].unk_00[v4].unk_00 = CellActorCollection_Add(&v1);
         }
 
-        param0->unk_20[v3].unk_48.unk_00 = GraphicElementManager_AddElement(&v1);
+        param0->unk_20[v3].unk_48.unk_00 = CellActorCollection_Add(&v1);
     }
 }
 
@@ -603,10 +603,10 @@ static void ov21_021E4868 (UnkStruct_ov21_021E4360 * param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            GraphicElementData_Delete(param0->unk_20[v0].unk_00[v1].unk_00);
+            CellActor_Delete(param0->unk_20[v0].unk_00[v1].unk_00);
         }
 
-        GraphicElementData_Delete(param0->unk_20[v0].unk_48.unk_00);
+        CellActor_Delete(param0->unk_20[v0].unk_48.unk_00);
     }
 }
 
@@ -755,18 +755,18 @@ static void ov21_021E4B30 (UnkStruct_ov21_021E4B30 * param0, int param1)
     v1.y = 96 << FX32_SHIFT;
 
     for (v0 = 0; v0 < 9; v0++) {
-        GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
-        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
+        CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
+        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
 
         v1.y += -8 << FX32_SHIFT;
 
-        GraphicElementData_SetAnim(param0->unk_00[v0].unk_00, 1);
+        CellActor_SetAnim(param0->unk_00[v0].unk_00, 1);
     }
 
     v1.y = 96 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_48.unk_00, &v1);
-    GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 0);
+    CellActor_SetPosition(param0->unk_48.unk_00, &v1);
+    CellActor_SetDrawFlag(param0->unk_48.unk_00, 0);
 }
 
 static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
@@ -775,17 +775,17 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
     int v1 = 0;
 
     for (v0 = 0; v0 < param1; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 1);
+        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 1);
         param0->unk_00[v0].unk_04 = 2 * (v0 + 1);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0].unk_00)) {
+        if (CellActor_GetDrawFlag(param0->unk_00[v0].unk_00)) {
             if ((param0->unk_00[v0].unk_04 - 1) > 0) {
                 param0->unk_00[v0].unk_04--;
                 v1 = v0 + 1;
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
+                CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
             }
         }
     }
@@ -795,7 +795,7 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
         param0->unk_48.unk_08 = 16;
 
         if (param0->unk_48.unk_04 < v1) {
-            GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 1);
+            CellActor_SetDrawFlag(param0->unk_48.unk_00, 1);
         }
 
         param0->unk_48.unk_04 = v1;
@@ -809,20 +809,20 @@ static void ov21_021E4B94 (UnkStruct_ov21_021E4B30 * param0, int param1)
             param0->unk_48.unk_08--;
         }
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_48.unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_48.unk_00, 0);
     }
 }
 
-static void ov21_021E4C38 (GraphicElementData * param0, int param1)
+static void ov21_021E4C38 (CellActor * param0, int param1)
 {
     VecFx32 v0;
     const VecFx32 * v1;
 
-    v1 = GraphicElementData_GetPosition(param0);
+    v1 = CellActor_GetPosition(param0);
     v0 = *v1;
     v0.y = (96 + (-8 * param1)) << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static void ov21_021E4C68 (UnkStruct_ov21_021E4898 * param0, UnkStruct_ov21_021E40F4 * param1)
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 1c21be25d6..acfe0060fb 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -99,12 +99,12 @@ typedef struct {
 } UnkStruct_ov21_021E5C80;
 
 typedef struct {
-    GraphicElementData * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_00;
+    CellActor * unk_04;
     UnkStruct_ov21_021E5C80 unk_08;
-    GraphicElementData * unk_20;
+    CellActor * unk_20;
     UnkStruct_ov21_021E5C80 unk_24;
-    GraphicElementData * unk_3C;
+    CellActor * unk_3C;
     int unk_40;
     fx32 unk_44;
     int unk_48;
@@ -148,9 +148,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(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_021E5C80(CellActor * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, BOOL param3);
+static void ov21_021E5CF8(CellActor * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3);
+static void ov21_021E5D90(CellActor * 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);
@@ -441,10 +441,10 @@ static int ov21_021E4F78 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_XLU);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_XLU);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_XLU);
 
     sub_02012AF0(param0->unk_50[0]->unk_00, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_XLU);
@@ -452,10 +452,10 @@ static void ov21_021E5004 (UnkStruct_ov21_021E5004 * param0)
 
 static void ov21_021E5040 (UnkStruct_ov21_021E5004 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_NORMAL);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_NORMAL);
-    GraphicElementData_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_20, GX_OAM_MODE_NORMAL);
 
     sub_02012AF0(param0->unk_50[0]->unk_00, GX_OAM_MODE_NORMAL);
     sub_02012AF0(param0->unk_50[1]->unk_00, GX_OAM_MODE_NORMAL);
@@ -851,7 +851,7 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 113 + 10000, 18 + 10000, 114 + 10000, 112 + 10000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -861,31 +861,31 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 67 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_3C = GraphicElementManager_AddElement(&v1);
+    param0->unk_3C = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_3C, 4);
-    GraphicElementData_SetAnimateFlag(param0->unk_3C, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_3C, (FX32_ONE * 2));
+    CellActor_SetAnim(param0->unk_3C, 4);
+    CellActor_SetAnimateFlag(param0->unk_3C, 1);
+    CellActor_SetAnimSpeed(param0->unk_3C, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_3C, 8);
 
     v1.position.x = 51 << FX32_SHIFT;
     v1.position.y = 157 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_00 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00, 1);
-    GraphicElementData_SetAffineOverwriteMode(param0->unk_00, 1);
+    CellActor_SetAnim(param0->unk_00, 1);
+    CellActor_SetAffineOverwriteMode(param0->unk_00, 1);
 
     v1.position.x = 180 << FX32_SHIFT;
     v1.position.y = 131 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_04 = GraphicElementManager_AddElement(&v1);
+    param0->unk_04 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_04, 3);
-    GraphicElementData_SetAnimateFlag(param0->unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_04, (FX32_ONE * 2));
+    CellActor_SetAnim(param0->unk_04, 3);
+    CellActor_SetAnimateFlag(param0->unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_04, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_04, 5);
 
     param0->unk_08.unk_00 = 3;
@@ -898,11 +898,11 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
     v1.position.y = 166 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_20 = GraphicElementManager_AddElement(&v1);
+    param0->unk_20 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_20, 6);
-    GraphicElementData_SetAnimateFlag(param0->unk_20, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_20, (FX32_ONE * 2));
+    CellActor_SetAnim(param0->unk_20, 6);
+    CellActor_SetAnimateFlag(param0->unk_20, 1);
+    CellActor_SetAnimSpeed(param0->unk_20, (FX32_ONE * 2));
     SpriteActor_SetAnimFrame(param0->unk_20, 5);
 
     param0->unk_24.unk_00 = 6;
@@ -914,10 +914,10 @@ static void ov21_021E5734 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E5898 (UnkStruct_ov21_021E5004 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
-    GraphicElementData_Delete(param0->unk_3C);
-    GraphicElementData_Delete(param0->unk_04);
-    GraphicElementData_Delete(param0->unk_20);
+    CellActor_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_3C);
+    CellActor_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_20);
 }
 
 static void ov21_021E58B8 (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, int param2)
@@ -979,13 +979,13 @@ static void ov21_021E59B4 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov2
     int v0;
 
     if (param0->unk_40 != param1->unk_34) {
-        v0 = GraphicElementData_GetAnimFrame(param0->unk_3C);
+        v0 = CellActor_GetAnimFrame(param0->unk_3C);
 
         if (param1->unk_34 == 0) {
-            GraphicElementData_SetAnim(param0->unk_3C, 4);
+            CellActor_SetAnim(param0->unk_3C, 4);
             SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
         } else {
-            GraphicElementData_SetAnim(param0->unk_3C, 0);
+            CellActor_SetAnim(param0->unk_3C, 0);
             SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
         }
 
@@ -1107,7 +1107,7 @@ static void ov21_021E5AD8 (UnkStruct_ov21_021E51DC * param0)
 
 static void ov21_021E5B50 (UnkStruct_ov21_021E5004 * param0, const UnkStruct_ov21_021E51DC * param1)
 {
-    GraphicElementData_SetAffineZRotation(param0->unk_00, sub_0201D580(14, param1->unk_5C));
+    CellActor_SetAffineZRotation(param0->unk_00, sub_0201D580(14, param1->unk_5C));
 }
 
 static void ov21_021E5B6C (UnkStruct_ov21_021E5004 * param0, UnkStruct_ov21_021E4DA4 * param1, const UnkStruct_ov21_021E51DC * param2)
@@ -1167,7 +1167,7 @@ static void ov21_021E5C4C (UnkStruct_ov21_021E5004 * param0)
     }
 }
 
-static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
+static void ov21_021E5C80 (CellActor * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1175,7 +1175,7 @@ static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         param3 = 1;
     }
 
-    v0 = GraphicElementData_GetAnimFrame(param0);
+    v0 = CellActor_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1188,20 +1188,20 @@ static void ov21_021E5C80 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
     case 2:
         if (v0 > param1->unk_14) {
             SpriteActor_SetAnimFrame(param0, param1->unk_14);
-            GraphicElementData_SetAnimSpeed(param0, 0);
+            CellActor_SetAnimSpeed(param0, 0);
         }
         break;
     case 1:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        GraphicElementData_SetAnimSpeed(param0, (FX32_ONE * 2));
+        CellActor_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
     }
 }
 
-static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
+static void ov21_021E5CF8 (CellActor * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1209,7 +1209,7 @@ static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         param3 = 3;
     }
 
-    v0 = GraphicElementData_GetAnimFrame(param0);
+    v0 = CellActor_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1228,33 +1228,33 @@ static void ov21_021E5CF8 (GraphicElementData * param0, UnkStruct_ov21_021E5C80
         break;
     case 2:
         SpriteActor_SetAnimFrame(param0, param1->unk_14);
-        GraphicElementData_SetAnimSpeed(param0, 0);
+        CellActor_SetAnimSpeed(param0, 0);
         break;
     case 3:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        GraphicElementData_SetAnimSpeed(param0, (FX32_ONE * 2));
+        CellActor_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
     }
 }
 
-static void ov21_021E5D90 (GraphicElementData * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2)
+static void ov21_021E5D90 (CellActor * param0, UnkStruct_ov21_021E5C80 * param1, BOOL param2)
 {
     int v0;
 
-    v0 = GraphicElementData_GetAnimFrame(param0);
+    v0 = CellActor_GetAnimFrame(param0);
 
     if (param2 == 1) {
         if (param1->unk_08 == param1->unk_00) {
-            GraphicElementData_SetAnim(param0, param1->unk_04);
+            CellActor_SetAnim(param0, param1->unk_04);
             param1->unk_08 = param1->unk_04;
             SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
         }
     } else {
         if (param1->unk_08 == param1->unk_04) {
-            GraphicElementData_SetAnim(param0, param1->unk_00);
+            CellActor_SetAnim(param0, param1->unk_00);
             param1->unk_08 = param1->unk_00;
             SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
         }
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index ee5e936437..18cbd0f004 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];
-    GraphicElementData * unk_10;
+    CellActor * 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(GraphicElementData * param0, short param1);
+static void ov21_021E6860(CellActor * param0, short param1);
 static void ov21_021E687C(Sprite * param0, short param1);
-static void ov21_021E688C(GraphicElementData * param0, short param1);
+static void ov21_021E688C(CellActor * param0, short param1);
 static void ov21_021E68B0(Sprite * param0, short param1);
 
 void ov21_021E6014 (UnkStruct_ov21_021E68F4 * param0, UnkStruct_ov21_021D0F60 * param1, int param2)
@@ -296,12 +296,12 @@ static int ov21_021E6204 (void * param0, UnkStruct_ov21_021E6B20 * param1, const
 
 static void ov21_021E6274 (UnkStruct_ov21_021E6274 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_XLU);
+    CellActor_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021E6280 (UnkStruct_ov21_021E6274 * param0)
 {
-    GraphicElementData_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_NORMAL);
+    CellActor_SetExplicitOAMMode(param0->unk_10, GX_OAM_MODE_NORMAL);
 }
 
 static void ov21_021E628C (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, BOOL param3)
@@ -418,7 +418,7 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 1, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -430,12 +430,12 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
     v1.position.x = 168 << FX32_SHIFT;
     v1.position.y = (88 + v4) << FX32_SHIFT;
 
-    param0->unk_10 = GraphicElementManager_AddElement(&v1);
+    param0->unk_10 = CellActorCollection_Add(&v1);
 
     if (ov21_021D3920(param2->unk_04) == 0) {
-        GraphicElementData_SetAnim(param0->unk_10, 5);
+        CellActor_SetAnim(param0->unk_10, 5);
     } else {
-        GraphicElementData_SetAnim(param0->unk_10, 6);
+        CellActor_SetAnim(param0->unk_10, 6);
     }
 
     ov21_021E6860(param0->unk_10, v4);
@@ -444,7 +444,7 @@ static void ov21_021E6518 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E
 
 static void ov21_021E65EC (UnkStruct_ov21_021E6274 * param0)
 {
-    GraphicElementData_Delete(param0->unk_10);
+    CellActor_Delete(param0->unk_10);
 }
 
 static void ov21_021E65F8 (UnkStruct_ov21_021E6274 * param0, UnkStruct_ov21_021E6118 * param1, const UnkStruct_ov21_021E6104 * param2, int param3)
@@ -545,14 +545,14 @@ static void ov21_021E6844 (UnkStruct_ov21_021E6118 * param0)
     sub_02008780(v0);
 }
 
-static void ov21_021E6860 (GraphicElementData * param0, short param1)
+static void ov21_021E6860 (CellActor * param0, short param1)
 {
     VecFx32 v0;
 
     v0.x = 168 << FX32_SHIFT;
     v0.y = (88 + param1) << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static void ov21_021E687C (Sprite * param0, short param1)
@@ -560,14 +560,14 @@ static void ov21_021E687C (Sprite * param0, short param1)
     sub_02007DEC(param0, 1, 88 + param1);
 }
 
-static void ov21_021E688C (GraphicElementData * param0, short param1)
+static void ov21_021E688C (CellActor * param0, short param1)
 {
     VecFx32 v0;
 
     v0.x = FX_Div(0x100 << FX32_SHIFT, param1 << FX32_SHIFT);
     v0.y = v0.x;
 
-    GraphicElementData_SetAffineScaleEx(param0, &v0, 2);
+    CellActor_SetAffineScaleEx(param0, &v0, 2);
 }
 
 static void ov21_021E68B0 (Sprite * param0, short param1)
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index 71e1d4d81d..f7c65f123d 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -67,10 +67,10 @@ typedef struct {
 } UnkStruct_ov21_021E6DAC;
 
 typedef struct {
-    GraphicElementData * unk_00[2];
+    CellActor * unk_00[2];
     UnkStruct_ov21_021D4CA0 * unk_08[2];
     UnkStruct_02009DC8 * unk_10[4];
-    GraphicElementData * unk_20[4];
+    CellActor * 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, 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_021E71D0(UnkStruct_ov21_021E6A34 * param0, CellActor * 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(CellActor * 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);
@@ -366,7 +366,7 @@ static void ov21_021E6C60 (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -376,7 +376,7 @@ static void ov21_021E6C88 (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -572,7 +572,7 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 102 + 9000, 11 + 2100, 100 + 9000, 101 + 9000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -582,17 +582,17 @@ static void ov21_021E700C (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
     v1.position.y = 120 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[0] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[0], 1);
+    CellActor_SetAnim(param0->unk_00[0], 1);
 
     v1.position.x = 188 << FX32_SHIFT;
     v1.position.y = 120 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[1] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[1] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[1], 1);
+    CellActor_SetAnim(param0->unk_00[1], 1);
 }
 
 static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0)
@@ -600,7 +600,7 @@ static void ov21_021E70BC (UnkStruct_ov21_021E6C60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -660,7 +660,7 @@ static void ov21_021E71B8 (UnkStruct_ov21_021E6C60 * param0, UnkStruct_ov21_021E
     }
 }
 
-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_021E71D0 (UnkStruct_ov21_021E6A34 * param0, CellActor * 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;
@@ -671,7 +671,7 @@ static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E727C(param1, param2, param4, param8, param9);
 
-    v0 = GraphicElementData_GetAnimFrame(param1);
+    v0 = CellActor_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -710,7 +710,7 @@ static void ov21_021E71D0 (UnkStruct_ov21_021E6A34 * param0, GraphicElementData
     }
 }
 
-static void ov21_021E727C (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E727C (CellActor * 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 43dd4e636e..5050f32bed 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;
-    GraphicElementData * unk_04;
-    GraphicElementData * unk_08;
-    GraphicElementData * unk_0C;
-    GraphicElementData * unk_10;
+    CellActor * unk_04;
+    CellActor * unk_08;
+    CellActor * unk_0C;
+    CellActor * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -97,10 +97,10 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02015214 * unk_00;
-    GraphicElementData * unk_04;
-    GraphicElementData * unk_08;
-    GraphicElementData * unk_0C;
-    GraphicElementData * unk_10;
+    CellActor * unk_04;
+    CellActor * unk_08;
+    CellActor * unk_0C;
+    CellActor * unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -108,7 +108,7 @@ typedef struct {
 } UnkStruct_ov21_021E81F8;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     fx32 unk_04;
     fx32 unk_08;
     s16 unk_0C;
@@ -119,10 +119,10 @@ typedef struct {
 } UnkStruct_ov21_021E82C8;
 
 typedef struct {
-    GraphicElementData * unk_00;
-    GraphicElementData * unk_04;
-    GraphicElementData * unk_08;
-    GraphicElementData * unk_0C[2];
+    CellActor * unk_00;
+    CellActor * unk_04;
+    CellActor * unk_08;
+    CellActor * 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, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5);
+static void ov21_021E80D4(UnkStruct_02015214 * param0, CellActor * param1, CellActor * param2, CellActor * param3, CellActor * 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);
@@ -639,7 +639,7 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 93 + 7000, 14 + 7000, 91 + 7000, 92 + 7000, 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -647,37 +647,37 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v1);
+    param0->unk_00 = CellActorCollection_Add(&v1);
 
     if (ov21_021D3920(param2->unk_00) == 0) {
-        GraphicElementData_SetAnim(param0->unk_00, 3);
+        CellActor_SetAnim(param0->unk_00, 3);
     } else {
-        GraphicElementData_SetAnim(param0->unk_00, 4);
+        CellActor_SetAnim(param0->unk_00, 4);
     }
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = (96 + 10) << FX32_SHIFT;
 
-    param0->unk_08 = GraphicElementManager_AddElement(&v1);
+    param0->unk_08 = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_08, 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_08, 1);
+    CellActor_SetAnim(param0->unk_08, 1);
+    CellActor_SetExplicitPriority(param0->unk_08, 1);
 
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[0] = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetAnim(param0->unk_0C[0], 0);
+    param0->unk_0C[0] = CellActorCollection_Add(&v1);
+    CellActor_SetAnim(param0->unk_0C[0], 0);
 
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[1] = GraphicElementManager_AddElement(&v1);
+    param0->unk_0C[1] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_0C[1], 0);
+    CellActor_SetAnim(param0->unk_0C[1], 0);
     sub_020093B4(&v0, sub_02009E08(param0->unk_14[0]), sub_02009E08(param0->unk_14[1]), sub_02009E08(param0->unk_14[2]), sub_02009E08(param0->unk_14[3]), 0xffffffff, 0xffffffff, 0, 3, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -685,17 +685,17 @@ static void ov21_021E7B34 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_04 = GraphicElementManager_AddElement(&v1);
-    GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
+    param0->unk_04 = CellActorCollection_Add(&v1);
+    CellActor_SetExplicitPaletteWithOffset(param0->unk_04, PokeIconPaletteIndex(v6, v7, 0));
 }
 
 static void ov21_021E7CCC (UnkStruct_ov21_021E7714 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
-    GraphicElementData_Delete(param0->unk_04);
-    GraphicElementData_Delete(param0->unk_08);
-    GraphicElementData_Delete(param0->unk_0C[0]);
-    GraphicElementData_Delete(param0->unk_0C[1]);
+    CellActor_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_08);
+    CellActor_Delete(param0->unk_0C[0]);
+    CellActor_Delete(param0->unk_0C[1]);
 }
 
 static void ov21_021E7CF0 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, const UnkStruct_ov21_021E7468 * param2, int param3)
@@ -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, GraphicElementData * param1, GraphicElementData * param2, GraphicElementData * param3, GraphicElementData * param4, u16 param5)
+static void ov21_021E80D4 (UnkStruct_02015214 * param0, CellActor * param1, CellActor * param2, CellActor * param3, CellActor * param4, u16 param5)
 {
     fx32 v0, v1;
     VecFx32 v2;
@@ -922,16 +922,16 @@ static void ov21_021E80D4 (UnkStruct_02015214 * param0, GraphicElementData * par
     v2.x = (128 << FX32_SHIFT) + v0;
     v2.y = (64 << FX32_SHIFT) + v1;
 
-    GraphicElementData_SetPosition(param3, &v2);
+    CellActor_SetPosition(param3, &v2);
     v2.y += 24 << FX32_SHIFT;
-    GraphicElementData_SetPosition(param1, &v2);
+    CellActor_SetPosition(param1, &v2);
 
     v2.x = (128 << FX32_SHIFT) - v0;
     v2.y = (64 << FX32_SHIFT) - v1;
 
-    GraphicElementData_SetPosition(param4, &v2);
+    CellActor_SetPosition(param4, &v2);
     v2.y += 24 << FX32_SHIFT;
-    GraphicElementData_SetPosition(param2, &v2);
+    CellActor_SetPosition(param2, &v2);
 }
 
 static void ov21_021E8188 (UnkStruct_ov21_021E7714 * param0, UnkStruct_ov21_021E747C * param1, u16 param2, u16 param3, int param4)
@@ -997,7 +997,7 @@ static void ov21_021E8258 (UnkStruct_ov21_021E7714 * param0, s16 param1, int par
 
     param0->unk_98.unk_10 = (-param1 / 1) * 2;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_98.unk_00);
+    v0 = CellActor_GetPosition(param0->unk_98.unk_00);
 
     param0->unk_98.unk_04 = v0->x;
     param0->unk_98.unk_08 = v0->y;
@@ -1023,7 +1023,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         v2.x = v0->unk_04;
         v2.y = v0->unk_08 + (v1 << FX32_SHIFT);
 
-        GraphicElementData_SetPosition(v0->unk_00, &v2);
+        CellActor_SetPosition(v0->unk_00, &v2);
 
         if (v0->unk_14 >= v0->unk_10) {
             v0->unk_14 = 0;
@@ -1035,7 +1035,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         if (v0->unk_14 == 0) {
             v2.x = v0->unk_04 + (2 * FX32_ONE);
             v2.y = v0->unk_08;
-            GraphicElementData_SetPosition(v0->unk_00, &v2);
+            CellActor_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1049,7 +1049,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
         if (v0->unk_14 == 0) {
             v2.x = v0->unk_04 - (2 * FX32_ONE);
             v2.y = v0->unk_08;
-            GraphicElementData_SetPosition(v0->unk_00, &v2);
+            CellActor_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1068,7 +1068,7 @@ static void ov21_021E82C8 (SysTask * param0, void * param1)
     case 3:
         v2.x = v0->unk_04;
         v2.y = v0->unk_08;
-        GraphicElementData_SetPosition(v0->unk_00, &v2);
+        CellActor_SetPosition(v0->unk_00, &v2);
         SysTask_Done(param0);
         *v0->unk_1C = 1;
         break;
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index d58917f877..9b61ccb3c4 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -67,10 +67,10 @@ typedef struct {
 } UnkStruct_ov21_021E88B0;
 
 typedef struct {
-    GraphicElementData * unk_00[1];
+    CellActor * unk_00[1];
     UnkStruct_ov21_021D4CA0 * unk_04[1];
     UnkStruct_02009DC8 * unk_08[4];
-    GraphicElementData * unk_18[4];
+    CellActor * 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, 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_021E8BE8(UnkStruct_ov21_021E8584 * param0, CellActor * 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(CellActor * 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);
@@ -354,7 +354,7 @@ static void ov21_021E8794 (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -364,7 +364,7 @@ static void ov21_021E87AC (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -544,7 +544,7 @@ static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
 
     sub_020093B4(&v0, 102 + 13000, 11 + 2100, 100 + 13000, 101 + 13000, 0xffffffff, 0xffffffff, 0, 2, v2->unk_13C[0], v2->unk_13C[1], v2->unk_13C[2], v2->unk_13C[3], NULL, NULL);
 
-    v1.manager = v2->unk_138;
+    v1.collection = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -554,9 +554,9 @@ static void ov21_021E8AA8 (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
     v1.position.y = 144 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v1);
+    param0->unk_00[0] = CellActorCollection_Add(&v1);
 
-    GraphicElementData_SetAnim(param0->unk_00[0], 2);
+    CellActor_SetAnim(param0->unk_00[0], 2);
 }
 
 static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0)
@@ -564,7 +564,7 @@ static void ov21_021E8B34 (UnkStruct_ov21_021E8794 * param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -612,7 +612,7 @@ static void ov21_021E8BDC (UnkStruct_ov21_021E8794 * param0, UnkStruct_ov21_021E
     }
 }
 
-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_021E8BE8 (UnkStruct_ov21_021E8584 * param0, CellActor * 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;
@@ -623,7 +623,7 @@ static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData
     ov21_021D144C(param1, param3);
     ov21_021E8C94(param1, param2, param4, param8, param9);
 
-    v0 = GraphicElementData_GetAnimFrame(param1);
+    v0 = CellActor_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -662,12 +662,12 @@ static void ov21_021E8BE8 (UnkStruct_ov21_021E8584 * param0, GraphicElementData
     }
 }
 
-static void ov21_021E8C94 (GraphicElementData * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
+static void ov21_021E8C94 (CellActor * param0, UnkStruct_ov21_021D4CA0 * param1, int param2, int param3, int param4)
 {
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = GraphicElementData_GetAnimFrame(param0);
+    v0 = CellActor_GetAnimFrame(param0);
 
     if (v0 < 2) {
         sub_02012AC0(param1->unk_00, param3);
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index a867763fa8..6e5b75b448 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -57,17 +57,17 @@
 #include "overlay021/ov21_021E8D48.h"
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_02009DC8 * unk_04[4];
 } UnkStruct_ov21_021E94F8;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     UnkStruct_ov21_021D4CA0 * unk_04;
 } UnkStruct_ov21_021E95B0;
 
 typedef struct {
-    GraphicElementData * unk_00[2];
+    CellActor * unk_00[2];
     UnkStruct_02009DC8 * unk_08[4];
 } UnkStruct_ov21_021E968C;
 
@@ -85,7 +85,7 @@ typedef struct UnkStruct_ov21_021E8D48_t {
     PaletteData * unk_08;
     Sprite * unk_0C;
     UnkStruct_0200C738 unk_10;
-    GraphicElementManager * unk_19C;
+    CellActorCollection * 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, CellActorResourceData * 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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3);
+static void ov21_021E94B0(UnkStruct_ov21_021E94F8 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3);
 static void ov21_021E94F8(UnkStruct_ov21_021E94F8 * param0);
-static void ov21_021E9504(UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4);
+static void ov21_021E9504(UnkStruct_ov21_021E95B0 * param0, CellActorCollection * 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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4);
+static void ov21_021E95F8(UnkStruct_ov21_021E968C * param0, CellActorCollection * 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);
@@ -277,7 +277,7 @@ static void ov21_021E900C (UnkStruct_ov21_021E8D48 * param0)
     ov21_021D2C58(&param0->unk_1B4, param0->unk_1A0);
     ov21_021E9228(param0->unk_1A0);
 
-    GraphicElementManager_Delete(param0->unk_19C);
+    CellActorCollection_Delete(param0->unk_19C);
 
     ov21_021E91F0(param0->unk_04);
     ov21_021E9194(param0->unk_00);
@@ -509,14 +509,14 @@ static void ov21_021E94A4 (UnkStruct_ov21_021E94F8 * param0, UnkStruct_02009714
     ov21_021E93C4(param0->unk_04, param1);
 }
 
-static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3)
+static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3)
 {
     CellActorInitParams v0;
     CellActorResourceData v1;
 
     ov21_021E93F8(param0->unk_04, param2, &v1, 2);
 
-    v0.manager = param1;
+    v0.collection = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -524,23 +524,23 @@ static void ov21_021E94B0 (UnkStruct_ov21_021E94F8 * param0, GraphicElementManag
     v0.position.x = (120 * FX32_ONE);
     v0.position.y = (88 * FX32_ONE);
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v0);
+    param0->unk_00 = CellActorCollection_Add(&v0);
     GF_ASSERT(param0->unk_00);
 }
 
 static void ov21_021E94F8 (UnkStruct_ov21_021E94F8 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
 }
 
-static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
+static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3, UnkStruct_02009DC8 ** param4)
 {
     CellActorInitParams v0;
     CellActorResourceData v1;
 
     ov21_021E93F8(param4, param2, &v1, 2);
 
-    v0.manager = param1;
+    v0.collection = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -548,15 +548,15 @@ static void ov21_021E9504 (UnkStruct_ov21_021E95B0 * param0, GraphicElementManag
     v0.position.x = (192 * FX32_ONE);
     v0.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = GraphicElementManager_AddElement(&v0);
+    param0->unk_00 = CellActorCollection_Add(&v0);
 
     GF_ASSERT(param0->unk_00);
-    GraphicElementData_SetAnim(param0->unk_00, 0x11);
+    CellActor_SetAnim(param0->unk_00, 0x11);
 }
 
 static void ov21_021E9554 (UnkStruct_ov21_021E95B0 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
 }
 
 static void ov21_021E9560 (UnkStruct_ov21_021E95B0 * param0, UnkStruct_ov21_021D4C0C * param1, int param2, int param3, UnkStruct_02009DC8 * param4)
@@ -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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, int param4)
+static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3, int param4)
 {
     CellActorInitParams v0;
     CellActorResourceData v1;
@@ -610,7 +610,7 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
 
     ov21_021E93F8(param0->unk_08, param2, &v1, 2);
 
-    v0.manager = param1;
+    v0.collection = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -618,15 +618,15 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
     v0.position.x = (170 * FX32_ONE);
     v0.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[0] = GraphicElementManager_AddElement(&v0);
+    param0->unk_00[0] = CellActorCollection_Add(&v0);
 
-    GraphicElementData_SetAnim(param0->unk_00[0], 0 + v2);
+    CellActor_SetAnim(param0->unk_00[0], 0 + v2);
 
     if (v2 != v3) {
         v0.position.x = (220 * FX32_ONE);
         v0.position.y = (72 * FX32_ONE);
-        param0->unk_00[1] = GraphicElementManager_AddElement(&v0);
-        GraphicElementData_SetAnim(param0->unk_00[1], 0 + v3);
+        param0->unk_00[1] = CellActorCollection_Add(&v0);
+        CellActor_SetAnim(param0->unk_00[1], 0 + v3);
     } else {
         param0->unk_00[1] = NULL;
     }
@@ -635,11 +635,11 @@ static void ov21_021E95F8 (UnkStruct_ov21_021E968C * param0, GraphicElementManag
 static void ov21_021E968C (UnkStruct_ov21_021E968C * param0)
 {
     if (param0->unk_00[0]) {
-        GraphicElementData_Delete(param0->unk_00[0]);
+        CellActor_Delete(param0->unk_00[0]);
     }
 
     if (param0->unk_00[1]) {
-        GraphicElementData_Delete(param0->unk_00[1]);
+        CellActor_Delete(param0->unk_00[1]);
     }
 }
 
@@ -722,7 +722,7 @@ static void ov21_021E9828 (SysTask * param0, void * param1)
         ov21_021E9A9C(&v0->unk_228);
     }
 
-    GraphicElementManager_Update(v0->unk_19C);
+    CellActorCollection_Update(v0->unk_19C);
 }
 
 static void ov21_021E98D8 (PaletteData * param0, Sprite * param1)
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 994dbdcdae..7f05d8b284 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -156,14 +156,14 @@ void ov22_022551D0 (UnkStruct_ov22_0225A0E4 * param0)
     sub_020151EC(param0->unk_00);
 }
 
-GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
+CellActor * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1, int param2, int param3, int param4, int param5)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
 
     sub_020093B4(&v0, param1, param1, param1, param1, 0xffffffff, 0xffffffff, 0, 0, param0->unk_48[0], param0->unk_48[1], param0->unk_48[2], param0->unk_48[3], NULL, NULL);
 
-    v1.manager = param0->unk_44;
+    v1.collection = param0->unk_44;
     v1.resourceData = &v0;
     v1.position.x = param2 << FX32_SHIFT;
     v1.position.y = param3 << FX32_SHIFT;
@@ -172,7 +172,7 @@ GraphicElementData * ov22_022551E4 (UnkStruct_ov22_0225A0E4 * param0, int param1
     v1.vramType = param5;
     v1.heapID = 14;
 
-    return GraphicElementManager_AddElement(&v1);
+    return CellActorCollection_Add(&v1);
 }
 
 void ov22_02255248 (UnkStruct_ov22_0225A0E4 * param0, NARC * param1, int param2, BOOL param3, int param4, int param5)
@@ -726,7 +726,7 @@ static void ov22_022559F8 (UnkStruct_ov22_0225A0E4 * param0)
 
 static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0)
 {
-    GraphicElementManager_Delete(param0->unk_44);
+    CellActorCollection_Delete(param0->unk_44);
 
     {
         int v0;
@@ -743,7 +743,7 @@ static void ov22_02255A98 (UnkStruct_ov22_0225A0E4 * param0)
 
 static void ov22_02255AC0 (UnkStruct_ov22_0225A0E4 * param0)
 {
-    GraphicElementManager_Update(param0->unk_44);
+    CellActorCollection_Update(param0->unk_44);
 }
 
 static void ov22_02255ACC (UnkStruct_ov22_0225A0E4 * param0, UnkStruct_ov22_02255CB8 * param1)
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index 288f9bb117..a8e56b203c 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -443,7 +443,7 @@ int ov22_02256174 (OverlayManager * param0, int * param1)
     ov22_0225894C(v2->unk_18, &v0->unk_1E8);
     ov22_022566C0(v0);
 
-    GraphicElementManager_SetActive(v0->unk_00.unk_44, 0);
+    CellActorCollection_SetActive(v0->unk_00.unk_44, 0);
     sub_02039734();
     sub_0200966C(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
     sub_02009704(NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -1278,7 +1278,7 @@ static void ov22_0225718C (UnkStruct_ov22_02255D44 * param0)
     ov22_022568DC(param0);
 
     sub_0200F344(0, 0x0);
-    GraphicElementManager_SetActive(param0->unk_00.unk_44, 1);
+    CellActorCollection_SetActive(param0->unk_00.unk_44, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index de6c343899..e90c924f39 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -58,7 +58,7 @@ void ov22_02259C58 (UnkStruct_ov22_02259C58 * param0, UnkStruct_ov22_02259C58_1
     GF_ASSERT(param0);
     GF_ASSERT(param1);
 
-    param0->unk_00 = GraphicElementManager_AddElementEx(param1->unk_00);
+    param0->unk_00 = CellActorCollection_AddEx(param1->unk_00);
     GF_ASSERT(param0->unk_00);
 
     param0->unk_04 = param1->unk_0C;
@@ -79,7 +79,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
 
     v0.unk_00 = param1->unk_14;
     v0.unk_04 = param1->unk_10;
-    v0.unk_08 = param1->unk_00.unk_00->manager;
+    v0.unk_08 = param1->unk_00.unk_00->collection;
     v0.unk_0C = param1->unk_18;
     v0.unk_10 = param0->unk_00.unk_00;
     v0.unk_14 = param1->unk_24;
@@ -95,7 +95,7 @@ void ov22_02259C9C (UnkStruct_ov22_0225A154 * param0, UnkStruct_ov22_02259C9C *
 
 void ov22_02259CE8 (UnkStruct_ov22_02259C58 * param0)
 {
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
     memset(param0, 0, sizeof(UnkStruct_ov22_02259C58));
 }
 
@@ -545,11 +545,11 @@ static void ov22_0225A3DC (UnkStruct_ov22_02259C58 * param0, int param1, int par
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_00);
+    v0 = CellActor_GetPosition(param0->unk_00);
     v1 = *v0;
     v1.x += param1 << FX32_SHIFT;
     v1.y += param2 << FX32_SHIFT;
-    GraphicElementData_SetPosition(param0->unk_00, &v1);
+    CellActor_SetPosition(param0->unk_00, &v1);
 }
 
 static void ov22_0225A418 (UnkStruct_ov22_0225A154 * param0, int param1, int param2)
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 82f98b8411..48d2520c60 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -48,10 +48,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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4);
+static void ov22_0225A914(UnkStruct_ov22_0225A914 * param0, CellActorCollection * 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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6);
+static void ov22_0225AB54(UnkStruct_ov22_0225AB54 * param0, CellActorCollection * 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);
@@ -291,7 +291,7 @@ static s32 ov22_0225A8B4 (Window * param0, int param1, int param2, int param3, i
     return v1;
 }
 
-static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
+static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3, NARC * param4)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
@@ -300,7 +300,7 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag
     ov22_0225AA34(param0->unk_00, param2, 14, param4, 103, 225, 102, 101, 2, 2000);
     ov22_0225AAF4(param0->unk_00, param2, &v0, 0);
 
-    v1.manager = param1;
+    v1.collection = param1;
     v1.resourceData = &v0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.priority = 0;
@@ -315,11 +315,11 @@ static void ov22_0225A914 (UnkStruct_ov22_0225A914 * param0, GraphicElementManag
             v1.position.x = 38 + (18 * v3);
             v1.position.x *= FX32_ONE;
 
-            param0->unk_10[(v2 * 10) + v3] = GraphicElementManager_AddElement(&v1);
-            GraphicElementData_SetAnim(param0->unk_10[(v2 * 10) + v3], 1);
+            param0->unk_10[(v2 * 10) + v3] = CellActorCollection_Add(&v1);
+            CellActor_SetAnim(param0->unk_10[(v2 * 10) + v3], 1);
 
             if (((v2 * 10) + v3) >= param3) {
-                GraphicElementData_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
+                CellActor_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
             }
         }
     }
@@ -331,11 +331,11 @@ static void ov22_0225A9C8 (UnkStruct_ov22_0225A914 * param0, int param1)
 
     if (param0->unk_60 < param1) {
         for (v0 = param0->unk_60; v0 < param1; v0++) {
-            GraphicElementData_SetAnim(param0->unk_10[v0], 0);
+            CellActor_SetAnim(param0->unk_10[v0], 0);
         }
     } else if (param0->unk_60 > param1) {
         for (v0 = param0->unk_60 - 1; v0 >= param1; v0--) {
-            GraphicElementData_SetAnim(param0->unk_10[v0], 1);
+            CellActor_SetAnim(param0->unk_10[v0], 1);
         }
     }
 
@@ -347,7 +347,7 @@ static void ov22_0225AA10 (UnkStruct_ov22_0225A914 * param0, UnkStruct_02009714
     int v0;
 
     for (v0 = 0; v0 < 20; v0++) {
-        GraphicElementData_Delete(param0->unk_10[v0]);
+        CellActor_Delete(param0->unk_10[v0]);
     }
 
     ov22_0225AAC0(param0->unk_00, param1);
@@ -384,7 +384,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, GraphicElementManager * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
+static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, CellActorCollection * param1, UnkStruct_02009714 ** param2, int param3, BGL * param4, UnkStruct_02095C60 * param5, NARC * param6)
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
@@ -393,7 +393,7 @@ static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManag
     ov22_0225AA34(param0->unk_00, param2, 14, param6, 229, 230, 228, 227, 2, 3000);
     ov22_0225AAF4(param0->unk_00, param2, &v0, 0);
 
-    v1.manager = param1;
+    v1.collection = param1;
     v1.resourceData = &v0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.priority = 0;
@@ -404,7 +404,7 @@ static void ov22_0225AB54 (UnkStruct_ov22_0225AB54 * param0, GraphicElementManag
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.x = 103 + (v2 * 24);
         v1.position.x *= FX32_ONE;
-        param0->unk_10[v2] = GraphicElementManager_AddElement(&v1);
+        param0->unk_10[v2] = CellActorCollection_Add(&v1);
     }
 
     param0->unk_1C = param3;
@@ -483,14 +483,14 @@ static void ov22_0225ACE4 (UnkStruct_ov22_0225AB54 * param0)
         v1 = v2 / v3;
 
         GF_ASSERT(v1 <= 10);
-        GraphicElementData_SetAnim(param0->unk_10[v0], 0 + v1);
+        CellActor_SetAnim(param0->unk_10[v0], 0 + v1);
 
         v2 -= v1 * v3;
         v3 /= 10;
 
         if (param0->unk_90 == 0) {
             if (param0->unk_1C <= 10) {
-                GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_10[v0], 1);
+                CellActor_SetExplicitPaletteWithOffset(param0->unk_10[v0], 1);
 
                 if (v0 == 2 - 1) {
                     param0->unk_90 = 1;
@@ -548,7 +548,7 @@ static void ov22_0225ADC0 (UnkStruct_ov22_0225AB54 * param0, UnkStruct_ov22_0225
 
     for (v0 = 0; v0 < 2; v0++) {
         param1->unk_04[v0] = param0->unk_10[v0];
-        GraphicElementData_SetAffineOverwriteMode(param1->unk_04[v0], 2);
+        CellActor_SetAffineOverwriteMode(param1->unk_04[v0], 2);
         v4.x = 103 + (v0 * 24);
         v4.x *= FX32_ONE;
         param1->unk_0C[v0] = v4;
@@ -594,19 +594,19 @@ static void ov22_0225AE9C (UnkStruct_ov22_0225AE9C * param0)
     v0.y = param0->unk_24.unk_00;
     v0.z = param0->unk_24.unk_00;
 
-    GraphicElementData_SetAffineScale(param0->unk_04[0], &v0);
-    GraphicElementData_SetAffineScale(param0->unk_04[1], &v0);
+    CellActor_SetAffineScale(param0->unk_04[0], &v0);
+    CellActor_SetAffineScale(param0->unk_04[1], &v0);
 
     v1 = param0->unk_0C[0];
     v1.x -= param0->unk_38.unk_00;
     v1.y -= param0->unk_4C.unk_00;
 
-    GraphicElementData_SetPosition(param0->unk_04[0], &v1);
+    CellActor_SetPosition(param0->unk_04[0], &v1);
 
     v1 = param0->unk_0C[1];
     v1.y -= param0->unk_4C.unk_00;
 
-    GraphicElementData_SetPosition(param0->unk_04[1], &v1);
+    CellActor_SetPosition(param0->unk_04[1], &v1);
 
     if (v2) {
         param0->unk_00 = 0;
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index d5b53f03fe..df1b121700 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -44,7 +44,7 @@ typedef struct {
     u32 unk_0C;
     UnkStruct_ov22_0225B1BC * unk_10;
     UnkStruct_ov22_0225A0E4 unk_14;
-    GraphicElementData * unk_1FC;
+    CellActor * unk_1FC;
     Window * unk_200;
 } UnkStruct_ov22_0225B85C;
 
@@ -228,7 +228,7 @@ static void ov22_0225B964 (UnkStruct_ov22_0225B85C * param0)
 
     param0->unk_1FC = ov22_022551E4(&param0->unk_14, 1000, 0, 144, 100, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetExplicitPriority(param0->unk_1FC, 1);
+    CellActor_SetExplicitPriority(param0->unk_1FC, 1);
 }
 
 static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0)
@@ -237,7 +237,7 @@ static void ov22_0225BA00 (UnkStruct_ov22_0225B85C * param0)
     ov22_022552D8(&param0->unk_14, 1000);
     ov22_022552EC(&param0->unk_14, 1000);
     ov22_02255300(&param0->unk_14, 1000);
-    GraphicElementData_Delete(param0->unk_1FC);
+    CellActor_Delete(param0->unk_1FC);
 }
 
 static void ov22_0225BA40 (UnkStruct_ov22_0225B85C * param0)
@@ -287,11 +287,11 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0)
     GF_ASSERT(v8);
     v5 = StringTemplate_Default(13);
 
-    GraphicElementData_SetAnim(param0->unk_1FC, 5);
+    CellActor_SetAnim(param0->unk_1FC, 5);
     v0.x = 48 << FX32_SHIFT;
     v0.y = 144 << FX32_SHIFT;
     v0.z = 0;
-    GraphicElementData_SetPosition(param0->unk_1FC, &v0);
+    CellActor_SetPosition(param0->unk_1FC, &v0);
 
     v7 = Strbuf_Init(12, 13);
     sub_0202A1A0(param0->unk_00, v7);
@@ -334,7 +334,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0)
     int v8, v9;
     int v10;
 
-    GraphicElementData_SetAnim(param0->unk_1FC, param0->unk_08);
+    CellActor_SetAnim(param0->unk_1FC, param0->unk_08);
 
     v0 = sub_0202A5D0(param0->unk_04);
     v1 = StringTemplate_Default(13);
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 50462f08a8..079686737a 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -150,13 +150,13 @@ typedef struct {
     FieldSystem * fieldSystem;
     BGL * unk_04;
     MATHRandContext32 unk_08;
-    GraphicElementManager * unk_20;
+    CellActorCollection * unk_20;
     UnkStruct_0200C738 unk_24;
     UnkStruct_02009714 * unk_1B0[4];
     UnkStruct_02009DC8 * unk_1C0[8];
     CellActorResourceData unk_1E0;
     CellActorResourceData unk_204[2];
-    GraphicElementData * unk_24C[8];
+    CellActor * unk_24C[8];
     UnkStruct_ov23_0223E6F8 unk_26C[250];
     UIControlData * unk_848;
     UnkStruct_ov23_0223E6F8 * unk_84C[8];
@@ -1268,35 +1268,35 @@ static void ov23_0223ED68 (int param0, int param1, BOOL param2, BOOL param3, BOO
     VecFx32 v3;
 
     if (param2) {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[0], 0);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[0], 0);
     } else {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[0], 1);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[0], 1);
     }
 
     if (param3) {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 2);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 2);
         Sound_PlayEffect(1700);
     } else if (param2) {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 3);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 3);
         Sound_PlayEffect(1698);
     } else {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[3], 4);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 4);
         Sound_PlayEffect(1699);
     }
 
-    GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[0], 1);
-    GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[3], 1);
+    CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[0], 1);
+    CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[3], 1);
 
     v3.x = FX32_ONE * (param0 + 8);
     v3.y = FX32_ONE * (param1 + 8);
 
-    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[0], &v3);
-    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
+    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[0], &v3);
+    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
 
     if (param4) {
-        GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[4], 5);
-        GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[4], 1);
-        GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[4], &v3);
+        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[4], 5);
+        CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[4], 1);
+        CellActor_SetPosition(Unk_ov23_02257740->unk_24C[4], &v3);
     }
 }
 
@@ -1398,7 +1398,7 @@ static void ov23_0223F020 (UnkStruct_ov23_0223EE80 * param0)
         }
     }
 
-    GraphicElementManager_Delete(Unk_ov23_02257740->unk_20);
+    CellActorCollection_Delete(Unk_ov23_02257740->unk_20);
     sub_0200A878();
 
     sub_0201E958();
@@ -1514,11 +1514,11 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         ov23_02240CFC(v0);
         ov23_02240B84(Unk_ov23_02257740->unk_04);
         ov23_0223FDE0(v0);
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
         break;
     case 14:
         ov23_0223FDE0(v0);
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
 
         v0->unk_08--;
 
@@ -1530,7 +1530,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 15:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
 
         if (Message_Printing(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1542,7 +1542,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 16:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
 
         if (ov23_022409F0(v0)) {
             v0->unk_00 = 17;
@@ -1552,7 +1552,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 17:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
 
         if (Message_Printing(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1568,13 +1568,13 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
         break;
     case 18:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
         ov23_02254044(ov23_0224219C());
         sub_0200F174(3, 16, 16, 0x0, 6, 1, 29);
         (v0->unk_00)++;
         break;
     case 19:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
 
         if (ScreenWipe_Done()) {
             sub_02039794();
@@ -1629,10 +1629,10 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         }
 
         ov23_02240B84(Unk_ov23_02257740->unk_04);
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
         break;
     case 23:
-        GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
         sub_0200F174(3, 2, 2, 0x0, 15, 1, 29);
         Sound_PlayEffect(1697);
         v0->unk_00 = 24;
@@ -1642,12 +1642,12 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
             int v3;
 
             for (v3 = 0; v3 < 8; v3++) {
-                GraphicElementData_SetDrawFlag(Unk_ov23_02257740->unk_24C[v3], 0);
+                CellActor_SetDrawFlag(Unk_ov23_02257740->unk_24C[v3], 0);
             }
 
             v0->unk_00 = 25;
         } else {
-            GraphicElementManager_Update(Unk_ov23_02257740->unk_20);
+            CellActorCollection_Update(Unk_ov23_02257740->unk_20);
         }
 
         break;
@@ -2013,8 +2013,8 @@ static void ov23_0223FDE0 (UnkStruct_ov23_0223EE80 * param0)
                 v4.x = FX32_ONE * v1;
                 v4.y = FX32_ONE * v2;
 
-                GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
-                GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
+                CellActor_SetAnim(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
+                CellActor_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
             }
         }
     }
@@ -2379,13 +2379,13 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[2], 6);
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
+            CellActor_SetAnim(Unk_ov23_02257740->unk_24C[2], 6);
+            CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 80;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
+            CellActor_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     case 1:
@@ -2398,13 +2398,13 @@ static void ov23_022404F8 (BGL * param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[2], 7);
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
+            CellActor_SetAnim(Unk_ov23_02257740->unk_24C[2], 7);
+            CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 152;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
+            CellActor_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     }
@@ -2435,7 +2435,7 @@ static void ov23_02240688 (BGL * param0)
     v4 = 6 - (v1 % 24) / 4;
 
     ov23_02240660(&v0);
-    GraphicElementData_SetAnim(Unk_ov23_02257740->unk_24C[1], v4);
+    CellActor_SetAnim(Unk_ov23_02257740->unk_24C[1], v4);
 
     v1 = v1 + 8;
     v2 = ((26 * 8) - v1) / 8;
@@ -2667,7 +2667,7 @@ static void ov23_02240B84 (BGL * param0)
     v3.x -= Unk_ov23_02257740->unk_A2D * FX32_ONE;
     v3.y -= Unk_ov23_02257740->unk_A2E * FX32_ONE;
 
-    GraphicElementData_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3);
+    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3);
 }
 
 static void ov23_02240C94 (BGL * param0)
@@ -2821,7 +2821,7 @@ static void ov23_0224108C (void)
     for (v0 = 0; v0 < 2; v0++) {
         sub_020093B4(&Unk_ov23_02257740->unk_204[v0], v0, v0, v0, v0, 0xffffffff, 0xffffffff, 0, 0, Unk_ov23_02257740->unk_1B0[0], Unk_ov23_02257740->unk_1B0[1], Unk_ov23_02257740->unk_1B0[2], Unk_ov23_02257740->unk_1B0[3], NULL, NULL);
 
-        v2.manager = Unk_ov23_02257740->unk_20;
+        v2.collection = Unk_ov23_02257740->unk_20;
         v2.resourceData = &Unk_ov23_02257740->unk_204[v0];
         v2.position.x = FX32_CONST(32);
         v2.position.y = FX32_CONST(96);
@@ -2838,13 +2838,13 @@ static void ov23_0224108C (void)
 
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
-                Unk_ov23_02257740->unk_24C[v1] = GraphicElementManager_AddElementEx(&v2);
-                GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v1], 1);
+                Unk_ov23_02257740->unk_24C[v1] = CellActorCollection_AddEx(&v2);
+                CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v1], 1);
             }
         }
 
-        Unk_ov23_02257740->unk_24C[v0] = GraphicElementManager_AddElementEx(&v2);
-        GraphicElementData_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v0], 1);
+        Unk_ov23_02257740->unk_24C[v0] = CellActorCollection_AddEx(&v2);
+        CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v0], 1);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index fd1aac6ae7..fdfce43d2b 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];
     FieldSystem * fieldSystem;
-    GraphicElementManager * unk_44;
+    CellActorCollection * unk_44;
     UnkStruct_0200C738 unk_48;
     UnkStruct_02009714 * unk_1D4[2][4];
     UnkStruct_02009DC8 * unk_1F4[2][4];
     CellActorResourceData unk_214;
     CellActorResourceData unk_238;
-    GraphicElementData * unk_25C[32];
-    GraphicElementData * unk_2DC[4];
+    CellActor * unk_25C[32];
+    CellActor * unk_2DC[4];
     TaskManager * unk_2EC;
     SysTask * unk_2F0;
     SysTask * unk_2F4;
@@ -3273,7 +3273,7 @@ static void ov23_02246370 (int param0)
 
     for (v0 = 0; v0 < param0; v0++) {
         if (Unk_ov23_02257764->unk_25C[v0] != NULL) {
-            GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[v0]);
+            CellActor_Delete(Unk_ov23_02257764->unk_25C[v0]);
             Unk_ov23_02257764->unk_25C[v0] = NULL;
         }
     }
@@ -3303,7 +3303,7 @@ static void ov23_02246370 (int param0)
     }
 
     if (Unk_ov23_02257764->unk_44) {
-        GraphicElementManager_Delete(Unk_ov23_02257764->unk_44);
+        CellActorCollection_Delete(Unk_ov23_02257764->unk_44);
     }
 
     Unk_ov23_02257764->unk_44 = NULL;
@@ -3317,7 +3317,7 @@ static void ov23_0224644C (int param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = Unk_ov23_02257764->unk_44;
+        v0.collection = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3334,12 +3334,12 @@ static void ov23_0224644C (int param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = CellActorCollection_AddEx(&v0);
 
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 0);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3350,7 +3350,7 @@ static void ov23_0224644C (int param0)
 static void ov23_02246548 (int param0)
 {
     if (Unk_ov23_02257764->unk_25C[param0]) {
-        GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[param0]);
+        CellActor_Delete(Unk_ov23_02257764->unk_25C[param0]);
         Unk_ov23_02257764->unk_25C[param0] = NULL;
     }
 }
@@ -3377,7 +3377,7 @@ static void ov23_02246574 (int param0, UnkStruct_ov23_02245ED4 * param1, int par
         v3.x = FX32_ONE * (v6) + v4;
         v3.y = FX32_ONE * (v7) + v5;
 
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3477,7 +3477,7 @@ static BOOL ov23_02246640 (BGL * param0, UnkStruct_ov23_02245ED4 * param1)
         param1->unk_110 = 0;
     }
 
-    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
+    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3667,7 +3667,7 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = Unk_ov23_02257764->unk_44;
+        v0.collection = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3684,14 +3684,14 @@ static void ov23_02246D44 (UnkStruct_ov23_022468DC * param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = CellActorCollection_AddEx(&v0);
 
-            GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 1);
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
+            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], v1 * 4);
-            GraphicElementData_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
-            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
+            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3712,7 +3712,7 @@ static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1)
         v3.x = param1->unk_44[param0].unk_00;
         v3.y = param1->unk_44[param0].unk_04;
 
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
         param1->unk_134[param0] += 0x250 + param0 * 100;
 
         v5 = FX_SinIdx(param1->unk_134[param0]) + FX32_ONE;
@@ -3721,7 +3721,7 @@ static void ov23_02246E90 (int param0, UnkStruct_ov23_022468DC * param1)
         v3.y = FX32_ONE - v4;
         v3.z = FX32_ONE - v4;
 
-        GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[param0], &v3);
+        CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3758,7 +3758,7 @@ static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1)
 
             if ((Unk_ov23_022563E8[param1->unk_08[v0]] * FX32_ONE) > v11) {
                 Sound_PlayEffect(1574);
-                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
+                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
                 param1->unk_E4[v0] = 1;
                 break;
             }
@@ -3791,7 +3791,7 @@ static BOOL ov23_02246F20 (BGL * param0, UnkStruct_ov23_022468DC * param1)
         }
     }
 
-    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
+    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3845,7 +3845,7 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = Unk_ov23_02257764->unk_44;
+        v0.collection = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3862,14 +3862,14 @@ static void ov23_022471D8 (UnkStruct_ov23_022471D8 * param0)
             v0.position.x = FX32_ONE * 100;
             v0.position.y = FX32_ONE * 100;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = CellActorCollection_AddEx(&v0);
 
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
-            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v1], 0);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
+            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[v1], 0);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            GraphicElementData_SetPriority(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
-            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetPriority(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
+            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3884,7 +3884,7 @@ static void ov23_0224730C (UnkStruct_ov23_022471D8 * param0, int param1, int par
     param0->unk_44[param1] = param3;
     param0->unk_BC[param1] = param5;
 
-    GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[param1], 1);
+    CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[param1], 1);
 }
 
 static void ov23_0224733C (UnkStruct_ov23_022471D8 * param0, int param1)
@@ -3927,10 +3927,10 @@ static void ov23_022474D4 (UnkStruct_ov23_022471D8 * param0)
             v1.x = param0->unk_08[v0] * FX32_ONE;
             v1.y = param0->unk_44[v0] * FX32_ONE;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v1);
+            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v1);
 
             if (param0->unk_44[v0] > (param0->unk_120 + 35)) {
-                GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 0);
+                CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 0);
                 param0->unk_80[v0] = 0;
             }
         }
@@ -3960,15 +3960,15 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             param1->unk_125 = 2;
             param1->unk_120 = 0;
             param1->unk_11C = 5;
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[0], 0);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[0], 0);
         }
         break;
     case 2:
         v11.x = 128 * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
-        GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 1);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 1);
 
         if (param1->unk_120 > 65) {
             param1->unk_125 = 3;
@@ -4028,7 +4028,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 4:
         if (param1->unk_124 == 0) {
@@ -4052,7 +4052,7 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
 
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 5:
         if (param1->unk_124 == 0) {
@@ -4060,29 +4060,29 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             sub_0200A490(param1->unk_F8[0], param1->unk_F8[6]);
 
             for (v0 = 1; v0 < 9; v0++) {
-                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v0], 1);
+                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v0], 1);
 
                 v11.x = (70 + 12 * v0) * FX32_ONE;
                 v11.y = (param1->unk_120 + 39 + v0 % 2) * FX32_ONE;
 
-                GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v11);
-                GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
+                CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v11);
+                CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
             }
 
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[10], 1);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[10], 1);
 
             v11.x = 100 * FX32_ONE;
             v11.y = (param1->unk_120 + 21) * FX32_ONE;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[10], &v11);
-            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[10], 1);
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[11], 1);
+            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[10], &v11);
+            CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[10], 1);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[11], 1);
 
             v11.x = 122 * FX32_ONE;
             v11.y = param1->unk_120 * FX32_ONE;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[11], &v11);
-            GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[11], 1);
+            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[11], &v11);
+            CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[11], 1);
         }
 
         param1->unk_124++;
@@ -4090,11 +4090,11 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
         v11.x = (128 - (10 / 2) + (LCRNG_Next() % 10)) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         param1->unk_120 += 1;
 
         if (param1->unk_124 % 8) {
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
         }
 
         if (param1->unk_124 == 75) {
@@ -4107,11 +4107,11 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
             param1->unk_114 = NULL;
         }
 
-        GraphicElementData_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 0);
+        CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 0);
         return 1;
     }
 
-    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
+    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4314,7 +4314,7 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = Unk_ov23_02257764->unk_44;
+        v0.collection = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -4331,13 +4331,13 @@ static void ov23_02247E38 (UnkStruct_ov23_02247E38 * param0)
             v0.position.x = FX32_ONE * 128;
             v0.position.y = FX32_ONE * 84;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = CellActorCollection_AddEx(&v0);
 
-            GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
-            GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
+            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
-            GraphicElementData_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -4424,14 +4424,14 @@ static BOOL ov23_02247F4C (BGL * param0, UnkStruct_ov23_02247E38 * param1)
         v11.y = FX32_ONE * v4;
         v11.z = FX32_ONE * v4;
 
-        GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
-        GraphicElementData_SetAnimNoRestart(Unk_ov23_02257764->unk_25C[0], v1);
+        CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
+        CellActor_SetAnimNoRestart(Unk_ov23_02257764->unk_25C[0], v1);
         break;
     case 2:
         break;
     }
 
-    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
+    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4726,13 +4726,13 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
     v2.x = param1->unk_28 * FX32_ONE;
     v2.y = param1->unk_2C * FX32_ONE;
 
-    GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[0], &v2);
+    CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v2);
 
     v2.x = (param1->unk_30 * FX32_ONE) / 10;
     v2.y = v2.z = v2.x;
 
-    GraphicElementData_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
-    GraphicElementData_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
+    CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
+    CellActor_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
 
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_OBJ, GX_BLEND_PLANEMASK_BG0, 16 - (param1->unk_30 / 2), 16);
 
@@ -4750,7 +4750,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
             v2.x = v3 * FX32_ONE;
             v2.y = v4 * FX32_ONE;
 
-            GraphicElementData_SetPosition(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
+            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
         }
     }
 
@@ -4760,7 +4760,7 @@ static BOOL ov23_02248614 (BGL * param0, UnkStruct_ov23_02248748 * param1)
         return 1;
     }
 
-    GraphicElementManager_Update(Unk_ov23_02257764->unk_44);
+    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4774,7 +4774,7 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = Unk_ov23_02257764->unk_44;
+        v0.collection = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -4791,18 +4791,18 @@ static void ov23_02248748 (UnkStruct_ov23_02248748 * param0)
             v0.position.x = FX32_ONE * 300;
             v0.position.y = FX32_ONE * 300;
 
-            Unk_ov23_02257764->unk_25C[v1] = GraphicElementManager_AddElementEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = CellActorCollection_AddEx(&v0);
 
             if (v1 == 0) {
-                GraphicElementData_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
-                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+                CellActor_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
+                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
             } else if (v1 < 9) {
-                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 1);
+                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 1);
             } else {
-                GraphicElementData_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
+                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
             }
 
-            GraphicElementData_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
             SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
         }
     }
@@ -4850,13 +4850,13 @@ static void ov23_02248884 (SysTask * param0, void * param1)
 
         for (v1 = 0; v1 < 25; v1++) {
             if (Unk_ov23_02257764->unk_25C[v1] != NULL) {
-                GraphicElementData_Delete(Unk_ov23_02257764->unk_25C[v1]);
+                CellActor_Delete(Unk_ov23_02257764->unk_25C[v1]);
             }
 
             Unk_ov23_02257764->unk_25C[v1] = NULL;
         }
 
-        GraphicElementManager_Delete(Unk_ov23_02257764->unk_44);
+        CellActorCollection_Delete(Unk_ov23_02257764->unk_44);
         SysTask_Done(param0);
         Heap_FreeToHeap(v0);
 
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 908b0c5a6a..b89f60419b 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -56,13 +56,13 @@ struct UnkStruct_ov23_0224942C_t {
     int unk_A4[17][4];
     FieldSystem * fieldSystem;
     BGL * unk_1B8;
-    GraphicElementManager * unk_1BC;
+    CellActorCollection * unk_1BC;
     UnkStruct_0200C738 unk_1C0;
     UnkStruct_02009714 * unk_34C[4];
     UnkStruct_02009DC8 * unk_35C[4];
     CellActorResourceData unk_36C;
-    GraphicElementData * unk_390[8];
-    GraphicElementData * unk_3B0[17];
+    CellActor * unk_390[8];
+    CellActor * unk_3B0[17];
     Window unk_3F4;
     int unk_404;
     int unk_408;
@@ -76,7 +76,7 @@ static void ov23_0224944C(BGL * param0, Window * param1);
 static void ov23_02249584(UnkStruct_ov23_0224942C * param0);
 static void ov23_02249214(PlayerAvatar * const playerAvatar, int param1[][2], int param2[][3]);
 static void ov23_022491CC(int param0[][2], int param1[][3]);
-static void ov23_022492C8(int param0[][3], GraphicElementData * param1[]);
+static void ov23_022492C8(int param0[][3], CellActor * 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);
@@ -85,7 +85,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], GraphicElementData * param1[]);
+static void ov23_0224937C(int param0[][4], CellActor * param1[]);
 static void ov23_02249334(int param0[][4]);
 
 static UnkStruct_ov23_0224942C * Unk_ov23_02257768;
@@ -112,7 +112,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         {
             CellActorInitParamsEx v3;
 
-            v3.manager = v0->unk_1BC;
+            v3.collection = v0->unk_1BC;
             v3.resourceData = &v0->unk_36C;
             v3.position.x = FX32_CONST(32);
             v3.position.y = FX32_CONST(96) + (192 << FX32_SHIFT);
@@ -126,20 +126,20 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             v3.heapID = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
-                v0->unk_390[v2] = GraphicElementManager_AddElementEx(&v3);
-                GraphicElementData_SetAnimateFlag(v0->unk_390[v2], 1);
-                GraphicElementData_SetDrawFlag(v0->unk_390[v2], 0);
+                v0->unk_390[v2] = CellActorCollection_AddEx(&v3);
+                CellActor_SetAnimateFlag(v0->unk_390[v2], 1);
+                CellActor_SetDrawFlag(v0->unk_390[v2], 0);
 
                 if (v2 == 0) {
-                    GraphicElementData_SetAnim(v0->unk_390[v2], 1);
+                    CellActor_SetAnim(v0->unk_390[v2], 1);
                 }
             }
 
             for (v2 = 0; v2 < 16 + 1; v2++) {
-                v0->unk_3B0[v2] = GraphicElementManager_AddElementEx(&v3);
-                GraphicElementData_SetAnimateFlag(v0->unk_3B0[v2], 1);
-                GraphicElementData_SetDrawFlag(v0->unk_3B0[v2], 0);
-                GraphicElementData_SetAnim(v0->unk_3B0[v2], 2);
+                v0->unk_3B0[v2] = CellActorCollection_AddEx(&v3);
+                CellActor_SetAnimateFlag(v0->unk_3B0[v2], 1);
+                CellActor_SetDrawFlag(v0->unk_3B0[v2], 0);
+                CellActor_SetAnim(v0->unk_3B0[v2], 2);
             }
         }
 
@@ -166,7 +166,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         ov23_02249334(v0->unk_A4);
         ov23_0224937C(v0->unk_A4, v0->unk_3B0);
         ov23_0224966C(v0->unk_1B8, &v0->unk_3F4, &v0->unk_404, &v0->unk_408, &v0->unk_40C, &v0->unk_410);
-        GraphicElementManager_Update(v0->unk_1BC);
+        CellActorCollection_Update(v0->unk_1BC);
         break;
     case 6:
         if (FieldMessage_FinishedPrinting(v0->unk_404)) {
@@ -181,7 +181,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
             sub_02009754(v0->unk_34C[v2]);
         }
 
-        GraphicElementManager_Delete(v0->unk_1BC);
+        CellActorCollection_Delete(v0->unk_1BC);
         sub_0200E084(&v0->unk_3F4, 0);
         BGL_DeleteWindow(&v0->unk_3F4);
         sub_02019044(v1, 7);
@@ -253,7 +253,7 @@ static void ov23_02249214 (PlayerAvatar * const playerAvatar, int param1[][2], i
     }
 }
 
-static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[])
+static void ov23_022492C8 (int param0[][3], CellActor * param1[])
 {
     int v0;
 
@@ -265,10 +265,10 @@ static void ov23_022492C8 (int param0[][3], GraphicElementData * param1[])
             v1.y = ((8 + 1) + ((((8 + 1) + 8 * 16) - (8 + 1)) * param0[v0][1]) / (32 * 13)) * FX32_ONE + (192 << FX32_SHIFT);
             v1.z = FX32_ONE;
 
-            GraphicElementData_SetPosition(param1[v0], &v1);
-            GraphicElementData_SetDrawFlag(param1[v0], 1);
+            CellActor_SetPosition(param1[v0], &v1);
+            CellActor_SetDrawFlag(param1[v0], 1);
         } else {
-            GraphicElementData_SetDrawFlag(param1[v0], 0);
+            CellActor_SetDrawFlag(param1[v0], 0);
         }
     }
 }
@@ -294,7 +294,7 @@ static void ov23_02249334 (int param0[][4])
     }
 }
 
-static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
+static void ov23_0224937C (int param0[][4], CellActor * param1[])
 {
     int v0;
 
@@ -306,18 +306,18 @@ static void ov23_0224937C (int param0[][4], GraphicElementData * param1[])
             v1.y = ((8 + 1) + ((((8 + 1) + 8 * 16) - (8 + 1)) * param0[v0][1]) / (32 * 13)) * FX32_ONE + (192 << FX32_SHIFT);
             v1.z = FX32_ONE;
 
-            GraphicElementData_SetPosition(param1[v0], &v1);
+            CellActor_SetPosition(param1[v0], &v1);
 
             if (param0[v0][2] != param0[v0][3]) {
                 if (param0[v0][2] != 0) {
-                    GraphicElementData_SetAnim(param1[v0], param0[v0][2]);
-                    GraphicElementData_SetDrawFlag(param1[v0], 1);
+                    CellActor_SetAnim(param1[v0], param0[v0][2]);
+                    CellActor_SetDrawFlag(param1[v0], 1);
                 } else {
-                    GraphicElementData_SetDrawFlag(param1[v0], 0);
+                    CellActor_SetDrawFlag(param1[v0], 0);
                 }
             }
         } else {
-            GraphicElementData_SetDrawFlag(param1[v0], 0);
+            CellActor_SetDrawFlag(param1[v0], 0);
         }
 
         param0[v0][3] = param0[v0][2];
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 20c0225113..274647eab6 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -81,10 +81,10 @@ typedef struct {
 
 static void ov23_0224F460(UnkStruct_ov23_02250CD4 * param0);
 static void ov23_0224F498(UnkStruct_ov23_02250CD4 * param0);
-static void ov23_0224F4D0(GraphicElementData * param0, u32 param1);
-static void ov23_0224F500(GraphicElementData * param0, u16 param1, u16 param2);
+static void ov23_0224F4D0(CellActor * param0, u32 param1);
+static void ov23_0224F500(CellActor * param0, u16 param1, u16 param2);
 static void ov23_0224F52C(UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2);
-static void ov23_0224F560(GraphicElementData * param0);
+static void ov23_0224F560(CellActor * 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);
@@ -220,7 +220,7 @@ static void ov23_0224F294 (UnkStruct_ov23_02250CD4 * param0, u8 * param1, u32 pa
 
         {
             VecFx32 v4 = {FX32_ONE, FX32_ONE, FX32_ONE};
-            GraphicElementData_SetAffineScaleEx(param0->unk_23C[1 + v1]->unk_00, &v4, 1);
+            CellActor_SetAffineScaleEx(param0->unk_23C[1 + v1]->unk_00, &v4, 1);
         }
     }
 
@@ -245,26 +245,26 @@ static void ov23_0224F498 (UnkStruct_ov23_02250CD4 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_25C; v0++) {
-        GraphicElementData_UpdateAnim(param0->unk_23C[v0]->unk_00, FX32_ONE);
+        CellActor_UpdateAnim(param0->unk_23C[v0]->unk_00, FX32_ONE);
     }
 }
 
-static void ov23_0224F4D0 (GraphicElementData * param0, u32 param1)
+static void ov23_0224F4D0 (CellActor * param0, u32 param1)
 {
     VecFx32 v0;
 
-    v0 = *(GraphicElementData_GetPosition(param0));
+    v0 = *(CellActor_GetPosition(param0));
     v0.y = (20 + 24 * param1) * FX32_ONE;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
-static void ov23_0224F500 (GraphicElementData * param0, u16 param1, u16 param2)
+static void ov23_0224F500 (CellActor * param0, u16 param1, u16 param2)
 {
-    u32 v0 = GraphicElementData_GetActiveAnim(param0);
+    u32 v0 = CellActor_GetActiveAnim(param0);
 
-    GraphicElementData_SetAnim(param0, (v0 / 3) * 3 + param1);
-    GraphicElementData_SetExplicitPaletteWithOffset(param0, param2);
+    CellActor_SetAnim(param0, (v0 / 3) * 3 + param1);
+    CellActor_SetExplicitPaletteWithOffset(param0, param2);
 }
 
 static void ov23_0224F52C (UnkStruct_ov23_02250CD4 * param0, u16 param1, u16 param2)
@@ -273,13 +273,13 @@ 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 (GraphicElementData * param0)
+static void ov23_0224F560 (CellActor * param0)
 {
-    if ((GraphicElementData_GetActiveAnim(param0) % 3) != 1) {
+    if ((CellActor_GetActiveAnim(param0) % 3) != 1) {
         return;
     }
 
-    if (GraphicElementData_IsAnimated(param0) == 0) {
+    if (CellActor_IsAnimated(param0) == 0) {
         ov23_0224F500(param0, 2, 1);
     }
 }
@@ -643,7 +643,7 @@ static BOOL ov23_0224FA58 (SysTask * param0, void * param1)
     switch (v0->unk_2A0) {
     case 0xffffffff:
         ov23_0224F498(v0);
-        GraphicElementManager_Update(v0->unk_74.unk_00);
+        CellActorCollection_Update(v0->unk_74.unk_00);
         return 0;
     case 0xfffffffe:
         v0->unk_2AA = 2;
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index 7d4bed9ac8..b4062861ac 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -84,12 +84,12 @@ struct UnkStruct_ov56_02256468_t {
     MessageLoader * unk_1C;
     u16 * unk_20;
     NNSG2dScreenData * unk_24;
-    GraphicElementManager * unk_28;
+    CellActorCollection * unk_28;
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[4];
     UnkStruct_02009DC8 * unk_1C8[4];
     CellActorResourceData unk_1D8;
-    GraphicElementData * unk_1FC[8];
+    CellActor * unk_1FC[8];
     int unk_21C;
     int unk_220;
     int unk_224;
@@ -120,7 +120,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(GraphicElementData * param0, int param1);
+static void ov56_02256994(CellActor * 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);
@@ -179,7 +179,7 @@ static void ov56_022561C0 (SysTask * param0, void * param1)
         ov56_02256D04(v0);
         ov56_022568E0(v0);
         ov56_022571D0(v0);
-        GraphicElementManager_Update(v0->unk_28);
+        CellActorCollection_Update(v0->unk_28);
         break;
     case 3:
         break;
@@ -267,7 +267,7 @@ void ov56_02256468 (UnkStruct_ov56_02256468 * param0)
             sub_02009754(param0->unk_1B8[v1]);
         }
 
-        GraphicElementManager_Delete(param0->unk_28);
+        CellActorCollection_Delete(param0->unk_28);
         MessageLoader_Free(param0->unk_1C);
         StringTemplate_Free(param0->unk_18);
 
@@ -420,7 +420,7 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_28;
+        v1.collection = param0->unk_28;
         v1.resourceData = &param0->unk_1D8;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -435,10 +435,10 @@ static void ov56_02256704 (UnkStruct_ov56_02256468 * param0)
             v1.position.x = FX32_CONST((256 - 24));
             v1.position.y = FX32_CONST(Unk_ov56_02257238[v0]) + (192 << FX32_SHIFT);
 
-            param0->unk_1FC[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_1FC[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_1FC[v0], v0);
+            CellActor_SetAnimateFlag(param0->unk_1FC[v0], 1);
+            CellActor_SetAnim(param0->unk_1FC[v0], v0);
         }
     }
 }
@@ -531,7 +531,7 @@ static const TouchScreenRect Unk_ov56_02257250[] = {
     {0xff, 0x0, 0x0, 0x0}
 };
 
-static void ov56_02256994 (GraphicElementData * param0, int param1)
+static void ov56_02256994 (CellActor * param0, int param1)
 {
     VecFx32 v0;
 
@@ -539,7 +539,7 @@ static void ov56_02256994 (GraphicElementData * param0, int param1)
     v0.y = FX32_CONST(param1) + (192 << FX32_SHIFT);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0)
@@ -551,7 +551,7 @@ static void ov56_022569E0 (UnkStruct_ov56_02256468 * param0)
         param0->unk_2D8.unk_04 = param0->unk_2D8.unk_00 - 3;
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_1FC[2], param0->unk_2D8.unk_06);
+    CellActor_SetDrawFlag(param0->unk_1FC[2], param0->unk_2D8.unk_06);
 
     if (param0->unk_2D8.unk_06) {
         if (ov56_02257184(param0) == 1) {
@@ -968,11 +968,11 @@ static void ov56_0225718C (UnkStruct_ov56_02256468 * param0, int param1)
     u16 v0;
     u16 v1;
 
-    v0 = GraphicElementData_GetAnimFrame(param0->unk_1FC[param1]);
-    v1 = GraphicElementData_GetActiveAnim(param0->unk_1FC[param1]);
+    v0 = CellActor_GetAnimFrame(param0->unk_1FC[param1]);
+    v1 = CellActor_GetActiveAnim(param0->unk_1FC[param1]);
 
     if ((v0 > 1) || (v1 != param1 + 4)) {
-        GraphicElementData_SetAnim(param0->unk_1FC[param1], param1 + 4);
+        CellActor_SetAnim(param0->unk_1FC[param1], param1 + 4);
     }
 
     param0->unk_2F4[param1] = 1;
@@ -984,17 +984,17 @@ static void ov56_022571D0 (UnkStruct_ov56_02256468 * param0)
     u16 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = GraphicElementData_GetAnimFrame(param0->unk_1FC[v0]);
+        v1 = CellActor_GetAnimFrame(param0->unk_1FC[v0]);
 
         if (param0->unk_2F4[v0] == 1) {
             if (v1 >= 1) {
-                GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 0);
+                CellActor_SetAnimateFlag(param0->unk_1FC[v0], 0);
             }
 
             param0->unk_2F4[v0] = 0;
         } else {
-            if (GraphicElementData_GetAnimateFlag(param0->unk_1FC[v0]) == 0) {
-                GraphicElementData_SetAnimateFlag(param0->unk_1FC[v0], 1);
+            if (CellActor_GetAnimateFlag(param0->unk_1FC[v0]) == 0) {
+                CellActor_SetAnimateFlag(param0->unk_1FC[v0], 1);
                 SpriteActor_SetAnimFrame(param0->unk_1FC[v0], 1 + 1);
             }
         }
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 9599acdcb6..c431efb7f6 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -84,7 +84,7 @@ static void ov58_021D1554(UnkStruct_02095EAC * param0, NARC * param1);
 static void ov58_021D16D8(UnkStruct_02095EAC * param0);
 static void ov58_021D18AC(UnkStruct_02095EAC * param0, OverlayManager * param1);
 static void ov58_021D19D4(UnkStruct_02095EAC * param0);
-static void ov58_021D1A10(GraphicElementData * param0, int param1, int param2);
+static void ov58_021D1A10(CellActor * 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);
@@ -122,8 +122,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(GraphicElementData ** param0, int param1);
-static void ov58_021D1CDC(GraphicElementData ** param0, BOOL param1);
+static void ov58_021D1CAC(CellActor ** param0, int param1);
+static void ov58_021D1CDC(CellActor ** 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);
@@ -300,7 +300,7 @@ int ov58_021D0F08 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_34);
+    CellActorCollection_Update(v0->unk_34);
 
     return 0;
 }
@@ -327,7 +327,7 @@ int ov58_021D1018 (OverlayManager * param0, int * param1)
             sub_02009754(v0->unk_1C4[v2]);
         }
 
-        GraphicElementManager_Delete(v0->unk_34);
+        CellActorCollection_Delete(v0->unk_34);
         sub_0200A878();
         sub_0201E958();
         sub_0201F8B4();
@@ -677,7 +677,7 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_34;
+        v1.collection = param0->unk_34;
         v1.resourceData = &param0->unk_1F4;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -694,11 +694,11 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.position.y = FX32_ONE * (32 + 32);
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
 
-            param0->unk_23C[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_23C[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_23C[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_23C[v0], v0);
-            GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 0);
+            CellActor_SetAnimateFlag(param0->unk_23C[v0], 1);
+            CellActor_SetAnim(param0->unk_23C[v0], v0);
+            CellActor_SetDrawFlag(param0->unk_23C[v0], 0);
         }
 
         for (v0 = 0; v0 < 9 + 3; v0++) {
@@ -706,28 +706,28 @@ static void ov58_021D16D8 (UnkStruct_02095EAC * param0)
             v1.position.x = FX32_ONE * (Unk_ov58_021D2EEC[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov58_021D2EEC[v0][1]);
 
-            param0->unk_2AC[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_2AC[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_2AC[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
+            CellActor_SetAnimateFlag(param0->unk_2AC[v0], 1);
+            CellActor_SetAnim(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
 
             if (v0 >= 8) {
-                GraphicElementData_SetExplicitPriority(param0->unk_2AC[v0], 2);
+                CellActor_SetExplicitPriority(param0->unk_2AC[v0], 2);
             }
         }
 
-        GraphicElementData_SetAnim(param0->unk_2AC[0], 6);
+        CellActor_SetAnim(param0->unk_2AC[0], 6);
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.position.x = FX32_ONE * 24;
             v1.position.y = FX32_ONE * (32 + 32 * v0) + (256 * FX32_ONE);
 
-            param0->unk_274[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_274[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_274[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_274[v0], v0);
-            GraphicElementData_SetPriority(param0->unk_274[v0], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_274[v0], 0);
+            CellActor_SetAnimateFlag(param0->unk_274[v0], 1);
+            CellActor_SetAnim(param0->unk_274[v0], v0);
+            CellActor_SetPriority(param0->unk_274[v0], 1);
+            CellActor_SetDrawFlag(param0->unk_274[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -773,7 +773,7 @@ static void ov58_021D19D4 (UnkStruct_02095EAC * param0)
     BGL_DeleteWindow(&param0->unk_33C);
 }
 
-static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2)
+static void ov58_021D1A10 (CellActor * param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -781,7 +781,7 @@ static void ov58_021D1A10 (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov58_021D2EB8[] = {
@@ -869,9 +869,9 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
 
             for (v3 = 0; v3 < 3; v3++) {
                 if ((v0 - 9) == v3) {
-                    GraphicElementData_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
+                    CellActor_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
                 } else {
-                    GraphicElementData_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3);
+                    CellActor_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3);
                 }
             }
 
@@ -885,11 +885,11 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
     }
 
     v1 = sub_02022644(Unk_ov58_021D2DDC);
-    GraphicElementData_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
+    CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
 
     if (v1 != 0xffffffff) {
         ov58_021D1A10(param0->unk_23C[CommSys_CurNetId()], gCoreSys.touchX, gCoreSys.touchY);
-        GraphicElementData_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
+        CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
     }
 
     {
@@ -906,25 +906,25 @@ static void ov58_021D1A80 (UnkStruct_02095EAC * param0)
     }
 }
 
-static void ov58_021D1CAC (GraphicElementData ** param0, int param1)
+static void ov58_021D1CAC (CellActor ** param0, int param1)
 {
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
         if (v0 == param1) {
-            GraphicElementData_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
+            CellActor_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
         } else {
-            GraphicElementData_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2]);
+            CellActor_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2]);
         }
     }
 }
 
-static void ov58_021D1CDC (GraphicElementData ** param0, BOOL param1)
+static void ov58_021D1CDC (CellActor ** param0, BOOL param1)
 {
     if (param1 == 1) {
-        GraphicElementData_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
+        CellActor_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
     } else {
-        GraphicElementData_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2]);
+        CellActor_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2]);
     }
 }
 
@@ -1576,10 +1576,10 @@ static void ov58_021D2820 (UnkStruct_02095EAC * param0)
     for (v0 = 0; v0 < 5; v0++) {
         if (v0 != CommSys_CurNetId()) {
             if ((v1[v0].unk_08_3 != 0) && (CommInfo_TrainerInfo(v0) != NULL)) {
-                GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_23C[v0], 1);
                 ov58_021D1A10(param0->unk_23C[v0], v1[v0].unk_00[v1[v0].unk_08_3 - 1], v1[v0].unk_04[v1[v0].unk_08_3 - 1]);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_23C[v0], 0);
+                CellActor_SetDrawFlag(param0->unk_23C[v0], 0);
             }
         }
     }
@@ -1633,9 +1633,9 @@ static void ov58_021D28E4 (Window * param0, int param1, u32 param2, UnkStruct_02
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param3->unk_398[v0][0] == NULL) {
-            GraphicElementData_SetDrawFlag(param3->unk_274[v0], 0);
+            CellActor_SetDrawFlag(param3->unk_274[v0], 0);
         } else {
-            GraphicElementData_SetDrawFlag(param3->unk_274[v0], 1);
+            CellActor_SetDrawFlag(param3->unk_274[v0], 1);
         }
     }
 
@@ -1782,7 +1782,7 @@ static int ov58_021D2B5C (UnkStruct_02095EAC * param0)
 
             if (param0->unk_945C) {
                 ov58_021D2D10(param0);
-                GraphicElementData_SetAnim(param0->unk_2AC[8], Unk_ov58_021D2EEC[8][2]);
+                CellActor_SetAnim(param0->unk_2AC[8], Unk_ov58_021D2EEC[8][2]);
             }
 
             return 2;
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index 36b39f7249..c6ad340046 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -292,7 +292,7 @@ int ov59_021D0F00 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_50);
+    CellActorCollection_Update(v0->unk_50);
 
     return 0;
 }
@@ -310,7 +310,7 @@ int ov59_021D0FF4 (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_1E0[v1]);
     }
 
-    GraphicElementManager_Delete(v0->unk_50);
+    CellActorCollection_Delete(v0->unk_50);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -647,7 +647,7 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_50;
+        v1.collection = param0->unk_50;
         v1.resourceData = &param0->unk_268;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -660,20 +660,20 @@ static void ov59_021D1598 (UnkStruct_020961E8 * param0)
         v1.position.x = FX32_ONE * Unk_ov59_021D32C4[0][0];
         v1.position.y = FX32_ONE * Unk_ov59_021D32C4[0][1];
 
-        param0->unk_28C[0] = GraphicElementManager_AddElementEx(&v1);
+        param0->unk_28C[0] = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_28C[0], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_28C[0], 1);
+        CellActor_SetAnimateFlag(param0->unk_28C[0], 1);
+        CellActor_SetDrawFlag(param0->unk_28C[0], 1);
 
         for (v0 = 0; v0 < 5; v0++) {
             v1.position.x = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][0];
             v1.position.y = FX32_ONE * Unk_ov59_021D32C4[v0 + 1][1];
 
-            param0->unk_28C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_28C[v0 + 1] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_28C[v0 + 1], 1);
-            GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
-            GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 0);
+            CellActor_SetAnimateFlag(param0->unk_28C[v0 + 1], 1);
+            CellActor_SetAnim(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
+            CellActor_SetDrawFlag(param0->unk_28C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1051,7 +1051,7 @@ void ov59_021D1D40 (UnkStruct_020961E8 * param0)
 {
     MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48);
     ov59_021D1784(&param0->unk_36C, param0->unk_48, 0);
-    GraphicElementData_SetAnim(param0->unk_28C[0], 37);
+    CellActor_SetAnim(param0->unk_28C[0], 37);
 
     param0->unk_0C.unk_00 = 1;
 }
@@ -1111,7 +1111,7 @@ static int ov59_021D1E0C (UnkStruct_020961E8 * param0, int param1)
         sub_020057A4(1624, 8);
         ov59_021D2628(param0, 13, 0);
         ov59_021D19B0(param0, 29);
-        GraphicElementData_SetAnim(param0->unk_28C[0], 0);
+        CellActor_SetAnim(param0->unk_28C[0], 0);
 
         param0->unk_0C.unk_00 = 0;
         param0->unk_3B4 = 0;
@@ -1626,13 +1626,13 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0)
             v2 = TrainerInfo_Appearance(param0->unk_3C8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 38 + v3 * 2);
+                CellActor_SetAnim(param0->unk_28C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov59_021D2860(param0->unk_390, param0->unk_3A0, v0, v2, v3);
-                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2);
+                CellActor_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2);
             }
         }
-            GraphicElementData_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
+            CellActor_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
             param0->unk_3F0[v0] = 2;
             v1 = 1;
             break;
@@ -1641,9 +1641,9 @@ static void ov59_021D26E8 (UnkStruct_020961E8 * param0)
         case 3:
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3C8[v0][0]);
-                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
+                CellActor_SetAnim(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                GraphicElementData_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
+                CellActor_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
             }
 
             param0->unk_3F0[v0] = 0;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 42041dd87a..406d16fc79 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;
-    GraphicElementData * unk_04;
-    GraphicElementData * unk_08;
+    CellActor * unk_04;
+    CellActor * 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     PaletteData * 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 (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3)
+UnkStruct_ov63_0222AE60 * ov63_0222AE60 (CellActorCollection * param0, PaletteData * param1, u32 param2, u32 param3)
 {
     UnkStruct_ov63_0222AE60 * v0;
     int v1;
@@ -452,7 +452,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     GF_ASSERT(ov63_0222B7D4(param0, v2) == 1);
     memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
-    v1.manager = param0->unk_00;
+    v1.collection = param0->unk_00;
     v1.resourceData = &param0->unk_10[v2].unk_14;
     v1.position.x = param1->unk_00 << FX32_SHIFT;
     v1.position.y = param1->unk_02 << FX32_SHIFT;
@@ -468,13 +468,13 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     }
 
-    v0->unk_04 = GraphicElementManager_AddElementEx(&v1);
-    GraphicElementData_SetExplicitPriority(v0->unk_04, param1->unk_06);
+    v0->unk_04 = CellActorCollection_AddEx(&v1);
+    CellActor_SetExplicitPriority(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
-        GraphicElementData_SetAnim(v0->unk_04, 5 + 1);
+        CellActor_SetAnim(v0->unk_04, 5 + 1);
     } else {
-        GraphicElementData_SetAnim(v0->unk_04, 1);
+        CellActor_SetAnim(v0->unk_04, 1);
     }
 
     v0->unk_0C = 9;
@@ -485,7 +485,7 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
     if (ov63_0222B96C(&param0->unk_2248)) {
         memset(&v1, 0, sizeof(CellActorInitParamsEx));
 
-        v1.manager = param0->unk_00;
+        v1.collection = param0->unk_00;
         v1.resourceData = &param0->unk_2248.unk_10;
         v1.position.x = param1->unk_00 << FX32_SHIFT;
         v1.position.y = param1->unk_02 << FX32_SHIFT;
@@ -501,9 +501,9 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v0->unk_08 = GraphicElementManager_AddElementEx(&v1);
+        v0->unk_08 = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetExplicitPriority(v0->unk_08, param1->unk_06);
+        CellActor_SetExplicitPriority(v0->unk_08, param1->unk_06);
     } else {
         v0->unk_08 = NULL;
     }
@@ -514,14 +514,14 @@ UnkStruct_ov63_0222BB38 * ov63_0222B0C0 (UnkStruct_ov63_0222AE60 * param0, const
 void ov63_0222B210 (UnkStruct_ov63_0222BB38 * param0)
 {
     if (param0->unk_08 != NULL) {
-        GraphicElementData_Delete(param0->unk_08);
+        CellActor_Delete(param0->unk_08);
     }
 
-    GraphicElementData_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_04);
     memset(param0, 0, sizeof(UnkStruct_ov63_0222BB38));
 }
 
-const GraphicElementData * ov63_0222B234 (const UnkStruct_ov63_0222BB38 * param0)
+const CellActor * ov63_0222B234 (const UnkStruct_ov63_0222BB38 * param0)
 {
     return param0->unk_04;
 }
@@ -534,38 +534,38 @@ void ov63_0222B238 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
     v0.y = param2 << FX32_SHIFT;
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0->unk_04, &v0);
+    CellActor_SetPosition(param0->unk_04, &v0);
 
     if (param0->unk_08) {
         v0.x += 8 << FX32_SHIFT;
         v0.y += 14 << FX32_SHIFT;
 
-        GraphicElementData_SetPosition(param0->unk_08, &v0);
+        CellActor_SetPosition(param0->unk_08, &v0);
     }
 }
 
 void ov63_0222B278 (UnkStruct_ov63_0222BB38 * param0, u16 param1)
 {
-    GraphicElementData_SetPriority(param0->unk_04, param1);
+    CellActor_SetPriority(param0->unk_04, param1);
 }
 
 u16 ov63_0222B284 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return GraphicElementData_GetPriority(param0->unk_04);
+    return CellActor_GetPriority(param0->unk_04);
 }
 
 void ov63_0222B294 (UnkStruct_ov63_0222BB38 * param0, BOOL param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_04, param1);
+    CellActor_SetDrawFlag(param0->unk_04, param1);
 
     if (param0->unk_08) {
-        GraphicElementData_SetDrawFlag(param0->unk_08, param1);
+        CellActor_SetDrawFlag(param0->unk_08, param1);
     }
 }
 
 BOOL ov63_0222B2B0 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return GraphicElementData_GetDrawFlag(param0->unk_04);
+    return CellActor_GetDrawFlag(param0->unk_04);
 }
 
 int ov63_0222B2BC (const UnkStruct_ov63_0222BB38 * param0)
@@ -585,7 +585,7 @@ void ov63_0222B2C8 (UnkStruct_ov63_0222BB38 * param0, u16 param1)
 
 u16 ov63_0222B2D4 (const UnkStruct_ov63_0222BB38 * param0)
 {
-    return GraphicElementData_GetAnimFrame(param0->unk_04);
+    return CellActor_GetAnimFrame(param0->unk_04);
 }
 
 void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
@@ -597,7 +597,7 @@ void ov63_0222B2E0 (UnkStruct_ov63_0222BB38 * param0, s16 param1, s16 param2)
         v0.y = param2 + 14 << FX32_SHIFT;
         v0.z = 0;
 
-        GraphicElementData_SetPosition(param0->unk_08, &v0);
+        CellActor_SetPosition(param0->unk_08, &v0);
     }
 }
 
@@ -1016,65 +1016,65 @@ static void ov63_0222BB38 (UnkStruct_ov63_0222BB38 * param0)
 static void ov63_0222BB50 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, param0->unk_10);
 }
 
 static void ov63_0222BB5C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 4);
+    CellActor_SetAnimNoRestart(param0->unk_04, 4);
 }
 
 static void ov63_0222BB6C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BB7C (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
     param0->unk_10 = param1;
 }
 
 static void ov63_0222BB90 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 9 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 9 + param0->unk_10);
 }
 
 static void ov63_0222BBA0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBB0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBC0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBD0 (UnkStruct_ov63_0222BB38 * param0, int param1)
 {
     param0->unk_10 = param1;
-    GraphicElementData_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBE0 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BBF0 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0)
@@ -1082,33 +1082,33 @@ static void ov63_0222BC00 (UnkStruct_ov63_0222BB38 * param0)
     if (param0->unk_14 == 0) {
         SpriteActor_SetAnimFrame(param0->unk_04, 1);
     } else {
-        GraphicElementData_SetAnim(param0->unk_04, 5 + param0->unk_10);
+        CellActor_SetAnim(param0->unk_04, 5 + param0->unk_10);
     }
 }
 
 static void ov63_0222BC20 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC30 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC40 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC50 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (8 * FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (8 * FX32_ONE));
 }
 
 static void ov63_0222BC60 (UnkStruct_ov63_0222BB38 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_04, (6 * FX32_ONE));
+    CellActor_UpdateAnim(param0->unk_04, (6 * FX32_ONE));
 }
 
 static BOOL ov63_0222BC70 (const UnkStruct_ov63_0222BB38 * param0)
diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c
index cfe1e34cda..cca6fb9971 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 (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4)
+UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (CellActorCollection * param0, PaletteData * param1, u32 param2, u32 param3, u32 param4)
 {
     UnkStruct_ov63_0222CD2C * v0;
 
@@ -40,7 +40,7 @@ UnkStruct_ov63_0222CD2C * ov63_0222CCE4 (GraphicElementManager * param0, Palette
     return v0;
 }
 
-UnkStruct_ov63_0222CD2C * ov63_0222CD2C (GraphicElementManager * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
+UnkStruct_ov63_0222CD2C * ov63_0222CD2C (CellActorCollection * param0, PaletteData * param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
 {
     UnkStruct_ov63_0222CD2C * v0;
 
@@ -248,7 +248,7 @@ u32 ov63_0222D034 (s16 param0, BOOL param1)
 
 u32 ov63_0222D050 (const UnkStruct_ov63_0222CE44 * param0)
 {
-    return GraphicElementData_GetExplicitPaletteOffset(ov63_0222B234(param0->unk_04));
+    return CellActor_GetExplicitPaletteOffset(ov63_0222B234(param0->unk_04));
 }
 
 void ov63_0222D060 (UnkStruct_ov63_0222CE44 * param0, UnkStruct_ov63_0222CC3C param1)
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 52871d648d..3b039e7f87 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -138,7 +138,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     NNSG2dRenderSurface unk_08;
     UnkStruct_0200C738 unk_78;
     UnkStruct_02009714 * unk_204[4];
@@ -151,7 +151,7 @@ typedef struct {
     u32 unk_238;
     CellActorResourceData unk_23C;
     UnkStruct_02009DC8 * unk_260[4];
-    GraphicElementData * unk_270[2];
+    CellActor * unk_270[2];
     UnkStruct_ov64_022300E4 unk_278;
 } UnkStruct_ov64_0222E21C;
 
@@ -197,7 +197,7 @@ typedef struct {
     BmpList * unk_F8;
     UIControlData * unk_FC;
     s32 unk_100;
-    GraphicElementData * unk_104;
+    CellActor * unk_104;
     u32 unk_108;
 } UnkStruct_ov64_0222F0C4;
 
@@ -905,7 +905,7 @@ static void ov64_0222E1A4 (UnkStruct_ov64_0222E21C * param0, const UnkStruct_ov6
 
 static void ov64_0222E21C (UnkStruct_ov64_0222E21C * param0)
 {
-    GraphicElementManager_Update(param0->unk_04);
+    CellActorCollection_Update(param0->unk_04);
 }
 
 static void ov64_0222E228 (UnkStruct_ov64_0222E21C * param0)
@@ -1052,7 +1052,7 @@ static void ov64_0222E570 (UnkStruct_ov64_0222E21C * param0)
         sub_02009754(param0->unk_204[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_04);
+    CellActorCollection_Delete(param0->unk_04);
     sub_0201E958();
     sub_0201F8B4();
     sub_0200A878();
@@ -1236,15 +1236,15 @@ static void ov64_0222E9A4 (UnkStruct_ov64_0222E21C * param0, u32 param1)
     int v1;
 
     for (v1 = 0; v1 < 2; v1++) {
-        v0[v1].manager = param0->unk_04;
+        v0[v1].collection = param0->unk_04;
         v0[v1].resourceData = &param0->unk_23C;
         v0[v1].heapID = param1;
 
-        param0->unk_270[v1] = GraphicElementManager_AddElementEx(&v0[v1]);
+        param0->unk_270[v1] = CellActorCollection_AddEx(&v0[v1]);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_270[v1], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_270[v1], 0);
-        GraphicElementData_SetAnim(param0->unk_270[v1], v1);
+        CellActor_SetAnimateFlag(param0->unk_270[v1], 1);
+        CellActor_SetDrawFlag(param0->unk_270[v1], 0);
+        CellActor_SetAnim(param0->unk_270[v1], v1);
     }
 }
 
@@ -1253,7 +1253,7 @@ static void ov64_0222EA0C (UnkStruct_ov64_0222E21C * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_270[v0]);
+        CellActor_Delete(param0->unk_270[v0]);
     }
 }
 
@@ -1262,7 +1262,7 @@ static void ov64_0222EA28 (UnkStruct_ov64_0222E21C * param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_270[v0], param1);
+        CellActor_SetDrawFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -1271,7 +1271,7 @@ static void ov64_0222EA48 (UnkStruct_ov64_0222E21C * param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetAnimateFlag(param0->unk_270[v0], param1);
+        CellActor_SetAnimateFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -2171,7 +2171,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     ldr r0, [sp, #0x18]
     str r0, [sp, #0x54]
     add r0, sp, #0x28
-    bl GraphicElementManager_AddElementEx
+    bl CellActorCollection_AddEx
     mov r2, #0x42
     ldr r1, [sp, #0x14]
     lsl r2, r2, #2
@@ -2179,7 +2179,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     add r0, r1, #0
     ldr r0, [r0, r2]
     mov r1, #0
-    bl GraphicElementData_SetDrawFlag
+    bl CellActor_SetDrawFlag
     add sp, #0x58
     pop {r3, r4, r5, r6, r7, pc}
     nop
@@ -2189,7 +2189,7 @@ static void ov64_0222F5F4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
 {
     int v0;
 
-    GraphicElementData_Delete(param0->unk_104);
+    CellActor_Delete(param0->unk_104);
     BGL_DeleteWindow(&param0->unk_C4);
     Strbuf_Free(param0->unk_D4);
 
@@ -2645,12 +2645,12 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     VecFx32 v0;
     u32 v1;
 
-    GraphicElementData_SetDrawFlag(param0->unk_104, 1);
-    GraphicElementData_SetAnim(param0->unk_104, 2);
+    CellActor_SetDrawFlag(param0->unk_104, 1);
+    CellActor_SetAnim(param0->unk_104, 2);
 
     param0->unk_108 = 0;
 
-    GraphicElementData_SetAnimateFlag(param0->unk_104, 1);
+    CellActor_SetAnimateFlag(param0->unk_104, 1);
 
     v1 = param0->unk_04;
 
@@ -2659,7 +2659,7 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     v0.x <<= FX32_SHIFT;
     v0.y <<= FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_104, &v0);
+    CellActor_SetPosition(param0->unk_104, &v0);
 
     G2_SetWndOBJInsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2, 0);
     G2_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 1);
@@ -2672,11 +2672,11 @@ static BOOL ov64_02230008 (UnkStruct_ov64_0222F0C4 * param0)
 {
     u32 v0;
 
-    if (GraphicElementData_IsAnimated(param0->unk_104) == 0) {
+    if (CellActor_IsAnimated(param0->unk_104) == 0) {
         return 1;
     }
 
-    v0 = GraphicElementData_GetAnimFrame(param0->unk_104);
+    v0 = CellActor_GetAnimFrame(param0->unk_104);
 
     if ((v0 - param0->unk_108) >= 2) {
         param0->unk_108 = v0;
@@ -2690,8 +2690,8 @@ static void ov64_02230044 (UnkStruct_ov64_0222F0C4 * param0)
 {
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
 
-    GraphicElementData_SetDrawFlag(param0->unk_104, 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_104, 0);
+    CellActor_SetDrawFlag(param0->unk_104, 0);
+    CellActor_SetAnimateFlag(param0->unk_104, 0);
 }
 
 static void ov64_02230074 (UnkStruct_ov64_02230074 * param0, UnkStruct_ov64_0222E21C * param1, const UnkStruct_ov64_0223221C * param2, u32 param3, u32 param4)
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index a7cead18c5..e1de2383d2 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -844,7 +844,7 @@ int ov65_0222E3FC (OverlayManager * param0, int * param1)
     }
 
     if (v0->unk_18C) {
-        GraphicElementManager_Update(v0->unk_18C);
+        CellActorCollection_Update(v0->unk_18C);
     }
 
     if (ov65_02235194(&v0->unk_3EC) == 1) {
@@ -879,7 +879,7 @@ static void ov65_0222E47C (UnkStruct_ov65_0222EBE0 * param0)
         sub_02009754(param0->unk_31C[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_18C);
+    CellActorCollection_Delete(param0->unk_18C);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -6702,13 +6702,13 @@ static void ov65_02234A68 (UnkStruct_ov65_0222EBE0 * param0, NARC * param1, u32
     sub_020093B4(&v2, 30, 30, 30, 30, 0xffffffff, 0xffffffff, 0, 0, param0->unk_31C[0], param0->unk_31C[1], param0->unk_31C[2], param0->unk_31C[3], NULL, NULL);
 
     for (v1 = 0; v1 < 3; v1++) {
-        v9[v1].manager = param0->unk_18C;
+        v9[v1].collection = param0->unk_18C;
         v9[v1].resourceData = &v2;
         v9[v1].heapID = param2;
 
-        param0->unk_BE0.unk_21C[v1] = GraphicElementManager_AddElementEx(&v9[v1]);
+        param0->unk_BE0.unk_21C[v1] = CellActorCollection_AddEx(&v9[v1]);
 
-        GraphicElementData_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
+        CellActor_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
     }
 
     sub_02002BB8(2, param2);
@@ -6762,7 +6762,7 @@ static void ov65_02234CFC (UnkStruct_ov65_0222EBE0 * param0)
     sub_0201EE28(&param0->unk_BE0.unk_228);
 
     for (v0 = 0; v0 < 3; v0++) {
-        GraphicElementData_Delete(param0->unk_BE0.unk_21C[v0]);
+        CellActor_Delete(param0->unk_BE0.unk_21C[v0]);
     }
 
     sub_0200A4E4(param0->unk_BE0.unk_20C[0]);
@@ -6789,7 +6789,7 @@ static void ov65_02234D6C (UnkStruct_ov65_0222EBE0 * param0)
 static void ov65_02234DA0 (UnkStruct_ov65_0222EBE0 * param0)
 {
     if (param0->unk_BE0.unk_238 == 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1);
+        CellActor_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1);
         sub_020129D0(param0->unk_BE0.unk_234, 1);
     }
 
@@ -6837,7 +6837,7 @@ static void ov65_02234E40 (u32 param0, u32 param1, void * param2)
 
 static void ov65_02234E50 (UnkStruct_ov65_02234E50 * param0, u32 param1)
 {
-    GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+    CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
     SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1));
 
     if (param1 == 1) {
@@ -6852,16 +6852,16 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
     u32 v2;
 
     if ((param2 == param1)) {
-        v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
+        v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
 
         if ((param3 == 0) || (param3 == 2)) {
             if (param3 == 0) {
-                GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
+                CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
             }
 
             if (v1 < 3) {
-                GraphicElementData_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
-                v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
+                CellActor_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
+                v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
 
                 if (param1 == 1) {
                     sub_020128C4(param0->unk_234, -18, Unk_ov65_0223893C[v1]);
@@ -6877,15 +6877,15 @@ static BOOL ov65_02234E8C (UnkStruct_ov65_02234E50 * param0, u32 param1, u32 par
             }
         }
     } else {
-        v2 = GraphicElementData_GetActiveAnim(param0->unk_21C[param1]);
-        v1 = GraphicElementData_GetAnimFrame(param0->unk_21C[param1]);
+        v2 = CellActor_GetActiveAnim(param0->unk_21C[param1]);
+        v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
 
         if (v2 == Unk_ov65_0223892C[param1]) {
-            GraphicElementData_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+            CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
             SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1) - v1);
         }
 
-        GraphicElementData_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
+        CellActor_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
     }
 
     return v0;
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index e86d2a754a..6848e00683 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -219,7 +219,7 @@ u32 ov65_02235198 (UnkStruct_ov65_02235130 * param0)
 void ov65_02235244 (UnkStruct_ov65_02235130 * param0)
 {
     if (param0->unk_00) {
-        GraphicElementManager_Update(param0->unk_14.unk_00);
+        CellActorCollection_Update(param0->unk_14.unk_00);
     }
 }
 
@@ -605,7 +605,7 @@ static void ov65_022358CC (UnkStruct_ov65_022358CC * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
 }
 
 static void ov65_022358F8 (UnkStruct_ov65_022358CC * param0, u32 param1, NARC * param2)
@@ -683,7 +683,7 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
 
     memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
-    v0.manager = param0->unk_00;
+    v0.collection = param0->unk_00;
     v0.resourceData = &param0->unk_1A0.unk_10;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.affineScale.x = FX32_ONE;
@@ -691,19 +691,19 @@ static void ov65_02235A94 (UnkStruct_ov65_022358CC * param0, u32 param1)
     v0.priority = 0;
     v0.heapID = param1;
 
-    param0->unk_1A0.unk_34 = GraphicElementManager_AddElementEx(&v0);
-    param0->unk_1A0.unk_38 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_1A0.unk_34 = CellActorCollection_AddEx(&v0);
+    param0->unk_1A0.unk_38 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_34, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_1A0.unk_38, 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_1A0.unk_34, 1);
-    GraphicElementData_SetAnim(param0->unk_1A0.unk_38, 1);
+    CellActor_SetDrawFlag(param0->unk_1A0.unk_34, 0);
+    CellActor_SetDrawFlag(param0->unk_1A0.unk_38, 0);
+    CellActor_SetAnimateFlag(param0->unk_1A0.unk_34, 1);
+    CellActor_SetAnim(param0->unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235B14 (UnkStruct_ov65_022358CC * param0)
 {
-    GraphicElementData_Delete(param0->unk_1A0.unk_34);
-    GraphicElementData_Delete(param0->unk_1A0.unk_38);
+    CellActor_Delete(param0->unk_1A0.unk_34);
+    CellActor_Delete(param0->unk_1A0.unk_38);
 }
 
 static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0)
@@ -719,13 +719,13 @@ static void ov65_02235B30 (UnkStruct_ov65_02235130 * param0)
     v1.x = v0.unk_00 << FX32_SHIFT;
     v1.y = v0.unk_02 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_14.unk_1A0.unk_34, &v1);
-    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 1);
+    CellActor_SetPosition(param0->unk_14.unk_1A0.unk_34, &v1);
+    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 1);
 }
 
 static void ov65_02235B78 (UnkStruct_ov65_02235130 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 0);
+    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 0);
 }
 
 static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222CC3C param1, u32 param2)
@@ -738,14 +738,14 @@ static void ov65_02235B88 (UnkStruct_ov65_02235130 * param0, UnkStruct_ov63_0222
     v0.x = param1.unk_00 << FX32_SHIFT;
     v0.y = param1.unk_02 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_14.unk_1A0.unk_38, &v0);
-    GraphicElementData_SetPriority(param0->unk_14.unk_1A0.unk_38, param2);
-    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 1);
+    CellActor_SetPosition(param0->unk_14.unk_1A0.unk_38, &v0);
+    CellActor_SetPriority(param0->unk_14.unk_1A0.unk_38, param2);
+    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235BD8 (UnkStruct_ov65_02235130 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 0);
+    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 0);
 }
 
 static BOOL ov65_02235BE8 (UnkStruct_ov65_02235130 * param0)
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index cdb3096b74..2d8a4f1002 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -117,7 +117,7 @@ typedef struct {
     u8 unk_14;
     u8 unk_15;
     u16 unk_16;
-    GraphicElementManager * unk_18;
+    CellActorCollection * unk_18;
     UnkStruct_0200C738 unk_1C;
     UnkStruct_02009714 * unk_1A8[4];
     UnkStruct_ov63_0222BE18 * unk_1B8;
@@ -502,7 +502,7 @@ int ov65_02236548 (OverlayManager * param0, int * param1)
     }
 
     ov65_022372B0(&v0->unk_30);
-    GraphicElementManager_Update(v0->unk_30.unk_18);
+    CellActorCollection_Update(v0->unk_30.unk_18);
 
     return 0;
 }
@@ -882,7 +882,7 @@ static void ov65_02236E04 (UnkStruct_ov65_02236840 * param0)
     ov63_0222CD9C(param0->unk_1BC);
     ov63_0222BE58(param0->unk_1B8);
 
-    GraphicElementManager_Delete(param0->unk_18);
+    CellActorCollection_Delete(param0->unk_18);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_1A8[v0]);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 3fadfd61b5..0b39ecc194 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -79,7 +79,7 @@ typedef struct {
 typedef struct {
     Window unk_00[1];
     s32 unk_10;
-    GraphicElementData * unk_14;
+    CellActor * unk_14;
     UnkStruct_02009DC8 * unk_18[4];
     u16 unk_28;
     u16 unk_2A;
@@ -125,7 +125,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NARC * unk_1A4;
@@ -472,7 +472,7 @@ static void ov68_0225C960 (UnkStruct_ov68_0225C91C * param0)
 
 static void ov68_0225C980 (UnkStruct_ov68_0225C91C * param0)
 {
-    GraphicElementManager_Update(param0->unk_04);
+    CellActorCollection_Update(param0->unk_04);
 }
 
 static void ov68_0225C98C (UnkStruct_ov68_0225C91C * param0)
@@ -559,7 +559,7 @@ static void ov68_0225CB44 (UnkStruct_ov68_0225C91C * param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_04);
+    CellActorCollection_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
@@ -700,14 +700,14 @@ static void ov68_0225CCD0 (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
 
         sub_020093B4(&v1, 20, 20, 20, 20, 0xffffffff, 0xffffffff, 0, 0, param2->unk_194[0], param2->unk_194[1], param2->unk_194[2], param2->unk_194[3], NULL, NULL);
 
-        v2.manager = param2->unk_04;
+        v2.collection = param2->unk_04;
         v2.resourceData = &v1;
         v2.priority = 0;
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v2.heapID = param3;
 
-        param0->unk_14 = GraphicElementManager_AddElement(&v2);
-        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
+        param0->unk_14 = CellActorCollection_Add(&v2);
+        CellActor_SetDrawFlag(param0->unk_14, 0);
     }
 
     {
@@ -867,7 +867,7 @@ static void ov68_0225D02C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
     }
 
     {
-        GraphicElementData_Delete(param0->unk_14);
+        CellActor_Delete(param0->unk_14);
     }
 
     {
@@ -901,13 +901,13 @@ static void ov68_0225D06C (UnkStruct_ov68_0225D0F8 * param0, UnkStruct_ov68_0225
 
 static void ov68_0225D0F8 (UnkStruct_ov68_0225D0F8 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_14, 1);
-    GraphicElementData_SetPosition(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
+    CellActor_SetDrawFlag(param0->unk_14, 1);
+    CellActor_SetPosition(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
 }
 
 static void ov68_0225D11C (UnkStruct_ov68_0225D0F8 * param0)
 {
-    GraphicElementData_SetAnimateFlag(param0->unk_14, 1);
+    CellActor_SetAnimateFlag(param0->unk_14, 1);
 }
 
 static void ov68_0225D128 (UnkStruct_ov68_0225D128 * param0, UnkStruct_ov68_0225C91C * param1, SaveData * param2, u32 param3)
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 1c052c67d4..1a0cd69dcf 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -120,7 +120,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     GenericPointerData * unk_1A4;
@@ -194,7 +194,7 @@ typedef struct {
     s16 unk_32;
     u8 unk_34[4];
     u8 unk_38[4];
-    GraphicElementData * unk_3C[12];
+    CellActor * unk_3C[12];
     UnkStruct_02009DC8 * unk_6C[12][4];
 } UnkStruct_ov69_0225EB60;
 
@@ -1409,7 +1409,7 @@ static void ov69_0225D35C (UnkStruct_ov69_0225D35C * param0)
 
 static void ov69_0225D384 (UnkStruct_ov69_0225D35C * param0)
 {
-    GraphicElementManager_Update(param0->unk_04);
+    CellActorCollection_Update(param0->unk_04);
 }
 
 static void ov69_0225D390 (UnkStruct_ov69_0225D35C * param0)
@@ -1511,7 +1511,7 @@ static void ov69_0225D5D8 (UnkStruct_ov69_0225D35C * param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_04);
+    CellActorCollection_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
@@ -2647,7 +2647,7 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
     param0->unk_30 = 2;
     param0->unk_32 = 128;
 
-    v3.manager = param1->unk_04;
+    v3.collection = param1->unk_04;
     v3.resourceData = &v1;
     v3.priority = 64;
     v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2669,10 +2669,10 @@ static void ov69_0225E960 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
         sub_02009D4C(param0->unk_6C[v0][0]);
         sub_020093B4(&v1, v0, 0, v0, v0, 0xffffffff, 0xffffffff, 0, 1, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        param0->unk_3C[v0] = GraphicElementManager_AddElement(&v3);
+        param0->unk_3C[v0] = CellActorCollection_Add(&v3);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_3C[v0], 1);
-        GraphicElementData_SetAnimSpeed(param0->unk_3C[v0], FX32_ONE);
+        CellActor_SetAnimateFlag(param0->unk_3C[v0], 1);
+        CellActor_SetAnimSpeed(param0->unk_3C[v0], FX32_ONE);
     }
 
     ov69_0225EBEC(param0);
@@ -2686,7 +2686,7 @@ static void ov69_0225EAE8 (UnkStruct_ov69_0225EB60 * param0, UnkStruct_ov69_0225
     sub_020057A4(1473, 0);
 
     for (v0 = 0; v0 < 12; v0++) {
-        GraphicElementData_Delete(param0->unk_3C[v0]);
+        CellActor_Delete(param0->unk_3C[v0]);
         sub_0200A4E4(param0->unk_6C[v0][0]);
 
         if (v0 == 0) {
@@ -2737,7 +2737,7 @@ static void ov69_0225EBEC (UnkStruct_ov69_0225EB60 * param0)
     int v0;
 
     for (v0 = 0; v0 < 12; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_3C[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -2780,7 +2780,7 @@ static BOOL ov69_0225EC70 (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru
     }
 
     ov69_0225ED5C(&param0->unk_00[param1], param2);
-    GraphicElementData_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 1);
+    CellActor_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 1);
     ov69_0225EEC4(param0, param1);
 
     return 1;
@@ -2798,7 +2798,7 @@ static BOOL ov69_0225ECAC (UnkStruct_ov69_0225EB60 * param0, u32 param1, UnkStru
     ov69_0225EEC4(param0, param1);
 
     if (v0 == 1) {
-        GraphicElementData_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 0);
+        CellActor_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 0);
     }
 
     return v0;
@@ -2904,12 +2904,12 @@ static void ov69_0225EE68 (const UnkStruct_ov69_0225ED90 * param0, UnkStruct_ov6
 static void ov69_0225EEC4 (UnkStruct_ov69_0225EB60 * param0, u32 param1)
 {
     VecFx32 v0;
-    GraphicElementData * v1;
+    CellActor * v1;
 
     ov69_0225ED78(&param0->unk_00[param1], &v0);
 
     v1 = param0->unk_3C[param0->unk_38[param1]];
-    GraphicElementData_SetPosition(v1, &v0);
+    CellActor_SetPosition(v1, &v0);
 }
 
 static u16 ov69_0225EEEC (u32 param0)
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index decaab2d3c..d96d15355b 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -117,7 +117,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NNSG2dCellTransferState * unk_1A4;
@@ -141,7 +141,7 @@ typedef struct {
     u16 unk_3A;
     BOOL unk_3C;
     UnkStruct_02009DC8 * unk_40[4];
-    GraphicElementData * unk_50[2];
+    CellActor * unk_50[2];
 } UnkStruct_ov70_0225EC20;
 
 typedef struct {
@@ -181,11 +181,11 @@ typedef struct {
 typedef struct {
     u32 unk_00;
     Window unk_04[5];
-    GraphicElementData * unk_54;
+    CellActor * unk_54;
     UnkStruct_02009DC8 * unk_58[4];
-    GraphicElementData * unk_68;
+    CellActor * unk_68;
     UnkStruct_02009DC8 * unk_6C[4];
-    GraphicElementData * unk_7C[12];
+    CellActor * unk_7C[12];
     UnkStruct_02009DC8 * unk_AC[4];
     UnkStruct_02009DC8 * unk_BC[12];
     UnkStruct_02009DC8 * unk_EC[4];
@@ -1363,7 +1363,7 @@ static void ov70_0225E4EC (UnkStruct_ov70_0225E4EC * param0, SaveData * param1,
 
 static void ov70_0225E6C0 (UnkStruct_ov70_0225E4EC * param0)
 {
-    GraphicElementManager_Update(param0->unk_04);
+    CellActorCollection_Update(param0->unk_04);
     sub_0201DCE8();
 }
 
@@ -1391,7 +1391,7 @@ static void ov70_0225E6D0 (UnkStruct_ov70_0225E4EC * param0)
             sub_02009754(param0->unk_194[v1]);
         }
 
-        GraphicElementManager_Delete(param0->unk_04);
+        CellActorCollection_Delete(param0->unk_04);
         sub_0201E958();
         sub_0201F8B4();
         sub_0200A878();
@@ -1686,7 +1686,7 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
     sub_0200A640(param0->unk_40[1]);
     sub_020093B4(&v0, 5000, 5000, 5000, 5000, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-    v1.manager = param1->unk_04;
+    v1.collection = param1->unk_04;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -1695,11 +1695,11 @@ static void ov70_0225EC20 (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
 
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.y = Unk_ov70_0226D580[v2] * FX32_ONE;
-        param0->unk_50[v2] = GraphicElementManager_AddElement(&v1);
+        param0->unk_50[v2] = CellActorCollection_Add(&v1);
 
-        GraphicElementData_SetAnim(param0->unk_50[v2], v2);
-        GraphicElementData_SetAnimateFlag(param0->unk_50[v2], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_50[v2], 0);
+        CellActor_SetAnim(param0->unk_50[v2], v2);
+        CellActor_SetAnimateFlag(param0->unk_50[v2], 1);
+        CellActor_SetDrawFlag(param0->unk_50[v2], 0);
     }
 
     param0->unk_3C = 0;
@@ -1718,7 +1718,7 @@ static void ov70_0225ED4C (UnkStruct_ov70_0225EC20 * param0, UnkStruct_ov70_0225
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_50[v0]);
+        CellActor_Delete(param0->unk_50[v0]);
         param0->unk_50[v0] = NULL;
     }
 
@@ -1834,7 +1834,7 @@ static void ov70_0225EF14 (UnkStruct_ov70_0225EC20 * param0, u16 * param1, u16 *
     param0->unk_3C = 0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_50[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_50[v0], 0);
     }
 }
 
@@ -1855,23 +1855,23 @@ static void ov70_0225EF70 (UnkStruct_ov70_0225EC20 * param0)
     u16 v0;
 
     if (param0->unk_3C == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_50[0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_50[1], 0);
+        CellActor_SetDrawFlag(param0->unk_50[0], 0);
+        CellActor_SetDrawFlag(param0->unk_50[1], 0);
         return;
     }
 
     sub_020014DC(param0->unk_30, &v0, NULL);
 
     if ((v0 <= 0)) {
-        GraphicElementData_SetDrawFlag(param0->unk_50[0], 0);
+        CellActor_SetDrawFlag(param0->unk_50[0], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_50[0], 1);
+        CellActor_SetDrawFlag(param0->unk_50[0], 1);
     }
 
     if (v0 >= (param0->unk_3A - 7)) {
-        GraphicElementData_SetDrawFlag(param0->unk_50[1], 0);
+        CellActor_SetDrawFlag(param0->unk_50[1], 0);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_50[1], 1);
+        CellActor_SetDrawFlag(param0->unk_50[1], 1);
     }
 }
 
@@ -2741,23 +2741,23 @@ static void ov70_0225FEF0 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
         sub_020093B4(&v3, 100, 100, 100, 100, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        v4.manager = param1->unk_04;
+        v4.collection = param1->unk_04;
         v4.resourceData = &v3;
         v4.priority = 16;
         v4.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v4.heapID = param3;
         v4.position.x = (FX32_CONST(208));
         v4.position.y = (FX32_CONST(152) + (256 * FX32_ONE));
-        param0->unk_54 = GraphicElementManager_AddElement(&v4);
+        param0->unk_54 = CellActorCollection_Add(&v4);
 
-        GraphicElementData_SetAnim(param0->unk_54, v1);
-        GraphicElementData_SetDrawFlag(param0->unk_54, param5);
+        CellActor_SetAnim(param0->unk_54, v1);
+        CellActor_SetDrawFlag(param0->unk_54, param5);
     }
 }
 
 static void ov70_02260048 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1)
 {
-    GraphicElementData_Delete(param0->unk_54);
+    CellActor_Delete(param0->unk_54);
     param0->unk_54 = NULL;
 
     {
@@ -2815,7 +2815,7 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
         sub_020093B4(&v6, 101, 101, 101, 101, 0xffffffff, 0xffffffff, 1, 3, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-        v7.manager = param1->unk_04;
+        v7.collection = param1->unk_04;
         v7.resourceData = &v6;
         v7.priority = 32;
         v7.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2823,14 +2823,14 @@ static void ov70_02260080 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
         v7.position.x = FX32_CONST(v1);
         v7.position.y = FX32_CONST(v2) + (256 * FX32_ONE);
 
-        param0->unk_68 = GraphicElementManager_AddElement(&v7);
+        param0->unk_68 = CellActorCollection_Add(&v7);
     }
 }
 
 static void ov70_02260228 (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225E4EC * param1)
 {
     sub_0201ED1C(SpriteActor_ImageProxy(param0->unk_68));
-    GraphicElementData_Delete(param0->unk_68);
+    CellActor_Delete(param0->unk_68);
 
     param0->unk_68 = NULL;
 
@@ -3025,7 +3025,7 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
             sub_02009D4C(param0->unk_BC[v0]);
             sub_020093B4(&v9, 150 + v0, 150 + v10->unk_00, 150 + v10->unk_00, 150 + v10->unk_00, 0xffffffff, 0xffffffff, 0, 0, param1->unk_194[0], param1->unk_194[1], param1->unk_194[2], param1->unk_194[3], NULL, NULL);
 
-            v8.manager = param1->unk_04;
+            v8.collection = param1->unk_04;
             v8.resourceData = &v9;
             v8.priority = 0;
             v8.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -3034,9 +3034,9 @@ static void ov70_022603CC (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
             v8.position.x += FX32_CONST(v10->unk_04);
             v8.position.y += FX32_CONST(v10->unk_06);
 
-            param0->unk_7C[v0] = GraphicElementManager_AddElement(&v8);
+            param0->unk_7C[v0] = CellActorCollection_Add(&v8);
 
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_7C[v0], v10->unk_01);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_7C[v0], v10->unk_01);
         }
     }
 
@@ -3049,7 +3049,7 @@ static void ov70_0226068C (UnkStruct_ov70_0225FA84 * param0, UnkStruct_ov70_0225
 
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_BC[v0] != NULL) {
-            GraphicElementData_Delete(param0->unk_7C[v0]);
+            CellActor_Delete(param0->unk_7C[v0]);
 
             param0->unk_7C[v0] = NULL;
 
diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c
index a7542b8977..4eb6e39b3e 100644
--- a/src/overlay071/ov71_0223B140.c
+++ b/src/overlay071/ov71_0223B140.c
@@ -238,9 +238,9 @@ int ov71_0223B140 (OverlayManager * param0, int * param1)
                 }
 
                 if (v5 == 4 - 1) {
-                    GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[8 + v6], 1);
+                    CellActor_SetDrawFlag(v0->unk_30E4.unk_1C0[8 + v6], 1);
                 } else if (v5 == 4) {
-                    GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
+                    CellActor_SetDrawFlag(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
                 }
             }
         }
@@ -280,9 +280,9 @@ int ov71_0223B388 (OverlayManager * param0, int * param1)
                 v0->unk_3350 = 1;
                 v0->unk_3381 = 1;
 
-                GraphicElementData_SetDrawFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
-                GraphicElementData_SetAnimateFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
-                GraphicElementData_SetAnim(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
+                CellActor_SetDrawFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                CellActor_SetAnimateFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                CellActor_SetAnim(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
 
                 v0->unk_337E = 0;
                 v0->unk_3380 = 0;
@@ -378,7 +378,7 @@ int ov71_0223B388 (OverlayManager * param0, int * param1)
     }
 
     ov71_0223C2F4(v0);
-    GraphicElementManager_Update(v0->unk_30E4.unk_00);
+    CellActorCollection_Update(v0->unk_30E4.unk_00);
 
     return 0;
 }
@@ -1110,10 +1110,10 @@ static void ov71_0223C1AC (UnkStruct_ov71_0223B620 * param0, const u8 param1)
                 }
 
                 if (v1 == 4 - 1) {
-                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 1);
+                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 1);
                 } else if (v1 == 4) {
-                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 0);
-                    GraphicElementData_SetDrawFlag(param0->unk_30E4.unk_1C0[(8 + 8) + param1], 1);
+                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 0);
+                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[(8 + 8) + param1], 1);
                 }
             }
         }
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 6b6a7dcfc0..8d1160e80e 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -112,7 +112,7 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         u8 v2;
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -128,12 +128,12 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
         for (v0 = 0; v0 < 8; v0++) {
             v3.position.x = FX32_ONE * Unk_ov71_0223D73C[v0].unk_00;
             v3.position.y = FX32_ONE * Unk_ov71_0223D73C[v0].unk_04;
-            param0->unk_1C0[v0] = GraphicElementManager_AddElementEx(&v3);
-            GraphicElementData_SetAnimateFlag(param0->unk_1C0[v0], 0);
-            GraphicElementData_SetAnim(param0->unk_1C0[v0], v0);
+            param0->unk_1C0[v0] = CellActorCollection_AddEx(&v3);
+            CellActor_SetAnimateFlag(param0->unk_1C0[v0], 0);
+            CellActor_SetAnim(param0->unk_1C0[v0], v0);
 
             if (!param1[v0]) {
-                GraphicElementData_SetDrawFlag(param0->unk_1C0[v0], 0);
+                CellActor_SetDrawFlag(param0->unk_1C0[v0], 0);
             }
         }
 
@@ -144,10 +144,10 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
-                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
-                GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
-                GraphicElementData_SetAnim(param0->unk_1C0[v2 + v0], 8);
-                GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
+                param0->unk_1C0[v2 + v0] = CellActorCollection_AddEx(&v3);
+                CellActor_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
+                CellActor_SetAnim(param0->unk_1C0[v2 + v0], 8);
+                CellActor_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
 
             v2 += 8;
@@ -156,10 +156,10 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
                 v3.position.x = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_00;
                 v3.position.y = FX32_ONE * Unk_ov71_0223D6FC[v0].unk_04;
                 v3.priority = 1;
-                param0->unk_1C0[v2 + v0] = GraphicElementManager_AddElementEx(&v3);
-                GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
-                GraphicElementData_SetAnim(param0->unk_1C0[v2 + v0], 9);
-                GraphicElementData_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
+                param0->unk_1C0[v2 + v0] = CellActorCollection_AddEx(&v3);
+                CellActor_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
+                CellActor_SetAnim(param0->unk_1C0[v2 + v0], 9);
+                CellActor_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
         }
         v2 += 8;
@@ -169,10 +169,10 @@ void ov71_0223D070 (UnkStruct_ov71_0223D238 * param0, const u8 * param1)
             v3.position.x = FX32_ONE * (12 * 8);
             v3.position.y = FX32_ONE * (17 * 8);
             v3.priority = 0;
-            param0->unk_1C0[v2] = GraphicElementManager_AddElementEx(&v3);
-            GraphicElementData_SetAnimateFlag(param0->unk_1C0[v2], 0);
-            GraphicElementData_SetAnim(param0->unk_1C0[v2], 10);
-            GraphicElementData_SetDrawFlag(param0->unk_1C0[v2], 0);
+            param0->unk_1C0[v2] = CellActorCollection_AddEx(&v3);
+            CellActor_SetAnimateFlag(param0->unk_1C0[v2], 0);
+            CellActor_SetAnim(param0->unk_1C0[v2], 10);
+            CellActor_SetDrawFlag(param0->unk_1C0[v2], 0);
         }
     }
 }
@@ -192,7 +192,7 @@ void ov71_0223D238 (UnkStruct_ov71_0223D238 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -208,7 +208,7 @@ void ov71_0223D298 (UnkStruct_ov71_0223D238 * param0, const u8 param1, const u8
     GF_ASSERT(param1 < 8);
     GF_ASSERT(param2 <= 3);
 
-    v0 = GraphicElementData_GetPaletteProxy(param0->unk_1C0[param1]);
+    v0 = CellActor_GetPaletteProxy(param0->unk_1C0[param1]);
     v1 = NNS_G2dGetImagePaletteLocation(v0, NNS_G2D_VRAM_TYPE_2DMAIN);
     v1 += param1 * (16 * 2);
     v3 = param0->unk_244[param1]->pRawData;
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index ab78adba41..f714c0e6a4 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -92,8 +92,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(GraphicElementData ** param0, int param1);
-static void ov72_0223E3A8(GraphicElementData ** param0, BOOL param1);
+static void ov72_0223E388(CellActor ** param0, int param1);
+static void ov72_0223E3A8(CellActor ** 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);
@@ -204,7 +204,7 @@ int ov72_0223D920 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_3C);
+    CellActorCollection_Update(v0->unk_3C);
 
     return 0;
 }
@@ -226,7 +226,7 @@ int ov72_0223D984 (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_1CC[v1]);
     }
 
-    GraphicElementManager_Delete(v0->unk_3C);
+    CellActorCollection_Delete(v0->unk_3C);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -521,7 +521,7 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_3C;
+        v1.collection = param0->unk_3C;
         v1.resourceData = &param0->unk_1FC;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -537,14 +537,14 @@ static void ov72_0223DF58 (UnkStruct_ov72_0223DB98 * param0)
             v1.position.x = FX32_ONE * (Unk_ov72_0223EB3C[v0][0]);
             v1.position.y = FX32_ONE * (Unk_ov72_0223EB3C[v0][1]);
 
-            param0->unk_2B4[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_2B4[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_2B4[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
-            GraphicElementData_SetExplicitPalette(param0->unk_2B4[v0], 0);
+            CellActor_SetAnimateFlag(param0->unk_2B4[v0], 1);
+            CellActor_SetAnim(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
+            CellActor_SetExplicitPalette(param0->unk_2B4[v0], 0);
 
             if (v0 == 0) {
-                GraphicElementData_SetExplicitPriority(param0->unk_2B4[v0], 2);
+                CellActor_SetExplicitPriority(param0->unk_2B4[v0], 2);
             }
         }
     }
@@ -694,25 +694,25 @@ static void ov72_0223E2A8 (UnkStruct_ov72_0223DB98 * param0)
     }
 }
 
-static void ov72_0223E388 (GraphicElementData ** param0, int param1)
+static void ov72_0223E388 (CellActor ** param0, int param1)
 {
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
         if (v0 == param1) {
-            GraphicElementData_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
+            CellActor_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
         } else {
-            GraphicElementData_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2]);
+            CellActor_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2]);
         }
     }
 }
 
-static void ov72_0223E3A8 (GraphicElementData ** param0, BOOL param1)
+static void ov72_0223E3A8 (CellActor ** param0, BOOL param1)
 {
     if (param1 == 1) {
-        GraphicElementData_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
+        CellActor_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
     } else {
-        GraphicElementData_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2]);
+        CellActor_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2]);
     }
 }
 
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index 00312317c6..fda2208c9b 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -600,7 +600,7 @@ void ov76_0223C188 (UnkStruct_ov76_0223DE00 * param0)
         v4 = Pokemon_GetValue(v5, MON_DATA_FORM, NULL);
         v3 = PokeIconPaletteIndex(v2, v4, v1);
 
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_2FC[v0]->unk_00, v3);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_2FC[v0]->unk_00, v3);
         sub_0200D364(param0->unk_2FC[v0], 1);
     }
 }
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 6582e703c9..317548a2f3 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 {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[11][4];
-    GraphicElementData * unk_250[17];
+    CellActor * unk_250[17];
     CellActorResourceData unk_294[3];
     NNSG2dCellTransferState * unk_300;
 } UnkStruct_ov77_021D5564;
@@ -118,7 +118,7 @@ static void ov77_021D54E8 (const int param0, UnkStruct_ov77_021D5564 * param1, c
     sub_020093B4(param4, param0, param0, param0, param0, 0xffffffff, 0xffffffff, param5, param2, param1->unk_190[0], param1->unk_190[1], param1->unk_190[2], param1->unk_190[3], NULL, NULL);
 
     {
-        param3->manager = param1->unk_00;
+        param3->collection = param1->unk_00;
         param3->resourceData = param4;
         param3->position.x = 0;
         param3->position.y = 0;
@@ -223,7 +223,7 @@ void ov77_021D5BAC (UnkStruct_ov77_021D5564 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 3; v0++) {
         sub_020094F0(&param0->unk_294[v0]);
@@ -270,104 +270,104 @@ void ov77_021D5C3C (UnkStruct_ov77_021D5564 * param0)
 
         v2.position.x = FX32_ONE * (128 - 48);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[0] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[0] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_250[0], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[0], 0);
+        CellActor_SetDrawFlag(param0->unk_250[0], 0);
 
         ov77_021D54E8(1, param0, 0, &v2, &param0->unk_294[2], 1, NNS_G2D_VRAM_TYPE_2DSUB);
 
         v2.position.x = FX32_ONE * (128 - 48);
         v2.position.y = FX32_ONE * (14 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[1] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[1] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[1], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_250[1], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[1], 0);
+        CellActor_SetDrawFlag(param0->unk_250[1], 0);
 
         ov77_021D54E8(2, param0, 0, &v2, &param0->unk_294[1], 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         v2.position.x = FX32_ONE * (128 + 48);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[2] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[2] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[2], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_250[2], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[2], 0);
+        CellActor_SetDrawFlag(param0->unk_250[2], 0);
 
         ov77_021D54E8(3, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         v2.position.x = FX32_ONE * -64;
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[3] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[3] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[3], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[3], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[3], 1);
+        CellActor_SetDrawFlag(param0->unk_250[3], 0);
 
         ov77_021D54E8(6, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         v2.position.x = FX32_ONE * (256 + 64);
         v2.position.y = FX32_ONE * (14 * 8);
-        param0->unk_250[10] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[10] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[10], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[10], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[10], 1);
+        CellActor_SetDrawFlag(param0->unk_250[10], 0);
 
         ov77_021D54E8(7, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (12 * 8);
-        param0->unk_250[11] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[11] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[11], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[11], 0);
-        GraphicElementData_SetAffineOverwriteMode(param0->unk_250[11], 1);
+        CellActor_SetAnimateFlag(param0->unk_250[11], 1);
+        CellActor_SetDrawFlag(param0->unk_250[11], 0);
+        CellActor_SetAffineOverwriteMode(param0->unk_250[11], 1);
 
         ov77_021D54E8(8, param0, 1, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (12 * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[12] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[12] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[12], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[12], 0);
-        GraphicElementData_SetAffineOverwriteMode(param0->unk_250[12], 1);
+        CellActor_SetAnimateFlag(param0->unk_250[12], 1);
+        CellActor_SetDrawFlag(param0->unk_250[12], 0);
+        CellActor_SetAffineOverwriteMode(param0->unk_250[12], 1);
 
         ov77_021D54E8(9, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (0xd * 8);
-        param0->unk_250[13] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[13] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[13], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[13], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[13], 1);
+        CellActor_SetDrawFlag(param0->unk_250[13], 0);
 
-        param0->unk_250[14] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[14] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[14], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[14], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[14], 1);
+        CellActor_SetDrawFlag(param0->unk_250[14], 0);
 
         ov77_021D54E8(10, param0, 3, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
         v2.position.x = FX32_ONE * 128;
         v2.position.y = FX32_ONE * (0xd * 8) + (192 << FX32_SHIFT);
-        param0->unk_250[15] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[15] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[15], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[15], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[15], 1);
+        CellActor_SetDrawFlag(param0->unk_250[15], 0);
 
-        param0->unk_250[16] = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_250[16] = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_250[16], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_250[16], 0);
+        CellActor_SetAnimateFlag(param0->unk_250[16], 1);
+        CellActor_SetDrawFlag(param0->unk_250[16], 0);
 
         for (v0 = 0; v0 < 6; v0++) {
             ov77_021D54E8(4, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
             v2.position.x = FX32_ONE * v4[v0];
             v2.position.y = FX32_ONE * v5[v0];
-            param0->unk_250[v3[v0]] = GraphicElementManager_AddElementEx(&v2);
+            param0->unk_250[v3[v0]] = CellActorCollection_AddEx(&v2);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_250[v3[v0]], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_250[v3[v0]], 0);
+            CellActor_SetAnimateFlag(param0->unk_250[v3[v0]], 1);
+            CellActor_SetDrawFlag(param0->unk_250[v3[v0]], 0);
         }
     }
 }
@@ -377,16 +377,16 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
     int v0;
     CellActorResourceData v1;
     CellActorInitParamsEx v2;
-    GraphicElementData ** v3;
+    CellActor ** v3;
 
     {
         ov77_021D54E8(5, param0, 0, &v2, &v1, 0, NNS_G2D_VRAM_TYPE_2DSUB);
 
         for (v0 = 0; v0 < 16; v0++) {
             v3 = ov77_021D6794(param1, v0);
-            (*v3) = GraphicElementManager_AddElementEx(&v2);
-            GraphicElementData_SetAnimateFlag(*v3, 0);
-            GraphicElementData_SetDrawFlag(*v3, 0);
+            (*v3) = CellActorCollection_AddEx(&v2);
+            CellActor_SetAnimateFlag(*v3, 0);
+            CellActor_SetDrawFlag(*v3, 0);
         }
     }
 }
@@ -394,17 +394,17 @@ void ov77_021D5FB4 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 *
 void ov77_021D6000 (UnkStruct_ov77_021D5564 * param0, UnkStruct_ov77_021D6734 * param1)
 {
     int v0;
-    GraphicElementData ** v1;
+    CellActor ** v1;
 
     for (v0 = 0; v0 < 16; v0++) {
         v1 = ov77_021D6794(param1, v0);
-        GraphicElementData_SetDrawFlag(*v1, 0);
+        CellActor_SetDrawFlag(*v1, 0);
     }
 }
 
 void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0)
 {
-    GraphicElementManager_Update(param0->unk_00);
+    CellActorCollection_Update(param0->unk_00);
 
     if (param0->unk_300 != NULL) {
         sub_0201DCE8();
@@ -413,29 +413,29 @@ void ov77_021D6020 (UnkStruct_ov77_021D5564 * param0)
 
 void ov77_021D603C (UnkStruct_ov77_021D5564 * param0, const u8 param1, const u8 param2)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_250[param1], param2);
+    CellActor_SetDrawFlag(param0->unk_250[param1], param2);
 }
 
 void ov77_021D6050 (UnkStruct_ov77_021D5564 * param0, const u8 param1)
 {
-    GraphicElementData_SetAnimateFlag(param0->unk_250[0], param1);
-    GraphicElementData_SetAnimateFlag(param0->unk_250[2], param1);
-    GraphicElementData_SetAnimateFlag(param0->unk_250[1], param1);
+    CellActor_SetAnimateFlag(param0->unk_250[0], param1);
+    CellActor_SetAnimateFlag(param0->unk_250[2], param1);
+    CellActor_SetAnimateFlag(param0->unk_250[1], param1);
 }
 
 void ov77_021D607C (UnkStruct_ov77_021D5564 * param0)
 {
     VecFx32 v0;
 
-    v0 = *GraphicElementData_GetPosition(param0->unk_250[1]);
+    v0 = *CellActor_GetPosition(param0->unk_250[1]);
     v0.x -= 0x200;
 
-    GraphicElementData_SetPosition(param0->unk_250[1], &v0);
+    CellActor_SetPosition(param0->unk_250[1], &v0);
 
-    v0 = *GraphicElementData_GetPosition(param0->unk_250[2]);
+    v0 = *CellActor_GetPosition(param0->unk_250[2]);
     v0.x += 0x200;
 
-    GraphicElementData_SetPosition(param0->unk_250[2], &v0);
+    CellActor_SetPosition(param0->unk_250[2], &v0);
 }
 
 BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -451,29 +451,29 @@ BOOL ov77_021D60E0 (UnkStruct_ov77_021D5564 * param0, int param1)
     }
 
     if (param1 < (53 * 30 - 15)) {
-        v0 = *GraphicElementData_GetPosition(param0->unk_250[3]);
+        v0 = *CellActor_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (FX32_ONE * ((128 + 48)))) {
             v0.x = (FX32_ONE * ((128 + 48)));
-            GraphicElementData_SetPosition(param0->unk_250[3], &v0);
+            CellActor_SetPosition(param0->unk_250[3], &v0);
             return 1;
         }
 
-        GraphicElementData_SetPosition(param0->unk_250[3], &v0);
+        CellActor_SetPosition(param0->unk_250[3], &v0);
         return 0;
     } else {
-        v0 = *GraphicElementData_GetPosition(param0->unk_250[3]);
+        v0 = *CellActor_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (256 + 64) * FX32_ONE) {
             v0.x = (256 + 64) * FX32_ONE;
-            GraphicElementData_SetPosition(param0->unk_250[3], &v0);
+            CellActor_SetPosition(param0->unk_250[3], &v0);
             ov77_021D603C(param0, 3, 0);
             return 1;
         }
 
-        GraphicElementData_SetPosition(param0->unk_250[3], &v0);
+        CellActor_SetPosition(param0->unk_250[3], &v0);
         return 0;
     }
 }
@@ -491,29 +491,29 @@ BOOL ov77_021D61B8 (UnkStruct_ov77_021D5564 * param0, int param1)
     }
 
     if (param1 < ((53 * 30 - 15))) {
-        v0 = *GraphicElementData_GetPosition(param0->unk_250[10]);
+        v0 = *CellActor_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= (FX32_ONE * ((128 - 48)))) {
             v0.x = (FX32_ONE * ((128 - 48)));
-            GraphicElementData_SetPosition(param0->unk_250[10], &v0);
+            CellActor_SetPosition(param0->unk_250[10], &v0);
             return 1;
         }
 
-        GraphicElementData_SetPosition(param0->unk_250[10], &v0);
+        CellActor_SetPosition(param0->unk_250[10], &v0);
         return 0;
     } else {
-        v0 = *GraphicElementData_GetPosition(param0->unk_250[10]);
+        v0 = *CellActor_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= -64 * FX32_ONE) {
             v0.x = -64 * FX32_ONE;
-            GraphicElementData_SetPosition(param0->unk_250[10], &v0);
+            CellActor_SetPosition(param0->unk_250[10], &v0);
             ov77_021D603C(param0, 10, 0);
             return 1;
         }
 
-        GraphicElementData_SetPosition(param0->unk_250[10], &v0);
+        CellActor_SetPosition(param0->unk_250[10], &v0);
         return 0;
     }
 }
@@ -532,7 +532,7 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v3 = 13;
     }
 
-    v0 = GraphicElementData_GetPosition(param0->unk_250[v2]);
+    v0 = CellActor_GetPosition(param0->unk_250[v2]);
     v1 = *v0;
     v1.x += param1;
 
@@ -540,11 +540,11 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v1.x -= 256 * FX32_ONE;
     }
 
-    GraphicElementData_SetPosition(param0->unk_250[v2], &v1);
+    CellActor_SetPosition(param0->unk_250[v2], &v1);
     v1.x -= 256 * FX32_ONE;
-    GraphicElementData_SetPosition(param0->unk_250[v2 + 1], &v1);
+    CellActor_SetPosition(param0->unk_250[v2 + 1], &v1);
 
-    v0 = GraphicElementData_GetPosition(param0->unk_250[v3]);
+    v0 = CellActor_GetPosition(param0->unk_250[v3]);
     v1 = *v0;
     v1.x -= param1;
 
@@ -552,9 +552,9 @@ void ov77_021D6290 (UnkStruct_ov77_021D5564 * param0, fx32 param1)
         v1.x += 256 * FX32_ONE;
     }
 
-    GraphicElementData_SetPosition(param0->unk_250[v3], &v1);
+    CellActor_SetPosition(param0->unk_250[v3], &v1);
     v1.x += 256 * FX32_ONE;
-    GraphicElementData_SetPosition(param0->unk_250[v3 + 1], &v1);
+    CellActor_SetPosition(param0->unk_250[v3 + 1], &v1);
 }
 
 void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -564,34 +564,34 @@ void ov77_021D636C (UnkStruct_ov77_021D5564 * param0, int param1)
 
     if (param1 == 0) {
         if (gCoreSys.unk_65 == 0) {
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 1);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 1);
         } else {
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 1);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 1);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 0);
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 1);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 1);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 0);
         }
     } else {
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 2);
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 2);
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 2);
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 2);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 2);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 2);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 2);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 2);
     }
 
-    v0 = GraphicElementData_GetPosition(param0->unk_250[13]);
+    v0 = CellActor_GetPosition(param0->unk_250[13]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    GraphicElementData_SetPosition(param0->unk_250[13], &v1);
+    CellActor_SetPosition(param0->unk_250[13], &v1);
 
-    v0 = GraphicElementData_GetPosition(param0->unk_250[15]);
+    v0 = CellActor_GetPosition(param0->unk_250[15]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    GraphicElementData_SetPosition(param0->unk_250[15], &v1);
+    CellActor_SetPosition(param0->unk_250[15], &v1);
 }
 
 void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1)
@@ -609,24 +609,24 @@ void ov77_021D6470 (UnkStruct_ov77_021D5564 * param0, int param1)
         (void)0;
     }
 
-    v0 = GraphicElementData_GetAffineZRotation(param0->unk_250[11]);
-    GraphicElementData_SetAffineZRotation(param0->unk_250[11], v0 + 0x1c00 + v3);
+    v0 = CellActor_GetAffineZRotation(param0->unk_250[11]);
+    CellActor_SetAffineZRotation(param0->unk_250[11], v0 + 0x1c00 + v3);
 
-    v0 = GraphicElementData_GetAffineZRotation(param0->unk_250[12]);
-    GraphicElementData_SetAffineZRotation(param0->unk_250[12], v0 - 0x1c00 - v3);
+    v0 = CellActor_GetAffineZRotation(param0->unk_250[12]);
+    CellActor_SetAffineZRotation(param0->unk_250[12], v0 - 0x1c00 - v3);
 
     if (param1 >= (65 * 30 - 15 - 15 - 45 - 15)) {
-        v1 = GraphicElementData_GetPosition(param0->unk_250[11]);
+        v1 = CellActor_GetPosition(param0->unk_250[11]);
         v2 = *v1;
         v2.x += 0x1000;
 
-        GraphicElementData_SetPosition(param0->unk_250[11], &v2);
+        CellActor_SetPosition(param0->unk_250[11], &v2);
 
-        v1 = GraphicElementData_GetPosition(param0->unk_250[12]);
+        v1 = CellActor_GetPosition(param0->unk_250[12]);
         v2 = *v1;
         v2.x -= 0x1000;
 
-        GraphicElementData_SetPosition(param0->unk_250[12], &v2);
+        CellActor_SetPosition(param0->unk_250[12], &v2);
     }
 }
 
@@ -652,28 +652,28 @@ void ov77_021D6530 (UnkStruct_ov77_021D5564 * param0, const int param1)
 
     if (param1 >= (1460 - 15)) {
         for (v0 = 0; v0 < 3; v0++) {
-            v1 = *GraphicElementData_GetPosition(param0->unk_250[v2[v0]]);
+            v1 = *CellActor_GetPosition(param0->unk_250[v2[v0]]);
             v1.x -= Unk_ov77_021D79AC[v0];
             v1.y -= (FX32_ONE * 4);
-            GraphicElementData_SetPosition(param0->unk_250[v2[v0]], &v1);
+            CellActor_SetPosition(param0->unk_250[v2[v0]], &v1);
         }
     }
 
     if (param1 >= (1490 - 15 + 15)) {
         for (v0 = 0; v0 < 1; v0++) {
-            v1 = *GraphicElementData_GetPosition(param0->unk_250[v3[v0]]);
+            v1 = *CellActor_GetPosition(param0->unk_250[v3[v0]]);
             v1.x -= Unk_ov77_021D79A0[v0];
             v1.y -= (FX32_ONE * 3);
-            GraphicElementData_SetPosition(param0->unk_250[v3[v0]], &v1);
+            CellActor_SetPosition(param0->unk_250[v3[v0]], &v1);
         }
     }
 
     if (param1 >= (1510 - 15 + 15)) {
         for (v0 = 0; v0 < 2; v0++) {
-            v1 = *GraphicElementData_GetPosition(param0->unk_250[v4[v0]]);
+            v1 = *CellActor_GetPosition(param0->unk_250[v4[v0]]);
             v1.x -= Unk_ov77_021D79A4[v0];
             v1.y -= (FX32_ONE * 3);
-            GraphicElementData_SetPosition(param0->unk_250[v4[v0]], &v1);
+            CellActor_SetPosition(param0->unk_250[v4[v0]], &v1);
         }
     }
 }
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index d0e634308b..2e450b2f7c 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;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
     SysTask * unk_08;
 } UnkStruct_ov77_021D6ADC;
 
@@ -54,7 +54,7 @@ typedef struct {
 } UnkStruct_ov77_021D6A0C;
 
 typedef struct {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
     UnkStruct_02009714 * unk_190[4];
     UnkStruct_02009DC8 * unk_1A0[4];
@@ -106,7 +106,7 @@ static void ov77_021D66A0 (UnkStruct_ov77_021D6800 * param0, CellActorInitParams
     sub_020093B4(param2, 0, 0, 0, 0, 0xffffffff, 0xffffffff, 0, 0, param0->unk_190[0], param0->unk_190[1], param0->unk_190[2], param0->unk_190[3], NULL, NULL);
 
     {
-        param1->manager = param0->unk_00;
+        param1->collection = param0->unk_00;
         param1->resourceData = param2;
         param1->position.x = 0;
         param1->position.y = 0;
@@ -163,7 +163,7 @@ void ov77_021D6760 (UnkStruct_ov77_021D6734 * param0)
     Heap_FreeToHeap(param0);
 }
 
-GraphicElementData ** ov77_021D6794 (UnkStruct_ov77_021D6734 * param0, const int param1)
+CellActor ** ov77_021D6794 (UnkStruct_ov77_021D6734 * param0, const int param1)
 {
     GF_ASSERT(param1 < param0->unk_00);
     return &param0->unk_04[param1].unk_04;
@@ -232,7 +232,7 @@ static void ov77_021D691C (UnkStruct_ov77_021D6800 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -249,16 +249,16 @@ static void ov77_021D6964 (UnkStruct_ov77_021D6800 * param0)
         v2.position.x = FX32_ONE * v0 * 2;
         v2.position.y = FX32_ONE * v0 * 2;
 
-        param0->unk_1B0[v0].unk_04 = GraphicElementManager_AddElementEx(&v2);
+        param0->unk_1B0[v0].unk_04 = CellActorCollection_AddEx(&v2);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_1B0[v0].unk_04, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_1B0[v0].unk_04, 0);
+        CellActor_SetAnimateFlag(param0->unk_1B0[v0].unk_04, 0);
+        CellActor_SetDrawFlag(param0->unk_1B0[v0].unk_04, 0);
     }
 }
 
 static void ov77_021D69B4 (UnkStruct_ov77_021D6800 * param0)
 {
-    GraphicElementManager_Update(param0->unk_00);
+    CellActorCollection_Update(param0->unk_00);
 }
 
 void ov77_021D69C0 (UnkStruct_ov77_021D670C * param0, const int param1)
@@ -302,15 +302,15 @@ static void ov77_021D6A44 (UnkStruct_ov77_021D6ADC * param0, const u8 param1, co
         {
             VecFx32 v3;
 
-            v3 = *GraphicElementData_GetPosition(v1->unk_04);
+            v3 = *CellActor_GetPosition(v1->unk_04);
             v3.x = FX32_ONE * (64 + (LCRNG_Next() % 128));
             v3.y = FX32_ONE * (v2 + (LCRNG_Next() % 64));
 
-            GraphicElementData_SetPosition(v1->unk_04, &v3);
+            CellActor_SetPosition(v1->unk_04, &v3);
         }
 
-        GraphicElementData_SetAnimateFlag(v1->unk_04, 1);
-        GraphicElementData_SetDrawFlag(v1->unk_04, 1);
+        CellActor_SetAnimateFlag(v1->unk_04, 1);
+        CellActor_SetDrawFlag(v1->unk_04, 1);
 
         v1->unk_08 = SysTask_Start(ov77_021D6B48, v1, 20);
     }
@@ -357,10 +357,10 @@ static void ov77_021D6B48 (SysTask * param0, void * param1)
     {
         VecFx32 v1;
 
-        v1 = *GraphicElementData_GetPosition(v0->unk_04);
+        v1 = *CellActor_GetPosition(v0->unk_04);
         v1.y += (FX32_ONE * 3);
 
-        GraphicElementData_SetPosition(v0->unk_04, &v1);
+        CellActor_SetPosition(v0->unk_04, &v1);
     }
 
     v0->unk_01++;
@@ -369,8 +369,8 @@ static void ov77_021D6B48 (SysTask * param0, void * param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        GraphicElementData_SetAnimateFlag(v0->unk_04, 0);
-        GraphicElementData_SetDrawFlag(v0->unk_04, 0);
+        CellActor_SetAnimateFlag(v0->unk_04, 0);
+        CellActor_SetDrawFlag(v0->unk_04, 0);
     }
 }
 
@@ -393,19 +393,19 @@ static void ov77_021D6BAC (UnkStruct_ov77_021D6734 * param0, const u8 param1, in
         {
             VecFx32 v3;
 
-            v3 = *GraphicElementData_GetPosition(v2->unk_04);
+            v3 = *CellActor_GetPosition(v2->unk_04);
             v3.x = FX32_ONE * ((16 - 6) + (LCRNG_Next() % 224));
             v3.y = FX32_ONE * (192 + (64 - 6) + (LCRNG_Next() % 56));
 
-            GraphicElementData_SetPosition(v2->unk_04, &v3);
+            CellActor_SetPosition(v2->unk_04, &v3);
         }
 
-        GraphicElementData_SetAnimateFlag(v2->unk_04, 1);
+        CellActor_SetAnimateFlag(v2->unk_04, 1);
 
         if (param2 == 0) {
-            GraphicElementData_SetDrawFlag(v2->unk_04, 1);
+            CellActor_SetDrawFlag(v2->unk_04, 1);
         } else {
-            GraphicElementData_SetDrawFlag(v2->unk_04, 0);
+            CellActor_SetDrawFlag(v2->unk_04, 0);
         }
 
         v2->unk_08 = SysTask_Start(ov77_021D6C44, v2, 20);
@@ -422,7 +422,7 @@ static void ov77_021D6C44 (SysTask * param0, void * param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        GraphicElementData_SetAnimateFlag(v0->unk_04, 0);
-        GraphicElementData_SetDrawFlag(v0->unk_04, 0);
+        CellActor_SetAnimateFlag(v0->unk_04, 0);
+        CellActor_SetDrawFlag(v0->unk_04, 0);
     }
 }
diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c
index f22f0fe2a4..3bfbe0553a 100644
--- a/src/overlay079/ov79_021D0D80.c
+++ b/src/overlay079/ov79_021D0D80.c
@@ -752,12 +752,12 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         param0->unk_1C0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[v0]);
-        GraphicElementData_SetDrawFlag(param0->unk_1C0[v0], 1);
+        CellActor_SetDrawFlag(param0->unk_1C0[v0], 1);
     }
 
-    GraphicElementData_SetAnimateFlag(param0->unk_1C0[0], 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 1);
+    CellActor_SetAnimateFlag(param0->unk_1C0[0], 0);
+    CellActor_SetAnimateFlag(param0->unk_1C0[1], 1);
+    CellActor_SetAnimateFlag(param0->unk_1C0[2], 1);
 
     for (v0 = 0; v0 < 5; v0++) {
         static const struct {
@@ -772,8 +772,8 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
         param0->unk_1CC[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[3]);
 
-        GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 1);
-        GraphicElementData_SetAnim(param0->unk_1CC[v0], v0 + 3);
+        CellActor_SetDrawFlag(param0->unk_1CC[v0], 1);
+        CellActor_SetAnim(param0->unk_1CC[v0], v0 + 3);
         SpriteActor_SetPositionXY(param0->unk_1CC[v0], v2[v0].unk_00, v2[v0].unk_02);
     }
 
@@ -791,11 +791,11 @@ static void ov79_021D167C (UnkStruct_ov79_021D0E1C * param0)
 
         param0->unk_1E0[v0] = sub_0200CA08(param0->unk_1B8, param0->unk_1BC, &v1[4]);
 
-        GraphicElementData_SetDrawFlag(param0->unk_1E0[v0], 1);
-        GraphicElementData_SetAnim(param0->unk_1E0[v0], v0 * 3);
-        GraphicElementData_SetAnimSpeed(param0->unk_1E0[v0], FX32_CONST(2));
-        GraphicElementData_SetExplicitPalette(param0->unk_1E0[v0], v0 + 2);
-        GraphicElementData_SetAnimateFlag(param0->unk_1E0[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_1E0[v0], 1);
+        CellActor_SetAnim(param0->unk_1E0[v0], v0 * 3);
+        CellActor_SetAnimSpeed(param0->unk_1E0[v0], FX32_CONST(2));
+        CellActor_SetExplicitPalette(param0->unk_1E0[v0], v0 + 2);
+        CellActor_SetAnimateFlag(param0->unk_1E0[v0], 0);
         SpriteActor_SetPositionXY(param0->unk_1E0[v0], v3[v0].unk_00, v3[v0].unk_02);
     }
 
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 195bf1d28b..6189d1d20d 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -215,30 +215,30 @@ void ov79_021D1B24 (UnkStruct_ov79_021D0E1C * param0, u8 param1, u8 param2)
 {
     switch (param2) {
     case 0:
-        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3);
-        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 0);
+        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3);
+        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 0);
         sub_0201C04C(
             &param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         break;
     case 1:
-        GraphicElementData_RestartAnim(param0->unk_1E0[param1]);
-        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
+        CellActor_RestartAnim(param0->unk_1E0[param1]);
+        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 2:
-        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
+        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
     case 3:
-        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2);
+        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 4:
-        GraphicElementData_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
-        GraphicElementData_SetAnimateFlag(param0->unk_1E0[param1], 1);
+        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
+        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1);
         sub_0201C04C(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
@@ -289,16 +289,16 @@ static void ov79_021D1D20 (UnkStruct_ov79_021D0E1C * param0, UnkStruct_020989DC
 
     if (param1 == NULL) {
         for (v0 = 0; v0 < 5; v0++) {
-            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 0);
+            CellActor_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
         return;
     }
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_20_val2 & v1) {
-            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 1);
+            CellActor_SetDrawFlag(param0->unk_1CC[v0], 1);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_1CC[v0], 0);
+            CellActor_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
 
         v1 <<= 1;
@@ -330,15 +330,15 @@ static void ov79_021D1D94 (BmpList * param0, u32 param1, u8 param2)
     SpriteActor_SetPositionXY(v0->unk_1C0[0], 105, v3 * 16 + 40);
 
     if (v2 == 0) {
-        GraphicElementData_SetDrawFlag(v0->unk_1C0[1], 0);
+        CellActor_SetDrawFlag(v0->unk_1C0[1], 0);
     } else {
-        GraphicElementData_SetDrawFlag(v0->unk_1C0[1], 1);
+        CellActor_SetDrawFlag(v0->unk_1C0[1], 1);
     }
 
     if (v2 < (v0->unk_1C - 6)) {
-        GraphicElementData_SetDrawFlag(v0->unk_1C0[2], 1);
+        CellActor_SetDrawFlag(v0->unk_1C0[2], 1);
     } else {
-        GraphicElementData_SetDrawFlag(v0->unk_1C0[2], 0);
+        CellActor_SetDrawFlag(v0->unk_1C0[2], 0);
     }
 
     BGL_WindowColor(&(v0->unk_E8[1]), ((0 << 4) | 0), 0, 0, 10 * 8, 2 * 8);
diff --git a/src/overlay079/ov79_021D20F4.c b/src/overlay079/ov79_021D20F4.c
index 661c9f0980..66ee004379 100644
--- a/src/overlay079/ov79_021D20F4.c
+++ b/src/overlay079/ov79_021D20F4.c
@@ -83,12 +83,12 @@ void ov79_021D21F8 (UnkStruct_ov79_021D0E1C * param0)
 void ov79_021D2214 (UnkStruct_ov79_021D0E1C * param0, BOOL param1)
 {
     if (param1 == 0) {
-        GraphicElementData_SetExplicitPalette(param0->unk_1C0[0], 0);
-        GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 1);
-        GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 1);
+        CellActor_SetExplicitPalette(param0->unk_1C0[0], 0);
+        CellActor_SetAnimateFlag(param0->unk_1C0[1], 1);
+        CellActor_SetAnimateFlag(param0->unk_1C0[2], 1);
     } else {
-        GraphicElementData_SetExplicitPalette(param0->unk_1C0[0], 9);
-        GraphicElementData_SetAnimateFlag(param0->unk_1C0[1], 0);
-        GraphicElementData_SetAnimateFlag(param0->unk_1C0[2], 0);
+        CellActor_SetExplicitPalette(param0->unk_1C0[0], 9);
+        CellActor_SetAnimateFlag(param0->unk_1C0[1], 0);
+        CellActor_SetAnimateFlag(param0->unk_1C0[2], 0);
     }
 }
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 1223602a37..8ea337cbce 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -96,7 +96,7 @@ struct UnkStruct_ov79_021D29B4_t {
     int unk_08;
     UnkStruct_ov79_021D2C50 unk_0C;
     UnkStruct_ov79_021D2C50 unk_68;
-    GraphicElementData * unk_C4;
+    CellActor * unk_C4;
     Sprite * unk_C8;
     UnkStruct_ov79_021D29E4 unk_CC[4];
 };
@@ -656,12 +656,12 @@ static int ov79_021D2A04 (UnkStruct_ov79_021D2928 * param0, UnkStruct_ov79_021D2
     param1->unk_0C.unk_58 = 24;
     param1->unk_0C.unk_54 = 0;
 
-    GraphicElementData_SetPosition(param1->unk_C4, &param1->unk_0C.unk_00);
+    CellActor_SetPosition(param1->unk_C4, &param1->unk_0C.unk_00);
     VEC_Subtract(&param1->unk_0C.unk_00, &param1->unk_0C.unk_0C, &v0);
     ov79_021D2268(&param1->unk_0C.unk_3C, &v0, FX32_CONST(24));
 
-    GraphicElementData_SetAffineOverwriteMode(param1->unk_C4, 1);
-    GraphicElementData_SetAffineScale(param1->unk_C4, &param1->unk_0C.unk_24);
+    CellActor_SetAffineOverwriteMode(param1->unk_C4, 1);
+    CellActor_SetAffineScale(param1->unk_C4, &param1->unk_0C.unk_24);
 
     ov79_021D29B4(param1, 0, ov79_021D2C50);
     ov79_021D29B4(param1, 1, ov79_021D2D7C);
@@ -775,9 +775,9 @@ static void ov79_021D2C50 (SysTask * param0, void * param1)
     VEC_Subtract(&v2->unk_24, &v2->unk_30, &v3);
 
     ov79_021D2268(&v2->unk_3C, &v3, FX32_CONST(v0->unk_04));
-    GraphicElementData_SetDrawFlag(v1->unk_C4, 1);
-    GraphicElementData_SetAffineOverwriteMode(v1->unk_C4, 1);
-    GraphicElementData_SetAffineScale(v1->unk_C4, &v2->unk_24);
+    CellActor_SetDrawFlag(v1->unk_C4, 1);
+    CellActor_SetAffineOverwriteMode(v1->unk_C4, 1);
+    CellActor_SetAffineScale(v1->unk_C4, &v2->unk_24);
     SysTask_SetCallback(param0, ov79_021D2CEC);
 }
 
@@ -791,13 +791,13 @@ static void ov79_021D2CEC (SysTask * param0, void * param1)
     v3.x = v2->unk_24.x - FX_Mul(v2->unk_3C.x, v0->unk_0C);
     v3.y = v2->unk_24.y - FX_Mul(v2->unk_3C.y, v0->unk_0C);
 
-    GraphicElementData_SetAffineScale(v1->unk_C4, &v3);
+    CellActor_SetAffineScale(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
 
     if (v0->unk_04 == 0) {
-        GraphicElementData_SetDrawFlag(v1->unk_C4, 0);
+        CellActor_SetDrawFlag(v1->unk_C4, 0);
         ov79_021D29E4(v0);
     }
 }
@@ -822,7 +822,7 @@ static void ov79_021D2D7C (SysTask * param0, void * param1)
     v2->unk_48 = FX_Div(FX32_CONST(180), FX32_CONST(v0->unk_04));
     v2->unk_4C = FX_Div(FX32_CONST(1), FX32_CONST(v0->unk_04));
 
-    GraphicElementData_SetPosition(v1->unk_C4, &v2->unk_00);
+    CellActor_SetPosition(v1->unk_C4, &v2->unk_00);
     SysTask_SetCallback(param0, ov79_021D2E74);
 }
 
@@ -842,7 +842,7 @@ static void ov79_021D2E74 (SysTask * param0, void * param1)
     v5 = FX32_ONE;
     v3.y += FX_Mul(v4, v5);
 
-    GraphicElementData_SetPosition(v1->unk_C4, &v3);
+    CellActor_SetPosition(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index e03462b261..645757425d 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -42,7 +42,7 @@ typedef struct {
     u16 unk_08;
     u8 unk_0A;
     u8 unk_0B;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
 } UnkStruct_ov80_021D1744;
 
 typedef struct {
@@ -78,9 +78,9 @@ typedef struct {
     UnkStruct_ov80_021D2C1C * unk_9C;
     UnkStruct_ov80_021D2AF4 * unk_A0;
     UnkStruct_ov80_021D2570 unk_A4;
-    GraphicElementData * unk_100;
-    GraphicElementData * unk_104;
-    GraphicElementData * unk_108;
+    CellActor * unk_100;
+    CellActor * unk_104;
+    CellActor * unk_108;
     SysTask * unk_10C;
 } UnkStruct_ov80_021D1478;
 
@@ -627,7 +627,7 @@ static void ov80_021D1C24 (UnkStruct_ov80_021D2A08 * param0)
 
     if (v1->unk_13-- == 3) {
         SpriteActor_SetPositionXY(v1->unk_104, v1->unk_18 * 7 + (48 - 23), v1->unk_1C * 7 + (6 - 40));
-        GraphicElementData_UpdateAnim(v1->unk_104, FX32_ONE);
+        CellActor_UpdateAnim(v1->unk_104, FX32_ONE);
 
         ov80_021D1A30(param0);
         ov80_021D1AB0(param0, &(v1->unk_28[0]), sub_02039F04((const UnkStruct_02039EBC *)param0->unk_30, v1->unk_18, v1->unk_1C), v1->unk_18, v1->unk_1C);
@@ -916,15 +916,15 @@ static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0)
 
     v0->unk_100 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[0]);
 
-    GraphicElementData_SetDrawFlag(v0->unk_100, 0);
-    GraphicElementData_SetAnimSpeed(v0->unk_100, FX32_ONE);
+    CellActor_SetDrawFlag(v0->unk_100, 0);
+    CellActor_SetAnimSpeed(v0->unk_100, FX32_ONE);
     SpriteActor_SetPositionXY(v0->unk_100, 128, 108);
 
     v0->unk_104 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[1]);
 
-    GraphicElementData_SetDrawFlag(v0->unk_104, 1);
-    GraphicElementData_SetAnimSpeed(v0->unk_104, FX32_CONST(2));
-    GraphicElementData_SetAnimateFlag(v0->unk_104, 1);
+    CellActor_SetDrawFlag(v0->unk_104, 1);
+    CellActor_SetAnimSpeed(v0->unk_104, FX32_CONST(2));
+    CellActor_SetAnimateFlag(v0->unk_104, 1);
     SpriteActor_SetPositionXY(v0->unk_104, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 
     if (param0->unk_2C->unk_0C == 0) {
@@ -935,7 +935,7 @@ static void ov80_021D2398 (UnkStruct_ov80_021D2A08 * param0)
 
     v0->unk_108 = sub_0200CA08(param0->unk_D8, param0->unk_DC, &v1);
 
-    GraphicElementData_SetDrawFlag(v0->unk_108, 1);
+    CellActor_SetDrawFlag(v0->unk_108, 1);
     SpriteActor_SetAnimFrame(v0->unk_108, param0->unk_2C->unk_0C);
     SpriteActor_SetPositionXY(v0->unk_108, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 }
@@ -1027,8 +1027,8 @@ static void ov80_021D259C (UnkStruct_ov80_021D2A08 * param0)
         v2->unk_0C = sub_0200CA08(param0->unk_D8, param0->unk_DC, &(Unk_ov80_021D30E8));
 
         SpriteActor_SetPositionXY(v2->unk_0C, v2->unk_00 * 7 + 25, v2->unk_04 * 7 + -34);
-        GraphicElementData_SetPriority(v2->unk_0C, 2);
-        GraphicElementData_SetDrawFlag(v2->unk_0C, 0);
+        CellActor_SetPriority(v2->unk_0C, 2);
+        CellActor_SetDrawFlag(v2->unk_0C, 0);
     }
 
     if (v0->unk_A4.unk_00 == 0) {
@@ -1047,8 +1047,8 @@ static void ov80_021D26AC (SysTask * param0, void * param1)
         return;
     }
 
-    GraphicElementData_SetDrawFlag(v0->unk_0C[v0->unk_0B].unk_0C, 0);
-    GraphicElementData_SetDrawFlag(v0->unk_0C[v0->unk_0A].unk_0C, 1);
+    CellActor_SetDrawFlag(v0->unk_0C[v0->unk_0B].unk_0C, 0);
+    CellActor_SetDrawFlag(v0->unk_0C[v0->unk_0A].unk_0C, 1);
 
     v0->unk_0B = v0->unk_0A;
     v0->unk_0A = (v0->unk_0A + (v0->unk_00 - 1)) % v0->unk_00;
@@ -1096,8 +1096,8 @@ static void ov80_021D2774 (SysTask * param0, void * param1)
 
     switch (v1->unk_04) {
     case 0:
-        GraphicElementData_SetDrawFlag(v1->unk_100, 1);
-        GraphicElementData_SetAnimateFlag(v1->unk_100, 1);
+        CellActor_SetDrawFlag(v1->unk_100, 1);
+        CellActor_SetAnimateFlag(v1->unk_100, 1);
         SpriteActor_SetAnimFrame(v1->unk_100, 1);
         Sound_PlayEffect(1508);
         v1->unk_04++;
@@ -1114,8 +1114,8 @@ static void ov80_021D2774 (SysTask * param0, void * param1)
 
         break;
     case 2:
-        GraphicElementData_SetDrawFlag(v1->unk_100, 0);
-        GraphicElementData_SetAnimateFlag(v1->unk_100, 0);
+        CellActor_SetDrawFlag(v1->unk_100, 0);
+        CellActor_SetAnimateFlag(v1->unk_100, 0);
 
         v0->unk_14 = 0;
         sub_0200F174(4, 13, 2, 0x0, 8, 1, v0->unk_04);
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 9f64663dc8..6c5311e95d 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -71,17 +71,17 @@ UnkStruct_ov80_021D2C1C * ov80_021D2AF4 (SpriteRenderer * param0, SpriteGfxHandl
         v1->unk_14 = param2[v3];
         v1->unk_18 = sub_0200CA08(param0, param1, &v4);
 
-        GraphicElementData_SetDrawFlag(v1->unk_18, 1);
+        CellActor_SetDrawFlag(v1->unk_18, 1);
 
         if (v1->unk_14) {
-            GraphicElementData_SetExplicitPalette(v1->unk_18, 5 + v1->unk_00.unk_09 + v1->unk_14);
+            CellActor_SetExplicitPalette(v1->unk_18, 5 + v1->unk_00.unk_09 + v1->unk_14);
         } else {
             if ((v1->unk_00.unk_0A == 1) || (v1->unk_00.unk_0A == 2)) {
-                GraphicElementData_SetDrawFlag(v1->unk_18, 0);
+                CellActor_SetDrawFlag(v1->unk_18, 0);
             }
         }
 
-        GraphicElementData_UpdateAnim(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
+        CellActor_UpdateAnim(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
         SpriteActor_SetPositionXY(v1->unk_18, v1->unk_00.unk_0C + 25, v1->unk_00.unk_10 + -34);
     }
 
@@ -95,8 +95,8 @@ void ov80_021D2C1C (UnkStruct_ov80_021D2C1C * param0)
 
     for (v1 = 0; v1 < param0->unk_00; v1++) {
         v0 = &param0->unk_08[v1];
-        GraphicElementData_SetAffineZRotationEx(v0->unk_18, 0, 0);
-        GraphicElementData_Delete(v0->unk_18);
+        CellActor_SetAffineZRotationEx(v0->unk_18, 0, 0);
+        CellActor_Delete(v0->unk_18);
     }
 
     Heap_FreeToHeap(param0->unk_08);
@@ -154,7 +154,7 @@ int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int
 
     if ((v0 == NULL) || (v0->unk_14 == 0)) {
         if (param0->unk_04 != NULL) {
-            GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
 
         param0->unk_04 = NULL;
@@ -166,7 +166,7 @@ int ov80_021D2CC0 (UnkStruct_ov80_021D2C1C * param0, int param1, int param2, int
         param0->unk_03 = 0;
     } else {
         if ((v0->unk_00.unk_0A == 2) || (v0->unk_00.unk_0A == 3)) {
-            GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
     }
 
@@ -184,9 +184,9 @@ void ov80_021D2D28 (UnkStruct_ov80_021D2C1C * param0, int param1)
     }
 
     if (param0->unk_03 == 0) {
-        GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
+        CellActor_SetExplicitPalette(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
     } else {
-        GraphicElementData_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+        CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
     }
 
     param0->unk_02++;
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index e322fb640a..b68db114ba 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -411,7 +411,7 @@ static int ov83_0223B9EC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B
     case 5:
         v2 = ov83_0223E32C(&param1->unk_5E4);
         {
-            int v3 = GraphicElementData_GetAnimFrame(param1->unk_5E4.unk_08);
+            int v3 = CellActor_GetAnimFrame(param1->unk_5E4.unk_08);
 
             if (param1->unk_3BC != (v3 + 1) / 3) {
                 if (v3 < 10) {
diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c
index a551aa99a8..9da5ece32b 100644
--- a/src/overlay083/ov83_0223C958.c
+++ b/src/overlay083/ov83_0223C958.c
@@ -134,7 +134,7 @@ void ov83_0223CBA4 (UnkStruct_ov83_0223B784 * param0)
 
     if (param0->unk_31C) {
         if (param0->unk_2C.unk_00) {
-            GraphicElementManager_Update(param0->unk_2C.unk_00);
+            CellActorCollection_Update(param0->unk_2C.unk_00);
         }
     }
 }
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index e0e4d90816..a6b1c4f86e 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -200,7 +200,7 @@ void ov83_0223D784 (UnkStruct_ov83_0223D784 * param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     for (v0 = 0; v0 < 4; v0++) {
@@ -271,12 +271,12 @@ void ov83_0223D95C (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C *
     }
 }
 
-GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
+CellActor * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_ov83_0223D95C * param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
 {
     CellActorInitParams v0;
-    GraphicElementData * v1;
+    CellActor * v1;
 
-    v0.manager = param0->unk_00;
+    v0.collection = param0->unk_00;
     v0.resourceData = &param1->unk_14;
     v0.position.x = param2;
     v0.position.y = param3;
@@ -285,7 +285,7 @@ GraphicElementData * ov83_0223D9A8 (UnkStruct_ov83_0223D784 * param0, UnkStruct_
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param6;
 
-    v1 = GraphicElementManager_AddElement(&v0);
+    v1 = CellActorCollection_Add(&v0);
     GF_ASSERT(v1);
 
     return v1;
@@ -409,11 +409,11 @@ void ov83_0223DB4C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223DB4C *
             ov83_0223D7A8(param2, &param0->unk_28[v1], v2, (70 + ((param1->unk_00[v0].unk_00) - 149)), 1, (6 + ((param1->unk_00[v0].unk_00) - 149)), 5, 4, 1000 + v0, param4);
 
             param0->unk_08[v1] = ov83_0223D9A8(param2, &param0->unk_28[v1], 0, 0, 0, 0, param4);
-            GraphicElementData_SetDrawFlag(param0->unk_08[v1], 0);
+            CellActor_SetDrawFlag(param0->unk_08[v1], 0);
 
             param0->unk_18[v1] = ov83_0223D9A8(param2, &param3[0], 0, 0, 0, 0, param4);
-            GraphicElementData_SetDrawFlag(param0->unk_18[v1], 0);
-            GraphicElementData_SetAnim(param0->unk_18[v1], 1);
+            CellActor_SetDrawFlag(param0->unk_18[v1], 0);
+            CellActor_SetAnim(param0->unk_18[v1], 1);
             v1++;
         }
 
@@ -434,8 +434,8 @@ void ov83_0223DC1C (UnkStruct_ov83_0223DB30 * param0, UnkStruct_ov83_0223D784 *
     GF_ASSERT(param0->unk_00 == 1);
 
     for (v0 = 0; v0 < param0->unk_108; v0++) {
-        GraphicElementData_Delete(param0->unk_08[v0]);
-        GraphicElementData_Delete(param0->unk_18[v0]);
+        CellActor_Delete(param0->unk_08[v0]);
+        CellActor_Delete(param0->unk_18[v0]);
         ov83_0223D95C(param1, &param0->unk_28[v0]);
     }
 
@@ -454,7 +454,7 @@ void ov83_0223DC68 (UnkStruct_ov83_0223DB30 * param0)
         ov83_0223DA34(&param0->unk_16C[v0], Unk_ov83_02240460[v0].unk_0C * FX32_ONE, Unk_ov83_02240460[v0].unk_0E * FX32_ONE, Unk_ov83_02240460[v0].unk_04, Unk_ov83_02240460[v0].unk_10);
 
         v1 = ov83_0223DAFC(param0->unk_10C[v0].unk_00, param0->unk_16C[v0].unk_00, 0);
-        GraphicElementData_SetPosition(param0->unk_08[v0], &v1);
+        CellActor_SetPosition(param0->unk_08[v0], &v1);
 
         param0->unk_1CC[v0] = 0;
         param0->unk_1DC[v0] = Unk_ov83_02240460[v0].unk_11;
@@ -480,7 +480,7 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0)
 
         if (param0->unk_1DC[param0->unk_1EC] <= 0) {
             param0->unk_1CC[param0->unk_1EC] = 1;
-            GraphicElementData_SetDrawFlag(param0->unk_08[param0->unk_1EC], 1);
+            CellActor_SetDrawFlag(param0->unk_08[param0->unk_1EC], 1);
 
             v3 = 2 + param0->unk_1EC;
             param0->unk_1EC++;
@@ -496,20 +496,20 @@ u32 ov83_0223DD30 (UnkStruct_ov83_0223DB30 * param0)
             ov83_0223DA94(&param0->unk_16C[v0]);
 
             v2 = ov83_0223DAFC(param0->unk_10C[v0].unk_00, param0->unk_16C[v0].unk_00, 0);
-            GraphicElementData_SetPosition(param0->unk_08[v0], &v2);
+            CellActor_SetPosition(param0->unk_08[v0], &v2);
 
             if (v1 == 1) {
-                GraphicElementData_SetPosition(param0->unk_18[v0], &v2);
-                GraphicElementData_SetDrawFlag(param0->unk_18[v0], 1);
-                GraphicElementData_SetAnimateFlag(param0->unk_18[v0], 1);
-                GraphicElementData_SetDrawFlag(param0->unk_08[v0], 0);
+                CellActor_SetPosition(param0->unk_18[v0], &v2);
+                CellActor_SetDrawFlag(param0->unk_18[v0], 1);
+                CellActor_SetAnimateFlag(param0->unk_18[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_08[v0], 0);
                 Sound_PlayEffect(1724);
                 param0->unk_1CC[v0]++;
             }
             break;
         case 2:
-            if (GraphicElementData_IsAnimated(param0->unk_18[v0]) == 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_18[v0], 0);
+            if (CellActor_IsAnimated(param0->unk_18[v0]) == 0) {
+                CellActor_SetDrawFlag(param0->unk_18[v0], 0);
                 param0->unk_1CC[v0]++;
             }
             break;
@@ -697,40 +697,40 @@ void ov83_0223E260 (UnkStruct_ov83_0223E244 * param0)
 void ov83_0223E28C (UnkStruct_ov83_0223E244 * param0, UnkStruct_ov83_0223D784 * param1, UnkStruct_ov83_0223D95C * param2, u32 param3, u32 param4, u32 param5)
 {
     param0->unk_08 = ov83_0223D9A8(param1, &param2[param4], (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param3);
-    GraphicElementData_SetDrawFlag(param0->unk_08, 0);
-    GraphicElementData_SetAnim(param0->unk_08, param5);
+    CellActor_SetDrawFlag(param0->unk_08, 0);
+    CellActor_SetAnim(param0->unk_08, param5);
     param0->unk_00 = 1;
 }
 
 void ov83_0223E2C8 (UnkStruct_ov83_0223E244 * param0)
 {
     GF_ASSERT(param0->unk_00 == 1);
-    GraphicElementData_Delete(param0->unk_08);
+    CellActor_Delete(param0->unk_08);
     param0->unk_00 = 0;
 }
 
 void ov83_0223E2E4 (UnkStruct_ov83_0223E244 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_08, 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_08, 1);
+    CellActor_SetDrawFlag(param0->unk_08, 1);
+    CellActor_SetAnimateFlag(param0->unk_08, 1);
 }
 
 void ov83_0223E2FC (UnkStruct_ov83_0223E244 * param0)
 {
     VecFx32 v0;
 
-    GraphicElementData_SetDrawFlag(param0->unk_08, 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_08, 1);
+    CellActor_SetDrawFlag(param0->unk_08, 1);
+    CellActor_SetAnimateFlag(param0->unk_08, 1);
 
     v0.x = 168 * FX32_ONE;
     v0.y = 60 * FX32_ONE;
 
-    GraphicElementData_SetPosition(param0->unk_08, &v0);
+    CellActor_SetPosition(param0->unk_08, &v0);
 }
 
 BOOL ov83_0223E32C (UnkStruct_ov83_0223E244 * param0)
 {
-    if (GraphicElementData_IsAnimated(param0->unk_08) == 0) {
+    if (CellActor_IsAnimated(param0->unk_08) == 0) {
         return 1;
     }
 
@@ -921,9 +921,9 @@ void ov83_0223E5DC (UnkStruct_ov83_0223E5C0 * param0, UnkStruct_ov83_0223D784 *
 
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov83_0223D9A8(param1, &param2[1], 128, 96, 0, 2, param3);
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0], 0);
-        GraphicElementData_SetAnim(param0->unk_04[v0], 4 + v0);
-        GraphicElementData_SetPosition(param0->unk_04[v0], &v1);
+        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
+        CellActor_SetAnim(param0->unk_04[v0], 4 + v0);
+        CellActor_SetPosition(param0->unk_04[v0], &v1);
     }
 
     param0->unk_00 = 1;
@@ -934,7 +934,7 @@ void ov83_0223E63C (UnkStruct_ov83_0223E5C0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(param0->unk_04[v0]);
+        CellActor_Delete(param0->unk_04[v0]);
     }
 
     param0->unk_00 = 0;
@@ -951,7 +951,7 @@ void ov83_0223E658 (UnkStruct_ov83_0223E5C0 * param0)
         v1 = param0->unk_14->unk_130[v0];
         v2.x = v3->unk_00[v1] * FX32_ONE;
         v2.y = v3->unk_04[v1] * FX32_ONE;
-        GraphicElementData_SetPosition(param0->unk_04[v0], &v2);
+        CellActor_SetPosition(param0->unk_04[v0], &v2);
     }
 }
 
@@ -964,7 +964,7 @@ void ov83_0223E69C (UnkStruct_ov83_0223E5C0 * param0, BOOL param1)
         v1 = param0->unk_14->unk_130[v0];
 
         if (ov83_0223D570(param0->unk_1C) != v1) {
-            GraphicElementData_SetDrawFlag(param0->unk_04[v0], param1);
+            CellActor_SetDrawFlag(param0->unk_04[v0], param1);
         }
     }
 }
@@ -1399,7 +1399,7 @@ static void ov83_0223F054 (UnkStruct_ov83_0223F054 * param0)
 {
     GF_ASSERT(param0->unk_78);
 
-    GraphicElementData_Delete(param0->unk_78);
+    CellActor_Delete(param0->unk_78);
     memset(param0, 0, sizeof(UnkStruct_ov83_0223F054));
 }
 
@@ -1415,19 +1415,19 @@ static void ov83_0223F074 (UnkStruct_ov83_0223F054 * param0)
         param0->unk_14.x = param0->unk_30.unk_00;
         param0->unk_14.y = param0->unk_48.unk_00;
 
-        GraphicElementData_SetPosition(param0->unk_78, &param0->unk_14);
+        CellActor_SetPosition(param0->unk_78, &param0->unk_14);
 
         if (param0->unk_0C) {
             param0->unk_20.x = param0->unk_60.unk_00;
             param0->unk_20.y = param0->unk_60.unk_00;
             param0->unk_20.z = param0->unk_60.unk_00;
 
-            GraphicElementData_SetAffineScale(param0->unk_78, &param0->unk_20);
+            CellActor_SetAffineScale(param0->unk_78, &param0->unk_20);
         }
     }
 
     if (param0->unk_08 == 0) {
-        if (GraphicElementData_IsAnimated(param0->unk_78) == 0) {
+        if (CellActor_IsAnimated(param0->unk_78) == 0) {
             param0->unk_08 = 1;
         }
     }
@@ -1465,7 +1465,7 @@ static void ov83_0223F0F4 (UnkStruct_ov83_0223F054 * param0, UnkStruct_ov83_0223
         v0.x += (128 * FX32_ONE);
         v0.y += (96 * FX32_ONE);
 
-        GraphicElementData_SetPosition(param0->unk_78, &v0);
+        CellActor_SetPosition(param0->unk_78, &v0);
     }
 }
 
@@ -1489,12 +1489,12 @@ static void ov83_0223F1C0 (UnkStruct_ov83_0223F054 * param0, int param1, fx32 pa
     GF_ASSERT(param0->unk_78);
 
     if (param0->unk_0C) {
-        GraphicElementData_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
+        CellActor_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
     }
 
-    GraphicElementData_SetAnim(param0->unk_78, param14);
-    GraphicElementData_SetAnimateFlag(param0->unk_78, 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_78, 2);
+    CellActor_SetAnim(param0->unk_78, param14);
+    CellActor_SetAnimateFlag(param0->unk_78, 1);
+    CellActor_SetExplicitPriority(param0->unk_78, 2);
 }
 
 static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0)
@@ -1508,7 +1508,7 @@ static void ov83_0223F268 (UnkStruct_ov83_0223F054 * param0)
     param0->unk_00 = 0;
     param0->unk_0C = 1;
 
-    GraphicElementData_SetAffineOverwriteMode(param0->unk_78, 2);
+    CellActor_SetAffineOverwriteMode(param0->unk_78, 2);
 }
 
 void ov83_0223F29C (UnkStruct_ov83_0223F29C * param0)
@@ -1536,10 +1536,10 @@ void ov83_0223F2C4 (UnkStruct_ov83_0223F29C * param0, UnkStruct_ov83_0223D784 *
         param0->unk_3C[v0].unk_00 = ov83_0223D9A8(param1, &param0->unk_04, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param2);
 
         if (v0 >= 2) {
-            GraphicElementData_SetAnim(param0->unk_3C[v0].unk_00, 1);
+            CellActor_SetAnim(param0->unk_3C[v0].unk_00, 1);
         }
 
-        GraphicElementData_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
     }
 
     param0->unk_7C = 1;
@@ -1552,7 +1552,7 @@ void ov83_0223F348 (UnkStruct_ov83_0223F29C * param0)
     GF_ASSERT(param0->unk_7C == 1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        GraphicElementData_Delete(param0->unk_3C[v0].unk_00);
+        CellActor_Delete(param0->unk_3C[v0].unk_00);
     }
 
     ov83_0223D95C(param0->unk_00, &param0->unk_04);
@@ -1590,7 +1590,7 @@ void ov83_0223F3D0 (UnkStruct_ov83_0223F29C * param0, int param1)
 
     param0->unk_3C[param1].unk_0C = 0;
 
-    GraphicElementData_SetDrawFlag(param0->unk_3C[param1].unk_00, 0);
+    CellActor_SetDrawFlag(param0->unk_3C[param1].unk_00, 0);
 }
 
 BOOL ov83_0223F3F0 (const UnkStruct_ov83_0223F29C * param0, int param1)
@@ -1625,7 +1625,7 @@ static void ov83_0223F420 (UnkStruct_ov83_0223F410 * param0)
         if (param0->unk_08 <= 0) {
             param0->unk_0C = 0;
 
-            GraphicElementData_SetDrawFlag(param0->unk_00, 0);
+            CellActor_SetDrawFlag(param0->unk_00, 0);
         }
     }
 }
@@ -1643,9 +1643,9 @@ static void ov83_0223F458 (UnkStruct_ov83_0223F410 * param0)
     }
 
     if (param0->unk_04 == 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_00, 1);
+        CellActor_SetDrawFlag(param0->unk_00, 1);
     } else if (param0->unk_04 == 8) {
-        GraphicElementData_SetDrawFlag(param0->unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_00, 0);
     } else if (param0->unk_04 == (8 * 2)) {
         param0->unk_04 = 0;
         return;
@@ -1672,7 +1672,7 @@ void ov83_0223F4CC (UnkStruct_ov83_0223F4AC * param0, UnkStruct_ov83_0223D784 *
 
     for (v0 = 0; v0 < 32; v0++) {
         param0->unk_0C[v0].unk_44 = ov83_0223D9A8(param1, &param2[1], 0, 0, 0, 5, param3);
-        GraphicElementData_SetDrawFlag(param0->unk_0C[v0].unk_44, 0);
+        CellActor_SetDrawFlag(param0->unk_0C[v0].unk_44, 0);
     }
 
     param0->unk_00 = 1;
@@ -1683,7 +1683,7 @@ void ov83_0223F510 (UnkStruct_ov83_0223F4AC * param0)
     int v0;
 
     for (v0 = 0; v0 < 32; v0++) {
-        GraphicElementData_Delete(param0->unk_0C[v0].unk_44);
+        CellActor_Delete(param0->unk_0C[v0].unk_44);
     }
 
     param0->unk_00 = 0;
@@ -1752,7 +1752,7 @@ static void ov83_0223F670 (UnkStruct_ov83_0223F670 * param0)
         ov83_0223DA94(&param0->unk_2C);
         param0->unk_08.x = param0->unk_14.unk_00;
         param0->unk_08.y = param0->unk_2C.unk_00;
-        GraphicElementData_SetPosition(param0->unk_44, &param0->unk_08);
+        CellActor_SetPosition(param0->unk_44, &param0->unk_08);
     }
 
     if (param0->unk_04 == 1) {
@@ -1766,7 +1766,7 @@ static void ov83_0223F6B4 (UnkStruct_ov83_0223F670 * param0)
         return;
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_44, 0);
+    CellActor_SetDrawFlag(param0->unk_44, 0);
     param0->unk_00 = 0;
 }
 
@@ -1778,11 +1778,11 @@ static void ov83_0223F6CC (UnkStruct_ov83_0223F670 * param0, int param1, fx32 pa
     param0->unk_08.x = param2;
     param0->unk_08.y = param3;
 
-    GraphicElementData_SetDrawFlag(param0->unk_44, 1);
-    GraphicElementData_SetAnim(param0->unk_44, param1);
-    GraphicElementData_RestartAnim(param0->unk_44);
-    GraphicElementData_SetAnimateFlag(param0->unk_44, 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_44, 2);
+    CellActor_SetDrawFlag(param0->unk_44, 1);
+    CellActor_SetAnim(param0->unk_44, param1);
+    CellActor_RestartAnim(param0->unk_44);
+    CellActor_SetAnimateFlag(param0->unk_44, 1);
+    CellActor_SetExplicitPriority(param0->unk_44, 2);
 
     param0->unk_00 = 1;
     param0->unk_04 = 0;
diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c
index 8ec5178c4d..49cd321c66 100644
--- a/src/overlay084/ov84_022403F4.c
+++ b/src/overlay084/ov84_022403F4.c
@@ -292,7 +292,7 @@ static void ov84_02240950 (UnkStruct_ov84_0223B5A0 * param0)
 
     {
         VecFx32 v1 = {FX32_ONE, FX32_ONE, FX32_ONE};
-        GraphicElementData_SetAffineScaleEx(param0->unk_E0[0]->unk_00, &v1, 2);
+        CellActor_SetAffineScaleEx(param0->unk_E0[0]->unk_00, &v1, 2);
     }
 }
 
@@ -361,7 +361,7 @@ static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0)
 {
     VecFx32 v0;
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_E0[1]->unk_00));
+    v0 = *(CellActor_GetPosition(param0->unk_E0[1]->unk_00));
 
     if (param0->unk_454.unk_01 == 0) {
         v0.x -= param0->unk_454.unk_04[param0->unk_454.unk_03];
@@ -369,12 +369,12 @@ static void ov84_02240B98 (UnkStruct_ov84_0223B5A0 * param0)
         v0.x += param0->unk_454.unk_04[param0->unk_454.unk_03];
     }
 
-    GraphicElementData_SetPosition(param0->unk_E0[1]->unk_00, &v0);
+    CellActor_SetPosition(param0->unk_E0[1]->unk_00, &v0);
     param0->unk_454.unk_03++;
 
     if (param0->unk_454.unk_03 == 8) {
         v0.x = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
-        GraphicElementData_SetPosition(param0->unk_E0[1]->unk_00, &v0);
+        CellActor_SetPosition(param0->unk_E0[1]->unk_00, &v0);
         param0->unk_454.unk_00 = 0;
     }
 }
@@ -389,7 +389,7 @@ static void ov84_02240C48 (UnkStruct_ov84_0223B5A0 * param0)
     VecFx32 v0;
     fx32 v1;
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_E0[1]->unk_00));
+    v0 = *(CellActor_GetPosition(param0->unk_E0[1]->unk_00));
     v1 = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
 
     if (v1 < v0.x) {
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index def7bfdbdc..bed0c42af6 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -70,10 +70,10 @@ typedef struct {
     UnkStruct_0203E234 * unk_0C;
     BGL * unk_10;
     Window unk_14;
-    GraphicElementManager * unk_24;
+    CellActorCollection * unk_24;
     UnkStruct_0200C738 unk_28;
-    GraphicElementData * unk_1B4[6];
-    GraphicElementData * unk_1CC;
+    CellActor * unk_1B4[6];
+    CellActor * unk_1CC;
     void * unk_1D0;
     void * unk_1D4;
     SpriteAnimationFrame unk_1D8[6][10];
@@ -123,14 +123,14 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BDE0;
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BEA0;
@@ -166,7 +166,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     const SpriteAnimationFrame * unk_0C;
     UnkStruct_02008900 unk_10;
     NNSG2dImageProxy unk_24[2];
@@ -203,7 +203,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    GraphicElementData ** unk_08;
+    CellActor ** unk_08;
     UnkStruct_ov86_0223B3C8 * unk_0C;
     int unk_10;
     int unk_14;
@@ -486,7 +486,7 @@ static BOOL ov86_0223B464 (UnkStruct_ov86_0223B3C8 * param0)
         break;
     case 6:
         if (ov86_0223B6B4(param0, 0)) {
-            GraphicElementData_SetDrawFlag(param0->unk_1B4[v0], 0);
+            CellActor_SetDrawFlag(param0->unk_1B4[v0], 0);
 
             if (++v0 < param0->unk_04) {
                 param0->unk_08 = 30;
@@ -606,7 +606,7 @@ static void ov86_0223B6CC (SysTask * param0, void * param1)
     NNS_G3dGePopMtx(1);
     G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
 
-    GraphicElementManager_Update(v0->unk_24);
+    CellActorCollection_Update(v0->unk_24);
     sub_0200A858();
 }
 
@@ -828,7 +828,7 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     v2.imageProxy = &v5;
     v2.paletteProxy = &v6;
 
-    v3.manager = param0->unk_24;
+    v3.collection = param0->unk_24;
     v3.resourceData = &v2;
 
     VEC_Set(&(v3.position), 0, 0, 0);
@@ -846,9 +846,9 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
         NNS_G2dLoadPalette(v8, v12 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v6);
 
         v3.priority = 1 + v12;
-        param0->unk_1B4[v12] = GraphicElementManager_AddElement(&v3);
+        param0->unk_1B4[v12] = CellActorCollection_Add(&v3);
 
-        GraphicElementData_SetDrawFlag(param0->unk_1B4[v12], 0);
+        CellActor_SetDrawFlag(param0->unk_1B4[v12], 0);
         v11 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, param0->unk_2C8[v12]);
         Pokemon_BuildArchivedSprite(&v1, (Pokemon *)v11, 2);
 
@@ -883,9 +883,9 @@ static void ov86_0223BAC8 (UnkStruct_ov86_0223B3C8 * param0, NNSG2dCellDataBank
     sub_02006E84(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63);
 
     v3.priority = 0;
-    param0->unk_1CC = GraphicElementManager_AddElement(&v3);
+    param0->unk_1CC = CellActorCollection_Add(&v3);
 
-    GraphicElementData_SetDrawFlag(param0->unk_1CC, 0);
+    CellActor_SetDrawFlag(param0->unk_1CC, 0);
     Heap_FreeToHeap(v10);
     Heap_FreeToHeap(v9);
 }
@@ -895,12 +895,12 @@ static void ov86_0223BD68 (UnkStruct_ov86_0223B3C8 * param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_Delete(param0->unk_1B4[v0]);
+        CellActor_Delete(param0->unk_1B4[v0]);
     }
 
     Heap_FreeToHeap(param0->unk_1D4);
     Heap_FreeToHeap(param0->unk_1D0);
-    GraphicElementManager_Delete(param0->unk_24);
+    CellActorCollection_Delete(param0->unk_24);
     sub_0200A878();
 }
 
@@ -946,8 +946,8 @@ static void ov86_0223BDE0 (UnkStruct_ov86_0223B3C8 * param0, int param1, int par
 
     VEC_Set(&v1->unk_0C, v0[v2].unk_00, 393216, 0);
 
-    GraphicElementData_SetPosition(v1->unk_08, &v1->unk_0C);
-    GraphicElementData_SetDrawFlag(v1->unk_08, 1);
+    CellActor_SetPosition(v1->unk_08, &v1->unk_0C);
+    CellActor_SetDrawFlag(v1->unk_08, 1);
 
     param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BE6C, v1, 0);
 }
@@ -957,7 +957,7 @@ static void ov86_0223BE6C (SysTask * param0, void * param1)
     UnkStruct_ov86_0223BDE0 * v0 = param1;
 
     v0->unk_0C.x = ov86_0223D284(&v0->unk_18);
-    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
+    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -977,8 +977,8 @@ static void ov86_0223BEA0 (UnkStruct_ov86_0223B3C8 * param0, int param1)
 
     VEC_Set(&v0->unk_0C, FX32_CONST(128), FX32_CONST(232), 0);
 
-    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
-    GraphicElementData_SetDrawFlag(v0->unk_08, 1);
+    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
+    CellActor_SetDrawFlag(v0->unk_08, 1);
 
     param0->unk_1C34[param1] = ov86_0223B744(ov86_0223BF10, v0, 0);
 }
@@ -988,7 +988,7 @@ static void ov86_0223BF10 (SysTask * param0, void * param1)
     UnkStruct_ov86_0223BEA0 * v0 = param1;
 
     v0->unk_0C.y = ov86_0223D284(&v0->unk_18);
-    GraphicElementData_SetPosition(v0->unk_08, &v0->unk_0C);
+    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -1248,7 +1248,7 @@ static void ov86_0223C398 (SysTask * param0, void * param1)
     v1 = sub_02008900(&v0->unk_10);
 
     if (v1 >= 0) {
-        GraphicElementData_SetImageProxy(v0->unk_08, &v0->unk_24[v1]);
+        CellActor_SetImageProxy(v0->unk_08, &v0->unk_24[v1]);
     } else {
         ov86_0223BDCC(&v0->unk_00);
         SysTask_Done(param0);
@@ -1473,8 +1473,8 @@ static void ov86_0223C840 (UnkStruct_ov86_0223B3C8 * param0, int param1)
 
     for (v3 = 0; v3 < v2->unk_14; v3++) {
         v2->unk_94[v3] = v0[v3];
-        GraphicElementData_SetPosition(v2->unk_08[v3], &v0[v3]);
-        GraphicElementData_SetDrawFlag(v2->unk_08[v3], 1);
+        CellActor_SetPosition(v2->unk_08[v3], &v0[v3]);
+        CellActor_SetDrawFlag(v2->unk_08[v3], 1);
     }
 
     for (v3 = 0; v3 < 6; v3++) {
@@ -1493,7 +1493,7 @@ static void ov86_0223C914 (SysTask * param0, void * param1)
         v0->unk_94[v1].x = ov86_0223D284(&v0->unk_1C[v1]);
 
         if (v1 < v0->unk_14) {
-            GraphicElementData_SetPosition(v0->unk_08[v1], &(v0->unk_94[v1]));
+            CellActor_SetPosition(v0->unk_08[v1], &(v0->unk_94[v1]));
         }
     }
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 9ddd434bd6..8c362853dc 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -51,9 +51,9 @@ typedef struct UnkStruct_ov87_021D106C_t {
     int unk_0C;
     BGL * unk_10;
     Window unk_14[2];
-    GraphicElementManager * unk_34;
+    CellActorCollection * unk_34;
     UnkStruct_0200C738 unk_38;
-    GraphicElementData * unk_1C4[6];
+    CellActor * unk_1C4[6];
     void * unk_1DC;
     void * unk_1E0;
     MessageLoader * unk_1E4;
@@ -132,7 +132,7 @@ void ov87_021D1140 (UnkStruct_ov87_021D106C * param0)
         MessageLoader_Free(param0->unk_1EC);
         MessageLoader_Free(param0->unk_1E8);
         MessageLoader_Free(param0->unk_1E4);
-        GraphicElementManager_Delete(param0->unk_34);
+        CellActorCollection_Delete(param0->unk_34);
         sub_0200A878();
         Heap_FreeToHeap(param0->unk_10);
         Heap_FreeToHeap(param0);
@@ -143,7 +143,7 @@ static void ov87_021D11AC (void * param0)
 {
     UnkStruct_ov87_021D106C * v0 = param0;
 
-    GraphicElementManager_Update(v0->unk_34);
+    CellActorCollection_Update(v0->unk_34);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -210,14 +210,14 @@ static BOOL ov87_021D12C0 (UnkStruct_ov87_021D106C * param0, int * param1)
 
     for (v1 = 0; v1 < v0->unk_14; v1++) {
         if (v1 == v0->unk_18) {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
-            GraphicElementData_SetPriority(param0->unk_1C4[v1], 0);
+            CellActor_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
+            CellActor_SetPriority(param0->unk_1C4[v1], 0);
             Sound_FlagDefaultChatotCry(1);
 
             sub_02005844(v0->unk_20[v1].unk_10, v0->unk_20[v1].unk_13);
         } else {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
-            GraphicElementData_SetPriority(param0->unk_1C4[v1], v1 + 1);
+            CellActor_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
+            CellActor_SetPriority(param0->unk_1C4[v1], v1 + 1);
         }
     }
 
@@ -471,7 +471,7 @@ static void ov87_021D186C (UnkStruct_ov87_021D106C * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_1C4[v0]) {
-            GraphicElementData_Delete(param0->unk_1C4[v0]);
+            CellActor_Delete(param0->unk_1C4[v0]);
         }
     }
 
@@ -511,7 +511,7 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
     v1.priority = 0;
     v1.imageProxy = &v3;
     v1.paletteProxy = &v4;
-    v2.manager = param0->unk_34;
+    v2.collection = param0->unk_34;
     v2.resourceData = &v1;
     v2.position.z = 0;
     v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -530,8 +530,8 @@ static void ov87_021D18A0 (UnkStruct_ov87_021D106C * param0, NNSG2dCellDataBank
         v2.position.y = v0[v9].y << FX32_SHIFT;
         v2.priority = v9 + 1;
 
-        param0->unk_1C4[v9] = GraphicElementManager_AddElement(&v2);
-        GraphicElementData_SetDrawFlag(param0->unk_1C4[v9], 0);
+        param0->unk_1C4[v9] = CellActorCollection_Add(&v2);
+        CellActor_SetDrawFlag(param0->unk_1C4[v9], 0);
     }
 
     Heap_FreeToHeap(v8);
@@ -563,16 +563,16 @@ static void ov87_021D1970 (UnkStruct_ov87_021D106C * param0)
         if (v3 == v2->unk_18) {
             Sound_FlagDefaultChatotCry(1);
             sub_02005844(v2->unk_20[v3].unk_10, v2->unk_20[v3].unk_13);
-            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
+            CellActor_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
         } else {
-            GraphicElementData_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
+            CellActor_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
         }
 
-        GraphicElementData_SetDrawFlag(param0->unk_1C4[v3], 1);
+        CellActor_SetDrawFlag(param0->unk_1C4[v3], 1);
     }
 
     for ( ; v3 < 6; v3++) {
-        GraphicElementData_SetDrawFlag(param0->unk_1C4[v3], 0);
+        CellActor_SetDrawFlag(param0->unk_1C4[v3], 0);
     }
 }
 
@@ -581,6 +581,6 @@ static void ov87_021D1AB8 (UnkStruct_ov87_021D106C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_1C4[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_1C4[v0], 0);
     }
 }
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 7c964021b5..414bd7b1c6 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -101,7 +101,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, GraphicElementData * param5);
+static void ov88_0223B2F0(NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, CellActor * param5);
 static void ov88_0223B320(UnkStruct_02095E80 * param0);
 static void ov88_0223C0E0(void * param0);
 static void ov88_0223C15C(void);
@@ -117,8 +117,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, GraphicElementData * param1, int param2);
-static int ov88_0223CFF4(u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4);
+static void ov88_0223CF68(int param0, CellActor * param1, int param2);
+static int ov88_0223CFF4(u32 * param0, int * param1, CellActor * param2, UnkStruct_ov88_0223C8AC * param3, int param4);
 static int ov88_0223C800(int param0, Pokemon * param1, u8 * param2, ArchivedSprite * param3);
 static void ov88_0223E7F0(Journal * param0, Pokemon * param1);
 static void ov88_0223D140(ChatotCry * param0);
@@ -138,7 +138,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(GraphicElementData * param0, int param1, int param2);
+static void ov88_0223E87C(CellActor * 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);
@@ -168,7 +168,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(GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5);
+static void ov88_0223DE7C(CellActor * param0, CellActor * param1, CellActor * 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);
@@ -348,12 +348,12 @@ int ov88_0223B140 (OverlayManager * param0, int * param1)
     return 1;
 }
 
-static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, GraphicElementData * param5)
+static void ov88_0223B2F0 (NNSG2dCharacterData * param0, int param1, int param2, int param3, int param4, CellActor * param5)
 {
     u8 * v0;
 
     GX_LoadOBJ(param0->pRawData, ((4 * 32 + 18) + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
-    GraphicElementData_SetExplicitPaletteOffset(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
+    CellActor_SetExplicitPaletteOffset(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
 }
 
 static void ov88_0223B320 (UnkStruct_02095E80 * param0)
@@ -410,8 +410,8 @@ static void ov88_0223B3C0 (UnkStruct_02095E80 * param0)
     ov88_0223B7A0(param0->unk_2270, 0, param0);
     ov88_0223B7A0(param0->unk_2274, 6, param0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 1);
+    CellActor_SetDrawFlag(param0->unk_39C[0], 1);
+    CellActor_SetDrawFlag(param0->unk_39C[1], 1);
     SetMainCallback(ov88_0223C0E0, param0);
     NARC_dtor(v0);
 }
@@ -502,7 +502,7 @@ int ov88_0223B57C (OverlayManager * param0, int * param1)
 
     if (!v0->unk_44) {
         ov88_0223E848(v0);
-        GraphicElementManager_Update(v0->unk_194);
+        CellActorCollection_Update(v0->unk_194);
     }
 
     sub_02038A1C(26, v0->unk_174);
@@ -544,27 +544,27 @@ static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * para
         DC_FlushRange(param2->unk_818[v1]->pRawData, 0x20 * 4 * 4);
 
         ov88_0223B2F0(param2->unk_818[v1], param2->unk_6F4[v1].unk_00, param2->unk_6F4[v1].unk_06, param2->unk_6F4[v1].unk_05, v1, param2->unk_3D4[v1]);
-        GraphicElementData_SetDrawFlag(param2->unk_3D4[v1], 1);
+        CellActor_SetDrawFlag(param2->unk_3D4[v1], 1);
 
         if (param2->unk_6F4[v1].unk_02 == 0) {
-            GraphicElementData_SetDrawFlag(param2->unk_404[v1], 0);
+            CellActor_SetDrawFlag(param2->unk_404[v1], 0);
         } else {
-            GraphicElementData_SetDrawFlag(param2->unk_404[v1], 1);
-            GraphicElementData_SetAnim(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
+            CellActor_SetDrawFlag(param2->unk_404[v1], 1);
+            CellActor_SetAnim(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
         }
 
         if (param2->unk_6F4[v1].unk_0C == 0) {
-            GraphicElementData_SetDrawFlag(param2->unk_434[v1], 0);
+            CellActor_SetDrawFlag(param2->unk_434[v1], 0);
         } else {
-            GraphicElementData_SetDrawFlag(param2->unk_434[v1], 1);
-            GraphicElementData_SetAnim(param2->unk_434[v1], 21);
+            CellActor_SetDrawFlag(param2->unk_434[v1], 1);
+            CellActor_SetAnim(param2->unk_434[v1], 21);
         }
     }
 
     for (; v0 < 6; v0++) {
-        GraphicElementData_SetDrawFlag(param2->unk_3D4[v0 + param1], 0);
-        GraphicElementData_SetDrawFlag(param2->unk_404[v0 + param1], 0);
-        GraphicElementData_SetDrawFlag(param2->unk_434[v0 + param1], 0);
+        CellActor_SetDrawFlag(param2->unk_3D4[v0 + param1], 0);
+        CellActor_SetDrawFlag(param2->unk_404[v0 + param1], 0);
+        CellActor_SetDrawFlag(param2->unk_434[v0 + param1], 0);
     }
 }
 
@@ -714,7 +714,7 @@ static int ov88_0223B914 (UnkStruct_02095E80 * param0)
                 int v9;
 
                 for (v9 = 0; v9 < 2; v9++) {
-                    GraphicElementData_SetDrawFlag(param0->unk_39C[v9], 1);
+                    CellActor_SetDrawFlag(param0->unk_39C[v9], 1);
                 }
             }
         }
@@ -796,7 +796,7 @@ static void ov88_0223BDA4 (UnkStruct_02095E80 * param0, int param1)
     param0->unk_2168 = ov88_0223C800(1, v0, param0->unk_848[param1 / 6], &param0->unk_2148[param1 / 6]);
 
     ov88_0223C8D8(param0->unk_49C, 1, param0->unk_2274, param1 % 6, param0);
-    GraphicElementData_SetAnim(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
+    CellActor_SetAnim(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
 }
 
 static void ov88_0223BE28 (UnkStruct_02095E80 * param0)
@@ -809,11 +809,11 @@ static void ov88_0223BE28 (UnkStruct_02095E80 * param0)
 
             ov88_0223C8D8(param0->unk_49C, 0, param0->unk_2270, param0->unk_88[0], param0);
             ov88_0223CB34(param0->unk_49C, 1, param0);
-            GraphicElementData_SetDrawFlag(param0->unk_464[3], 0);
+            CellActor_SetDrawFlag(param0->unk_464[3], 0);
         } else {
             ov88_0223BDA4(param0, param0->unk_88[0]);
             ov88_0223CB34(param0->unk_49C, 0, param0);
-            GraphicElementData_SetDrawFlag(param0->unk_464[2], 0);
+            CellActor_SetDrawFlag(param0->unk_464[2], 0);
         }
     }
 }
@@ -862,7 +862,7 @@ static void ov88_0223BF7C (UnkStruct_02095E80 * param0)
         sub_02009754(param0->unk_324[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_194);
+    CellActorCollection_Delete(param0->unk_194);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -1331,15 +1331,15 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
     v5 = Party_GetPokemonBySlotIndex(param2, param3);
     v4 = Pokemon_SpriteYOffset(v5, 2);
 
-    GraphicElementData_SetDrawFlag(param4->unk_464[param1], 1);
+    CellActor_SetDrawFlag(param4->unk_464[param1], 1);
     ov88_0223E87C(param4->unk_464[param1], Unk_ov88_0223EF54[param1][0], Unk_ov88_0223EF54[param1][1] + v4 + 192);
 
     if (param1 == 0) {
-        GraphicElementData_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
+        CellActor_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
     }
 
-    GraphicElementData_SetAnim(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
-    GraphicElementData_SetDrawFlag(param4->unk_464[2 + param1], 1);
+    CellActor_SetAnim(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
+    CellActor_SetDrawFlag(param4->unk_464[2 + param1], 1);
     ov88_0223C860(&param0[26 + param1], param2, param3, 9, 6);
 
     {
@@ -1353,15 +1353,15 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
 
         switch (v6) {
         case 2:
-            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 0);
+            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 0);
             break;
         case 0:
-            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            GraphicElementData_SetAnim(param4->unk_464[4 + param1], 22 + 1);
+            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 1);
+            CellActor_SetAnim(param4->unk_464[4 + param1], 22 + 1);
             break;
         case 1:
-            GraphicElementData_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            GraphicElementData_SetAnim(param4->unk_464[4 + param1], 22);
+            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 1);
+            CellActor_SetAnim(param4->unk_464[4 + param1], 22);
             break;
         }
     }
@@ -1393,9 +1393,9 @@ static void ov88_0223C8D8 (Window * param0, int param1, Party * param2, int para
 
 static void ov88_0223CB34 (Window * param0, int param1, UnkStruct_02095E80 * param2)
 {
-    GraphicElementData_SetDrawFlag(param2->unk_464[param1], 0);
-    GraphicElementData_SetDrawFlag(param2->unk_464[2 + param1], 0);
-    GraphicElementData_SetDrawFlag(param2->unk_464[4 + param1], 0);
+    CellActor_SetDrawFlag(param2->unk_464[param1], 0);
+    CellActor_SetDrawFlag(param2->unk_464[2 + param1], 0);
+    CellActor_SetDrawFlag(param2->unk_464[4 + param1], 0);
     sub_0201ACF4(&param0[26 + param1]);
     sub_0201ACF4(&param0[28 + param1]);
     sub_0201ACF4(&param0[30 + param1]);
@@ -1411,7 +1411,7 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         CellActorInitParamsEx v0;
         int v1;
 
-        v0.manager = param0->unk_194;
+        v0.collection = param0->unk_194;
         v0.resourceData = &param0->unk_354;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -1427,57 +1427,57 @@ static void ov88_0223CBA0 (UnkStruct_02095E80 * param0)
         for (v1 = 0; v1 < 2; v1++) {
             v0.position.x = FX32_ONE * Unk_ov88_0223EF9C[v1][0];
             v0.position.y = FX32_ONE * Unk_ov88_0223EF9C[v1][1];
-            param0->unk_39C[v1] = GraphicElementManager_AddElementEx(&v0);
-            GraphicElementData_SetAnimateFlag(param0->unk_39C[v1], 1);
+            param0->unk_39C[v1] = CellActorCollection_AddEx(&v0);
+            CellActor_SetAnimateFlag(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
-            GraphicElementData_SetPriority(param0->unk_39C[v1], 100);
-            GraphicElementData_SetDrawFlag(param0->unk_39C[v1], 0);
+            CellActor_SetPriority(param0->unk_39C[v1], 100);
+            CellActor_SetDrawFlag(param0->unk_39C[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] - 6);
-            param0->unk_3D4[v1] = GraphicElementManager_AddElementEx(&v0);
-            GraphicElementData_SetAnimateFlag(param0->unk_3D4[v1], 1);
-            GraphicElementData_SetAnim(param0->unk_3D4[v1], 5 + v1);
-            GraphicElementData_SetPriority(param0->unk_3D4[v1], 5);
-            GraphicElementData_SetDrawFlag(param0->unk_3D4[v1], 0);
+            param0->unk_3D4[v1] = CellActorCollection_AddEx(&v0);
+            CellActor_SetAnimateFlag(param0->unk_3D4[v1], 1);
+            CellActor_SetAnim(param0->unk_3D4[v1], 5 + v1);
+            CellActor_SetPriority(param0->unk_3D4[v1], 5);
+            CellActor_SetDrawFlag(param0->unk_3D4[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
-            param0->unk_404[v1] = GraphicElementManager_AddElementEx(&v0);
-            GraphicElementData_SetPriority(param0->unk_404[v1], 3);
-            GraphicElementData_SetDrawFlag(param0->unk_404[v1], 0);
+            param0->unk_404[v1] = CellActorCollection_AddEx(&v0);
+            CellActor_SetPriority(param0->unk_404[v1], 3);
+            CellActor_SetDrawFlag(param0->unk_404[v1], 0);
         }
 
         for (v1 = 0; v1 < 12; v1++) {
             v0.position.x = FX32_ONE * (Unk_ov88_0223EF9C[v1][0] + 16 + 20 + 9);
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF9C[v1][1] + 16);
             v0.priority = 0;
-            param0->unk_434[v1] = GraphicElementManager_AddElementEx(&v0);
-            GraphicElementData_SetPriority(param0->unk_434[v1], 3);
-            GraphicElementData_SetDrawFlag(param0->unk_434[v1], 0);
+            param0->unk_434[v1] = CellActorCollection_AddEx(&v0);
+            CellActor_SetPriority(param0->unk_434[v1], 3);
+            CellActor_SetDrawFlag(param0->unk_434[v1], 0);
         }
 
         v0.position.x = FX32_ONE * (128 - 4 * 8);
         v0.position.y = FX32_ONE * (8 * 8 + 2);
-        param0->unk_47C = GraphicElementManager_AddElementEx(&v0);
-        GraphicElementData_SetAnimateFlag(param0->unk_47C, 1);
-        GraphicElementData_SetAnim(param0->unk_47C, 20);
-        GraphicElementData_SetDrawFlag(param0->unk_47C, 0);
+        param0->unk_47C = CellActorCollection_AddEx(&v0);
+        CellActor_SetAnimateFlag(param0->unk_47C, 1);
+        CellActor_SetAnim(param0->unk_47C, 20);
+        CellActor_SetDrawFlag(param0->unk_47C, 0);
 
         for (v1 = 0; v1 < 6; v1++) {
             v0.resourceData = &param0->unk_378;
             v0.position.x = FX32_ONE * Unk_ov88_0223EF54[v1][0];
             v0.position.y = FX32_ONE * (Unk_ov88_0223EF54[v1][1]) + (192 << FX32_SHIFT);
             v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
-            param0->unk_464[v1] = GraphicElementManager_AddElementEx(&v0);
-            GraphicElementData_SetDrawFlag(param0->unk_464[v1], 0);
-            GraphicElementData_SetAnimateFlag(param0->unk_464[v1], 0);
-            GraphicElementData_SetAnim(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
+            param0->unk_464[v1] = CellActorCollection_AddEx(&v0);
+            CellActor_SetDrawFlag(param0->unk_464[v1], 0);
+            CellActor_SetAnimateFlag(param0->unk_464[v1], 0);
+            CellActor_SetAnim(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
         }
     }
 }
@@ -1542,8 +1542,8 @@ static void ov88_0223CE74 (UnkStruct_02095E80 * param0)
             sub_02005844(v0, v1);
         }
 
-        GraphicElementData_SetAnimateFlag(param0->unk_464[v2], 1);
-        GraphicElementData_SetAnim(param0->unk_464[v2], 4 + v2);
+        CellActor_SetAnimateFlag(param0->unk_464[v2], 1);
+        CellActor_SetAnim(param0->unk_464[v2], 4 + v2);
     }
 }
 
@@ -1587,7 +1587,7 @@ static const int Unk_ov88_0223EE50[][3] = {
     {0x11, 0x12, 0x13}
 };
 
-static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2)
+static void ov88_0223CF68 (int param0, CellActor * param1, int param2)
 {
     VecFx32 v0;
 
@@ -1597,20 +1597,20 @@ static void ov88_0223CF68 (int param0, GraphicElementData * param1, int param2)
     v0.y = FX32_ONE * Unk_ov88_0223EF9C[param0][1];
 
     if (param0 == 12) {
-        GraphicElementData_SetPosition(param1, &v0);
-        GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][2]);
+        CellActor_SetPosition(param1, &v0);
+        CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][2]);
     } else {
-        GraphicElementData_SetPosition(param1, &v0);
+        CellActor_SetPosition(param1, &v0);
 
         if (param0 < 6) {
-            GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][0]);
+            CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][0]);
         } else {
-            GraphicElementData_SetAnim(param1, Unk_ov88_0223EE50[param2][1]);
+            CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][1]);
         }
     }
 }
 
-static int ov88_0223CFF4 (u32 * param0, int * param1, GraphicElementData * param2, UnkStruct_ov88_0223C8AC * param3, int param4)
+static int ov88_0223CFF4 (u32 * param0, int * param1, CellActor * param2, UnkStruct_ov88_0223C8AC * param3, int param4)
 {
     int v0 = *param0 - 1;
     int v1 = 0;
@@ -2183,36 +2183,36 @@ static int ov88_0223DD1C (UnkStruct_02095E80 * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (v0 != param0->unk_88[0]) {
-            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0], 0);
+            CellActor_SetDrawFlag(param0->unk_3D4[v0], 0);
 
             if (param0->unk_6F4[v0].unk_02) {
-                GraphicElementData_SetDrawFlag(param0->unk_404[v0], 0);
+                CellActor_SetDrawFlag(param0->unk_404[v0], 0);
             }
 
             if (param0->unk_6F4[v0].unk_0C) {
-                GraphicElementData_SetDrawFlag(param0->unk_434[v0], 0);
+                CellActor_SetDrawFlag(param0->unk_434[v0], 0);
             }
         }
 
         sub_0201AD10(&param0->unk_49C[7 + v0]);
 
         if (v0 != (param0->unk_88[1] - 6)) {
-            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0 + 6], 0);
+            CellActor_SetDrawFlag(param0->unk_3D4[v0 + 6], 0);
 
             if (param0->unk_6F4[v0 + 6].unk_02) {
-                GraphicElementData_SetDrawFlag(param0->unk_404[v0 + 6], 0);
+                CellActor_SetDrawFlag(param0->unk_404[v0 + 6], 0);
             }
 
             if (param0->unk_6F4[v0 + 6].unk_0C) {
-                GraphicElementData_SetDrawFlag(param0->unk_434[v0 + 6], 0);
+                CellActor_SetDrawFlag(param0->unk_434[v0 + 6], 0);
             }
         }
 
         sub_0201AD10(&param0->unk_49C[13 + v0]);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 0);
+    CellActor_SetDrawFlag(param0->unk_39C[0], 0);
+    CellActor_SetDrawFlag(param0->unk_39C[1], 0);
 
     ov88_0223DE68(param0->unk_231C, Unk_ov88_0223EF9C[param0->unk_88[0]][0] + 16, Unk_ov88_0223EF9C[param0->unk_88[0]][1] + -6, 6 * 8, 6 * 8);
     ov88_0223DE68(param0->unk_2334, Unk_ov88_0223EF9C[param0->unk_88[1]][0] + 16, Unk_ov88_0223EF9C[param0->unk_88[1]][1] + -6, 22 * 8, 6 * 8);
@@ -2231,25 +2231,25 @@ static void ov88_0223DE68 (VecFx32 param0[], int param1, int param2, int param3,
     param0[1].y = FX32_ONE * param4;
 }
 
-static void ov88_0223DE7C (GraphicElementData * param0, GraphicElementData * param1, GraphicElementData * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5)
+static void ov88_0223DE7C (CellActor * param0, CellActor * param1, CellActor * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5)
 {
     VecFx32 v0, v1, v2;
 
     v0.x = param4[0].x + ((param4[1].x - param4[0].x) / 20) * param3;
     v0.y = param4[0].y + ((param4[1].y - param4[0].y) / 20) * param3;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
         v1.x = v0.x + 20 * FX32_ONE;
         v1.y = v0.y + (16 + 6) * FX32_ONE;
-        GraphicElementData_SetPosition(param1, &v1);
+        CellActor_SetPosition(param1, &v1);
     }
 
     if (param5->unk_0C) {
         v2.x = v0.x + (20 + 8) * FX32_ONE;
         v2.y = v0.y + (16 + 6) * FX32_ONE;
-        GraphicElementData_SetPosition(param2, &v2);
+        CellActor_SetPosition(param2, &v2);
     }
 }
 
@@ -2265,7 +2265,7 @@ static int ov88_0223DF00 (UnkStruct_02095E80 * param0)
         ov88_0223C860(&param0->unk_49C[20], param0->unk_2274, param0->unk_88[1] - 6, 8, 1);
         ov88_0223BDA4(param0, param0->unk_88[1]);
         param0->unk_226C = ov88_0223E110;
-        GraphicElementData_SetDrawFlag(param0->unk_47C, 1);
+        CellActor_SetDrawFlag(param0->unk_47C, 1);
     }
 
     return 0;
@@ -2282,27 +2282,27 @@ static void ov88_0223DFF4 (UnkStruct_02095E80 * param0)
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_6F4[v0].unk_00 != 0) {
             ov88_0223E87C(param0->unk_3D4[v0], Unk_ov88_0223EF9C[v0][0] + 16, Unk_ov88_0223EF9C[v0][1] + -6);
-            GraphicElementData_SetDrawFlag(param0->unk_3D4[v0], 1);
+            CellActor_SetDrawFlag(param0->unk_3D4[v0], 1);
 
             if (param0->unk_6F4[v0].unk_02) {
                 ov88_0223E87C(param0->unk_404[v0], Unk_ov88_0223EF9C[v0][0] + (16 + 20), Unk_ov88_0223EF9C[v0][1] + 16);
-                GraphicElementData_SetDrawFlag(param0->unk_404[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_404[v0], 1);
             }
 
             if (param0->unk_6F4[v0].unk_0C) {
                 ov88_0223E87C(param0->unk_434[v0], Unk_ov88_0223EF9C[v0][0] + (16 + 20 + 8), Unk_ov88_0223EF9C[v0][1] + 16);
-                GraphicElementData_SetDrawFlag(param0->unk_434[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_434[v0], 1);
             }
 
             sub_0201A9A4(&param0->unk_49C[7 + v0]);
         }
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_39C[0], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_39C[1], 1);
+    CellActor_SetDrawFlag(param0->unk_39C[0], 1);
+    CellActor_SetDrawFlag(param0->unk_39C[1], 1);
     ov88_0223CB34(param0->unk_49C, 1, param0);
-    GraphicElementData_SetDrawFlag(param0->unk_464[3], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_47C, 0);
+    CellActor_SetDrawFlag(param0->unk_464[3], 0);
+    CellActor_SetDrawFlag(param0->unk_47C, 0);
 }
 
 static int ov88_0223E110 (UnkStruct_02095E80 * param0)
@@ -2558,14 +2558,14 @@ static void ov88_0223E848 (UnkStruct_02095E80 * param0)
     sub_02019184(param0->unk_174, 3, 0, param0->unk_2310);
 }
 
-static void ov88_0223E87C (GraphicElementData * param0, int param1, int param2)
+static void ov88_0223E87C (CellActor * param0, int param1, int param2)
 {
     VecFx32 v0;
 
     v0.x = FX32_ONE * param1;
     v0.y = FX32_ONE * param2;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static void ov88_0223E894 (UnkStruct_02095E80 * param0)
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index d38d6a901e..eac64bb986 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -98,7 +98,7 @@ typedef struct {
     UnkStruct_ov90_021D17F8 unk_BC[30];
     SpriteRenderer * unk_29C;
     SpriteGfxHandler * unk_2A0;
-    GraphicElementData * unk_2A4[4];
+    CellActor * unk_2A4[4];
 } UnkStruct_ov90_021D0ECC;
 
 static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC * param0);
@@ -934,12 +934,12 @@ static void ov90_021D1BAC (UnkStruct_ov90_021D0ECC * param0)
         param0->unk_2A4[v0] = sub_0200CA08(param0->unk_29C, param0->unk_2A0, &v1[v0]);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[0], 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[2], 1);
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[3], 1);
-    GraphicElementData_SetExplicitPriority(param0->unk_2A4[1], 3);
+    CellActor_SetDrawFlag(param0->unk_2A4[2], 0);
+    CellActor_SetDrawFlag(param0->unk_2A4[1], 0);
+    CellActor_SetAnimateFlag(param0->unk_2A4[0], 1);
+    CellActor_SetAnimateFlag(param0->unk_2A4[2], 1);
+    CellActor_SetAnimateFlag(param0->unk_2A4[3], 1);
+    CellActor_SetExplicitPriority(param0->unk_2A4[1], 3);
 }
 
 static void ov90_021D1C28 (UnkStruct_ov90_021D0ECC * param0)
@@ -956,16 +956,16 @@ static void ov90_021D1C44 (UnkStruct_ov90_021D0ECC * param0, BOOL param1)
     BOOL v0;
 
     if (param1 == 0) {
-        GraphicElementData_SetExplicitPalette(param0->unk_2A4[0], 1);
+        CellActor_SetExplicitPalette(param0->unk_2A4[0], 1);
         v0 = 0;
     } else {
-        GraphicElementData_SetExplicitPalette(param0->unk_2A4[0], 0);
+        CellActor_SetExplicitPalette(param0->unk_2A4[0], 0);
         v0 = 1;
     }
 
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[0], v0);
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[2], v0);
-    GraphicElementData_SetAnimateFlag(param0->unk_2A4[3], v0);
+    CellActor_SetAnimateFlag(param0->unk_2A4[0], v0);
+    CellActor_SetAnimateFlag(param0->unk_2A4[2], v0);
+    CellActor_SetAnimateFlag(param0->unk_2A4[3], v0);
 }
 
 static void ov90_021D1C90 (UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param2, u8 param3)
@@ -973,30 +973,30 @@ static void ov90_021D1C90 (UnkStruct_ov90_021D0ECC * param0, u8 param1, u8 param
     u16 v0, v1;
 
     if (param0->unk_0E == 10 - 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 1);
+        CellActor_SetDrawFlag(param0->unk_2A4[1], 1);
 
         if (param1 == 10) {
             SpriteActor_SetAnimFrame(param0->unk_2A4[1], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 0);
+            CellActor_SetDrawFlag(param0->unk_2A4[0], 0);
         } else {
             SpriteActor_SetAnimFrame(param0->unk_2A4[1], 0);
-            GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 1);
+            CellActor_SetDrawFlag(param0->unk_2A4[0], 1);
         }
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[0], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[1], 0);
+        CellActor_SetDrawFlag(param0->unk_2A4[0], 1);
+        CellActor_SetDrawFlag(param0->unk_2A4[1], 0);
     }
 
     switch (param0->unk_0E) {
     case 0:
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 0);
+        CellActor_SetDrawFlag(param0->unk_2A4[2], 0);
         break;
     case (10 - 2):
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[3], 0);
+        CellActor_SetDrawFlag(param0->unk_2A4[3], 0);
         break;
     default:
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[2], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_2A4[3], 1);
+        CellActor_SetDrawFlag(param0->unk_2A4[2], 1);
+        CellActor_SetDrawFlag(param0->unk_2A4[3], 1);
         break;
     }
 
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index 60cd9d0c4d..aff7787af9 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -1335,7 +1335,7 @@ static void ov91_021D20E8 (UnkStruct_ov91_021D0ED8 * param0)
     u16 v0;
 
     for (v0 = 0; v0 < 13; v0++) {
-        GraphicElementData_UpdateAnim(param0->unk_118[v0]->unk_00, FX32_ONE);
+        CellActor_UpdateAnim(param0->unk_118[v0]->unk_00, FX32_ONE);
     }
 }
 
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 401d111c45..8af4051f98 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -203,7 +203,7 @@ int ov94_0223BE2C (OverlayManager * param0, int * param1)
     ov94_0223C598(v0);
 
     if (v0->unk_BE4 != NULL) {
-        GraphicElementManager_Update(v0->unk_BE4);
+        CellActorCollection_Update(v0->unk_BE4);
     }
 
     return 0;
@@ -380,7 +380,7 @@ static void ov94_0223C0D4 (UnkStruct_ov94_0223FD4C * param0)
 
 void ov94_0223C300 (CellActorInitParamsEx * param0, UnkStruct_ov94_0223FD4C * param1, CellActorResourceData * param2, int param3)
 {
-    param0->manager = param1->unk_BE4;
+    param0->collection = param1->unk_BE4;
     param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -429,7 +429,7 @@ void ov94_0223C3F4 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2)
     param0->unk_30 = param2;
 }
 
-void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2)
+void ov94_0223C3FC (CellActor * param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -437,7 +437,7 @@ void ov94_0223C3FC (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static void * ov94_0223C468 (DWCAllocType param0, u32 param1, int param2)
@@ -520,7 +520,7 @@ static void ov94_0223C508 (UnkStruct_ov94_0223FD4C * param0)
         sub_02009754(param0->unk_D74[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_BE4);
+    CellActorCollection_Delete(param0->unk_BE4);
     param0->unk_BE4 = NULL;
 
     sub_0200A878();
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 3ebbb84afe..55d7bd1c93 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -275,7 +275,7 @@ static void ov94_0223C85C (UnkStruct_ov94_0223FD4C * param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_E20, 0);
+    CellActor_SetDrawFlag(param0->unk_E20, 0);
 }
 
 static void ov94_0223C888 (UnkStruct_ov94_0223FD4C * param0)
@@ -313,15 +313,15 @@ static void ov94_0223C950 (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][0];
     v0.position.y = FX32_ONE * Unk_ov94_02245A48[param0->unk_10C][1];
 
-    param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_E20 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    GraphicElementData_SetAnim(param0->unk_E20, 1);
+    CellActor_SetAnimateFlag(param0->unk_E20, 1);
+    CellActor_SetAnim(param0->unk_E20, 1);
 }
 
 static void ov94_0223C9B0 (UnkStruct_ov94_0223FD4C * param0)
 {
-    GraphicElementData_Delete(param0->unk_E20);
+    CellActor_Delete(param0->unk_E20);
 }
 
 static void ov94_0223C9C0 (UnkStruct_ov94_0223FD4C * param0)
@@ -423,7 +423,7 @@ static int ov94_0223CBEC (UnkStruct_ov94_0223FD4C * param0)
 {
     ov94_0223CF80(param0, 4, 1, 0, 0xf0f);
     ov94_0223C3F4(param0, 10, 6);
-    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
+    CellActor_SetAnimateFlag(param0->unk_E20, 1);
     ov94_0223C584(param0);
 
     return 3;
@@ -434,7 +434,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
     if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
         ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f);
         ov94_0223C3F4(param0, 10, 12);
-        GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
+        CellActor_SetAnimateFlag(param0->unk_E20, 0);
     } else if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
         switch (param0->unk_10C) {
         case 0:
@@ -450,7 +450,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
                     param0->unk_3A = (60 * 30);
                     Sound_PlayEffect(1500);
                 } else {
-                    GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
+                    CellActor_SetAnimateFlag(param0->unk_E20, 0);
                     ov94_0223CF80(param0, 34, 1, 0, 0xf0f);
                     ov94_0223C3F4(param0, 11, 5);
                     Sound_PlayEffect(1523);
@@ -466,7 +466,7 @@ static int ov94_0223CC28 (UnkStruct_ov94_0223FD4C * param0)
         case 2:
             ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f);
             ov94_0223C3F4(param0, 10, 12);
-            GraphicElementData_SetAnimateFlag(param0->unk_E20, 0);
+            CellActor_SetAnimateFlag(param0->unk_E20, 0);
             Sound_PlayEffect(1500);
             break;
         }
@@ -535,7 +535,7 @@ static int ov94_0223CE7C (UnkStruct_ov94_0223FD4C * param0)
         if (v0 == 0xfffffffe) {
             sub_0200E084(&param0->unk_109C, 1);
             sub_0201ACF4(&param0->unk_109C);
-            GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
+            CellActor_SetAnimateFlag(param0->unk_E20, 1);
             param0->unk_2C = 5;
         } else {
             sub_0200E084(&param0->unk_109C, 1);
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index a05e9df554..b2199482d6 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -267,16 +267,16 @@ static void ov94_0223D3DC (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_F30 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
-    GraphicElementData_SetAnim(param0->unk_F30, 37);
+    CellActor_SetAnimateFlag(param0->unk_F30, 1);
+    CellActor_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
 static void ov94_0223D428 (UnkStruct_ov94_0223FD4C * param0)
 {
-    GraphicElementData_Delete(param0->unk_F30);
+    CellActor_Delete(param0->unk_F30);
 }
 
 static const int Unk_ov94_02245B94[][4] = {
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 73cfc031f6..21f29f52d8 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -230,16 +230,16 @@ static void ov94_0223DE7C (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_F30 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_F30, 1);
-    GraphicElementData_SetAnim(param0->unk_F30, 37);
+    CellActor_SetAnimateFlag(param0->unk_F30, 1);
+    CellActor_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
 static void ov94_0223DEC8 (UnkStruct_ov94_0223FD4C * param0)
 {
-    GraphicElementData_Delete(param0->unk_F30);
+    CellActor_Delete(param0->unk_F30);
 }
 
 static const int Unk_ov94_02245CC4[][4] = {
@@ -357,7 +357,7 @@ static int ov94_0223E0A4 (UnkStruct_ov94_0223FD4C * param0)
 
         if (1) {
             if ((v0 != param0->unk_11C) && (v0 >= 0)) {
-                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 16 + v0 * 4);
+                CellActor_SetAnim(param0->unk_F34[v0 + 1], 16 + v0 * 4);
                 param0->unk_2C = 2;
                 ov94_0223C4C0(param0, 3, 0);
                 param0->unk_11C = v0;
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 04ed9cd684..5d902df655 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -301,17 +301,17 @@ static void ov94_0223E770 (UnkStruct_ov94_0223FD4C * param0)
     v0.position.x = FX32_ONE;
     v0.position.y = FX32_ONE;
 
-    param0->unk_E20 = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_E20 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    GraphicElementData_SetAnim(param0->unk_E20, 0);
-    GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
+    CellActor_SetAnimateFlag(param0->unk_E20, 1);
+    CellActor_SetAnim(param0->unk_E20, 0);
+    CellActor_SetExplicitPriority(param0->unk_E20, 1);
     sub_02039734();
 }
 
 static void ov94_0223E7C4 (UnkStruct_ov94_0223FD4C * param0)
 {
-    GraphicElementData_Delete(param0->unk_E20);
+    CellActor_Delete(param0->unk_E20);
 }
 
 static const u16 Unk_ov94_02245D94[6][2] = {
@@ -464,7 +464,7 @@ static int ov94_0223EA84 (UnkStruct_ov94_0223FD4C * param0)
 
         if (param0->unk_10F2) {
             if (v1 >= 0) {
-                GraphicElementData_SetAnim(param0->unk_F34[v1 + 1], 16 + v1 * 4);
+                CellActor_SetAnim(param0->unk_F34[v1 + 1], 16 + v1 * 4);
                 param0->unk_2C = 2;
                 ov94_0223C4C0(param0, 3, 0);
                 param0->unk_11C = v1;
@@ -736,7 +736,7 @@ static void ov94_0223EFAC (UnkStruct_ov94_0223FD4C * param0)
         v1.x = FX32_ONE * Unk_ov94_02246848[ov94_0223EF94(param0)][0];
         v1.y = FX32_ONE * Unk_ov94_02246848[ov94_0223EF94(param0)][1];
 
-        GraphicElementData_SetPosition(param0->unk_E20, &v1);
+        CellActor_SetPosition(param0->unk_E20, &v1);
     }
 }
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 430486adb0..956fdc137d 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;
-    GraphicElementData * unk_08;
+    CellActor * 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, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6);
+static void ov94_02240DF8(int param0, int param1, int param2, int param3, CellActor * 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, GraphicElementData * param1, GraphicElementData * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7);
+static void ov94_02240EAC(BoxPokemon * param0, CellActor * param1, CellActor * 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, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3);
+static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, CellActor ** 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);
@@ -365,15 +365,15 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
     v1.position.x = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][0];
     v1.position.y = FX32_ONE * Unk_ov94_02245ED4[param0->unk_112][1];
 
-    param0->unk_E20 = GraphicElementManager_AddElementEx(&v1);
+    param0->unk_E20 = CellActorCollection_AddEx(&v1);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_E20, 1);
-    GraphicElementData_SetAnim(param0->unk_E20, 4);
+    CellActor_SetAnimateFlag(param0->unk_E20, 1);
+    CellActor_SetAnim(param0->unk_E20, 4);
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        GraphicElementData_SetExplicitPriority(param0->unk_E20, 0);
+        CellActor_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
+        CellActor_SetExplicitPriority(param0->unk_E20, 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -381,10 +381,10 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * Unk_ov94_02245ED4[v0][1];
         v1.priority = 20;
 
-        param0->unk_E28[v0] = GraphicElementManager_AddElementEx(&v1);
+        param0->unk_E28[v0] = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetAnim(param0->unk_E28[v0], 6 + v0);
-        GraphicElementData_SetExplicitPriority(param0->unk_E28[v0], 1);
+        CellActor_SetAnim(param0->unk_E28[v0], 6 + v0);
+        CellActor_SetExplicitPriority(param0->unk_E28[v0], 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -392,10 +392,10 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.priority = 10;
 
-        param0->unk_EA0[v0] = GraphicElementManager_AddElementEx(&v1);
+        param0->unk_EA0[v0] = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetAnim(param0->unk_EA0[v0], 40);
-        GraphicElementData_SetExplicitPriority(param0->unk_EA0[v0], 1);
+        CellActor_SetAnim(param0->unk_EA0[v0], 40);
+        CellActor_SetExplicitPriority(param0->unk_EA0[v0], 1);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
@@ -403,21 +403,21 @@ static void ov94_0223FE24 (UnkStruct_ov94_0223FD4C * param0)
         v1.position.y = FX32_ONE * (Unk_ov94_02245ED4[v0][1] + 6);
         v1.priority = 10;
 
-        param0->unk_F18[v0] = GraphicElementManager_AddElementEx(&v1);
+        param0->unk_F18[v0] = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetAnim(param0->unk_F18[v0], 42);
-        GraphicElementData_SetExplicitPriority(param0->unk_F18[v0], 1);
+        CellActor_SetAnim(param0->unk_F18[v0], 42);
+        CellActor_SetExplicitPriority(param0->unk_F18[v0], 1);
     }
 
     for (v0 = 0; v0 < 2; v0++) {
         v1.position.x = FX32_ONE * Unk_ov94_02245E1C[v0][0];
         v1.position.y = FX32_ONE * Unk_ov94_02245E1C[v0][1];
 
-        param0->unk_F54[v0] = GraphicElementManager_AddElementEx(&v1);
+        param0->unk_F54[v0] = CellActorCollection_AddEx(&v1);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_F54[v0], 1);
-        GraphicElementData_SetAnim(param0->unk_F54[v0], 38 + v0);
-        GraphicElementData_SetExplicitPriority(param0->unk_F54[v0], 1);
+        CellActor_SetAnimateFlag(param0->unk_F54[v0], 1);
+        CellActor_SetAnim(param0->unk_F54[v0], 38 + v0);
+        CellActor_SetExplicitPriority(param0->unk_F54[v0], 1);
     }
 }
 
@@ -426,18 +426,18 @@ static void ov94_0223FFC8 (UnkStruct_ov94_0223FD4C * param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        GraphicElementData_Delete(param0->unk_F54[v0]);
+        CellActor_Delete(param0->unk_F54[v0]);
     }
 
-    GraphicElementData_Delete(param0->unk_E20);
+    CellActor_Delete(param0->unk_E20);
 
     for (v0 = 0; v0 < 30; v0++) {
-        GraphicElementData_Delete(param0->unk_E28[v0]);
-        GraphicElementData_Delete(param0->unk_EA0[v0]);
+        CellActor_Delete(param0->unk_E28[v0]);
+        CellActor_Delete(param0->unk_EA0[v0]);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_Delete(param0->unk_F18[v0]);
+        CellActor_Delete(param0->unk_F18[v0]);
     }
 }
 
@@ -663,9 +663,9 @@ static void ov94_022404F0 (UnkStruct_ov94_0223FD4C * param0)
     }
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        GraphicElementData_SetExplicitPriority(param0->unk_E20, 0);
+        CellActor_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        GraphicElementData_SetExplicitPriority(param0->unk_E20, 1);
+        CellActor_SetExplicitPriority(param0->unk_E20, 1);
     }
 }
 
@@ -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, GraphicElementData * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6)
+static void ov94_02240DF8 (int param0, int param1, int param2, int param3, CellActor * param4, NARC * param5, UnkStruct_ov94_02240FA0 * param6)
 {
     u8 * v0;
     u8 * v1;
@@ -1082,14 +1082,14 @@ static void ov94_02240E5C (void * param0)
             DC_FlushRange(v2->unk_0C, ((4 * 4) * 0x20));
             GX_LoadOBJ(v2->unk_0C, v2->unk_00, ((4 * 4) * 0x20));
 
-            GraphicElementData_SetExplicitPalette(v2->unk_08, v2->unk_04);
+            CellActor_SetExplicitPalette(v2->unk_08, v2->unk_04);
         }
     }
 
     Heap_FreeToHeap(v0->unk_1114);
 }
 
-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)
+static void ov94_02240EAC (BoxPokemon * param0, CellActor * param1, CellActor * param2, u16 * param3, int param4, NARC * param5, UnkStruct_ov94_0223BA88_sub2 * param6, UnkStruct_ov94_02240FA0 * param7)
 {
     int v0, v1, v2, v3;
 
@@ -1113,22 +1113,22 @@ static void ov94_02240EAC (BoxPokemon * param0, GraphicElementData * param1, Gra
 
     if (v0) {
         ov94_02240DF8(*param3, v3, v2, param4, param1, param5, param7);
-        GraphicElementData_SetDrawFlag(param1, 1);
+        CellActor_SetDrawFlag(param1, 1);
 
         if (v1 != 0) {
-            GraphicElementData_SetDrawFlag(param2, 1);
+            CellActor_SetDrawFlag(param2, 1);
 
             if (Item_IsMail(v1)) {
-                GraphicElementData_SetAnim(param2, 41);
+                CellActor_SetAnim(param2, 41);
             } else {
-                GraphicElementData_SetAnim(param2, 40);
+                CellActor_SetAnim(param2, 40);
             }
         } else {
-            GraphicElementData_SetDrawFlag(param2, 0);
+            CellActor_SetDrawFlag(param2, 0);
         }
     } else {
-        GraphicElementData_SetDrawFlag(param1, 0);
-        GraphicElementData_SetDrawFlag(param2, 0);
+        CellActor_SetDrawFlag(param1, 0);
+        CellActor_SetDrawFlag(param2, 0);
 
         param7->unk_08 = NULL;
     }
@@ -1156,7 +1156,7 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1)
             ov94_02240EAC(sub_02079C9C(v5, param1, v1), param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
 
             if (v1 < 6) {
-                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
+                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
@@ -1172,20 +1172,20 @@ static void ov94_02240FA0 (UnkStruct_ov94_0223FD4C * param0, int param1)
             ov94_02240EAC(v4, param0->unk_E28[v1], param0->unk_EA0[v1], &v0[v1], v1, v6, &param0->unk_1108->unk_00[v1], &v7[v1]);
 
             if (Pokemon_GetValue(v3, MON_DATA_MAIL_ID, NULL)) {
-                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 1);
+                CellActor_SetDrawFlag(param0->unk_F18[v1], 1);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
+                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
         for (; v1 < 30; v1++) {
             param0->unk_1108->unk_00[v1].unk_00 = 0;
-            GraphicElementData_SetDrawFlag(param0->unk_E28[v1], 0);
-            GraphicElementData_SetDrawFlag(param0->unk_EA0[v1], 0);
+            CellActor_SetDrawFlag(param0->unk_E28[v1], 0);
+            CellActor_SetDrawFlag(param0->unk_EA0[v1], 0);
             v7[v1].unk_08 = NULL;
 
             if (v1 < 6) {
-                GraphicElementData_SetDrawFlag(param0->unk_F18[v1], 0);
+                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
@@ -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, GraphicElementData ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3)
+static void ov94_02241464 (UnkStruct_ov94_0223BA88_sub2 * param0, CellActor ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3)
 {
     int v0, v1;
 
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index 464bad91d4..2beea64253 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -27,7 +27,7 @@ typedef struct {
 
 static void ov94_0224400C(SysTask * param0, void * param1);
 static void ov94_022440FC(SysTask * param0, void * param1);
-static void ov94_022441A0(GraphicElementData * param0, int param1, int param2);
+static void ov94_022441A0(CellActor * 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);
@@ -55,18 +55,18 @@ void ov94_02243EF8 (UnkStruct_ov94_0223FD4C * param0, int param1)
     v0.position.x = FX32_ONE * 128;
     v0.position.y = FX32_ONE * 130 + (256 * FX32_ONE);
 
-    param0->unk_F34[0] = GraphicElementManager_AddElementEx(&v0);
+    param0->unk_F34[0] = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_F34[0], 1);
-    GraphicElementData_SetAnim(param0->unk_F34[0], 3 + param1 * 7);
-    GraphicElementData_SetDrawFlag(param0->unk_F34[0], 1);
+    CellActor_SetAnimateFlag(param0->unk_F34[0], 1);
+    CellActor_SetAnim(param0->unk_F34[0], 3 + param1 * 7);
+    CellActor_SetDrawFlag(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
-        param0->unk_F34[v1 + 1] = GraphicElementManager_AddElementEx(&v0);
+        param0->unk_F34[v1 + 1] = CellActorCollection_AddEx(&v0);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_F34[v1 + 1], 1);
-        GraphicElementData_SetAnim(param0->unk_F34[v1 + 1], 14 + v1 * 4);
-        GraphicElementData_SetDrawFlag(param0->unk_F34[v1 + 1], 0);
+        CellActor_SetAnimateFlag(param0->unk_F34[v1 + 1], 1);
+        CellActor_SetAnim(param0->unk_F34[v1 + 1], 14 + v1 * 4);
+        CellActor_SetDrawFlag(param0->unk_F34[v1 + 1], 0);
 
         ov94_022441A0(param0->unk_F34[v1 + 1], Unk_ov94_02246322[v1][0], Unk_ov94_02246322[v1][1]);
     }
@@ -94,7 +94,7 @@ void ov94_02243FA8 (UnkStruct_ov94_0223FD4C * param0, int param1)
 
 static void ov94_02243FF0 (UnkStruct_ov94_02243FF0 * param0, int param1)
 {
-    GraphicElementData_SetAnim(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
+    CellActor_SetAnim(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
 }
 
 static void ov94_0224400C (SysTask * param0, void * param1)
@@ -116,7 +116,7 @@ static void ov94_0224400C (SysTask * param0, void * param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!GraphicElementData_IsAnimated(v2->unk_F34[0])) {
+        if (!CellActor_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 2);
             v1->unk_00 = 2;
         }
@@ -177,7 +177,7 @@ static void ov94_022440FC (SysTask * param0, void * param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!GraphicElementData_IsAnimated(v2->unk_F34[0])) {
+        if (!CellActor_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 0);
             v1->unk_00 = 2;
             Sound_PlayEffect(1584);
@@ -200,7 +200,7 @@ static void ov94_022440FC (SysTask * param0, void * param1)
     }
 }
 
-static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2)
+static void ov94_022441A0 (CellActor * param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -208,7 +208,7 @@ static void ov94_022441A0 (GraphicElementData * param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8) + (256 * FX32_ONE);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov94_0224633E[] = {
@@ -251,14 +251,14 @@ void ov94_02244234 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2)
             ov94_02244378(param0->unk_10F8, param0->unk_1100, v0, v1, v2);
 
             if (param2) {
-                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 14 + v0 * 4);
+                CellActor_SetAnim(param0->unk_F34[v0 + 1], 14 + v0 * 4);
             } else {
-                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], 17 + v0 * 4);
+                CellActor_SetAnim(param0->unk_F34[v0 + 1], 17 + v0 * 4);
             }
 
-            GraphicElementData_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
+            CellActor_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_F34[v0 + 1], 0);
+            CellActor_SetDrawFlag(param0->unk_F34[v0 + 1], 0);
         }
     }
 }
@@ -273,9 +273,9 @@ void ov94_022442E4 (UnkStruct_ov94_0223FD4C * param0)
     int v0;
 
     for (v0 = 0; v0 < 7; v0++) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_F34[v0 + 1])) {
-            if (GraphicElementData_GetActiveAnim(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
-                GraphicElementData_SetAnim(param0->unk_F34[v0 + 1], ov94_022442DC(v0) + 1);
+        if (CellActor_GetDrawFlag(param0->unk_F34[v0 + 1])) {
+            if (CellActor_GetActiveAnim(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
+                CellActor_SetAnim(param0->unk_F34[v0 + 1], ov94_022442DC(v0) + 1);
             }
         }
     }
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 1fa77d7d53..156f4a2c21 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -56,7 +56,7 @@ struct UnkStruct_ov95_02247628_t {
     StringTemplate * unk_0C;
     MessageLoader * unk_10;
     Strbuf* unk_14;
-    GraphicElementManager * unk_18;
+    CellActorCollection * unk_18;
     UnkStruct_0200C738 unk_1C;
     SysTask * unk_1A8;
     BOOL unk_1AC;
@@ -220,7 +220,7 @@ int ov95_02246E1C (OverlayManager * param0, int * param1)
     MessageLoader_Free(v1->unk_10);
     Strbuf_Free(v1->unk_14);
     Heap_FreeToHeap(v1->unk_08);
-    GraphicElementManager_Delete(v1->unk_18);
+    CellActorCollection_Delete(v1->unk_18);
     sub_0200A878();
     OverlayManager_FreeData(param0);
     Heap_Destroy(57);
@@ -265,7 +265,7 @@ static void ov95_02246F0C (SysTask * param0, void * param1)
 {
     UnkStruct_ov95_02247628 * v0 = param1;
 
-    GraphicElementManager_Update(v0->unk_18);
+    CellActorCollection_Update(v0->unk_18);
     sub_0200A858();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -647,12 +647,12 @@ void ov95_022475C4 (CellActorResourceData * param0, UnkStruct_ov95_02247568 * pa
     param0->isVRamTransfer = 0;
 }
 
-GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
+CellActor * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorResourceData * param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
     CellActorInitParams v1;
 
-    v1.manager = param0->unk_18;
+    v1.collection = param0->unk_18;
     v1.resourceData = param1;
     v1.position.x = param2 * FX32_ONE;
     v1.position.y = param3 * FX32_ONE;
@@ -661,11 +661,11 @@ GraphicElementData * ov95_022475E4 (UnkStruct_ov95_02247628 * param0, CellActorR
     v1.vramType = param5;
     v1.heapID = 57;
 
-    v0 = GraphicElementManager_AddElement(&v1);
+    v0 = CellActorCollection_Add(&v1);
 
     if (v0) {
-        GraphicElementData_SetAnimateFlag(v0, 1);
-        GraphicElementData_SetAnimSpeed(v0, FX32_ONE);
+        CellActor_SetAnimateFlag(v0, 1);
+        CellActor_SetAnimSpeed(v0, FX32_ONE);
     }
 
     return v0;
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index b2f39bc21f..e841ed01ac 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -52,7 +52,7 @@ typedef struct {
     UnkStruct_02007768 * unk_0C;
     Sprite * unk_10;
     SpriteAnimationFrame unk_14[10];
-    GraphicElementData * unk_3C[2];
+    CellActor * unk_3C[2];
     UnkStruct_ov95_02247568 unk_44;
     BGL * unk_54;
     Window unk_58;
@@ -307,8 +307,8 @@ static int ov95_02247ED8 (UnkStruct_ov95_02247C6C * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            GraphicElementData_SetAnim(param0->unk_3C[0], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_3C[0], 1);
+            CellActor_SetAnim(param0->unk_3C[0], 1);
+            CellActor_SetDrawFlag(param0->unk_3C[0], 1);
             return 1;
         }
         break;
@@ -402,13 +402,13 @@ static int ov95_02248090 (UnkStruct_ov95_02247C6C * param0, int * param1)
     case 1:
         if (ov95_022483B4(param0)) {
             sub_02007DC8(param0->unk_10);
-            GraphicElementData_SetAnim(param0->unk_3C[1], 0);
-            GraphicElementData_SetDrawFlag(param0->unk_3C[1], 1);
+            CellActor_SetAnim(param0->unk_3C[1], 0);
+            CellActor_SetDrawFlag(param0->unk_3C[1], 1);
             (*param1)++;
         }
         break;
     case 2:
-        if (GraphicElementData_IsAnimated(param0->unk_3C[1]) == 0) {
+        if (CellActor_IsAnimated(param0->unk_3C[1]) == 0) {
             ov95_022479A8(param0->unk_74, 1);
             ov95_02248364(param0, 16, 0, 16);
             ov95_02248420(param0);
@@ -495,9 +495,9 @@ static void ov95_0224829C (UnkStruct_ov95_02247C6C * param0)
     param0->unk_3C[0] = ov95_022475E4(param0->unk_00, &v2, 128, 100, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
     param0->unk_3C[1] = ov95_022475E4(param0->unk_00, &v2, 128, 90, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetExplicitPriority(param0->unk_3C[1], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_3C[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_3C[1], 0);
+    CellActor_SetExplicitPriority(param0->unk_3C[1], 1);
+    CellActor_SetDrawFlag(param0->unk_3C[0], 0);
+    CellActor_SetDrawFlag(param0->unk_3C[1], 0);
 }
 
 static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0)
@@ -506,7 +506,7 @@ static void ov95_02248340 (UnkStruct_ov95_02247C6C * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0]) {
-            GraphicElementData_Delete(param0->unk_3C[v0]);
+            CellActor_Delete(param0->unk_3C[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index bff8a6de74..52d7d26ced 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -130,7 +130,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     UnkStruct_ov95_02247568 unk_0C;
-    GraphicElementData * unk_1C[20][2];
+    CellActor * unk_1C[20][2];
     u32 unk_BC;
     BGL * unk_C0;
     UnkStruct_ov95_02247004 * unk_C4;
@@ -626,10 +626,10 @@ static void ov95_02248CA8 (UnkStruct_ov95_02248688 * param0)
         param0->unk_1C[v3][0] = ov95_022475E4(param0->unk_00, &v2, v4, v5, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
         param0->unk_1C[v3][1] = ov95_022475E4(param0->unk_00, &v2, v4, v5 + 56, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-        GraphicElementData_SetAnim(param0->unk_1C[v3][0], 0);
-        GraphicElementData_SetAnim(param0->unk_1C[v3][1], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_1C[v3][0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_1C[v3][1], 0);
+        CellActor_SetAnim(param0->unk_1C[v3][0], 0);
+        CellActor_SetAnim(param0->unk_1C[v3][1], 1);
+        CellActor_SetDrawFlag(param0->unk_1C[v3][0], 0);
+        CellActor_SetDrawFlag(param0->unk_1C[v3][1], 0);
     }
 }
 
@@ -639,11 +639,11 @@ static void ov95_02248DC4 (UnkStruct_ov95_02248688 * param0)
 
     for (v0 = 0; v0 < 20; v0++) {
         if (param0->unk_1C[v0][0]) {
-            GraphicElementData_Delete(param0->unk_1C[v0][0]);
+            CellActor_Delete(param0->unk_1C[v0][0]);
         }
 
         if (param0->unk_1C[v0][1]) {
-            GraphicElementData_Delete(param0->unk_1C[v0][1]);
+            CellActor_Delete(param0->unk_1C[v0][1]);
         }
     }
 
@@ -682,7 +682,7 @@ static void ov95_02248E5C (UnkStruct_ov95_02248688 * param0, SysTask ** param1,
 
     for (v0 = 0; v0 < 20; v0++) {
         param2->unk_08[v0] = 0;
-        param2->unk_58[v0] = *(GraphicElementData_GetPosition(param0->unk_1C[v0][0]));
+        param2->unk_58[v0] = *(CellActor_GetPosition(param0->unk_1C[v0][0]));
     }
 
     *(param2->unk_00) = SysTask_Start(ov95_02248EC4, param2, 0);
@@ -714,17 +714,17 @@ static void ov95_02248EC4 (SysTask * param0, void * param1)
             v0->unk_58[v2].y = -114688 + (v0->unk_58[v2].y - 1736704);
 
             if (v0->unk_08[v2]) {
-                GraphicElementData_SetDrawFlag(v0->unk_04->unk_1C[v2][0], 1);
-                GraphicElementData_SetDrawFlag(v0->unk_04->unk_1C[v2][1], 1);
+                CellActor_SetDrawFlag(v0->unk_04->unk_1C[v2][0], 1);
+                CellActor_SetDrawFlag(v0->unk_04->unk_1C[v2][1], 1);
             }
         }
 
-        GraphicElementData_SetPosition(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
+        CellActor_SetPosition(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
 
         v1 = v0->unk_58[v2];
         v1.y += 229376;
 
-        GraphicElementData_SetPosition(v0->unk_04->unk_1C[v2][1], &v1);
+        CellActor_SetPosition(v0->unk_04->unk_1C[v2][1], &v1);
     }
 }
 
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 0edf898680..403dbd9528 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;
-    GraphicElementData * unk_20[1];
+    CellActor * unk_20[1];
     BGL * unk_24;
     UnkStruct_ov95_0224773C * unk_28;
     UnkStruct_ov95_02247958 * unk_2C;
@@ -221,13 +221,13 @@ static int ov95_02249840 (UnkStruct_ov95_022497D8 * param0, int * param1)
     case 2:
         if (ov95_02249CF0(&(param0->unk_34))) {
             Sound_PlayEffect(1709);
-            GraphicElementData_SetAnim(param0->unk_20[0], 3);
-            GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
+            CellActor_SetAnim(param0->unk_20[0], 3);
+            CellActor_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 3:
-        if (GraphicElementData_IsAnimated(param0->unk_20[0]) == 0) {
+        if (CellActor_IsAnimated(param0->unk_20[0]) == 0) {
             sub_0200F174(0, 0, 0, 0x7fff, 16, 1, 58);
             (*param1)++;
         }
@@ -415,7 +415,7 @@ static void ov95_02249B90 (UnkStruct_ov95_022497D8 * param0)
 
     param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, UnkEnum_ov95_02249B90_00, UnkEnum_ov95_02249B90_01, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetDrawFlag(param0->unk_20[0], 0);
+    CellActor_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0)
@@ -424,7 +424,7 @@ static void ov95_02249C10 (UnkStruct_ov95_022497D8 * param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            GraphicElementData_Delete(param0->unk_20[v0]);
+            CellActor_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index aef2632edb..d32d87fd32 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;
-    GraphicElementData * unk_20[1];
+    CellActor * unk_20[1];
     BGL * unk_24;
     UnkStruct_ov95_0224773C * unk_28;
     UnkStruct_ov95_02247958 * unk_2C;
@@ -191,13 +191,13 @@ static int ov95_0224A464 (UnkStruct_ov95_0224A42C * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            GraphicElementData_SetAnim(param0->unk_20[0], 3);
-            GraphicElementData_SetDrawFlag(param0->unk_20[0], 1);
+            CellActor_SetAnim(param0->unk_20[0], 3);
+            CellActor_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 1:
-        if (GraphicElementData_IsAnimated(param0->unk_20[0]) == 0) {
+        if (CellActor_IsAnimated(param0->unk_20[0]) == 0) {
             Sound_PlayEffect(1707);
             ov95_0224A864(param0, &(param0->unk_34));
             ov95_022479A8(param0->unk_2C, 1);
@@ -390,7 +390,7 @@ static void ov95_0224A7B0 (UnkStruct_ov95_0224A42C * param0)
 
     ov95_022475C4(&v2, &param0->unk_10, &v1, &v0, 1);
     param0->unk_20[0] = ov95_022475E4(param0->unk_00, &v2, 128, 96, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
-    GraphicElementData_SetDrawFlag(param0->unk_20[0], 0);
+    CellActor_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0)
@@ -399,7 +399,7 @@ static void ov95_0224A830 (UnkStruct_ov95_0224A42C * param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            GraphicElementData_Delete(param0->unk_20[v0]);
+            CellActor_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 87355a0352..a6e5f49200 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -69,7 +69,7 @@ typedef struct {
     UnkStruct_02007768 * unk_10;
     Sprite * unk_14;
     SpriteAnimationFrame unk_18[10];
-    GraphicElementData * unk_40[2];
+    CellActor * unk_40[2];
     UnkStruct_ov95_02247568 unk_48;
     BGL * unk_58;
     Window unk_5C;
@@ -335,8 +335,8 @@ static int ov95_0224B6F0 (UnkStruct_ov95_0224B4D4 * param0, int * param1)
     switch (*param1) {
     case 0:
         if (ScreenWipe_Done()) {
-            GraphicElementData_SetAnim(param0->unk_40[0], 1);
-            GraphicElementData_SetDrawFlag(param0->unk_40[0], 1);
+            CellActor_SetAnim(param0->unk_40[0], 1);
+            CellActor_SetDrawFlag(param0->unk_40[0], 1);
             return 1;
         }
         break;
@@ -353,8 +353,8 @@ static int ov95_0224B71C (UnkStruct_ov95_0224B4D4 * param0, int * param1)
         (*param1)++;
     case 1:
         if (param0->unk_80 == NULL) {
-            GraphicElementData_SetAnim(param0->unk_40[1], 2);
-            GraphicElementData_SetDrawFlag(param0->unk_40[1], 1);
+            CellActor_SetAnim(param0->unk_40[1], 2);
+            CellActor_SetDrawFlag(param0->unk_40[1], 1);
             ov95_022479A8(param0->unk_78, 0);
             param0->unk_08 = 0;
             (*param1)++;
@@ -538,9 +538,9 @@ static void ov95_0224BAE8 (UnkStruct_ov95_0224B4D4 * param0)
     param0->unk_40[0] = ov95_022475E4(param0->unk_00, &v2, 128, 100, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
     param0->unk_40[1] = ov95_022475E4(param0->unk_00, &v2, 128, 90, 0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetExplicitPriority(param0->unk_40[1], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_40[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_40[1], 0);
+    CellActor_SetExplicitPriority(param0->unk_40[1], 1);
+    CellActor_SetDrawFlag(param0->unk_40[0], 0);
+    CellActor_SetDrawFlag(param0->unk_40[1], 0);
 }
 
 static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0)
@@ -549,7 +549,7 @@ static void ov95_0224BB8C (UnkStruct_ov95_0224B4D4 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_40[v0]) {
-            GraphicElementData_Delete(param0->unk_40[v0]);
+            CellActor_Delete(param0->unk_40[v0]);
         }
     }
 
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 435101a7b8..e61739774c 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -161,7 +161,7 @@ int ov96_0223B7F8 (OverlayManager * param0, int * param1)
     }
 
     if (v0->unk_BF4 != NULL) {
-        GraphicElementManager_Update(v0->unk_BF4);
+        CellActorCollection_Update(v0->unk_BF4);
     }
 
     return 0;
@@ -287,7 +287,7 @@ static const u16 Unk_ov96_0223DA80[][2] = {
 
 void ov96_0223BAE0 (CellActorInitParamsEx * param0, UnkStruct_ov96_0223BF40 * param1, CellActorResourceData * param2, int param3)
 {
-    param0->manager = param1->unk_BF4;
+    param0->collection = param1->unk_BF4;
     param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -313,10 +313,10 @@ static void ov96_0223BB0C (UnkStruct_ov96_0223BF40 * param0)
         for (v0 = 0; v0 < 2; v0++) {
             v1.position.x = FX32_ONE * Unk_ov96_0223DA80[v0][0];
             v1.position.y = FX32_ONE * Unk_ov96_0223DA80[v0][1];
-            param0->unk_E30[v0] = GraphicElementManager_AddElementEx(&v1);
-            GraphicElementData_SetAnimateFlag(param0->unk_E30[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_E30[v0], v0);
-            GraphicElementData_SetDrawFlag(param0->unk_E30[v0], 0);
+            param0->unk_E30[v0] = CellActorCollection_AddEx(&v1);
+            CellActor_SetAnimateFlag(param0->unk_E30[v0], 1);
+            CellActor_SetAnim(param0->unk_E30[v0], v0);
+            CellActor_SetDrawFlag(param0->unk_E30[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -416,7 +416,7 @@ static void ov96_0223BC8C (UnkStruct_ov96_0223BF40 * param0)
         sub_02009754(param0->unk_D84[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_BF4);
+    CellActorCollection_Delete(param0->unk_BF4);
 
     param0->unk_BF4 = NULL;
 
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index 5ffd6c0c64..af60161f80 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -1652,8 +1652,8 @@ void ov96_0223D948 (UnkStruct_ov96_0223BF40 * param0)
 static void ov96_0223D950 (UnkStruct_ov96_0223BF40 * param0, int param1, int param2)
 {
     if ((param1 == 0) || (param1 == 1)) {
-        GraphicElementData_SetDrawFlag(param0->unk_E30[0], param2);
-        GraphicElementData_SetDrawFlag(param0->unk_E30[1], param2);
+        CellActor_SetDrawFlag(param0->unk_E30[0], param2);
+        CellActor_SetDrawFlag(param0->unk_E30[1], param2);
     }
 }
 
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index d2ac7c64aa..c07c26c168 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -129,7 +129,7 @@ typedef struct {
     int unk_150;
     BOOL unk_154[1];
     Window unk_158;
-    GraphicElementData * unk_168[2];
+    CellActor * unk_168[2];
     int unk_170;
 } UnkStruct_0222AE60;
 
@@ -489,10 +489,10 @@ static void ov97_0222B404 (UnkStruct_0222AE60 * param0)
     ov97_02237B0C(116, 43, 40, 42, 41, 0);
 
     param0->unk_168[0] = ov97_02237D14(0, param0->unk_168[0], HW_LCD_WIDTH / 2, 8, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_168[0], 0);
+    CellActor_SetDrawFlag(param0->unk_168[0], 0);
 
     param0->unk_168[1] = ov97_02237D14(0, param0->unk_168[1], HW_LCD_WIDTH / 2, HW_LCD_HEIGHT - 8, 1);
-    GraphicElementData_SetDrawFlag(param0->unk_168[1], 0);
+    CellActor_SetDrawFlag(param0->unk_168[1], 0);
 }
 
 static void ov97_0222B46C (UnkStruct_0222AE60 * param0)
@@ -893,8 +893,8 @@ static void ov97_0222BC1C (UnkStruct_0222AE60 * param0)
         }
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_168[0], v1);
-    GraphicElementData_SetDrawFlag(param0->unk_168[1], v2);
+    CellActor_SetDrawFlag(param0->unk_168[0], v1);
+    CellActor_SetDrawFlag(param0->unk_168[1], v2);
 }
 
 static void ov97_0222BC9C (OverlayManager * param0)
@@ -903,8 +903,8 @@ static void ov97_0222BC9C (OverlayManager * param0)
     UnkStruct_0222AE60 * v1 = OverlayManager_Data(param0);
 
     if (v1->unk_168[0] || v1->unk_168[1]) {
-        GraphicElementData_Delete(v1->unk_168[0]);
-        GraphicElementData_Delete(v1->unk_168[1]);
+        CellActor_Delete(v1->unk_168[0]);
+        CellActor_Delete(v1->unk_168[1]);
         ov97_02237DA0();
     }
 
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index 4335cd0fbd..a0187ef47e 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -381,7 +381,7 @@ typedef struct {
     int unk_168;
     u8 unk_16C[12288];
     OverlayManager * unk_316C;
-    GraphicElementData * unk_3170;
+    CellActor * unk_3170;
     MysteryGift * unk_3174;
     int unk_3178;
     int unk_317C;
@@ -940,7 +940,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
         break;
     case UnkEnum_ov97_0222C6F8_29:
         ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 30);
-        GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
+        CellActor_SetDrawFlag(param0->unk_3170, 0);
         DeleteWaitDial(param0->unk_34D8);
         param0->unk_34D8 = NULL;
         Sound_PlayEffect(1500);
@@ -977,7 +977,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
     case UnkEnum_ov97_0222C6F8_10:
         if (ov97_022332F4()) {
             ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 71);
-            GraphicElementData_SetDrawFlag(param0->unk_3170, 1);
+            CellActor_SetDrawFlag(param0->unk_3170, 1);
             ov97_0222C578(param0);
             *v3 = UnkEnum_ov97_0222C6F8_11;
         }
@@ -1071,7 +1071,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
 
             ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 73);
 
-            GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
+            CellActor_SetDrawFlag(param0->unk_3170, 0);
             DeleteWaitDial(param0->unk_34D8);
             Sound_PlayEffect(1500);
 
@@ -1096,7 +1096,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0)
         *v3 = UnkEnum_ov97_0222C6F8_23;
     case UnkEnum_ov97_0222C6F8_23:
         ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 74);
-        GraphicElementData_SetDrawFlag(param0->unk_3170, 0);
+        CellActor_SetDrawFlag(param0->unk_3170, 0);
 
         if (param0->unk_34D8) {
             DeleteWaitDial(param0->unk_34D8);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 242597388e..dba88d356b 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -86,7 +86,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     BOOL unk_08;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
     VecFx32 unk_10;
     fx32 unk_1C;
     fx32 unk_20;
@@ -287,7 +287,7 @@ static void ov97_0222D40C (UnkStruct_ov97_0222D04C * param0, int param1)
     if (param1 != -1) {
         param0->unk_628 = ov97_02237D14(0, param0->unk_628, HW_LCD_WIDTH / 2, 100, param1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_628, 0);
+        CellActor_SetDrawFlag(param0->unk_628, 0);
     }
 }
 
@@ -1174,15 +1174,15 @@ 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 GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int param1)
+static CellActor * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int param1)
 {
-    GraphicElementData * v0;
+    CellActor * v0;
 
     {
         CellActorInitParamsEx v1;
         int v2 = (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) ? 0 : 1;
 
-        v1.manager = param0->unk_0C->unk_00;
+        v1.collection = param0->unk_0C->unk_00;
         v1.resourceData = &param0->unk_10[v2];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -1199,14 +1199,14 @@ static GraphicElementData * ov97_0222E538 (UnkStruct_ov97_0222E398 * param0, int
             v1.position.y += FX32_CONST(256);
         }
 
-        v0 = GraphicElementManager_AddElementEx(&v1);
+        v0 = CellActorCollection_AddEx(&v1);
     }
 
     if (v0) {
-        GraphicElementData_SetAnimateFlag(v0, 1);
-        GraphicElementData_SetExplicitPriority(v0, 0);
-        GraphicElementData_SetAnim(v0, 0);
-        GraphicElementData_SetDrawFlag(v0, 1);
+        CellActor_SetAnimateFlag(v0, 1);
+        CellActor_SetExplicitPriority(v0, 0);
+        CellActor_SetAnim(v0, 0);
+        CellActor_SetDrawFlag(v0, 1);
     }
 
     return v0;
@@ -1216,16 +1216,16 @@ static void ov97_0222E5B4 (UnkStruct_ov97_0222E398 * param0)
 {
     param0->unk_3008.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    GraphicElementData_SetAnimNoRestart(param0->unk_3008.unk_0C, 2);
+    CellActor_SetAnimNoRestart(param0->unk_3008.unk_0C, 2);
     SpriteActor_SetAnimFrame(param0->unk_3008.unk_0C, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_3008.unk_0C, 0);
-    GraphicElementData_SetPriority(param0->unk_3008.unk_0C, 0);
-    GraphicElementData_SetAffineOverwriteMode(param0->unk_3008.unk_0C, 2);
+    CellActor_SetDrawFlag(param0->unk_3008.unk_0C, 0);
+    CellActor_SetPriority(param0->unk_3008.unk_0C, 0);
+    CellActor_SetAffineOverwriteMode(param0->unk_3008.unk_0C, 2);
 
     {
         VecFx32 * v0;
 
-        v0 = ( VecFx32 * )GraphicElementData_GetPosition(param0->unk_3008.unk_0C);
+        v0 = ( VecFx32 * )CellActor_GetPosition(param0->unk_3008.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(96);
     }
@@ -1235,16 +1235,16 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0)
 {
     param0->unk_3054.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    GraphicElementData_SetAnimNoRestart(param0->unk_3054.unk_0C, 4);
+    CellActor_SetAnimNoRestart(param0->unk_3054.unk_0C, 4);
     SpriteActor_SetAnimFrame(param0->unk_3054.unk_0C, 0);
-    GraphicElementData_SetDrawFlag(param0->unk_3054.unk_0C, 0);
-    GraphicElementData_SetPriority(param0->unk_3054.unk_0C, 0);
-    GraphicElementData_SetAffineOverwriteMode(param0->unk_3054.unk_0C, 2);
+    CellActor_SetDrawFlag(param0->unk_3054.unk_0C, 0);
+    CellActor_SetPriority(param0->unk_3054.unk_0C, 0);
+    CellActor_SetAffineOverwriteMode(param0->unk_3054.unk_0C, 2);
 
     {
         VecFx32 * v0;
 
-        v0 = ( VecFx32 * )GraphicElementData_GetPosition(param0->unk_3054.unk_0C);
+        v0 = ( VecFx32 * )CellActor_GetPosition(param0->unk_3054.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(0) + FX32_CONST(256);
     }
@@ -1252,13 +1252,13 @@ static void ov97_0222E60C (UnkStruct_ov97_0222E398 * param0)
 
 static void ov97_0222E664 (UnkStruct_ov97_0222E398 * param0)
 {
-    GraphicElementData_Delete(param0->unk_3008.unk_0C);
+    CellActor_Delete(param0->unk_3008.unk_0C);
     param0->unk_3008.unk_0C = NULL;
 }
 
 static void ov97_0222E67C (UnkStruct_ov97_0222E398 * param0)
 {
-    GraphicElementData_Delete(param0->unk_3054.unk_0C);
+    CellActor_Delete(param0->unk_3054.unk_0C);
     param0->unk_3054.unk_0C = NULL;
 }
 
@@ -1268,20 +1268,20 @@ static void ov97_0222E694 (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         if (param0->unk_88[v0].unk_0C) {
-            GraphicElementData_UpdateAnim(param0->unk_88[v0].unk_0C, FX32_CONST(2));
+            CellActor_UpdateAnim(param0->unk_88[v0].unk_0C, FX32_CONST(2));
         }
 
         if (param0->unk_1848[v0].unk_0C) {
-            GraphicElementData_UpdateAnim(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
+            CellActor_UpdateAnim(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
         }
     }
 
     if (param0->unk_3008.unk_0C) {
-        GraphicElementData_UpdateAnim(param0->unk_3008.unk_0C, FX32_CONST(2));
+        CellActor_UpdateAnim(param0->unk_3008.unk_0C, FX32_CONST(2));
     }
 
     if (param0->unk_3054.unk_0C) {
-        GraphicElementData_UpdateAnim(param0->unk_3054.unk_0C, FX32_CONST(2));
+        CellActor_UpdateAnim(param0->unk_3054.unk_0C, FX32_CONST(2));
     }
 }
 
@@ -1291,7 +1291,7 @@ static void ov97_0222E6F8 (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         param0->unk_88[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
-        GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+        CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
         SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
     }
 }
@@ -1303,7 +1303,7 @@ static void ov97_0222E734 (UnkStruct_ov97_0222E398 * param0)
     for (v0 = 0; v0 < 80; v0++) {
         if (v0 < (80 / 4)) {
             param0->unk_88[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
-            GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+            CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
             SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
         } else {
             param0->unk_88[v0].unk_0C = NULL;
@@ -1317,7 +1317,7 @@ static void ov97_0222E77C (UnkStruct_ov97_0222E398 * param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         param0->unk_1848[v0].unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB);
-        GraphicElementData_SetAnimNoRestart(param0->unk_1848[v0].unk_0C, 5);
+        CellActor_SetAnimNoRestart(param0->unk_1848[v0].unk_0C, 5);
         SpriteActor_SetAnimFrame(param0->unk_1848[v0].unk_0C, 0);
     }
 }
@@ -1331,7 +1331,7 @@ static void ov97_0222E7B4 (UnkStruct_ov97_0222E398 * param0)
             continue;
         }
 
-        GraphicElementData_Delete(param0->unk_88[v0].unk_0C);
+        CellActor_Delete(param0->unk_88[v0].unk_0C);
         param0->unk_88[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_88[v0].unk_48);
     }
@@ -1342,7 +1342,7 @@ static void ov97_0222E7E4 (UnkStruct_ov97_0222E398 * param0)
     int v0;
 
     for (v0 = 0; v0 < 80; v0++) {
-        GraphicElementData_Delete(param0->unk_1848[v0].unk_0C);
+        CellActor_Delete(param0->unk_1848[v0].unk_0C);
         param0->unk_1848[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_1848[v0].unk_48);
     }
@@ -1412,12 +1412,12 @@ static void ov97_0222E814 (UnkStruct_ov97_0222E398 * param0)
         param0->unk_88[v0].unk_40 = param0->unk_88[v0].unk_38;
         param0->unk_88[v0].unk_44 = param0->unk_88[v0].unk_38;
 
-        v1 = *( VecFx32 *)GraphicElementData_GetPosition(param0->unk_88[v0].unk_0C);
+        v1 = *( VecFx32 *)CellActor_GetPosition(param0->unk_88[v0].unk_0C);
         v1.x = FX32_CONST(16 + (LCRNG_Next() % (256 - 32)));
         v1.y = FX32_CONST(0);
 
-        GraphicElementData_SetPosition(param0->unk_88[v0].unk_0C, &v1);
-        GraphicElementData_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
+        CellActor_SetPosition(param0->unk_88[v0].unk_0C, &v1);
+        CellActor_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1464,11 +1464,11 @@ static void ov97_0222EA68 (UnkStruct_ov97_0222E398 * param0)
             v1.x = param0->unk_88[v0].unk_10.x + (sub_0201D250(v2) * v3);
             v1.y = param0->unk_88[v0].unk_10.y + (sub_0201D264(v2) * v3);
 
-            GraphicElementData_SetPosition(param0->unk_88[v0].unk_0C, &v1);
+            CellActor_SetPosition(param0->unk_88[v0].unk_0C, &v1);
         }
 
-        GraphicElementData_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
-        GraphicElementData_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
+        CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+        CellActor_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1516,13 +1516,13 @@ static void ov97_0222EBD0 (UnkStruct_ov97_0222E398 * param0)
         param0->unk_1848[v0].unk_40 = param0->unk_1848[v0].unk_38;
         param0->unk_1848[v0].unk_44 = param0->unk_1848[v0].unk_38;
 
-        v1 = *( VecFx32 *)GraphicElementData_GetPosition(param0->unk_1848[v0].unk_0C);
+        v1 = *( VecFx32 *)CellActor_GetPosition(param0->unk_1848[v0].unk_0C);
 
         v1.x = FX32_CONST(128);
         v1.y = FX32_CONST(384);
 
-        GraphicElementData_SetPosition(param0->unk_1848[v0].unk_0C, &v1);
-        GraphicElementData_SetDrawFlag(param0->unk_1848[v0].unk_0C, 1);
+        CellActor_SetPosition(param0->unk_1848[v0].unk_0C, &v1);
+        CellActor_SetDrawFlag(param0->unk_1848[v0].unk_0C, 1);
 
         param0->unk_1848[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_1848[v0], 6);
     }
@@ -1574,20 +1574,20 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1)
         v0->unk_30--;
         return;
     } else {
-        GraphicElementData_SetDrawFlag(v0->unk_0C, 1);
+        CellActor_SetDrawFlag(v0->unk_0C, 1);
     }
 
     {
         BOOL v4;
 
-        v1 = *(( VecFx32 * )GraphicElementData_GetPosition(v0->unk_0C));
+        v1 = *(( VecFx32 * )CellActor_GetPosition(v0->unk_0C));
         v4 = ov97_0222EDC0(v0->unk_10.x >> FX32_SHIFT, v0->unk_10.y >> FX32_SHIFT, FX_FX32_TO_F32(v1.x), FX_FX32_TO_F32(v1.y), &v2, &v3, FX_FX32_TO_F32(v0->unk_1C), FX_FX32_TO_F32(v0->unk_20));
 
         if (v4 && (v0->unk_24 == 0)) {
             v1.x += FX_F32_TO_FX32(v2);
             v1.y += FX_F32_TO_FX32(v3);
 
-            GraphicElementData_SetPosition(v0->unk_0C, &v1);
+            CellActor_SetPosition(v0->unk_0C, &v1);
         } else {
             switch (v0->unk_24) {
             case 0:
@@ -1661,14 +1661,14 @@ static void ov97_0222EEB8 (SysTask * param0, void * param1)
                         v1.x += FX_F32_TO_FX32(v2);
                         v1.y += FX_F32_TO_FX32(v3);
 
-                        GraphicElementData_SetPosition(v0->unk_0C, &v1);
+                        CellActor_SetPosition(v0->unk_0C, &v1);
                     } else {
                         v0->unk_08 = 1;
                     }
                 }
 
                 v0->unk_28 %= 360;
-                GraphicElementData_SetPosition(v0->unk_0C, &v1);
+                CellActor_SetPosition(v0->unk_0C, &v1);
                 break;
             }
         }
@@ -1839,11 +1839,11 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         }
 
         if (v3 > 50) {
-            GraphicElementData_SetAnimNoRestart(v0->unk_3008.unk_0C, 4);
+            CellActor_SetAnimNoRestart(v0->unk_3008.unk_0C, 4);
         } else if (v3 > 30) {
-            GraphicElementData_SetAnimNoRestart(v0->unk_3008.unk_0C, 3);
+            CellActor_SetAnimNoRestart(v0->unk_3008.unk_0C, 3);
         } else if (v3 > 7) {
-            GraphicElementData_SetDrawFlag(v0->unk_3008.unk_0C, 1);
+            CellActor_SetDrawFlag(v0->unk_3008.unk_0C, 1);
         }
 
         if (v1 || (v3 == (80 - 1))) {
@@ -1911,8 +1911,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
             break;
         }
 
-        v6 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_3008.unk_0C);
-        v7 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_3054.unk_0C);
+        v6 = ( VecFx32 * )CellActor_GetPosition(v0->unk_3008.unk_0C);
+        v7 = ( VecFx32 * )CellActor_GetPosition(v0->unk_3054.unk_0C);
 
         if (v6->y < FX32_CONST(256 - 32)) {
             v6->y += FX32_CONST(8);
@@ -1924,8 +1924,8 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
             if (v7->y < FX32_CONST(384)) {
                 v7->y += FX32_CONST(8);
 
-                if (GraphicElementData_GetDrawFlag(v0->unk_3054.unk_0C) == 0) {
-                    GraphicElementData_SetDrawFlag(v0->unk_3054.unk_0C, 1);
+                if (CellActor_GetDrawFlag(v0->unk_3054.unk_0C) == 0) {
+                    CellActor_SetDrawFlag(v0->unk_3054.unk_0C, 1);
                 }
             } else {
                 v0->unk_00 = 7;
@@ -1958,11 +1958,11 @@ static void ov97_0222F4BC (SysTask * param0, void * param1)
         }
 
         if (v10 > 50) {
-            GraphicElementData_SetDrawFlag(v0->unk_3054.unk_0C, 0);
+            CellActor_SetDrawFlag(v0->unk_3054.unk_0C, 0);
         } else if (v10 > 30) {
-            GraphicElementData_SetAnimNoRestart(v0->unk_3054.unk_0C, 2);
+            CellActor_SetAnimNoRestart(v0->unk_3054.unk_0C, 2);
         } else if (v10 > 7) {
-            GraphicElementData_SetAnimNoRestart(v0->unk_3054.unk_0C, 3);
+            CellActor_SetAnimNoRestart(v0->unk_3054.unk_0C, 3);
         }
 
         if (v1) {
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 5b4f2afacb..66cec1a47f 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -109,13 +109,13 @@ typedef struct {
     void (* unk_2C98)(void *);
     int unk_2C9C;
     int unk_2CA0;
-    GraphicElementManager * unk_2CA4;
+    CellActorCollection * unk_2CA4;
     UnkStruct_0200C738 unk_2CA8;
     UnkStruct_02009714 * unk_2E34[6];
     UnkStruct_02009DC8 * unk_2E4C[6];
     CellActorResourceData unk_2E64;
-    GraphicElementData * unk_2E88[2];
-    GraphicElementData * unk_2E90[3];
+    CellActor * unk_2E88[2];
+    CellActor * unk_2E90[3];
     UnkUnion_ov97_0222D2B0 unk_2E9C;
     UnkStruct_ov97_02231318 unk_31F4;
     void (* unk_3E0C)(void *);
@@ -249,25 +249,25 @@ static void ov97_02230410 (UnkStruct_ov97_02230868 * param0)
 static void ov97_02230438 (UnkStruct_ov97_02230868 * param0)
 {
     if (param0->unk_2E88[0]) {
-        GraphicElementData_Delete(param0->unk_2E88[0]);
+        CellActor_Delete(param0->unk_2E88[0]);
     }
 
     if (param0->unk_2E88[1]) {
-        GraphicElementData_Delete(param0->unk_2E88[1]);
+        CellActor_Delete(param0->unk_2E88[1]);
     }
 
     param0->unk_2E88[0] = param0->unk_2E88[1] = NULL;
 
     if (param0->unk_2E90[0]) {
-        GraphicElementData_Delete(param0->unk_2E90[0]);
+        CellActor_Delete(param0->unk_2E90[0]);
     }
 
     if (param0->unk_2E90[1]) {
-        GraphicElementData_Delete(param0->unk_2E90[1]);
+        CellActor_Delete(param0->unk_2E90[1]);
     }
 
     if (param0->unk_2E90[2]) {
-        GraphicElementData_Delete(param0->unk_2E90[2]);
+        CellActor_Delete(param0->unk_2E90[2]);
     }
 
     param0->unk_2E90[0] = param0->unk_2E90[1] = param0->unk_2E90[2] = NULL;
@@ -279,9 +279,9 @@ static void ov97_022304AC (UnkStruct_ov97_02230868 * param0)
     param0->unk_3E10 = 0;
     param0->unk_2E88[0] = ov97_02237D14(0, param0->unk_2E88[0], 72, 168, 1);
 
-    GraphicElementData_SetExplicitPriority(param0->unk_2E88[0], 2);
+    CellActor_SetExplicitPriority(param0->unk_2E88[0], 2);
     param0->unk_2E88[1] = ov97_02237D14(0, param0->unk_2E88[1], 184, 168, 0);
-    GraphicElementData_SetExplicitPriority(param0->unk_2E88[1], 2);
+    CellActor_SetExplicitPriority(param0->unk_2E88[1], 2);
 }
 
 static void ov97_02230500 (Window * param0, u8 param1)
@@ -808,7 +808,7 @@ static void ov97_022310FC (UnkStruct_ov97_02230868 * param0)
 
         if (v2 == 0) {
             if (param0->unk_2E90[v1]) {
-                GraphicElementData_SetDrawFlag(param0->unk_2E90[v1], 0);
+                CellActor_SetDrawFlag(param0->unk_2E90[v1], 0);
             }
 
             continue;
@@ -820,7 +820,7 @@ static void ov97_022310FC (UnkStruct_ov97_02230868 * param0)
         DC_FlushRange(v4->pRawData, ((4 * 4) * 0x20));
         GX_LoadOBJ(v4->pRawData, (0x64 + v1 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
 
-        GraphicElementData_SetExplicitPalette(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
+        CellActor_SetExplicitPalette(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
         Heap_FreeToHeap(v3);
     }
 }
@@ -997,8 +997,8 @@ static void ov97_022314FC (UnkStruct_ov97_02230868 * param0, int param1, int * p
     }
 
     if (v1 != param0->unk_3E10) {
-        GraphicElementData_SetAnim(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
-        GraphicElementData_SetAnim(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
+        CellActor_SetAnim(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
+        CellActor_SetAnim(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
     }
 
     v0 = 0;
@@ -1258,7 +1258,7 @@ static int ov97_0223161C (OverlayManager * param0, int * param1)
     }
 
     if (v4->unk_2CA4 != NULL) {
-        GraphicElementManager_Update(v4->unk_2CA4);
+        CellActorCollection_Update(v4->unk_2CA4);
     }
 
     ov97_02237CA0();
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 767165c25f..21b17283c5 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -103,13 +103,13 @@ typedef struct {
 } UnkStruct_ov97_02233DAC;
 
 typedef struct {
-    GraphicElementData * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_00;
+    CellActor * unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub1;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub2;
@@ -123,7 +123,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
     u8 unk_0C[512];
 } UnkStruct_ov97_0223F434;
 
@@ -138,19 +138,19 @@ typedef struct {
     int unk_1C;
     BGL * unk_20;
     int unk_24;
-    GraphicElementManager * unk_28;
+    CellActorCollection * unk_28;
     UnkStruct_0200C738 unk_2C;
     UnkStruct_02009714 * unk_1B8[6];
     UnkStruct_02009DC8 * unk_1D0[6];
     CellActorResourceData unk_1E8;
     UnkStruct_ov97_02234A2C_sub1 unk_20C[30];
     TouchScreenRect unk_374[34];
-    GraphicElementData * unk_3FC[4];
-    GraphicElementData * unk_40C[4];
-    GraphicElementData * unk_41C[4];
+    CellActor * unk_3FC[4];
+    CellActor * unk_40C[4];
+    CellActor * unk_41C[4];
     UnkStruct_ov97_02234A2C_sub2 unk_42C[6];
     int unk_474;
-    GraphicElementData * unk_478[6];
+    CellActor * unk_478[6];
     UnkStruct_ov97_02233DAC unk_490;
     Window unk_4DC;
     Window unk_4EC;
@@ -553,7 +553,7 @@ static void ov97_022340B0 (UnkStruct_ov97_02234A2C * param0)
 
 static void ov97_022340FC (CellActorInitParamsEx * param0, UnkStruct_ov97_02234A2C * param1, CellActorResourceData * param2, int param3)
 {
-    param0->manager = param1->unk_28;
+    param0->collection = param1->unk_28;
     param0->resourceData = &param1->unk_1E8;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -646,7 +646,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, GraphicElementData * param5)
+static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int param4, CellActor * param5)
 {
     u8 * v0;
     u8 v1;
@@ -660,11 +660,11 @@ static void ov97_02234278 (int param0, int param1, u32 param2, int param3, int p
     DC_FlushRange(v2->pRawData, ((4 * 4) * 0x20));
     GX_LoadOBJ(v2->pRawData, (0x64 + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
 
-    GraphicElementData_SetExplicitPalette(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
+    CellActor_SetExplicitPalette(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
     Heap_FreeToHeap(v0);
 }
 
-static void ov97_022342E4 (int param0, int param1, int param2, int param3, GraphicElementData * param4, void * param5, NARC * param6)
+static void ov97_022342E4 (int param0, int param1, int param2, int param3, CellActor * param4, void * param5, NARC * param6)
 {
     u32 v0;
     NNSG2dCharacterData * v1;
@@ -699,7 +699,7 @@ static void ov97_02234364 (void)
         if (v1->unk_08) {
             DC_FlushRange(v1->unk_0C, ((4 * 4) * 0x20));
             GX_LoadOBJ(v1->unk_0C, v1->unk_00, ((4 * 4) * 0x20));
-            GraphicElementData_SetExplicitPalette(v1->unk_08, v1->unk_04);
+            CellActor_SetExplicitPalette(v1->unk_08, v1->unk_04);
         }
     }
 }
@@ -723,17 +723,17 @@ static void ov97_022343A8 (UnkStruct_ov97_02234A2C * param0)
             v4 = GBASpeciesToDSFormId(ov97_02236DD0(v1), v5, v3);
 
             ov97_022342E4(v1, v2, v4, v0, param0->unk_20C[v0].unk_00, v6, v7);
-            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
+            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
 
             if (GetGBABoxMonData(&(param0->unk_E8E0->boxes[param0->unk_E8E4][v0]), 12, NULL)) {
-                GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 1);
+                CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 1);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+                CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
             }
         } else {
             ov97_022342E4(v1, v2, v4, v0, NULL, v6, v7);
-            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
-            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
         }
     }
 
@@ -763,27 +763,27 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
             v3.position.y = FX32_ONE * (v2 * 24 + 40);
 
             if (param0->unk_20C[v0].unk_00 == NULL) {
-                param0->unk_20C[v0].unk_00 = GraphicElementManager_AddElementEx(&v3);
+                param0->unk_20C[v0].unk_00 = CellActorCollection_AddEx(&v3);
             }
 
-            GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_00, 1);
-            GraphicElementData_SetAnim(param0->unk_20C[v0].unk_00, 10 + v0);
-            GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_00, 1);
-            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
-            GraphicElementData_SetPriority(param0->unk_20C[v0].unk_00, 100 + v0);
+            CellActor_SetAnimateFlag(param0->unk_20C[v0].unk_00, 1);
+            CellActor_SetAnim(param0->unk_20C[v0].unk_00, 10 + v0);
+            CellActor_SetExplicitPriority(param0->unk_20C[v0].unk_00, 1);
+            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
+            CellActor_SetPriority(param0->unk_20C[v0].unk_00, 100 + v0);
 
             v3.position.x += FX32_ONE * 6;
             v3.position.y += FX32_ONE * 12;
 
             if (param0->unk_20C[v0].unk_04 == NULL) {
-                param0->unk_20C[v0].unk_04 = GraphicElementManager_AddElementEx(&v3);
+                param0->unk_20C[v0].unk_04 = CellActorCollection_AddEx(&v3);
             }
 
-            GraphicElementData_SetAnimateFlag(param0->unk_20C[v0].unk_04, 1);
-            GraphicElementData_SetAnim(param0->unk_20C[v0].unk_04, 40);
-            GraphicElementData_SetExplicitPriority(param0->unk_20C[v0].unk_04, 1);
-            GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
-            GraphicElementData_SetPriority(param0->unk_20C[v0].unk_04, 0 + v0);
+            CellActor_SetAnimateFlag(param0->unk_20C[v0].unk_04, 1);
+            CellActor_SetAnim(param0->unk_20C[v0].unk_04, 40);
+            CellActor_SetExplicitPriority(param0->unk_20C[v0].unk_04, 1);
+            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+            CellActor_SetPriority(param0->unk_20C[v0].unk_04, 0 + v0);
 
             v0++;
 
@@ -794,10 +794,10 @@ static void ov97_02234508 (UnkStruct_ov97_02234A2C * param0)
     }
 }
 
-static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4)
+static CellActor * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int param1, int param2, int param3, int param4)
 {
     CellActorInitParamsEx v0;
-    GraphicElementData * v1;
+    CellActor * v1;
 
     ov97_022340FC(&v0, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -805,12 +805,12 @@ static GraphicElementData * ov97_02234638 (UnkStruct_ov97_02234A2C * param0, int
     v0.position.y = FX32_ONE * param2;
     v0.priority = 10;
 
-    v1 = GraphicElementManager_AddElementEx(&v0);
+    v1 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetAnimateFlag(v1, 1);
-    GraphicElementData_SetAnim(v1, param3);
-    GraphicElementData_SetExplicitPriority(v1, 1);
-    GraphicElementData_SetDrawFlag(v1, param4);
+    CellActor_SetAnimateFlag(v1, 1);
+    CellActor_SetAnim(v1, param3);
+    CellActor_SetExplicitPriority(v1, 1);
+    CellActor_SetDrawFlag(v1, param4);
 
     return v1;
 }
@@ -1045,7 +1045,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
 {
     int v0, v1;
 
-    if (param0->unk_20C[param1].unk_00 && (GraphicElementData_GetDrawFlag(param0->unk_20C[param1].unk_00) == 0)) {
+    if (param0->unk_20C[param1].unk_00 && (CellActor_GetDrawFlag(param0->unk_20C[param1].unk_00) == 0)) {
         return 3;
     }
 
@@ -1081,16 +1081,16 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
 
         for (v0 = 0; v0 < 6; v0++) {
             if (param0->unk_42C[v0].unk_04 == -1) {
-                v2 = GraphicElementData_GetPosition(param0->unk_20C[param1].unk_00);
-                GraphicElementData_SetPosition(param0->unk_42C[v0].unk_00, v2);
-                v2 = GraphicElementData_GetPosition(param0->unk_42C[v0].unk_00);
+                v2 = CellActor_GetPosition(param0->unk_20C[param1].unk_00);
+                CellActor_SetPosition(param0->unk_42C[v0].unk_00, v2);
+                v2 = CellActor_GetPosition(param0->unk_42C[v0].unk_00);
 
                 v3 = *v2;
                 v3.x -= FX32_ONE * 8;
                 v3.y -= FX32_ONE * 4;
 
-                GraphicElementData_SetPosition(param0->unk_42C[v0].unk_00, &v3);
-                GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
+                CellActor_SetPosition(param0->unk_42C[v0].unk_00, &v3);
+                CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
 
                 param0->unk_42C[v0].unk_04 = param1;
                 param0->unk_42C[v0].unk_08 = param0->unk_E8E4;
@@ -1100,7 +1100,7 @@ static int ov97_02234854 (UnkStruct_ov97_02234A2C * param0, int param1)
             }
         }
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_42C[v1].unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_42C[v1].unk_00, 0);
 
         param0->unk_42C[v1].unk_04 = -1;
         param0->unk_474--;
@@ -1117,9 +1117,9 @@ static void ov97_022349E0 (UnkStruct_ov97_02234A2C * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if ((param0->unk_42C[v0].unk_04 != -1) && (param0->unk_42C[v0].unk_08 == param0->unk_E8E4)) {
-            GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
+            CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
+            CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
         }
     }
 }
@@ -1459,17 +1459,17 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
     CellActorInitParamsEx v5;
 
     for (v0 = 0; v0 < 30; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+        CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_3FC[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[0], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_40C[0], 0);
+    CellActor_SetDrawFlag(param0->unk_3FC[0], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[0], 0);
+    CellActor_SetDrawFlag(param0->unk_40C[0], 0);
 
     ov97_022340FC(&v5, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -1477,12 +1477,12 @@ static void ov97_02234F88 (UnkStruct_ov97_02234A2C * param0)
         v5.position.x = FX32_ONE * (v0 * 40 + 28);
         v5.position.y = FX32_ONE * 142;
 
-        param0->unk_478[v0] = GraphicElementManager_AddElementEx(&v5);
+        param0->unk_478[v0] = CellActorCollection_AddEx(&v5);
 
-        GraphicElementData_SetAnimateFlag(param0->unk_478[v0], 1);
-        GraphicElementData_SetAnim(param0->unk_478[v0], 10 + v0);
-        GraphicElementData_SetExplicitPriority(param0->unk_478[v0], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_478[v0], 1);
+        CellActor_SetAnimateFlag(param0->unk_478[v0], 1);
+        CellActor_SetAnim(param0->unk_478[v0], 10 + v0);
+        CellActor_SetExplicitPriority(param0->unk_478[v0], 1);
+        CellActor_SetDrawFlag(param0->unk_478[v0], 1);
 
         v1 = ov97_02234124(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04);
         v2 = ov97_02234148(param0, param0->unk_42C[v0].unk_08, param0->unk_42C[v0].unk_04);
@@ -1519,15 +1519,15 @@ static void ov97_02235178 (UnkStruct_ov97_02234A2C * param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        GraphicElementData_Delete(param0->unk_478[v0]);
+        CellActor_Delete(param0->unk_478[v0]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     ov97_02235158(&param0->unk_4FC);
 
-    GraphicElementData_SetDrawFlag(param0->unk_3FC[0], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[0], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_40C[0], 1);
+    CellActor_SetDrawFlag(param0->unk_3FC[0], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[0], 1);
+    CellActor_SetDrawFlag(param0->unk_40C[0], 1);
 
     for (v0 = 0; v0 < 6; v0++) {
         param0->unk_42C[v0].unk_04 = -1;
@@ -1545,30 +1545,30 @@ static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0)
 
     for (v0 = 0; v0 < 30; v0++) {
         if (param0->unk_20C[v0].unk_00) {
-            GraphicElementData_Delete(param0->unk_20C[v0].unk_00);
+            CellActor_Delete(param0->unk_20C[v0].unk_00);
         }
 
         if (param0->unk_20C[v0].unk_04) {
-            GraphicElementData_Delete(param0->unk_20C[v0].unk_04);
+            CellActor_Delete(param0->unk_20C[v0].unk_04);
         }
     }
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_42C[v0].unk_00) {
-            GraphicElementData_Delete(param0->unk_42C[v0].unk_00);
+            CellActor_Delete(param0->unk_42C[v0].unk_00);
         }
     }
 
     if (param0->unk_3FC[0]) {
-        GraphicElementData_Delete(param0->unk_3FC[0]);
+        CellActor_Delete(param0->unk_3FC[0]);
     }
 
     if (param0->unk_41C[0]) {
-        GraphicElementData_Delete(param0->unk_41C[0]);
+        CellActor_Delete(param0->unk_41C[0]);
     }
 
     if (param0->unk_40C[0]) {
-        GraphicElementData_Delete(param0->unk_40C[0]);
+        CellActor_Delete(param0->unk_40C[0]);
     }
 
     ov97_02235158(&param0->unk_4DC);
@@ -1583,7 +1583,7 @@ static void ov97_022351F0 (UnkStruct_ov97_02234A2C * param0)
         sub_02009754(param0->unk_1B8[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_28);
+    CellActorCollection_Delete(param0->unk_28);
     param0->unk_28 = NULL;
 
     sub_0200A878();
@@ -2141,7 +2141,7 @@ static int ov97_022356E8 (OverlayManager * param0, int * param1)
     }
 
     if (v3->unk_28 != NULL) {
-        GraphicElementManager_Update(v3->unk_28);
+        CellActorCollection_Update(v3->unk_28);
     }
 
     return 0;
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index a51c0ca721..6d3531c473 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -67,7 +67,7 @@ typedef struct {
     int unk_20;
     BOOL unk_24[4];
     UnkStruct_ov97_02237AEC unk_34;
-    GraphicElementData * unk_26C;
+    CellActor * unk_26C;
     int unk_270;
     fx32 unk_274;
     u8 unk_278[3200];
@@ -419,11 +419,11 @@ void ov97_02237CAC (int param0)
         VecFx32 * v1;
 
         if (v0->unk_270 == 0) {
-            if ((GraphicElementData_GetDrawFlag(v0->unk_26C) == 0) && (param0 == 0)) {
-                GraphicElementData_SetDrawFlag(v0->unk_26C, 1);
+            if ((CellActor_GetDrawFlag(v0->unk_26C) == 0) && (param0 == 0)) {
+                CellActor_SetDrawFlag(v0->unk_26C, 1);
             }
 
-            v1 = ( VecFx32 * )GraphicElementData_GetPosition(v0->unk_26C);
+            v1 = ( VecFx32 * )CellActor_GetPosition(v0->unk_26C);
 
             if (v1->y < 384 * FX32_ONE) {
                 v1->y += FX32_ONE * 3;
@@ -434,18 +434,18 @@ void ov97_02237CAC (int param0)
     }
 
     if (v0->unk_34.unk_00 != NULL) {
-        GraphicElementManager_Update(v0->unk_34.unk_00);
+        CellActorCollection_Update(v0->unk_34.unk_00);
     }
 }
 
-GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int param2, int param3, int param4)
+CellActor * ov97_02237D14 (int param0, CellActor * param1, int param2, int param3, int param4)
 {
     UnkStruct_ov97_0223F550 * v0 = &Unk_ov97_0223F550;
 
     if (param1 == NULL) {
         CellActorInitParamsEx v1;
 
-        v1.manager = v0->unk_34.unk_00;
+        v1.collection = v0->unk_34.unk_00;
         v1.resourceData = &v0->unk_34.unk_1D8[param0];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -462,13 +462,13 @@ GraphicElementData * ov97_02237D14 (int param0, GraphicElementData * param1, int
             v1.position.y += v0->unk_274;
         }
 
-        param1 = GraphicElementManager_AddElementEx(&v1);
+        param1 = CellActorCollection_AddEx(&v1);
     }
 
-    GraphicElementData_SetAnimateFlag(param1, 1);
-    GraphicElementData_SetExplicitPriority(param1, 0);
-    GraphicElementData_SetAnim(param1, param4);
-    GraphicElementData_SetDrawFlag(param1, 1);
+    CellActor_SetAnimateFlag(param1, 1);
+    CellActor_SetExplicitPriority(param1, 0);
+    CellActor_SetAnim(param1, param4);
+    CellActor_SetDrawFlag(param1, 1);
 
     return param1;
 }
@@ -480,7 +480,7 @@ void ov97_02237DA0 (void)
     int v2;
 
     if (v0->unk_26C) {
-        GraphicElementData_Delete(v0->unk_26C);
+        CellActor_Delete(v0->unk_26C);
         v0->unk_26C = NULL;
     }
 
@@ -505,7 +505,7 @@ void ov97_02237DA0 (void)
         v1->unk_190[v2] = NULL;
     }
 
-    GraphicElementManager_Delete(v1->unk_00);
+    CellActorCollection_Delete(v1->unk_00);
     v1->unk_00 = NULL;
 
     sub_0200A878();
@@ -572,7 +572,7 @@ static int ov97_02237EA8 (int param0)
     return 0;
 }
 
-static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int param2, int param3, u8 * param4, ArchivedSprite * param5)
+static void ov97_02237EF8 (CellActor * param0, Pokemon * param1, int param2, int param3, u8 * param4, ArchivedSprite * param5)
 {
     int v0, v1;
     u32 v2;
@@ -596,7 +596,7 @@ static void ov97_02237EF8 (GraphicElementData * param0, Pokemon * param1, int pa
     }
 
     {
-        NNSG2dImagePaletteProxy * v6 = GraphicElementData_GetPaletteProxy(param0);
+        NNSG2dImagePaletteProxy * v6 = CellActor_GetPaletteProxy(param0);
         u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB);
 
         sub_02006E84(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08);
@@ -718,7 +718,7 @@ void ov97_02238194 (BGL * param0, UnkStruct_0202DF40 * param1)
         break;
     }
 
-    GraphicElementData_SetDrawFlag(v2->unk_26C, 0);
+    CellActor_SetDrawFlag(v2->unk_26C, 0);
 }
 
 void ov97_0223829C (UnkStruct_ov97_0223829C * param0, UnkUnion_ov97_0222D2B0 * param1, int param2)
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 364305d939..0260cff0a4 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -205,7 +205,7 @@ static int ov101_021D5A0C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00.unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 0, 0, 0, 0, 3, 2);
-    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -230,13 +230,13 @@ static void ov101_021D5A70 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v3);
     v3.y = v2 + (FX32_ONE * 16) + v4->unk_00.unk_00->unk_9C[v0];
-    GraphicElementData_SetPosition(v4->unk_0C.unk_04, &v3);
+    CellActor_SetPosition(v4->unk_0C.unk_04, &v3);
 
     v2 = ((v2) / 32);
     v1 = Unk_ov101_021D927C[ov101_021D55A4(v4->unk_00.unk_00, v0, ((v2) / FX32_ONE))];
 
-    if (v1 != GraphicElementData_GetActiveAnim(v4->unk_0C.unk_04)) {
-        GraphicElementData_SetAnim(v4->unk_0C.unk_04, v1);
+    if (v1 != CellActor_GetActiveAnim(v4->unk_0C.unk_04)) {
+        CellActor_SetAnim(v4->unk_0C.unk_04, v1);
         SpriteActor_SetAnimFrame(v4->unk_0C.unk_04, 0);
     }
 }
@@ -275,7 +275,7 @@ static int ov101_021D5B44 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 1, 1, 1, 1, 1, 1);
-    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -293,23 +293,23 @@ static void ov101_021D5BA8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     u32 v2 = v1->unk_00->unk_60;
 
     if ((v1->unk_04 > 1) && (v2 < v1->unk_04)) {
-        GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 0);
+        CellActor_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 1);
+    CellActor_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
 
-    if (v2 != GraphicElementData_GetActiveAnim(v1->unk_0C.unk_04)) {
-        GraphicElementData_SetAnim(v1->unk_0C.unk_04, v2);
-        GraphicElementData_RestartAnim(v1->unk_0C.unk_04);
+    if (v2 != CellActor_GetActiveAnim(v1->unk_0C.unk_04)) {
+        CellActor_SetAnim(v1->unk_0C.unk_04, v2);
+        CellActor_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D937C[v2];
-    GraphicElementData_SetPosition(v1->unk_0C.unk_04, &v0);
+    CellActor_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5C24 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -348,7 +348,7 @@ static int ov101_021D5C7C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_0C, &v0, (NNS_G2D_VRAM_TYPE_2DMAIN), 0, 1, 1, 1, 1, 1, 1);
-    GraphicElementData_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -366,23 +366,23 @@ static void ov101_021D5CE0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     u32 v2 = v1->unk_00->unk_64;
 
     if (v2 < v1->unk_04) {
-        GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 0);
+        CellActor_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    GraphicElementData_SetDrawFlag(v1->unk_0C.unk_04, 1);
+    CellActor_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->unk_04;
 
-    if (v2 != GraphicElementData_GetActiveAnim(v1->unk_0C.unk_04)) {
-        GraphicElementData_SetAnim(v1->unk_0C.unk_04, v2);
-        GraphicElementData_RestartAnim(v1->unk_0C.unk_04);
+    if (v2 != CellActor_GetActiveAnim(v1->unk_0C.unk_04)) {
+        CellActor_SetAnim(v1->unk_0C.unk_04, v2);
+        CellActor_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D9354[v2];
-    GraphicElementData_SetPosition(v1->unk_0C.unk_04, &v0);
+    CellActor_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -425,9 +425,9 @@ void ov101_021D5DA4 (UnkStruct_ov101_021D5D90 * param0, int param1)
     UnkStruct_ov101_021D630C * v0 = sub_02071598(param0);
 
     if (param1 == 1) {
-        GraphicElementData_SetDrawFlag(v0->unk_3C.unk_04, 0);
+        CellActor_SetDrawFlag(v0->unk_3C.unk_04, 0);
     } else {
-        GraphicElementData_SetDrawFlag(v0->unk_3C.unk_04, 1);
+        CellActor_SetDrawFlag(v0->unk_3C.unk_04, 1);
     }
 }
 
@@ -525,10 +525,10 @@ static int ov101_021D5E84 (UnkStruct_ov101_021D630C * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * 192)), 0};
     VecFx32 v1 = {0x2000, 0x2000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 0);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 0);
     SpriteActor_SetAnimFrame(param0->unk_3C.unk_04, 0);
     Sound_PlayEffect(1572);
 
@@ -557,8 +557,8 @@ static int ov101_021D5EEC (UnkStruct_ov101_021D630C * param0)
         param0->unk_04++;
     }
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v1);
 
     return 0;
 }
@@ -582,9 +582,9 @@ static int(*const Unk_ov101_021D912C[])(UnkStruct_ov101_021D630C *) = {
 
 static int ov101_021D5F70 (UnkStruct_ov101_021D630C * param0)
 {
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 1);
-    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
-    GraphicElementData_SetAnimateFlag(param0->unk_3C.unk_04, 1);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 1);
+    CellActor_RestartAnim(param0->unk_3C.unk_04);
+    CellActor_SetAnimateFlag(param0->unk_3C.unk_04, 1);
 
     Sound_PlayEffect(1744);
     param0->unk_04++;
@@ -616,11 +616,11 @@ static int ov101_021D5FB8 (UnkStruct_ov101_021D630C * param0)
 
     param0->unk_14 = v1;
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 3);
-    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 3);
+    CellActor_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -634,7 +634,7 @@ static int ov101_021D6020 (UnkStruct_ov101_021D630C * param0)
     v0 = param0->unk_14;
     v0.y += v1[param0->unk_30 / 2];
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v0);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v0);
 
     param0->unk_30++;
 
@@ -658,11 +658,11 @@ static int ov101_021D6084 (UnkStruct_ov101_021D630C * param0)
 
     param0->unk_14 = v1;
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 4);
-    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 4);
+    CellActor_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -691,8 +691,8 @@ static int ov101_021D60EC (UnkStruct_ov101_021D630C * param0)
         param0->unk_04++;
     }
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v2);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v2);
 
     return 0;
 }
@@ -714,11 +714,11 @@ static int ov101_021D6158 (UnkStruct_ov101_021D630C * param0)
     param0->unk_2C = 0;
     param0->unk_08 = 1;
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 2);
-    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 2);
+    CellActor_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -744,8 +744,8 @@ static int ov101_021D61E0 (UnkStruct_ov101_021D630C * param0)
         param0->unk_30 = 0;
     }
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &param0->unk_14);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, param0->unk_2C);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &param0->unk_14);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, param0->unk_2C);
 
     return 0;
 }
@@ -764,11 +764,11 @@ static int ov101_021D6288 (UnkStruct_ov101_021D630C * param0)
     param0->unk_20 = v2;
     param0->unk_08 = 1;
 
-    GraphicElementData_SetPosition(param0->unk_3C.unk_04, &v1);
-    GraphicElementData_SetAffineScale(param0->unk_3C.unk_04, &v0);
-    GraphicElementData_SetAffineZRotation(param0->unk_3C.unk_04, 0);
-    GraphicElementData_SetAnim(param0->unk_3C.unk_04, 2);
-    GraphicElementData_RestartAnim(param0->unk_3C.unk_04);
+    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
+    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    CellActor_SetAnim(param0->unk_3C.unk_04, 2);
+    CellActor_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
 
@@ -841,11 +841,11 @@ static void ov101_021D6410 (UnkStruct_ov101_021D13C8 * param0, UnkStruct_ov101_0
 
     ov101_021D84A4(param0->unk_450, param1, param2, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 2, 2, 2, 2, 2, 7);
 
-    GraphicElementData_SetAffineOverwriteMode(param1->unk_04, 2);
-    GraphicElementData_SetAffineTranslation(param1->unk_04, &v0);
-    GraphicElementData_SetAffineScale(param1->unk_04, &v1);
-    GraphicElementData_SetAffineZRotation(param1->unk_04, sub_0201D2A4(0));
-    GraphicElementData_SetAnimateFlag(param1->unk_04, 1);
+    CellActor_SetAffineOverwriteMode(param1->unk_04, 2);
+    CellActor_SetAffineTranslation(param1->unk_04, &v0);
+    CellActor_SetAffineScale(param1->unk_04, &v1);
+    CellActor_SetAffineZRotation(param1->unk_04, sub_0201D2A4(0));
+    CellActor_SetAnimateFlag(param1->unk_04, 1);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150;
@@ -894,7 +894,7 @@ static void ov101_021D64FC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
             sub_020715E4(param0, &v1);
             ov101_021D84A4(v0->unk_10->unk_450, &v0->unk_14, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 3, 3, 3, 3, 2, 5);
-            GraphicElementData_SetAnimateFlag(v0->unk_14.unk_04, 1);
+            CellActor_SetAnimateFlag(v0->unk_14.unk_04, 1);
 
             v0->unk_00++;
         }
@@ -1102,9 +1102,9 @@ static int ov101_021D682C (UnkStruct_ov101_021D66D0 * param0)
         VecFx32 v2 = {0x1000, 0x1000, 0};
 
         ov101_021D84A4(param0->unk_20->unk_450, &param0->unk_24, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 4, 4, 4, 4, 2, 6);
-        GraphicElementData_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
-        GraphicElementData_SetAffineTranslation(param0->unk_24.unk_04, &v1);
-        GraphicElementData_SetAffineZRotation(param0->unk_24.unk_04, sub_0201D2A4(0));
+        CellActor_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
+        CellActor_SetAffineTranslation(param0->unk_24.unk_04, &v1);
+        CellActor_SetAffineZRotation(param0->unk_24.unk_04, sub_0201D2A4(0));
 
         param0->unk_0C = 1;
         param0->unk_08++;
@@ -1127,11 +1127,11 @@ static int ov101_021D68AC (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x400, 0x400, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 0);
 
     param0->unk_08++;
     return 0;
@@ -1159,14 +1159,14 @@ static int ov101_021D6908 (UnkStruct_ov101_021D66D0 * param0)
         sub_02005844(35, 0);
     }
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
     return 0;
 }
 
 static int ov101_021D6968 (UnkStruct_ov101_021D66D0 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_24.unk_04, (FX32_ONE * 1));
+    CellActor_UpdateAnim(param0->unk_24.unk_04, (FX32_ONE * 1));
     param0->unk_14++;
 
     if (param0->unk_14 >= 9) {
@@ -1187,11 +1187,11 @@ static int ov101_021D6994 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 0);
     Sound_PlayEffect(1745);
 
     param0->unk_08++;
@@ -1219,8 +1219,8 @@ static int ov101_021D69FC (UnkStruct_ov101_021D66D0 * param0)
         param0->unk_0C = 1;
     }
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
 
     return 0;
 }
@@ -1234,12 +1234,12 @@ static int ov101_021D6A60 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 0);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, 0);
-    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 0);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    CellActor_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1256,14 +1256,14 @@ static int ov101_021D6AC8 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE / 2);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE / 2);
 
-    if (GraphicElementData_GetActiveAnim(param0->unk_24.unk_04) != 2) {
-        GraphicElementData_SetAnim(param0->unk_24.unk_04, 2);
-        GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    if (CellActor_GetActiveAnim(param0->unk_24.unk_04) != 2) {
+        CellActor_SetAnim(param0->unk_24.unk_04, 2);
+        CellActor_RestartAnim(param0->unk_24.unk_04);
     }
 
     param0->unk_0C = 1;
@@ -1281,12 +1281,12 @@ static int ov101_021D6B3C (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 5);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 5);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    CellActor_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1303,12 +1303,12 @@ static int ov101_021D6BA4 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 4);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 4);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    CellActor_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1325,12 +1325,12 @@ static int ov101_021D6C0C (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 3);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 1);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
-    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnim(param0->unk_24.unk_04, 3);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    CellActor_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1347,13 +1347,13 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0)
     VecFx32 v0 = {(FX32_ONE * 128), ((FX32_ONE * 192) + (FX32_ONE * (160 - 32))), 0};
     VecFx32 v1 = {0x1000, 0x1000, 0};
 
-    GraphicElementData_SetAffineScale(param0->unk_24.unk_04, &v1);
-    GraphicElementData_SetPosition(param0->unk_24.unk_04, &v0);
-    GraphicElementData_SetAnimateFlag(param0->unk_24.unk_04, 0);
-    GraphicElementData_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
+    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    CellActor_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    CellActor_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
 
-    GraphicElementData_SetAnim(param0->unk_24.unk_04, 5);
-    GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+    CellActor_SetAnim(param0->unk_24.unk_04, 5);
+    CellActor_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_14 = 0;
     param0->unk_0C = 1;
@@ -1364,14 +1364,14 @@ static int ov101_021D6C74 (UnkStruct_ov101_021D66D0 * param0)
 
 static int ov101_021D6CE0 (UnkStruct_ov101_021D66D0 * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
 
-    if (GraphicElementData_IsAnimated(param0->unk_24.unk_04) == 0) {
+    if (CellActor_IsAnimated(param0->unk_24.unk_04) == 0) {
         param0->unk_14++;
 
         if (param0->unk_14 >= 8) {
             param0->unk_14 = 0;
-            GraphicElementData_RestartAnim(param0->unk_24.unk_04);
+            CellActor_RestartAnim(param0->unk_24.unk_04);
         }
     }
 
@@ -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, GraphicElementData * param5, int param6)
+static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, CellActor * param5, int param6)
 {
     VecFx32 v0, v1;
 
@@ -1484,7 +1484,7 @@ static void ov101_021D6E78 (UnkStruct_ov101_021D5D90 * param0, fx32 param1, fx32
     }
 
     v1.y = param2 - v0.y;
-    GraphicElementData_SetPosition(param5, &v1);
+    CellActor_SetPosition(param5, &v1);
 }
 
 static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
@@ -1502,7 +1502,7 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
             ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_30, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4);
             ov101_021D84A4(v0->unk_2C->unk_450, &v0->unk_3C, &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 5, 5, 5, 5, 2, 4);
-            GraphicElementData_SetFlipMode(v0->unk_3C.unk_04, 1);
+            CellActor_SetFlipMode(v0->unk_3C.unk_04, 1);
             v0->unk_00++;
         }
     case 1:
@@ -1530,12 +1530,12 @@ static void ov101_021D6EC8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v4.x = (FX32_ONE * -32) + v3.x;
         v4.y = ((FX32_ONE * 192) + (FX32_ONE * 228)) - v3.y;
 
-        GraphicElementData_SetPosition(v0->unk_30.unk_04, &v4);
+        CellActor_SetPosition(v0->unk_30.unk_04, &v4);
 
         v4.x = (FX32_ONE * 288) - v3.x;
         v4.y = ((FX32_ONE * 192) + (FX32_ONE * 228)) - v3.y;
 
-        GraphicElementData_SetPosition(v0->unk_3C.unk_04, &v4);
+        CellActor_SetPosition(v0->unk_3C.unk_04, &v4);
 
         if (v2 == 2) {
             v0->unk_00++;
@@ -1688,7 +1688,7 @@ static int ov101_021D7260 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_04, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 6, 6, 6, 6, 2, 3);
-    GraphicElementData_SetAnimateFlag(v1->unk_04.unk_04, 1);
+    CellActor_SetAnimateFlag(v1->unk_04.unk_04, 1);
 
     return 1;
 }
@@ -1709,7 +1709,7 @@ static void ov101_021D72B8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v0 = 0;
     }
 
-    GraphicElementData_SetDrawFlag(v1->unk_04.unk_04, v0);
+    CellActor_SetDrawFlag(v1->unk_04.unk_04, v0);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D918C = {
@@ -1746,11 +1746,11 @@ static int ov101_021D7304 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v3->unk_04->unk_450, &v3->unk_08, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 6, 6, 6, 6, 2, 3);
 
-    GraphicElementData_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
-    GraphicElementData_SetAffineTranslation(v3->unk_08.unk_04, &v1);
-    GraphicElementData_SetAffineScale(v3->unk_08.unk_04, &v2);
-    GraphicElementData_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
-    GraphicElementData_SetAnimateFlag(v3->unk_08.unk_04, 1);
+    CellActor_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    CellActor_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    CellActor_SetAffineScale(v3->unk_08.unk_04, &v2);
+    CellActor_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
+    CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
 
     return 1;
 }
@@ -1801,7 +1801,7 @@ static int ov101_021D73EC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v1->unk_00->unk_450, &v1->unk_04, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 7, 6, 7, 7, 2, 3);
-    GraphicElementData_SetAnimateFlag(v1->unk_04.unk_04, 1);
+    CellActor_SetAnimateFlag(v1->unk_04.unk_04, 1);
 
     return 1;
 }
@@ -1822,7 +1822,7 @@ static void ov101_021D7444 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v0 = 0;
     }
 
-    GraphicElementData_SetDrawFlag(v1->unk_04.unk_04, v0);
+    CellActor_SetDrawFlag(v1->unk_04.unk_04, v0);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D922C = {
@@ -1859,11 +1859,11 @@ static int ov101_021D74A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020715E4(param0, &v0);
     ov101_021D84A4(v3->unk_04->unk_450, &v3->unk_08, &v0, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 7, 6, 7, 7, 2, 3);
 
-    GraphicElementData_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
-    GraphicElementData_SetAffineTranslation(v3->unk_08.unk_04, &v1);
-    GraphicElementData_SetAffineScale(v3->unk_08.unk_04, &v2);
-    GraphicElementData_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
-    GraphicElementData_SetAnimateFlag(v3->unk_08.unk_04, 1);
+    CellActor_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    CellActor_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    CellActor_SetAffineScale(v3->unk_08.unk_04, &v2);
+    CellActor_SetAffineZRotation(v3->unk_08.unk_04, sub_0201D2A4(0));
+    CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
 
     return 1;
 }
@@ -1916,8 +1916,8 @@ static int ov101_021D7588 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     for (v0 = 0; v0 < 2; v0++) {
         ov101_021D84A4(v2->unk_00->unk_450, &v2->unk_04[v0], &v1, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 8, 6, 8, 8, 2, 3);
-        GraphicElementData_SetDrawFlag(v2->unk_04[v0].unk_04, 0);
-        GraphicElementData_SetAnimateFlag(v2->unk_04[v0].unk_04, 1);
+        CellActor_SetDrawFlag(v2->unk_04[v0].unk_04, 0);
+        CellActor_SetAnimateFlag(v2->unk_04[v0].unk_04, 1);
     }
 
     return 1;
@@ -1936,8 +1936,8 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     UnkStruct_ov101_021D75F0 * v0 = param1;
     UnkStruct_ov101_021D4764 * v1 = &v0->unk_00->unk_13C;
 
-    GraphicElementData_SetDrawFlag(v0->unk_04[0].unk_04, 0);
-    GraphicElementData_SetDrawFlag(v0->unk_04[1].unk_04, 0);
+    CellActor_SetDrawFlag(v0->unk_04[0].unk_04, 0);
+    CellActor_SetDrawFlag(v0->unk_04[1].unk_04, 0);
 
     if (v1->unk_0C == 1) {
         return;
@@ -1956,20 +1956,20 @@ static void ov101_021D7604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         v4 = (v5 % 100) / 10;
 
         if (v4) {
-            GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
-            GraphicElementData_SetAnim(v0->unk_04[v3].unk_04, v4);
-            GraphicElementData_RestartAnim(v0->unk_04[v3].unk_04);
-            GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
+            CellActor_SetPosition(v0->unk_04[v3].unk_04, &v2);
+            CellActor_SetAnim(v0->unk_04[v3].unk_04, v4);
+            CellActor_RestartAnim(v0->unk_04[v3].unk_04);
+            CellActor_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
             v2.x += (FX32_ONE * 8);
             v3++;
         }
 
         v4 = (v5 % 10);
 
-        GraphicElementData_SetPosition(v0->unk_04[v3].unk_04, &v2);
-        GraphicElementData_SetAnim(v0->unk_04[v3].unk_04, v4);
-        GraphicElementData_RestartAnim(v0->unk_04[v3].unk_04);
-        GraphicElementData_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
+        CellActor_SetPosition(v0->unk_04[v3].unk_04, &v2);
+        CellActor_SetAnim(v0->unk_04[v3].unk_04, v4);
+        CellActor_RestartAnim(v0->unk_04[v3].unk_04);
+        CellActor_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
     }
 }
 
@@ -2030,7 +2030,7 @@ static void ov101_021D776C (UnkStruct_ov101_021D5D90 * param0, void * param1)
             v3 = 0;
         }
 
-        for (v0 = 0; v0 < 5; GraphicElementData_SetDrawFlag(v1->unk_04[v0].unk_04, v3), v0++) {
+        for (v0 = 0; v0 < 5; CellActor_SetDrawFlag(v1->unk_04[v0].unk_04, v3), v0++) {
             (void)0;
         }
 
@@ -2051,8 +2051,8 @@ static void ov101_021D776C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
         for (v4 = 10000; v4 >= 1; v4 /= 10, v5++) {
             v6 = (v7 % (v4 * 10)) / v4;
-            GraphicElementData_SetAnim(v1->unk_04[v5].unk_04, v6);
-            GraphicElementData_RestartAnim(v1->unk_04[v5].unk_04);
+            CellActor_SetAnim(v1->unk_04[v5].unk_04, v6);
+            CellActor_RestartAnim(v1->unk_04[v5].unk_04);
         }
     }
 }
@@ -2133,15 +2133,15 @@ static int ov101_021D7810 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     for (v0 = 0, v1 = 1; v0 < v6->unk_08; v0++, v1 *= 10, v3.x -= (FX32_ONE * 16)) {
         ov101_021D84A4(v6->unk_14->unk_450, &v6->unk_18[v0], &v3, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 8, 6, 8, 8, 2, 3);
 
-        GraphicElementData_SetAffineOverwriteMode(v6->unk_18[v0].unk_04, 2);
-        GraphicElementData_SetAffineTranslation(v6->unk_18[v0].unk_04, &v4);
-        GraphicElementData_SetAffineScale(v6->unk_18[v0].unk_04, &v5);
-        GraphicElementData_SetAffineZRotation(v6->unk_18[v0].unk_04, sub_0201D2A4(0));
+        CellActor_SetAffineOverwriteMode(v6->unk_18[v0].unk_04, 2);
+        CellActor_SetAffineTranslation(v6->unk_18[v0].unk_04, &v4);
+        CellActor_SetAffineScale(v6->unk_18[v0].unk_04, &v5);
+        CellActor_SetAffineZRotation(v6->unk_18[v0].unk_04, sub_0201D2A4(0));
 
         v2 = (v6->unk_04 % (v1 * 10)) / v1;
 
-        GraphicElementData_SetAnim(v6->unk_18[v0].unk_04, v2);
-        GraphicElementData_RestartAnim(v6->unk_18[v0].unk_04);
+        CellActor_SetAnim(v6->unk_18[v0].unk_04, v2);
+        CellActor_RestartAnim(v6->unk_18[v0].unk_04);
     }
 
     v6->unk_10 = v0;
@@ -2222,7 +2222,7 @@ static int ov101_021D7A00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         ov101_021D84A4(v5->unk_08->unk_450, &v5->unk_0C[v0], &v4, (NNS_G2D_VRAM_TYPE_2DSUB), 0, 9, 7, 9, 9, 2, 3);
 
         v3 = (v1 % (v2 * 10)) / v2;
-        GraphicElementData_SetAnim(v5->unk_0C[v0].unk_04, v3);
+        CellActor_SetAnim(v5->unk_0C[v0].unk_04, v3);
     }
 
     return 1;
@@ -2352,7 +2352,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         for (v0 = 0; v0 < 3; v0++) {
             v2 = Unk_ov101_021D9424[v3->unk_1C][v0];
             ov101_021D84A4(v3->unk_44->unk_450, &v3->unk_20[v0], &v2, (NNS_G2D_VRAM_TYPE_MAX), 0, 10, 0, 10, 10, 1, 0);
-            GraphicElementData_SetAnimateFlag(v3->unk_20[v0].unk_04, 1);
+            CellActor_SetAnimateFlag(v3->unk_20[v0].unk_04, 1);
         }
 
         v3->unk_00++;
@@ -2368,7 +2368,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
                 v1 = 1;
             }
 
-            GraphicElementData_SetPosition(v3->unk_20[v0].unk_04, &v2);
+            CellActor_SetPosition(v3->unk_20[v0].unk_04, &v2);
         }
 
         if (v1 == 0) {
@@ -2393,7 +2393,7 @@ static void ov101_021D7BB4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
         }
 
         for (v0 = 0; v0 < 3; v0++) {
-            GraphicElementData_SetDrawFlag(v3->unk_20[v0].unk_04, v1);
+            CellActor_SetDrawFlag(v3->unk_20[v0].unk_04, v1);
         }
 
         if (v3->unk_0C >= 30) {
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 5c3c485707..086d9393a2 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;
-    GraphicElementManager * unk_0C;
+    CellActorCollection * unk_0C;
     UnkStruct_0200C738 unk_10;
     NNSG2dCellTransferState * unk_19C;
     UnkStruct_02009714 * unk_1A0;
@@ -139,14 +139,14 @@ void ov101_021D7FB4 (UnkStruct_ov101_021D7E48 * param0)
     Heap_FreeToHeap(param0->unk_1BC);
     sub_0201DC3C();
     sub_0201DCF0(param0->unk_19C);
-    GraphicElementManager_DeleteAll(param0->unk_0C);
-    GraphicElementManager_Delete(param0->unk_0C);
+    CellActorCollection_DeleteAll(param0->unk_0C);
+    CellActorCollection_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 }
 
 void ov101_021D80D4 (UnkStruct_ov101_021D7E48 * param0)
 {
-    GraphicElementManager_Update(param0->unk_0C);
+    CellActorCollection_Update(param0->unk_0C);
     sub_0201DCE8();
 }
 
@@ -325,7 +325,7 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
 {
     CellActorResourceData v0;
     CellActorInitParams v1;
-    GraphicElementData * v2;
+    CellActor * v2;
 
     if (param8 == param0->unk_0B) {
         param8 = 0xffffffff;
@@ -341,14 +341,14 @@ void ov101_021D84A4 (UnkStruct_ov101_021D7E48 * param0, UnkStruct_ov101_021D8544
         param1->unk_00 = 0;
     }
 
-    v1.manager = param0->unk_0C;
+    v1.collection = param0->unk_0C;
     v1.resourceData = &v0;
     v1.position = *param2;
     v1.priority = param10;
     v1.vramType = param3;
     v1.heapID = param0->unk_00;
 
-    param1->unk_04 = GraphicElementManager_AddElement(&v1);
+    param1->unk_04 = CellActorCollection_Add(&v1);
     GF_ASSERT(param1->unk_04 != NULL);
 }
 
@@ -358,18 +358,18 @@ void ov101_021D8544 (UnkStruct_ov101_021D8544 * param0)
         sub_0200A5B4(param0->unk_08);
     }
 
-    GraphicElementData_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 }
 
-void ov101_021D8560 (GraphicElementData * param0, VecFx32 * param1)
+void ov101_021D8560 (CellActor * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = GraphicElementData_GetPosition(param0);
+    const VecFx32 * v0 = CellActor_GetPosition(param0);
     *param1 = *v0;
 }
 
-void ov101_021D8574 (GraphicElementData * param0, VecFx32 * param1)
+void ov101_021D8574 (CellActor * param0, VecFx32 * param1)
 {
-    const VecFx32 * v0 = GraphicElementData_GetAffineScale(param0);
+    const VecFx32 * v0 = CellActor_GetAffineScale(param0);
     *param1 = *v0;
 }
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 322c0fb104..8a7a100215 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -41,8 +41,8 @@
 #include "overlay104/ov104_0222DCE0.h"
 
 void ov104_0222E1C0(SaveData * param0, Party * param1, Pokemon * param2);
-void ov104_0222E1D8(GraphicElementData * param0, u8 param1);
-void ov104_0222E204(GraphicElementData * param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(CellActor * param0, u8 param1);
+void ov104_0222E204(CellActor * 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);
@@ -384,19 +384,19 @@ void ov104_0222E1C0 (SaveData * param0, Party * param1, Pokemon * param2)
     return;
 }
 
-void ov104_0222E1D8 (GraphicElementData * param0, u8 param1)
+void ov104_0222E1D8 (CellActor * param0, u8 param1)
 {
-    if (GraphicElementData_GetActiveAnim(param0) == param1) {
+    if (CellActor_GetActiveAnim(param0) == param1) {
         return;
     }
 
     SpriteActor_SetAnimFrame(param0, 0);
-    GraphicElementData_SetAnim(param0, param1);
-    GraphicElementData_UpdateAnim(param0, FX32_ONE);
+    CellActor_SetAnim(param0, param1);
+    CellActor_UpdateAnim(param0, FX32_ONE);
     return;
 }
 
-void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 param3)
+void ov104_0222E204 (CellActor * param0, s16 param1, s16 param2, u8 param3)
 {
     VecFx32 v0;
 
@@ -405,14 +405,14 @@ void ov104_0222E204 (GraphicElementData * param0, s16 param1, s16 param2, u8 par
     v0.z = 0;
 
     if (param3 == 1) {
-        if (GraphicElementData_GetAnimFrame(param0) == 0) {
+        if (CellActor_GetAnimFrame(param0) == 0) {
             v0.y = (param2 - 3) * FX32_ONE;
         } else {
             v0.y = (param2 + 1) * FX32_ONE;
         }
     }
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
     return;
 }
 
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index df2485886f..de479beb4d 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -935,7 +935,7 @@ void ov104_02232CE0 (UnkStruct_ov104_0223C4CC * param0, Pokemon * param1, int pa
         DC_FlushRange(v4, sizeof((10 * 10 * ((8 / 2) * 8))));
         GX_LoadOBJ(v4, v11->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], (10 * 10 * ((8 / 2) * 8)));
 
-        v12 = GraphicElementData_GetPaletteProxy(v5->unk_00);
+        v12 = CellActor_GetPaletteProxy(v5->unk_00);
         v13 = sub_0201FAB4(v12, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteSys_LoadPalette(v2, v3.archive, v3.palette, param2, 2, 0x20, v13 * 16);
@@ -1022,7 +1022,7 @@ CellActorData * ov104_02232F4C (UnkStruct_ov104_0223C4CC * param0, Pokemon * par
 
     v0 = SpriteActor_LoadResources(param0->unk_34.unk_00, param0->unk_34.unk_04, &v1);
 
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_00, Pokemon_IconPaletteIndex(param1));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_00, Pokemon_IconPaletteIndex(param1));
     sub_0200D330(v0);
 
     return v0;
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 430e618dc4..2d2be2b4d6 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -405,27 +405,27 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
             {
                 VecFx32 v21;
                 VecFx32 v22;
-                GraphicElementData * v23;
-                GraphicElementData * v24;
+                CellActor * v23;
+                CellActor * v24;
 
                 for (v11 = 0; v11 < v4; v11++) {
                     v23 = v3->unk_30[v11]->unk_00;
-                    v21 = *(GraphicElementData_GetPosition((const GraphicElementData *)v23));
+                    v21 = *(CellActor_GetPosition((const CellActor *)v23));
 
                     v24 = v3->unk_40[v11]->unk_00;
-                    v22 = *(GraphicElementData_GetPosition((const GraphicElementData *)v24));
+                    v22 = *(CellActor_GetPosition((const CellActor *)v24));
 
-                    GraphicElementData_SetPosition(v23, &v22);
-                    GraphicElementData_SetPosition(v24, &v21);
+                    CellActor_SetPosition(v23, &v22);
+                    CellActor_SetPosition(v24, &v21);
 
                     v23 = v3->unk_50[v11]->unk_00;
-                    v21 = *(GraphicElementData_GetPosition((const GraphicElementData *)v23));
+                    v21 = *(CellActor_GetPosition((const CellActor *)v23));
 
                     v24 = v3->unk_60[v11]->unk_00;
-                    v22 = *(GraphicElementData_GetPosition((const GraphicElementData *)v24));
+                    v22 = *(CellActor_GetPosition((const CellActor *)v24));
 
-                    GraphicElementData_SetPosition(v23, &v22);
-                    GraphicElementData_SetPosition(v24, &v21);
+                    CellActor_SetPosition(v23, &v22);
+                    CellActor_SetPosition(v24, &v21);
                 }
             }
         }
@@ -453,11 +453,11 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
 
         if (v18 == 0) {
             for (v11 = 0; v11 < v4; v11++) {
-                GraphicElementData_SetExplicitPriority(v3->unk_30[v11]->unk_00, 2);
+                CellActor_SetExplicitPriority(v3->unk_30[v11]->unk_00, 2);
             }
         } else {
             for (v11 = 0; v11 < v5; v11++) {
-                GraphicElementData_SetExplicitPriority(v3->unk_40[v11]->unk_00, 2);
+                CellActor_SetExplicitPriority(v3->unk_40[v11]->unk_00, 2);
             }
         }
         break;
@@ -523,7 +523,7 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
             {
                 u32 v25;
                 UnkStruct_ov104_0223C634 * v26;
-                GraphicElementData * v27;
+                CellActor * v27;
 
                 v26 = ov104_0223D5A8(param0->unk_00->unk_00, v19);
                 v25 = ov63_0222D050(v26->unk_04);
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 8fcd133ea8..121767a817 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -706,13 +706,13 @@ void ov104_02238764 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
         for (v2 = 0; v2 < v0; v2++) {
             v3 = Party_GetPokemonBySlotIndex(param0->unk_70, v2);
             param0->unk_30[v2] = ov104_02232F4C(param1, v3, v2, Unk_ov104_0223FB18[v2].unk_00, Unk_ov104_0223FB18[v2].unk_02);
-            GraphicElementData_SetAnimateFlag(param0->unk_30[v2]->unk_00, 0);
+            CellActor_SetAnimateFlag(param0->unk_30[v2]->unk_00, 0);
         }
     } else {
         for (v2 = 0; v2 < v1; v2++) {
             v3 = Party_GetPokemonBySlotIndex(param0->unk_74, v2);
             param0->unk_40[v2] = ov104_02232F4C(param1, v3, v2 + v0, Unk_ov104_0223FB28[v2].unk_00, Unk_ov104_0223FB28[v2].unk_02);
-            GraphicElementData_SetAnimateFlag(param0->unk_40[v2]->unk_00, 0);
+            CellActor_SetAnimateFlag(param0->unk_40[v2]->unk_00, 0);
         }
     }
 
@@ -751,9 +751,9 @@ void ov104_0223886C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
     }
 
     if (param2 == 1) {
-        GraphicElementData_SetDrawFlag(param0->unk_30[param3]->unk_00, 1);
+        CellActor_SetDrawFlag(param0->unk_30[param3]->unk_00, 1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_30[param3]->unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_30[param3]->unk_00, 0);
     }
 
     return;
@@ -770,9 +770,9 @@ void ov104_022388A4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
     }
 
     if (param2 == 1) {
-        GraphicElementData_SetDrawFlag(param0->unk_40[param3]->unk_00, 1);
+        CellActor_SetDrawFlag(param0->unk_40[param3]->unk_00, 1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_40[param3]->unk_00, 0);
+        CellActor_SetDrawFlag(param0->unk_40[param3]->unk_00, 0);
     }
 
     return;
@@ -794,7 +794,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
             v3 = Party_GetPokemonBySlotIndex(param0->unk_70, v2);
 
             if (Pokemon_GetValue(v3, MON_DATA_HELD_ITEM, NULL) == 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_50[v2]->unk_00, 0);
+                CellActor_SetDrawFlag(param0->unk_50[v2]->unk_00, 0);
             }
         }
     } else {
@@ -804,7 +804,7 @@ void ov104_022388DC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
             v3 = Party_GetPokemonBySlotIndex(param0->unk_74, v2);
 
             if (Pokemon_GetValue(v3, MON_DATA_HELD_ITEM, NULL) == 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_60[v2]->unk_00, 0);
+                CellActor_SetDrawFlag(param0->unk_60[v2]->unk_00, 0);
             }
         }
     }
@@ -852,12 +852,12 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
 
         if (param4 == 1) {
             if (v0 == 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
+                CellActor_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 1);
+                CellActor_SetDrawFlag(param0->unk_50[param3]->unk_00, 1);
             }
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
+            CellActor_SetDrawFlag(param0->unk_50[param3]->unk_00, 0);
         }
     } else {
         if (param3 >= v2) {
@@ -869,12 +869,12 @@ void ov104_022389F4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC
 
         if (param4 == 1) {
             if (v0 == 0) {
-                GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
+                CellActor_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
             } else {
-                GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 1);
+                CellActor_SetDrawFlag(param0->unk_60[param3]->unk_00, 1);
             }
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
+            CellActor_SetDrawFlag(param0->unk_60[param3]->unk_00, 0);
         }
     }
 
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index 508a14a97d..db022944a0 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -530,8 +530,8 @@ static void ov104_0223E3FC (UnkStruct_ov104_0223DD30 * param0, UnkStruct_ov104_0
         SpriteActor_EnableObject(param1->unk_04[v0], 0);
 
         if (v0 != 3) {
-            GraphicElementData_SetAffineOverwriteMode(param1->unk_04[v0]->unk_00, 2);
-            GraphicElementData_SetAnim(param1->unk_04[v0]->unk_00, 1);
+            CellActor_SetAffineOverwriteMode(param1->unk_04[v0]->unk_00, 2);
+            CellActor_SetAnim(param1->unk_04[v0]->unk_00, 1);
             ov104_0223E534(&param1->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
             ov104_0223E534(&param1->unk_14[v0], FX32_CONST(1), FX32_CONST(1), 6);
@@ -569,8 +569,8 @@ static BOOL ov104_0223E4A4 (UnkStruct_ov104_0223E48C * param0)
         v1 = ov104_0223E544(&param0->unk_14[v0]);
         v3 = ov104_0223E58C(param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue, param0->unk_14[v0].currentValue);
 
-        GraphicElementData_SetAffineScale(param0->unk_04[v0]->unk_00, &v3);
-        GraphicElementData_SetDrawFlag(param0->unk_04[v0]->unk_00, 1);
+        CellActor_SetAffineScale(param0->unk_04[v0]->unk_00, &v3);
+        CellActor_SetDrawFlag(param0->unk_04[v0]->unk_00, 1);
 
         if (v1 == 0) {
             v2 = 0;
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index d2fc055f86..a73517c0d2 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -582,7 +582,7 @@ int ov105_02241BD8 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_144.unk_00);
+    CellActorCollection_Update(v0->unk_144.unk_00);
     ov105_02245D50(v0->unk_128);
 
     return 0;
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 3ab021f01d..338cb802aa 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);
-GraphicElementData * ov105_02245BA4(UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+CellActor * 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,18 +60,18 @@ void ov105_02245AAC (UnkStruct_ov105_02245AAC * param0)
     return;
 }
 
-GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
+CellActor * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
 {
     int v0;
     CellActorResourceData v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
     {
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -94,10 +94,10 @@ GraphicElementData * ov105_02245BA4 (UnkStruct_ov105_02245AAC * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElementEx(&v3);
+        v2 = CellActorCollection_AddEx(&v3);
 
-        GraphicElementData_SetAnimateFlag(v2, 1);
-        GraphicElementData_SetAnim(v2, param2);
+        CellActor_SetAnimateFlag(v2, 1);
+        CellActor_SetAnim(v2, param2);
     }
 
     return v2;
@@ -116,7 +116,7 @@ void ov105_02245C50 (UnkStruct_ov105_02245AAC * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 05a26e4f15..54ab1699be 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;
-    GraphicElementData * unk_08;
+    CellActor * unk_08;
 };
 
 UnkStruct_ov105_02245E1C * ov105_02245DC4(UnkStruct_ov105_02245AAC * param0, u32 param1, int param2, int param3, u32 param4);
@@ -40,7 +40,7 @@ UnkStruct_ov105_02245E1C * ov105_02245DC4 (UnkStruct_ov105_02245AAC * param0, u3
 
 void * ov105_02245E1C (UnkStruct_ov105_02245E1C * param0)
 {
-    GraphicElementData_Delete(param0->unk_08);
+    CellActor_Delete(param0->unk_08);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -53,11 +53,11 @@ void ov105_02245E30 (UnkStruct_ov105_02245E1C * param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_08, &v0);
+    CellActor_SetPosition(param0->unk_08, &v0);
     return;
 }
 
 BOOL ov105_02245E48 (UnkStruct_ov105_02245E1C * param0)
 {
-    return GraphicElementData_IsAnimated(param0->unk_08);
+    return CellActor_IsAnimated(param0->unk_08);
 }
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 9b242d9510..28ebf9e939 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;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
 };
 
 UnkStruct_ov105_02245EA8 * ov105_02245E54(UnkStruct_ov105_02245AAC * param0, int param1, int param2, u32 param3);
@@ -48,14 +48,14 @@ UnkStruct_ov105_02245EA8 * ov105_02245E54 (UnkStruct_ov105_02245AAC * param0, in
     v0->unk_0C = ov105_02245BA4(param0, 0, 6, 0, 0, 0);
 
     ov105_02245F14(v0, param1, param2);
-    GraphicElementData_SetExplicitPalette(v0->unk_0C, 1);
+    CellActor_SetExplicitPalette(v0->unk_0C, 1);
 
     return v0;
 }
 
 void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0)
 {
-    GraphicElementData_Delete(param0->unk_0C);
+    CellActor_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -63,7 +63,7 @@ void * ov105_02245EA8 (UnkStruct_ov105_02245EA8 * param0)
 
 void ov105_02245EBC (UnkStruct_ov105_02245EA8 * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
+    CellActor_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -71,12 +71,12 @@ VecFx32 ov105_02245EC8 (UnkStruct_ov105_02245EA8 * param0, int param1, int param
 {
     VecFx32 v0;
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
+    v0 = *(CellActor_GetPosition(param0->unk_0C));
     v0.x += (param1 * FX32_ONE);
     v0.y += (param2 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
-    return *(GraphicElementData_GetPosition(param0->unk_0C));
+    CellActor_SetPosition(param0->unk_0C, &v0);
+    return *(CellActor_GetPosition(param0->unk_0C));
 }
 
 void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2)
@@ -86,13 +86,13 @@ void ov105_02245F14 (UnkStruct_ov105_02245EA8 * param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
 const VecFx32 * ov105_02245F2C (UnkStruct_ov105_02245EA8 * param0)
 {
-    return GraphicElementData_GetPosition(param0->unk_0C);
+    return CellActor_GetPosition(param0->unk_0C);
 }
 
 void ov105_02245F38 (UnkStruct_ov105_02245EA8 * param0, u8 param1)
@@ -128,7 +128,7 @@ void ov105_02245F5C (UnkStruct_ov105_02245EA8 * param0)
     v0.x = ((v1->x / FX32_ONE) + 248) * FX32_ONE;
     v0.y = v1->y;
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -144,14 +144,14 @@ int ov105_02245F8C (UnkStruct_ov105_02245EA8 * param0)
 
 void ov105_02245F90 (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    GraphicElementData_SetAnim(param0->unk_0C, param1);
+    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    CellActor_SetAnim(param0->unk_0C, param1);
 
     return;
 }
 
 void ov105_02245FAC (UnkStruct_ov105_02245EA8 * param0, u32 param1)
 {
-    GraphicElementData_SetExplicitPalette(param0->unk_0C, param1);
+    CellActor_SetExplicitPalette(param0->unk_0C, param1);
     return;
 }
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index 08946d9e9e..79eb50a92f 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;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
     u8 unk_10;
 };
 
@@ -61,13 +61,13 @@ UnkStruct_ov105_02246060 * ov105_02245FB8 (UnkStruct_ov105_02245AAC * param0, u8
     v1.x = (v0->unk_04[v0->unk_02].unk_00 * FX32_ONE);
     v1.y = (v0->unk_04[v0->unk_02].unk_02 * FX32_ONE);
 
-    GraphicElementData_SetPosition(v0->unk_0C, &v1);
+    CellActor_SetPosition(v0->unk_0C, &v1);
     return v0;
 }
 
 void * ov105_02246060 (UnkStruct_ov105_02246060 * param0)
 {
-    GraphicElementData_Delete(param0->unk_0C);
+    CellActor_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -75,7 +75,7 @@ void * ov105_02246060 (UnkStruct_ov105_02246060 * param0)
 
 void ov105_02246074 (UnkStruct_ov105_02246060 * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
+    CellActor_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -145,14 +145,14 @@ void ov105_02246080 (UnkStruct_ov105_02246060 * param0)
     }
 
     if (param0->unk_08 != NULL) {
-        GraphicElementData_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        CellActor_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
+    v0 = *(CellActor_GetPosition(param0->unk_0C));
     v0.x = (param0->unk_04[param0->unk_02].unk_00 * FX32_ONE);
     v0.y = (param0->unk_04[param0->unk_02].unk_02 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -166,9 +166,9 @@ void ov105_022461A4 (UnkStruct_ov105_02246060 * param0, int param1)
     param0->unk_03 = param1;
 
     if (param1 == 0) {
-        GraphicElementData_SetAnimNoRestart(param0->unk_0C, 8);
+        CellActor_SetAnimNoRestart(param0->unk_0C, 8);
     } else {
-        GraphicElementData_SetAnimNoRestart(param0->unk_0C, 13);
+        CellActor_SetAnimNoRestart(param0->unk_0C, 13);
     }
 
     return;
@@ -181,14 +181,14 @@ void ov105_022461C0 (UnkStruct_ov105_02246060 * param0, u8 param1)
     param0->unk_02 = param1;
 
     if (param0->unk_08 != NULL) {
-        GraphicElementData_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        CellActor_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_0C));
+    v0 = *(CellActor_GetPosition(param0->unk_0C));
 
     v0.x = (param0->unk_04[param0->unk_02].unk_00 * FX32_ONE);
     v0.y = (param0->unk_04[param0->unk_02].unk_02 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetPosition(param0->unk_0C, &v0);
     return;
 }
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 21b542914d..5ef25e0bb3 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -311,7 +311,7 @@ int ov106_02241B9C (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_C0.unk_00);
+    CellActorCollection_Update(v0->unk_C0.unk_00);
     return 0;
 }
 
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 0687b7aa00..6d8290e2c8 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);
-GraphicElementData * ov106_022434BC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4);
+CellActor * 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,18 +73,18 @@ void ov106_02243310 (UnkStruct_ov106_02243310 * param0, Pokemon * param1)
     return;
 }
 
-GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4)
+CellActor * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u32 param3, u8 param4)
 {
     int v0;
     CellActorResourceData v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
     {
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
 
         v3.position.x = 0;
@@ -108,11 +108,11 @@ GraphicElementData * ov106_022434BC (UnkStruct_ov106_02243310 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElementEx(&v3);
+        v2 = CellActorCollection_AddEx(&v3);
 
-        GraphicElementData_SetAnimateFlag(v2, 1);
-        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        GraphicElementData_SetAnim(v2, param2);
+        CellActor_SetAnimateFlag(v2, 1);
+        CellActor_SetAnimSpeed(v2, FX32_ONE);
+        CellActor_SetAnim(v2, param2);
     }
 
     return v2;
@@ -131,7 +131,7 @@ void ov106_02243570 (UnkStruct_ov106_02243310 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 512ce9d7f1..95fcd28870 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;
-    GraphicElementData * unk_10;
+    CellActor * unk_10;
 };
 
 UnkStruct_ov106_02243650 * ov106_022435FC(UnkStruct_ov106_02243310 * param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 * param5);
@@ -47,14 +47,14 @@ UnkStruct_ov106_02243650 * ov106_022435FC (UnkStruct_ov106_02243310 * param0, u3
     v1.x = (param3 * FX32_ONE);
     v1.y = (param4 * FX32_ONE);
 
-    GraphicElementData_SetPosition(v0->unk_10, &v1);
+    CellActor_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
 
 void * ov106_02243650 (UnkStruct_ov106_02243650 * param0)
 {
-    GraphicElementData_Delete(param0->unk_10);
+    CellActor_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -62,7 +62,7 @@ void * ov106_02243650 (UnkStruct_ov106_02243650 * param0)
 
 void ov106_02243664 (UnkStruct_ov106_02243650 * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_10, param1);
+    CellActor_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -71,28 +71,28 @@ void ov106_02243670 (UnkStruct_ov106_02243650 * param0, u16 param1, u16 param2)
     VecFx32 v0;
 
     if (param0->unk_0C != NULL) {
-        GraphicElementData_SetAnimNoRestart(param0->unk_10, param0->unk_0C[0]);
+        CellActor_SetAnimNoRestart(param0->unk_10, param0->unk_0C[0]);
     }
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_10));
+    v0 = *(CellActor_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_10, &v0);
+    CellActor_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov106_022436B0 (UnkStruct_ov106_02243650 * param0, u32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    GraphicElementData_SetAnimNoRestart(param0->unk_10, param1);
+    CellActor_SetAnimSpeed(param0->unk_10, FX32_ONE);
+    CellActor_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
 
 void ov106_022436CC (UnkStruct_ov106_02243650 * param0, Pokemon * param1)
 {
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index 0ca0410f04..d272aea3af 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -586,7 +586,7 @@ int ov107_02241BD4 (OverlayManager * param0, int * param1)
     }
 
     ov107_02245C00(v0);
-    GraphicElementManager_Update(v0->unk_1D8.unk_00);
+    CellActorCollection_Update(v0->unk_1D8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 734d670e3a..3e1e1a8931 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -380,7 +380,7 @@ int ov107_02245FD0 (OverlayManager * param0, int * param1)
     }
 
     ov107_022492A8(v0);
-    GraphicElementManager_Update(v0->unk_158.unk_00);
+    CellActorCollection_Update(v0->unk_158.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 3dcfbdd514..92328e7b19 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);
-GraphicElementData * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+CellActor * 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,18 +112,18 @@ void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param
     return;
 }
 
-GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+CellActor * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
     CellActorResourceData v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
     {
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -146,11 +146,11 @@ GraphicElementData * ov107_022498A4 (UnkStruct_ov107_02249954 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElementEx(&v3);
+        v2 = CellActorCollection_AddEx(&v3);
 
-        GraphicElementData_SetAnimateFlag(v2, 1);
-        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        GraphicElementData_SetAnim(v2, param4);
+        CellActor_SetAnimateFlag(v2, 1);
+        CellActor_SetAnimSpeed(v2, FX32_ONE);
+        CellActor_SetAnim(v2, param4);
     }
 
     return v2;
@@ -172,7 +172,7 @@ void ov107_02249954 (UnkStruct_ov107_02249954 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 7707187419..822e72c5fc 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;
-    GraphicElementData * unk_04;
+    CellActor * 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);
@@ -49,7 +49,7 @@ UnkStruct_ov107_02249B8C * ov107_02249B1C (UnkStruct_ov107_02249954 * param0, u3
     v1.x = (param5 * FX32_ONE);
     v1.y = (param6 * FX32_ONE);
 
-    GraphicElementData_SetPosition(v0->unk_04, &v1);
+    CellActor_SetPosition(v0->unk_04, &v1);
     return v0;
 }
 
@@ -60,7 +60,7 @@ void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0)
         return NULL;
     }
 
-    GraphicElementData_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_04);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -68,7 +68,7 @@ void * ov107_02249B8C (UnkStruct_ov107_02249B8C * param0)
 
 void ov107_02249BAC (UnkStruct_ov107_02249B8C * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_04, param1);
+    CellActor_SetDrawFlag(param0->unk_04, param1);
     return;
 }
 
@@ -76,25 +76,25 @@ void ov107_02249BB8 (UnkStruct_ov107_02249B8C * param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_04));
+    v0 = *(CellActor_GetPosition(param0->unk_04));
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    GraphicElementData_SetPosition(param0->unk_04, &v0);
+    CellActor_SetPosition(param0->unk_04, &v0);
     return;
 }
 
 void ov107_02249BEC (UnkStruct_ov107_02249B8C * param0, u32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0->unk_04, FX32_ONE);
-    GraphicElementData_SetAnim(param0->unk_04, param1);
+    CellActor_SetAnimSpeed(param0->unk_04, FX32_ONE);
+    CellActor_SetAnim(param0->unk_04, param1);
 
     return;
 }
 
 void ov107_02249C08 (UnkStruct_ov107_02249B8C * param0, Pokemon * param1)
 {
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_04, Pokemon_IconPaletteIndex(param1));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_04, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -112,12 +112,12 @@ void ov107_02249C28 (UnkStruct_ov107_02249B8C * param0, u8 param1)
 
 BOOL ov107_02249C40 (UnkStruct_ov107_02249B8C * param0)
 {
-    return GraphicElementData_IsAnimated(param0->unk_04);
+    return CellActor_IsAnimated(param0->unk_04);
 }
 
 void ov107_02249C4C (UnkStruct_ov107_02249B8C * param0, u8 param1)
 {
-    GraphicElementData_SetExplicitPriority(param0->unk_04, param1);
+    CellActor_SetExplicitPriority(param0->unk_04, param1);
     return;
 }
 
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 14df84b8c6..d931b034c1 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -409,7 +409,7 @@ int ov108_02241C38 (OverlayManager * param0, int * param1)
         v0->unk_13_0 ^= 1;
     }
 
-    GraphicElementManager_Update(v0->unk_E8.unk_00);
+    CellActorCollection_Update(v0->unk_E8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index d1dba09ca5..f13d2d8eb7 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);
-GraphicElementData * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+CellActor * 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,18 +74,18 @@ void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party *
     return;
 }
 
-GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+CellActor * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
     CellActorResourceData v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
     {
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -104,11 +104,11 @@ GraphicElementData * ov108_022430F0 (UnkStruct_ov108_02243030 * param0, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = GraphicElementManager_AddElementEx(&v3);
+        v2 = CellActorCollection_AddEx(&v3);
 
-        GraphicElementData_SetAnimateFlag(v2, 1);
-        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        GraphicElementData_SetAnim(v2, param4);
+        CellActor_SetAnimateFlag(v2, 1);
+        CellActor_SetAnimSpeed(v2, FX32_ONE);
+        CellActor_SetAnim(v2, param4);
     }
 
     return v2;
@@ -130,7 +130,7 @@ void ov108_02243194 (UnkStruct_ov108_02243030 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index 674ec1a5a3..53c9791ce1 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;
-    GraphicElementData * unk_10;
+    CellActor * 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);
@@ -52,14 +52,14 @@ UnkStruct_ov108_02243594 * ov108_0224351C (UnkStruct_ov108_02243030 * param0, u3
         v1.y += (192 << FX32_SHIFT);
     }
 
-    GraphicElementData_SetPosition(v0->unk_10, &v1);
+    CellActor_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
 
 void * ov108_02243594 (UnkStruct_ov108_02243594 * param0)
 {
-    GraphicElementData_Delete(param0->unk_10);
+    CellActor_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -67,7 +67,7 @@ void * ov108_02243594 (UnkStruct_ov108_02243594 * param0)
 
 void ov108_022435A8 (UnkStruct_ov108_02243594 * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_10, param1);
+    CellActor_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -75,7 +75,7 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(GraphicElementData_GetPosition(param0->unk_10));
+    v0 = *(CellActor_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
@@ -84,21 +84,21 @@ void ov108_022435B4 (UnkStruct_ov108_02243594 * param0, u16 param1, u16 param2)
         v0.y += (192 << FX32_SHIFT);
     }
 
-    GraphicElementData_SetPosition(param0->unk_10, &v0);
+    CellActor_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov108_022435F4 (UnkStruct_ov108_02243594 * param0, u32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    GraphicElementData_SetAnimNoRestart(param0->unk_10, param1);
+    CellActor_SetAnimSpeed(param0->unk_10, FX32_ONE);
+    CellActor_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
 
 void ov108_02243610 (UnkStruct_ov108_02243594 * param0, Pokemon * param1)
 {
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -116,6 +116,6 @@ static const VecFx32 Unk_ov111_021D3834[] = {
 
 void ov108_02243624 (UnkStruct_ov108_02243594 * param0, u8 param1)
 {
-    GraphicElementData_SetAnimateFlag(param0->unk_10, param1);
+    CellActor_SetAnimateFlag(param0->unk_10, param1);
     return;
 }
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index 91bc774f12..b553f8f0b9 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -292,7 +292,7 @@ int ov109_021D3EB0 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_60);
+    CellActorCollection_Update(v0->unk_60);
     return 0;
 }
 
@@ -309,7 +309,7 @@ int ov109_021D3F9C (OverlayManager * param0, int * param1)
         sub_02009754(v1->unk_1F0[v0]);
     }
 
-    GraphicElementManager_Delete(v1->unk_60);
+    CellActorCollection_Delete(v1->unk_60);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
@@ -645,7 +645,7 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_60;
+        v1.collection = param0->unk_60;
         v1.resourceData = &param0->unk_278;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -660,11 +660,11 @@ static void ov109_021D4518 (UnkStruct_ov109_021D5140 * param0)
             v1.position.x = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][0];
             v1.position.y = FX32_ONE * Unk_ov109_021D5DD0[v0 + 1][1];
 
-            param0->unk_29C[v0 + 1] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_29C[v0 + 1] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_29C[v0 + 1], 1);
-            GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
-            GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 0);
+            CellActor_SetAnimateFlag(param0->unk_29C[v0 + 1], 1);
+            CellActor_SetAnim(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
+            CellActor_SetDrawFlag(param0->unk_29C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1628,13 +1628,13 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0)
             v2 = TrainerInfo_Appearance(param0->unk_3D8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 38 + v3 * 2);
+                CellActor_SetAnim(param0->unk_29C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov109_021D57E0(param0->unk_3A0, param0->unk_3B0, v0, v2, v3);
-                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2);
+                CellActor_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2);
             }
         }
-            GraphicElementData_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
+            CellActor_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
             param0->unk_400[v0] = 2;
             v1 = 1;
             break;
@@ -1644,9 +1644,9 @@ static void ov109_021D5668 (UnkStruct_ov109_021D5140 * param0)
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3D8[v0][0]);
 
-                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
+                CellActor_SetAnim(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                GraphicElementData_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2 + 1);
+                CellActor_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2 + 1);
             }
 
             param0->unk_400[v0] = 0;
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index 3285c502c0..e4ace515de 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -423,7 +423,7 @@ int ov111_021D0E34 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_16C.unk_00);
+    CellActorCollection_Update(v0->unk_16C.unk_00);
 
     return 0;
 }
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 6d39123b0d..d7626cdb2b 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);
-GraphicElementData * ov111_021D3280(UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+CellActor * 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,18 +113,18 @@ static void ov111_021D31F4 (UnkStruct_ov111_021D2F80 * param0, int param1)
     return;
 }
 
-GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
+CellActor * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
 {
     int v0;
     CellActorResourceData v1;
-    GraphicElementData * v2;
+    CellActor * 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);
 
     {
         CellActorInitParamsEx v3;
 
-        v3.manager = param0->unk_00;
+        v3.collection = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -142,11 +142,11 @@ GraphicElementData * ov111_021D3280 (UnkStruct_ov111_021D2F80 * param0, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v2 = GraphicElementManager_AddElementEx(&v3);
+        v2 = CellActorCollection_AddEx(&v3);
 
-        GraphicElementData_SetAnimateFlag(v2, 0);
-        GraphicElementData_SetAnimSpeed(v2, FX32_ONE);
-        GraphicElementData_SetAnim(v2, param2);
+        CellActor_SetAnimateFlag(v2, 0);
+        CellActor_SetAnimSpeed(v2, FX32_ONE);
+        CellActor_SetAnim(v2, param2);
     }
 
     return v2;
@@ -165,7 +165,7 @@ void ov111_021D3320 (UnkStruct_ov111_021D2F80 * param0)
         sub_02009754(param0->unk_190[v0]);
     }
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0200A878();
     sub_0201E958();
     sub_0201F8B4();
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index b94300873a..b19c3f5385 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;
-    GraphicElementData * unk_0C;
+    CellActor * 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);
@@ -51,20 +51,20 @@ UnkStruct_ov111_021D33F4 * ov111_021D33F4 (UnkStruct_ov111_021D2F80 * param0, u3
 
 void * ov111_021D3448 (UnkStruct_ov111_021D33F4 * param0)
 {
-    GraphicElementData_Delete(param0->unk_0C);
+    CellActor_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
     return NULL;
 }
 
 void ov111_021D345C (UnkStruct_ov111_021D33F4 * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_0C, param1);
+    CellActor_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D3468 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    GraphicElementData_SetPriority(param0->unk_0C, param1);
+    CellActor_SetPriority(param0->unk_0C, param1);
     return;
 }
 
@@ -79,7 +79,7 @@ void ov111_021D3474 (UnkStruct_ov111_021D33F4 * param0, int param1, int param2)
         v0.y += (512 * FX32_ONE);
     }
 
-    GraphicElementData_SetPosition(param0->unk_0C, &v0);
+    CellActor_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -87,7 +87,7 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para
 {
     const VecFx32 * v0;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_0C);
+    v0 = CellActor_GetPosition(param0->unk_0C);
 
     *param1 = (v0->x / FX32_ONE);
     *param2 = (v0->y / FX32_ONE);
@@ -97,8 +97,8 @@ void ov111_021D349C (UnkStruct_ov111_021D33F4 * param0, int * param1, int * para
 
 void ov111_021D34C4 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    GraphicElementData_SetAnimNoRestart(param0->unk_0C, param1);
+    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    CellActor_SetAnimNoRestart(param0->unk_0C, param1);
 
     return;
 }
@@ -122,38 +122,38 @@ void ov111_021D34E0 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
     u8 v0;
     v0 = param1;
 
-    GraphicElementData_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
+    CellActor_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
 
     return;
 }
 
 void ov111_021D34F4 (UnkStruct_ov111_021D33F4 * param0, VecFx32 * param1)
 {
-    GraphicElementData_SetAffineScaleEx(param0->unk_0C, param1, 2);
+    CellActor_SetAffineScaleEx(param0->unk_0C, param1, 2);
     return;
 }
 
 void ov111_021D3500 (UnkStruct_ov111_021D33F4 * param0, u32 param1)
 {
-    GraphicElementData_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
+    CellActor_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D350C (UnkStruct_ov111_021D33F4 * param0, int param1)
 {
-    GraphicElementData_SetAnimateFlag(param0->unk_0C, param1);
-    GraphicElementData_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    GraphicElementData_SetAnim(param0->unk_0C, GraphicElementData_GetActiveAnim(param0->unk_0C));
+    CellActor_SetAnimateFlag(param0->unk_0C, param1);
+    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    CellActor_SetAnim(param0->unk_0C, CellActor_GetActiveAnim(param0->unk_0C));
     return;
 }
 
 void ov111_021D3530 (UnkStruct_ov111_021D33F4 * param0, BOOL param1)
 {
-    GraphicElementData_SetPixelated(param0->unk_0C, param1);
+    CellActor_SetPixelated(param0->unk_0C, param1);
     return;
 }
 
 BOOL ov111_021D353C (UnkStruct_ov111_021D33F4 * param0)
 {
-    return GraphicElementData_IsAnimated(param0->unk_0C);
+    return CellActor_IsAnimated(param0->unk_0C);
 }
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index a8065a8003..af7aa17b47 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -124,7 +124,7 @@ typedef struct {
 
 typedef struct {
     BGL * unk_00;
-    GraphicElementManager * unk_04;
+    CellActorCollection * unk_04;
     UnkStruct_0200C738 unk_08;
     UnkStruct_02009714 * unk_194[4];
     NARC * unk_1A4;
@@ -497,7 +497,7 @@ static void ov112_0225C9F4 (UnkStruct_ov112_0225C9BC * param0)
 
 static void ov112_0225CA14 (UnkStruct_ov112_0225C9BC * param0)
 {
-    GraphicElementManager_Update(param0->unk_04);
+    CellActorCollection_Update(param0->unk_04);
 }
 
 static void ov112_0225CA20 (UnkStruct_ov112_0225C9BC * param0)
@@ -587,7 +587,7 @@ static void ov112_0225CC38 (UnkStruct_ov112_0225C9BC * param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_04);
+    CellActorCollection_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_194[v0]);
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index dbc81d9cd2..7c301ce620 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -95,7 +95,7 @@ typedef struct {
 } UnkStruct_ov114_0225CCD0;
 
 typedef struct {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_0200C738 unk_04;
 } UnkStruct_ov114_0225CFCC;
 
@@ -133,8 +133,8 @@ typedef struct {
 
 typedef struct {
     Window unk_00;
-    GraphicElementData * unk_10;
-    GraphicElementData * unk_14;
+    CellActor * unk_10;
+    CellActor * unk_14;
     u16 unk_18;
     u8 unk_1A;
     u8 unk_1B;
@@ -204,7 +204,7 @@ typedef struct {
 typedef struct {
     void * unk_00;
     NNSG2dScreenData * unk_04;
-    GraphicElementData * unk_08[15];
+    CellActor * unk_08[15];
     UnkStruct_ov114_0225CDB4 * unk_44;
     u8 unk_48;
     u8 unk_49;
@@ -250,7 +250,7 @@ typedef struct UnkStruct_ov114_0225E854_t {
 } UnkStruct_ov114_0225E854;
 
 typedef struct {
-    GraphicElementData * unk_00[2];
+    CellActor * unk_00[2];
     s16 unk_08;
     s16 unk_0A;
     u8 unk_0C[2][192];
@@ -264,12 +264,12 @@ typedef struct UnkStruct_ov114_02025CAD4_t {
     u32 unk_00;
     u16 unk_04;
     s16 unk_06;
-    GraphicElementManager * unk_08;
+    CellActorCollection * unk_08;
     NARC * unk_0C;
     UnkStruct_ov114_0225CCD0 unk_10;
     UnkStruct_ov114_0225CDB4 * unk_28;
     SysTask * unk_2C;
-    GraphicElementData * unk_30;
+    CellActor * unk_30;
     UnkStruct_ov114_0225FAB8 unk_34;
 } UnkStruct_ov114_0225CAD4;
 
@@ -284,7 +284,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 GraphicElementData * ov114_0225CDB4(UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5);
+static CellActor * ov114_0225CDB4(UnkStruct_ov114_0225CDB4 * param0, CellActorCollection * 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);
@@ -381,7 +381,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, GraphicElementManager * param2, u32 param3);
+static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, CellActorCollection * 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);
@@ -1107,7 +1107,7 @@ BOOL ov114_0225CA98 (const UnkStruct_ov114_0225C76C * param0)
     return 0;
 }
 
-UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (GraphicElementManager * param0, u32 param1)
+UnkStruct_ov114_0225CAD4 * ov114_0225CAD4 (CellActorCollection * param0, u32 param1)
 {
     UnkStruct_ov114_0225CAD4 * v0;
 
@@ -1132,7 +1132,7 @@ void ov114_0225CB38 (UnkStruct_ov114_0225CAD4 * param0)
     }
 
     if (param0->unk_30 != NULL) {
-        GraphicElementData_Delete(param0->unk_30);
+        CellActor_Delete(param0->unk_30);
     }
 
     ov114_0225FBF0(&param0->unk_34);
@@ -1283,11 +1283,11 @@ static UnkStruct_ov114_0225CDB4 * ov114_0225CD54 (UnkStruct_ov114_0225CCD0 * par
     return v1;
 }
 
-static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, GraphicElementManager * param1, s16 param2, s16 param3, u16 param4, u32 param5)
+static CellActor * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, CellActorCollection * param1, s16 param2, s16 param3, u16 param4, u32 param5)
 {
     CellActorInitParams v0;
 
-    v0.manager = param1;
+    v0.collection = param1;
     v0.resourceData = &param0->unk_14;
     v0.position.x = param2 << FX32_SHIFT;
     v0.position.y = param3 << FX32_SHIFT;
@@ -1295,7 +1295,7 @@ static GraphicElementData * ov114_0225CDB4 (UnkStruct_ov114_0225CDB4 * param0, G
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param5;
 
-    return GraphicElementManager_AddElement(&v0);
+    return CellActorCollection_Add(&v0);
 }
 
 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)
@@ -1413,7 +1413,7 @@ static void ov114_0225CFCC (UnkStruct_ov114_0225CFCC * param0, u32 param1, u32 p
 
 static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0)
 {
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     sub_0201E958();
     sub_0201F8B4();
     sub_0200A878();
@@ -1421,7 +1421,7 @@ static void ov114_0225D058 (UnkStruct_ov114_0225CFCC * param0)
 
 static void ov114_0225D070 (UnkStruct_ov114_0225CFCC * param0)
 {
-    GraphicElementManager_Update(param0->unk_00);
+    CellActorCollection_Update(param0->unk_00);
 }
 
 static void ov114_0225D07C (UnkStruct_ov114_0225CFCC * param0)
@@ -1984,10 +1984,10 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
 
         param0->unk_10 = ov114_0225CDB4(param8, param7->unk_00, v2, v3, 0, param9);
 
-        GraphicElementData_SetAnim(param0->unk_10, v1);
-        GraphicElementData_SetExplicitPaletteOffset(param0->unk_10, param5);
-        GraphicElementData_SetDrawFlag(param0->unk_10, 0);
-        GraphicElementData_SetAnimateFlag(param0->unk_10, 1);
+        CellActor_SetAnim(param0->unk_10, v1);
+        CellActor_SetExplicitPaletteOffset(param0->unk_10, param5);
+        CellActor_SetDrawFlag(param0->unk_10, 0);
+        CellActor_SetAnimateFlag(param0->unk_10, 1);
     }
 
     {
@@ -1998,8 +1998,8 @@ static void ov114_0225DAC0 (UnkStruct_ov114_0225DAC0 * param0, u32 param1, u32 p
 
         param0->unk_14 = ov114_0225CDB4(param8, param7->unk_00, v4, v5, 0, param9);
 
-        GraphicElementData_SetAnim(param0->unk_14, 0);
-        GraphicElementData_SetDrawFlag(param0->unk_14, 0);
+        CellActor_SetAnim(param0->unk_14, 0);
+        CellActor_SetDrawFlag(param0->unk_14, 0);
     }
 
     param0->unk_1A = param5;
@@ -2037,9 +2037,9 @@ static void ov114_0225DCA0 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0
 
 static void ov114_0225DD0C (UnkStruct_ov114_0225DAC0 * param0, u32 param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_14, 1);
-    GraphicElementData_SetAnim(param0->unk_14, 4 + param1);
-    GraphicElementData_SetAnimateFlag(param0->unk_14, 1);
+    CellActor_SetDrawFlag(param0->unk_14, 1);
+    CellActor_SetAnim(param0->unk_14, 4 + param1);
+    CellActor_SetAnimateFlag(param0->unk_14, 1);
 }
 
 static void ov114_0225DD2C (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0225D084 * param1, u32 param2, s16 param3, s16 param4, u32 param5)
@@ -2061,18 +2061,18 @@ static void ov114_0225DD80 (UnkStruct_ov114_0225DAC0 * param0, UnkStruct_ov114_0
 
 static void ov114_0225DD94 (UnkStruct_ov114_0225DAC0 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_10, 1);
+    CellActor_SetDrawFlag(param0->unk_10, 1);
 }
 
 static void ov114_0225DDA0 (UnkStruct_ov114_0225DAC0 * param0)
 {
     if (param0->unk_10) {
-        GraphicElementData_Delete(param0->unk_10);
+        CellActor_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 
     if (param0->unk_14) {
-        GraphicElementData_Delete(param0->unk_14);
+        CellActor_Delete(param0->unk_14);
         param0->unk_14 = NULL;
     }
 
@@ -2137,7 +2137,7 @@ static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_10, &v3);
+    CellActor_SetPosition(param0->unk_10, &v3);
 
     v1 = 24;
     v2 = (Unk_ov114_02260204[param0->unk_18 - 1].unk_00[param0->unk_1B] * 8) + 21;
@@ -2145,7 +2145,7 @@ static void ov114_0225DEBC (UnkStruct_ov114_0225DAC0 * param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    GraphicElementData_SetPosition(param0->unk_14, &v3);
+    CellActor_SetPosition(param0->unk_14, &v3);
 }
 
 static u32 ov114_0225DF44 (u32 param0, u32 param1, u32 param2)
@@ -3413,9 +3413,9 @@ static void ov114_0225F484 (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
             for (v1 = 0; v1 < 5; v1++) {
                 v2 = (v0 * 5) + v1;
                 param0->unk_08[v2] = ov114_0225CDB4(param0->unk_44, param2->unk_00, v3, v4, 0, param5);
-                GraphicElementData_SetDrawFlag(param0->unk_08[v2], 0);
-                GraphicElementData_SetAnim(param0->unk_08[v2], v0);
-                GraphicElementData_SetExplicitPriority(param0->unk_08[v2], 0);
+                CellActor_SetDrawFlag(param0->unk_08[v2], 0);
+                CellActor_SetAnim(param0->unk_08[v2], v0);
+                CellActor_SetExplicitPriority(param0->unk_08[v2], 0);
 
                 v3 += 24;
             }
@@ -3431,7 +3431,7 @@ static void ov114_0225F578 (UnkStruct_ov114_0225F578 * param0)
         int v0;
 
         for (v0 = 0; v0 < (5 * 3); v0++) {
-            GraphicElementData_Delete(param0->unk_08[v0]);
+            CellActor_Delete(param0->unk_08[v0]);
         }
     }
 
@@ -3465,7 +3465,7 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
         }
 
         Sound_PlayEffect(1404);
-        GraphicElementData_SetDrawFlag(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
+        CellActor_SetDrawFlag(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
         param0->unk_49 = 8;
         param0->unk_48++;
         break;
@@ -3480,8 +3480,8 @@ static BOOL ov114_0225F5AC (UnkStruct_ov114_0225F578 * param0, UnkStruct_ov114_0
 
                 if (param0->unk_4A != param0->unk_4B) {
                     for (v0 = 0; v0 < (5 * 3); v0++) {
-                        GraphicElementData_SetDrawFlag(param0->unk_08[v0], 0);
-                        GraphicElementData_SetAnim(param0->unk_08[v0], 2);
+                        CellActor_SetDrawFlag(param0->unk_08[v0], 0);
+                        CellActor_SetAnim(param0->unk_08[v0], 2);
                     }
                 }
             }
@@ -3652,7 +3652,7 @@ static void ov114_0225F988 (UnkStruct_ov114_0225E854 * param0)
     }
 }
 
-static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, GraphicElementManager * param2, u32 param3)
+static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0225CDB4 * param1, CellActorCollection * param2, u32 param3)
 {
     int v0;
     int v1;
@@ -3666,8 +3666,8 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0
 
     for (v0 = 0; v0 < 2; v0++) {
         param0->unk_00[v0] = ov114_0225CDB4(param1, param2, Unk_ov114_0226019C[v0].x >> FX32_SHIFT, Unk_ov114_0226019C[v0].y >> FX32_SHIFT, 0, param3);
-        GraphicElementData_SetAnim(param0->unk_00[v0], 5);
-        GraphicElementData_SetExplicitPriority(param0->unk_00[v0], 0);
+        CellActor_SetAnim(param0->unk_00[v0], 5);
+        CellActor_SetExplicitPriority(param0->unk_00[v0], 0);
     }
 
     v1 = GX_GetVisibleWnd();
@@ -3683,7 +3683,7 @@ static void ov114_0225F9B8 (UnkStruct_ov114_0225FAB8 * param0, UnkStruct_ov114_0
     param0->battlerType.effect = 1;
 
     SetHBlankCallback(ov114_0225FCF0, param0);
-    GraphicElementData_SetFlipMode(param0->unk_00[1], 2);
+    CellActor_SetFlipMode(param0->unk_00[1], 2);
 
     ov114_0225FC6C(param0);
 }
@@ -3714,8 +3714,8 @@ static BOOL ov114_0225FAD8 (UnkStruct_ov114_0225FAB8 * param0)
         param0->unk_08 = 1;
         v0 = 1;
 
-        GraphicElementData_SetDrawFlag(param0->unk_00[0], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_00[1], 0);
+        CellActor_SetDrawFlag(param0->unk_00[0], 0);
+        CellActor_SetDrawFlag(param0->unk_00[1], 0);
     }
 
     ov114_0225FB10(param0, -1);
@@ -3746,7 +3746,7 @@ static void ov114_0225FB10 (UnkStruct_ov114_0225FAB8 * param0, s32 param1)
             v0.y += FX32_CONST(v2);
         }
 
-        GraphicElementData_SetPosition(param0->unk_00[v1], &v0);
+        CellActor_SetPosition(param0->unk_00[v1], &v0);
     }
 
     ov114_0225FC6C(param0);
@@ -3763,7 +3763,7 @@ static void ov114_0225FBF0 (UnkStruct_ov114_0225FAB8 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_00[v0] != NULL) {
-            GraphicElementData_Delete(param0->unk_00[v0]);
+            CellActor_Delete(param0->unk_00[v0]);
             param0->unk_00[v0] = NULL;
         }
     }
@@ -3844,7 +3844,7 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
     case 1:
         ov114_0225F9B8(&v0->unk_34, v0->unk_28, v0->unk_08, v0->unk_00);
         v0->unk_30 = ov114_0225CDB4(v0->unk_28, v0->unk_08, 128, 97, 64, v0->unk_00);
-        GraphicElementData_SetExplicitPriority(v0->unk_30, 0);
+        CellActor_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
@@ -3856,9 +3856,9 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
         }
         break;
     case 3:
-        v2 = GraphicElementData_GetAnimFrame(v0->unk_30);
-        GraphicElementData_UpdateAnim(v0->unk_30, FX32_CONST(2));
-        v3 = GraphicElementData_GetAnimFrame(v0->unk_30);
+        v2 = CellActor_GetAnimFrame(v0->unk_30);
+        CellActor_UpdateAnim(v0->unk_30, FX32_CONST(2));
+        v3 = CellActor_GetAnimFrame(v0->unk_30);
 
         if (v2 != v3) {
             switch (v3) {
@@ -3884,9 +3884,9 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
 
         if (v3 == 15) {
             if (v0->unk_06 == 0) {
-                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
+                CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
             } else if (v0->unk_06 == 4) {
-                GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 1);
+                CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 1);
             }
 
             v0->unk_06++;
@@ -3896,18 +3896,18 @@ static void ov114_0225FDC8 (SysTask * param0, void * param1)
             }
         }
 
-        v1 = GraphicElementData_IsAnimated(v0->unk_30);
+        v1 = CellActor_IsAnimated(v0->unk_30);
 
         if (v1 == 0) {
             v0->unk_04++;
-            GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
+            CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
         }
         break;
     case 4:
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            GraphicElementData_Delete(v0->unk_30);
+            CellActor_Delete(v0->unk_30);
             v0->unk_30 = NULL;
             v0->unk_04++;
             v0->unk_06 = 0;
@@ -3942,15 +3942,15 @@ static void ov114_0225FF54 (SysTask * param0, void * param1)
     case 1:
         ov114_0225F9B8(&v0->unk_34, v0->unk_28, v0->unk_08, v0->unk_00);
         v0->unk_30 = ov114_0225CDB4(v0->unk_28, v0->unk_08, 128, 97, 64, v0->unk_00);
-        GraphicElementData_SetAnim(v0->unk_30, 1);
-        GraphicElementData_SetExplicitPriority(v0->unk_30, 0);
+        CellActor_SetAnim(v0->unk_30, 1);
+        CellActor_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
         v1 = ov114_0225FAB8(&v0->unk_34);
 
         if (v1 == 1) {
-            GraphicElementData_SetAnimateFlag(v0->unk_30, 1);
+            CellActor_SetAnimateFlag(v0->unk_30, 1);
             v0->unk_04++;
             v0->unk_06 = 0;
         }
@@ -3966,7 +3966,7 @@ static void ov114_0225FF54 (SysTask * param0, void * param1)
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            GraphicElementData_Delete(v0->unk_30);
+            CellActor_Delete(v0->unk_30);
             v0->unk_30 = NULL;
             v0->unk_06 = 0;
             v0->unk_04++;
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index dd2e86cba2..588de4070a 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -170,7 +170,7 @@ typedef struct {
 } UnkStruct_ov115_02264A40;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     Easy3DObject unk_04;
     Easy3DObject unk_7C;
     BOOL unk_F4;
@@ -184,12 +184,12 @@ typedef struct {
 
 typedef struct {
     BOOL unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
 } UnkStruct_ov115_02264BA0;
 
 typedef struct {
     BOOL unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_04;
     VecFx32 unk_08;
     s32 unk_14;
     BOOL unk_18;
@@ -200,7 +200,7 @@ typedef struct {
 } UnkStruct_ov115_02264C90;
 
 typedef struct {
-    GraphicElementData * unk_00[3];
+    CellActor * unk_00[3];
     u32 unk_0C[3];
     VecFx32 unk_18[3];
     BOOL unk_3C;
@@ -246,7 +246,7 @@ typedef struct {
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     CellActorResourceData unk_10;
-    GraphicElementData * unk_34;
+    CellActor * unk_34;
     u8 unk_38;
     u8 unk_39;
     u8 unk_3A;
@@ -263,7 +263,7 @@ typedef struct {
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
     CellActorResourceData unk_10;
-    GraphicElementData * unk_34;
+    CellActor * unk_34;
     Window unk_38;
     FontOAM * unk_48;
     UnkStruct_02012B20 * unk_4C;
@@ -294,7 +294,7 @@ typedef struct {
     u16 unk_14;
     u16 unk_16;
     GenericPointerData * unk_18;
-    GraphicElementManager * unk_1C;
+    CellActorCollection * unk_1C;
     UnkStruct_0200C738 unk_20;
     UnkStruct_02009714 * unk_1AC[4];
     CellActorResourceData unk_1BC;
@@ -1259,7 +1259,7 @@ static void ov115_02261520 (UnkStruct_ov115_02261574 * param0, UnkStruct_ov115_0
     int v1, v2;
     u32 v3;
 
-    v0.manager = param1->unk_1C;
+    v0.collection = param1->unk_1C;
     v0.resourceData = &param1->unk_1BC;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
@@ -1309,12 +1309,12 @@ static void ov115_022615B0 (UnkStruct_ov115_022615B0 * param0, CellActorInitPara
         param1->position.x = v1 << FX32_SHIFT;
         param1->position.y = v2 << FX32_SHIFT;
         param0->unk_18[v0] = param1->position;
-        param0->unk_00[v0] = GraphicElementManager_AddElementEx(param1);
+        param0->unk_00[v0] = CellActorCollection_AddEx(param1);
 
-        GraphicElementData_SetAnim(param0->unk_00[v0], 2);
-        GraphicElementData_SetDrawFlag(param0->unk_00[v0], 0);
-        GraphicElementData_SetAnimateFlag(param0->unk_00[v0], 1);
-        GraphicElementData_SetAnimSpeed(param0->unk_00[v0], FX32_CONST(1.5));
+        CellActor_SetAnim(param0->unk_00[v0], 2);
+        CellActor_SetDrawFlag(param0->unk_00[v0], 0);
+        CellActor_SetAnimateFlag(param0->unk_00[v0], 1);
+        CellActor_SetAnimSpeed(param0->unk_00[v0], FX32_CONST(1.5));
 
         param0->unk_0C[v0] = 0;
     }
@@ -1331,7 +1331,7 @@ static void ov115_02261648 (UnkStruct_ov115_022615B0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0]);
+        CellActor_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -1350,13 +1350,13 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p
     v1 = -1;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0]) == 0) {
+        if (CellActor_GetDrawFlag(param0->unk_00[v0]) == 0) {
             v1 = v0;
             v2 = 1;
         } else {
-            v3 = GraphicElementData_GetPriority(param0->unk_00[v0]);
+            v3 = CellActor_GetPriority(param0->unk_00[v0]);
             v3++;
-            GraphicElementData_SetPriority(param0->unk_00[v0], v3);
+            CellActor_SetPriority(param0->unk_00[v0], v3);
 
             if ((v2 == 0) && (v4 <= v3)) {
                 v4 = v3;
@@ -1389,12 +1389,12 @@ static void ov115_02261660 (UnkStruct_ov115_022615B0 * param0, u32 param1, u32 p
         v6 = 7;
     }
 
-    GraphicElementData_SetAnim(param0->unk_00[v1], v5);
+    CellActor_SetAnim(param0->unk_00[v1], v5);
     param0->unk_0C[v1] = 0;
-    GraphicElementData_SetDrawFlag(param0->unk_00[v1], 1);
+    CellActor_SetDrawFlag(param0->unk_00[v1], 1);
     ov115_0226177C(param0, v1);
-    GraphicElementData_SetPriority(param0->unk_00[v1], 0);
-    GraphicElementData_SetExplicitPalette(param0->unk_00[v1], v6);
+    CellActor_SetPriority(param0->unk_00[v1], 0);
+    CellActor_SetExplicitPalette(param0->unk_00[v1], v6);
 }
 
 static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0)
@@ -1402,7 +1402,7 @@ static void ov115_02261744 (UnkStruct_ov115_022615B0 * param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_00[v0]) == 1) {
+        if (CellActor_GetDrawFlag(param0->unk_00[v0]) == 1) {
             param0->unk_0C[v0]++;
 
             if (param0->unk_0C[v0] > 16) {
@@ -1423,12 +1423,12 @@ static void ov115_0226177C (UnkStruct_ov115_022615B0 * param0, u32 param1)
     v1 = param0->unk_18[param1];
     v1.y += v0;
 
-    GraphicElementData_SetPosition(param0->unk_00[param1], &v1);
+    CellActor_SetPosition(param0->unk_00[param1], &v1);
 }
 
 static void ov115_022617D8 (UnkStruct_ov115_022615B0 * param0, u32 param1)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_00[param1], 0);
+    CellActor_SetDrawFlag(param0->unk_00[param1], 0);
 }
 
 static void ov115_022617E8 (UnkStruct_ov115_022617E8 * param0, UnkStruct_ov115_02261ADC * param1, const UnkStruct_ov115_02262F50 * param2, u32 param3, u32 param4, NARC * param5, u32 param6)
@@ -2688,7 +2688,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
     {
         CellActorInitParams v2;
 
-        v2.manager = param1->unk_1C;
+        v2.collection = param1->unk_1C;
         v2.resourceData = &param0->unk_10;
         v2.position.x = FX32_CONST(128);
         v2.position.y = FX32_CONST(120) + (512 << FX32_SHIFT);
@@ -2696,8 +2696,8 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         v2.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v2.heapID = param2;
 
-        param0->unk_34 = GraphicElementManager_AddElement(&v2);
-        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+        param0->unk_34 = CellActorCollection_Add(&v2);
+        CellActor_SetDrawFlag(param0->unk_34, 0);
     }
 
     NARC_dtor(v0);
@@ -2706,7 +2706,7 @@ static void ov115_02262FB4 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
 static void ov115_022630DC (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02261ADC * param1)
 {
     {
-        GraphicElementData_Delete(param0->unk_34);
+        CellActor_Delete(param0->unk_34);
     }
 
     {
@@ -2729,7 +2729,7 @@ static void ov115_02263130 (UnkStruct_ov115_02263130 * param0)
         param0->unk_39 = 0;
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_34, 1);
+    CellActor_SetDrawFlag(param0->unk_34, 1);
 }
 
 static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_02260D78 * param1)
@@ -2744,12 +2744,12 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         param0->unk_3A++;
         break;
     case 1:
-        GraphicElementData_UpdateAnim(param0->unk_34, FX32_CONST(2));
+        CellActor_UpdateAnim(param0->unk_34, FX32_CONST(2));
 
         {
             u32 v0;
 
-            v0 = GraphicElementData_GetAnimFrame(param0->unk_34);
+            v0 = CellActor_GetAnimFrame(param0->unk_34);
 
             switch (v0) {
             case 10:
@@ -2787,7 +2787,7 @@ static BOOL ov115_02263150 (UnkStruct_ov115_02263130 * param0, UnkStruct_ov115_0
         break;
     case 3:
         if (ov115_022625C8(param1) == 0) {
-            GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+            CellActor_SetDrawFlag(param0->unk_34, 0);
             return 1;
         }
         break;
@@ -2999,7 +2999,7 @@ static void ov115_0226369C (const UnkStruct_ov115_02260D78 * param0, UnkStruct_o
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    GraphicElementManager_Update(param1->unk_1C);
+    CellActorCollection_Update(param1->unk_1C);
 }
 
 static void ov115_0226376C (UnkStruct_ov115_02261ADC * param0, u32 param1)
@@ -3212,7 +3212,7 @@ static void ov115_02263A3C (UnkStruct_ov115_02261ADC * param0)
     int v0;
 
     sub_020127BC(param0->unk_1F0);
-    GraphicElementManager_Delete(param0->unk_1C);
+    CellActorCollection_Delete(param0->unk_1C);
 
     for (v0 = 0; v0 < 4; v0++) {
         sub_02009754(param0->unk_1AC[v0]);
@@ -3708,7 +3708,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     {
         CellActorInitParamsEx v0 = {0};
 
-        v0.manager = param0->unk_1C;
+        v0.collection = param0->unk_1C;
         v0.resourceData = &param0->unk_760.unk_70;
         v0.affineScale.x = FX32_ONE;
         v0.affineScale.y = FX32_ONE;
@@ -3716,9 +3716,9 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
         v0.priority = 32;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v0.heapID = param2;
-        param1->unk_00 = GraphicElementManager_AddElementEx(&v0);
+        param1->unk_00 = CellActorCollection_AddEx(&v0);
 
-        GraphicElementData_SetDrawFlag(param1->unk_00, 0);
+        CellActor_SetDrawFlag(param1->unk_00, 0);
     }
 
     Easy3DObject_Init(&param1->unk_7C, &param0->unk_760.unk_50);
@@ -3727,7 +3727,7 @@ static void ov115_022646BC (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 
 static void ov115_02264728 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1)
 {
-    GraphicElementData_Delete(param1->unk_00);
+    CellActor_Delete(param1->unk_00);
     memset(param1, 0, sizeof(UnkStruct_ov115_022647A0));
 }
 
@@ -3737,9 +3737,9 @@ static void ov115_02264740 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     param1->unk_F4 = 1;
     param1->unk_104 = 0;
 
-    GraphicElementData_SetExplicitPalette(param1->unk_00, param2->unk_04.unk_00);
+    CellActor_SetExplicitPalette(param1->unk_00, param2->unk_04.unk_00);
     ov115_02264980(param1, param2, param3);
-    GraphicElementData_SetDrawFlag(param1->unk_00, 1);
+    CellActor_SetDrawFlag(param1->unk_00, 1);
 }
 
 static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_022647A0 * param1, const UnkStruct_ov115_022622F8 * param2)
@@ -3747,7 +3747,7 @@ static void ov115_0226477C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     param1->unk_F8 = param2;
     param1->unk_104 = 0;
 
-    GraphicElementData_SetDrawFlag(param1->unk_00, 0);
+    CellActor_SetDrawFlag(param1->unk_00, 0);
     ov115_022649F0(param1, param0);
 }
 
@@ -3830,7 +3830,7 @@ static void ov115_02264924 (UnkStruct_ov115_022647A0 * param0)
     param0->unk_F8 = NULL;
     param0->unk_F4 = 0;
 
-    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
+    CellActor_SetDrawFlag(param0->unk_00, 0);
     Easy3DObject_SetVisibility(&param0->unk_7C, 0);
 }
 
@@ -3862,7 +3862,7 @@ static BOOL ov115_02264980 (UnkStruct_ov115_022647A0 * param0, const UnkStruct_o
     v0.y = (v1.y << FX32_SHIFT) + (512 << FX32_SHIFT);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0->unk_00, &v0);
+    CellActor_SetPosition(param0->unk_00, &v0);
 
     if ((v1.x < 0) || (v1.y < 0)) {
         return 0;
@@ -3875,7 +3875,7 @@ static void ov115_022649F0 (UnkStruct_ov115_022647A0 * param0, UnkStruct_ov115_0
 {
     Easy3DModel * v0;
 
-    GraphicElementData_SetDrawFlag(param0->unk_00, 0);
+    CellActor_SetDrawFlag(param0->unk_00, 0);
     param0->unk_F4 = 0;
 
     v0 = ov115_02264A40(param0->unk_F8, &param1->unk_760);
@@ -3930,7 +3930,7 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
 {
     CellActorInitParamsEx v0 = {0};
 
-    v0.manager = param0->unk_1C;
+    v0.collection = param0->unk_1C;
     v0.resourceData = &param0->unk_760.unk_70;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
@@ -3939,22 +3939,22 @@ static void ov115_02264B40 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v0.heapID = param3;
 
-    param1->unk_04 = GraphicElementManager_AddElementEx(&v0);
+    param1->unk_04 = CellActorCollection_AddEx(&v0);
 
-    GraphicElementData_SetDrawFlag(param1->unk_04, 0);
-    GraphicElementData_SetExplicitPalette(param1->unk_04, param2);
+    CellActor_SetDrawFlag(param1->unk_04, 0);
+    CellActor_SetExplicitPalette(param1->unk_04, param2);
 
     param1->unk_00 = 0;
 }
 
 static void ov115_02264BA0 (UnkStruct_ov115_02264BA0 * param0)
 {
-    GraphicElementData_Delete(param0->unk_04);
+    CellActor_Delete(param0->unk_04);
 }
 
 static void ov115_02264BAC (UnkStruct_ov115_02264BA0 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_04, 1);
+    CellActor_SetDrawFlag(param0->unk_04, 1);
     param0->unk_00 = 1;
 }
 
@@ -3976,12 +3976,12 @@ static void ov115_02264BD8 (UnkStruct_ov115_02264BA0 * param0, s32 param1, s32 p
     v0.x = param1 << FX32_SHIFT;
     v0.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    GraphicElementData_SetPosition(param0->unk_04, &v0);
+    CellActor_SetPosition(param0->unk_04, &v0);
 }
 
 static void ov115_02264BF8 (UnkStruct_ov115_02264BA0 * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_04, 0);
+    CellActor_SetDrawFlag(param0->unk_04, 0);
     param0->unk_00 = 0;
 }
 
@@ -3990,7 +3990,7 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     int v0;
     CellActorInitParamsEx v1 = {0};
 
-    v1.manager = param0->unk_1C;
+    v1.collection = param0->unk_1C;
     v1.resourceData = &param0->unk_760.unk_70;
     v1.affineScale.x = 9;
     v1.affineScale.y = 9;
@@ -4000,10 +4000,10 @@ static void ov115_02264C0C (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     v1.heapID = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
-        param1->unk_00[v0].unk_04 = GraphicElementManager_AddElementEx(&v1);
-        GraphicElementData_SetDrawFlag(param1->unk_00[v0].unk_04, 0);
-        GraphicElementData_SetAffineOverwriteMode(param1->unk_00[v0].unk_04, 1);
-        GraphicElementData_SetExplicitPalette(param1->unk_00[v0].unk_04, param2);
+        param1->unk_00[v0].unk_04 = CellActorCollection_AddEx(&v1);
+        CellActor_SetDrawFlag(param1->unk_00[v0].unk_04, 0);
+        CellActor_SetAffineOverwriteMode(param1->unk_00[v0].unk_04, 1);
+        CellActor_SetExplicitPalette(param1->unk_00[v0].unk_04, param2);
         param1->unk_00[v0].unk_00 = 0;
     }
 }
@@ -4013,7 +4013,7 @@ static void ov115_02264C78 (UnkStruct_ov115_02261ADC * param0, UnkStruct_ov115_0
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        GraphicElementData_Delete(param1->unk_00[v0].unk_04);
+        CellActor_Delete(param1->unk_00[v0].unk_04);
     }
 }
 
@@ -4045,7 +4045,7 @@ static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0)
             v5.x = v4;
             v5.y = v4;
 
-            GraphicElementData_SetAffineScale(param0->unk_00[v0].unk_04, &v5);
+            CellActor_SetAffineScale(param0->unk_00[v0].unk_04, &v5);
 
             if (param0->unk_00[v0].unk_18) {
                 param0->unk_00[v0].unk_08.x += v2 << FX32_SHIFT;
@@ -4054,11 +4054,11 @@ static void ov115_02264C90 (UnkStruct_ov115_02264C90 * param0)
             }
 
             param0->unk_00[v0].unk_08.y += v3 << FX32_SHIFT;
-            GraphicElementData_SetPosition(param0->unk_00[v0].unk_04, &param0->unk_00[v0].unk_08);
+            CellActor_SetPosition(param0->unk_00[v0].unk_04, &param0->unk_00[v0].unk_08);
 
             if ((param0->unk_00[v0].unk_08.x < (-FX32_CONST(32))) || (param0->unk_00[v0].unk_08.x > (FX32_CONST(288))) || (param0->unk_00[v0].unk_08.y < (-FX32_CONST(32)) + (512 << FX32_SHIFT)) || (param0->unk_00[v0].unk_08.y > (FX32_CONST(224)) + (512 << FX32_SHIFT))) {
                 param0->unk_00[v0].unk_00 = 0;
-                GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_04, 0);
+                CellActor_SetDrawFlag(param0->unk_00[v0].unk_04, 0);
             }
         }
     }
@@ -4089,10 +4089,10 @@ static void ov115_02264D80 (UnkStruct_ov115_02264C90 * param0, s32 param1, s32 p
     v1->unk_08.x = param1 << FX32_SHIFT;
     v1->unk_08.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    GraphicElementData_SetPosition(v1->unk_04, &v1->unk_08);
+    CellActor_SetPosition(v1->unk_04, &v1->unk_08);
 
     v1->unk_00 = 1;
-    GraphicElementData_SetDrawFlag(v1->unk_04, 1);
+    CellActor_SetDrawFlag(v1->unk_04, 1);
     v1->unk_14 = 0;
 }
 
@@ -4404,7 +4404,7 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
     {
         CellActorInitParams v1;
 
-        v1.manager = param1->unk_1C;
+        v1.collection = param1->unk_1C;
         v1.resourceData = &param0->unk_10;
         v1.position.x = (-FX32_CONST(64));
         v1.position.y = (FX32_CONST(48));
@@ -4412,8 +4412,8 @@ static void ov115_02265478 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.heapID = param3;
 
-        param0->unk_34 = GraphicElementManager_AddElement(&v1);
-        GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+        param0->unk_34 = CellActorCollection_Add(&v1);
+        CellActor_SetDrawFlag(param0->unk_34, 0);
     }
 
     {
@@ -4472,7 +4472,7 @@ static void ov115_02265688 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
         Strbuf_Free(param0->unk_5C);
     }
 
-    GraphicElementData_Delete(param0->unk_34);
+    CellActor_Delete(param0->unk_34);
 
     {
         sub_0200A4E4(param0->unk_00[0]);
@@ -4495,7 +4495,7 @@ static void ov115_02265700 (UnkStruct_ov115_02265788 * param0, UnkStruct_ov115_0
     }
 
     sub_020129D0(param0->unk_48, 1);
-    GraphicElementData_SetDrawFlag(param0->unk_34, 1);
+    CellActor_SetDrawFlag(param0->unk_34, 1);
 
     param0->unk_98 = 1;
     param0->unk_9A = 0;
@@ -4552,7 +4552,7 @@ static void ov115_02265820 (UnkStruct_ov115_02265788 * param0)
         } else {
             param0->unk_98 = 0;
             sub_020129D0(param0->unk_48, 0);
-            GraphicElementData_SetDrawFlag(param0->unk_34, 0);
+            CellActor_SetDrawFlag(param0->unk_34, 0);
         }
         break;
     }
@@ -4574,7 +4574,7 @@ static void ov115_02265820 (UnkStruct_ov115_02265788 * param0)
         v0.x = param0->unk_64.unk_00;
         v0.y = param0->unk_7C.unk_00;
 
-        GraphicElementData_SetPosition(param0->unk_34, &v0);
+        CellActor_SetPosition(param0->unk_34, &v0);
         sub_02012938(param0->unk_48);
     }
 }
diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c
index fd562fe8e6..0c9b9e5ac6 100644
--- a/src/overlay119/ov119_021D191C.c
+++ b/src/overlay119/ov119_021D191C.c
@@ -574,7 +574,7 @@ static BOOL ov119_021D1FAC (UnkStruct_ov119_021D0FD0 * param0)
                 NNSG2dImagePaletteProxy * v1;
                 int v2;
 
-                v1 = GraphicElementData_GetPaletteProxy(param0->unk_78->unk_00);
+                v1 = CellActor_GetPaletteProxy(param0->unk_78->unk_00);
                 v2 = sub_0201FAB4(v1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 sub_02003178(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v2), 0, 0, 16, 0xFFFF);
@@ -682,7 +682,7 @@ static BOOL ov119_021D21BC (UnkStruct_ov119_021D0FD0 * param0)
                 NNSG2dImagePaletteProxy * v0;
                 int v1;
 
-                v0 = GraphicElementData_GetPaletteProxy(param0->unk_78->unk_00);
+                v0 = CellActor_GetPaletteProxy(param0->unk_78->unk_00);
                 v1 = sub_0201FAB4(v0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 sub_02003178(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v1), 0, 0, 16, 0xFFFF);
diff --git a/src/pokemon.c b/src/pokemon.c
index 8bf23e540f..fb8e7f8001 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3175,7 +3175,7 @@ CellActorData *sub_02076994(SpriteRenderer *param0, SpriteGfxHandler *param1, Pa
 
     v1 = SpriteActor_LoadResources(param0, param1, &v0);
 
-    GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(v1->unk_00, 0);
+    CellActor_SetExplicitPaletteOffsetAutoAdjust(v1->unk_00, 0);
     SpriteActor_SetSpritePositionXY(v1, param3, param4);
     sub_0200D330(v1);
     sub_0200D390(v1, 1);
diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c
index 844bb32e57..f057e6e78c 100644
--- a/src/pokemon_summary_app.c
+++ b/src/pokemon_summary_app.c
@@ -709,7 +709,7 @@ static int sub_0208CC6C (PokemonSummaryApp * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[10], 0);
 
         if ((param0->cursor != 4) && (param0->cursor != param0->cursorTmp)) {
             Sound_PlayEffect(1501);
@@ -726,7 +726,7 @@ static int sub_0208CC6C (PokemonSummaryApp * param0)
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_B) {
         Sound_PlayEffect(1501);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[10], 0);
         return 7;
     }
 
@@ -1656,7 +1656,7 @@ static u8 sub_0208DD8C (PokemonSummaryApp * param0)
             SpriteActor_DrawSprite(param0->unk_41C[12], 1);
         }
 
-        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[9], 1);
         return 1;
     }
 
@@ -1671,7 +1671,7 @@ static u8 sub_0208DEA4 (PokemonSummaryApp * param0)
         SpriteActor_DrawSprite(param0->unk_41C[12], 0);
         SpriteActor_DrawSprite(param0->unk_41C[18], 0);
         SpriteActor_DrawSprite(param0->unk_41C[19], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[9], 0);
         sub_0201AD10(&param0->staticWindows[35]);
         sub_0208F6DC(param0, NULL);
         sub_0209145C(param0);
@@ -1825,7 +1825,7 @@ static void sub_0208E190 (PokemonSummaryApp * param0)
         SpriteActor_DrawSprite(param0->unk_41C[12], 1);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[9], 1);
 }
 
 static u8 sub_0208E208 (PokemonSummaryApp * param0)
@@ -1867,7 +1867,7 @@ static u8 sub_0208E208 (PokemonSummaryApp * param0)
         sub_0208DFF4(param0);
         sub_0208F7A4(param0);
         sub_0208F844(param0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[9], 1);
 
         return 1;
     }
@@ -1882,7 +1882,7 @@ static u8 sub_0208E308 (PokemonSummaryApp * param0)
         sub_0208F964(param0);
         SpriteActor_DrawSprite(param0->unk_41C[19], 0);
         sub_0208E498(param0, 0xffffffff);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[9], 0);
         sub_0201AD10(&param0->staticWindows[35]);
         sub_0208F6DC(param0, NULL);
         sub_0209145C(param0);
@@ -2017,12 +2017,12 @@ static u8 sub_0208E57C (PokemonSummaryApp * param0)
     case 2:
         sub_02090064(param0, 181);
         sub_0208F6DC(param0, &param0->staticWindows[35]);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[67], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[70], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[63], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[64], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[65], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[66], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[67], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[70], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[63], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[64], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[65], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[66], 0);
         sub_0208E794(param0, 0);
 
         return 1;
@@ -2137,15 +2137,15 @@ static void sub_0208E794 (PokemonSummaryApp * param0, s8 param1)
     sub_02090F84(param0);
 
     if (param0->ribbonState != 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[68], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[68], 1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[68], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[68], 0);
     }
 
     if ((param0->ribbonState * 4 + 8) < param0->ribbonMax) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[69], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[69], 1);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[69], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[69], 0);
     }
 }
 
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index ddd1eab994..f5f3c25068 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -137,9 +137,9 @@ void sub_020095A8 (UnkStruct_02009508 * param0)
     Heap_FreeToHeap(param0);
 }
 
-GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2)
+CellActorCollection * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, int param2)
 {
-    GraphicElementManagerParams v0;
+    CellActorCollectionParams v0;
     NNSG2dViewRect v1;
 
     sub_0202309C(&param1->unk_00, -FX32_ONE);
@@ -162,7 +162,7 @@ GraphicElementManager * sub_020095C4 (int param0, UnkStruct_0200C738 * param1, i
     v0.renderer = &param1->unk_00;
     v0.heapID = param2;
 
-    return GraphicElementManager_New(&v0);
+    return CellActorCollection_New(&v0);
 }
 
 void sub_0200962C (UnkStruct_0200C738 * param0, fx32 param1, fx32 param2)
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index faeec80291..93d4fc816c 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -45,7 +45,7 @@ typedef struct CellTransferStateData_t {
 } SpriteRenderer;
 
 typedef struct AnimationResourceCollection_t {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_02009508 * unk_04;
     UnkStruct_02009F38 * unk_08;
     UnkStruct_02009714 * unk_0C[6];
@@ -149,15 +149,15 @@ BOOL sub_0200C7C0 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param
     return 1;
 }
 
-void sub_0200C7E4 (GraphicElementData * param0)
+void sub_0200C7E4 (CellActor * param0)
 {
-    GraphicElementData_Delete(param0);
+    CellActor_Delete(param0);
 }
 
 void sub_0200C7EC (SpriteGfxHandler * param0)
 {
     GF_ASSERT(param0 != NULL);
-    GraphicElementManager_Update(param0->unk_00);
+    CellActorCollection_Update(param0->unk_00);
 }
 
 void sub_0200C800 (void)
@@ -172,7 +172,7 @@ void sub_0200C808 (void)
 
 void sub_0200C810 (SpriteGfxHandler * param0)
 {
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
 }
 
 void sub_0200C81C (SpriteGfxHandler * param0)
@@ -290,20 +290,20 @@ BOOL sub_0200C8F0 (SpriteRenderer * param0, SpriteGfxHandler * param1, const Unk
     return 1;
 }
 
-GraphicElementData * sub_0200CA08 (SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2)
+CellActor * sub_0200CA08 (SpriteRenderer * param0, SpriteGfxHandler * param1, const UnkStruct_ov7_0224F358 * param2)
 {
-    GraphicElementData * v0 = NULL;
+    CellActor * 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;
 }
 
-GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * 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)
+CellActor * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * 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 * v0 = NULL;
+    CellActor * v0 = NULL;
     CellActorInitParamsEx v1;
 
-    v1.manager = param1->unk_00;
+    v1.collection = param1->unk_00;
     v1.resourceData = &param1->unk_04->unk_00[param2];
     v1.position.x = FX32_CONST(param3);
     v1.position.y = FX32_CONST(param4);
@@ -321,11 +321,11 @@ GraphicElementData * sub_0200CA44 (SpriteRenderer * param0, SpriteGfxHandler * p
     v1.vramType = param9;
     v1.heapID = param0->unk_00;
 
-    v0 = GraphicElementManager_AddElementEx(&v1);
+    v0 = CellActorCollection_AddEx(&v1);
 
     if (v0 != NULL) {
-        GraphicElementData_SetAnim(v0, param6);
-        GraphicElementData_SetExplicitPalette(v0, param8);
+        CellActor_SetAnim(v0, param6);
+        CellActor_SetExplicitPalette(v0, param8);
     }
 
     return v0;
@@ -557,7 +557,7 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
 
     sub_020093B4(v2->unk_04, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param2->transferToVRAM, param2->bgPriority, param1->unk_0C[0], param1->unk_0C[1], param1->unk_0C[2], param1->unk_0C[3], param1->unk_0C[4], param1->unk_0C[5]);
 
-    v3.manager = param1->unk_00;
+    v3.collection = param1->unk_00;
     v3.resourceData = v2->unk_04;
     v3.position.x = FX32_CONST(param2->x);
     v3.position.y = FX32_CONST(param2->y);
@@ -574,14 +574,14 @@ CellActorData * SpriteActor_LoadResources (SpriteRenderer * param0, SpriteGfxHan
     v3.priority = param2->priority;
     v3.vramType = param2->vramType;
     v3.heapID = param0->unk_00;
-    v2->unk_00 = GraphicElementManager_AddElementEx(&v3);
+    v2->unk_00 = CellActorCollection_AddEx(&v3);
     v2->unk_0C = param2->transferToVRAM;
 
     if (v2->unk_00 != NULL) {
-        v1 = GraphicElementData_GetExplicitPalette(v2->unk_00);
+        v1 = CellActor_GetExplicitPalette(v2->unk_00);
 
-        GraphicElementData_SetAnim(v2->unk_00, param2->animIdx);
-        GraphicElementData_SetExplicitPalette(v2->unk_00, v1 + param2->plttIdx);
+        CellActor_SetAnim(v2->unk_00, param2->animIdx);
+        CellActor_SetExplicitPalette(v2->unk_00, v1 + param2->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -643,7 +643,7 @@ void sub_0200D0F4 (CellActorData * param0)
         sub_0200A5B4(param0->unk_04->imageProxy);
     }
 
-    GraphicElementData_Delete(param0->unk_00);
+    CellActor_Delete(param0->unk_00);
     sub_020095A8(param0->unk_08);
     Heap_FreeToHeap(param0);
 }
@@ -788,9 +788,9 @@ static BOOL sub_0200D2D0 (UnkStruct_02009714 * param0, UnkStruct_02009CFC * para
     return 0;
 }
 
-void SpriteActor_UpdateObject (GraphicElementData * param0)
+void SpriteActor_UpdateObject (CellActor * param0)
 {
-    GraphicElementData_UpdateAnim(param0, FX32_ONE);
+    CellActor_UpdateAnim(param0, FX32_ONE);
 }
 
 void sub_0200D330 (CellActorData * param0)
@@ -800,37 +800,37 @@ void sub_0200D330 (CellActorData * param0)
 
 void sub_0200D33C (CellActorData * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_00, FX32_CONST(2));
+    CellActor_UpdateAnim(param0->unk_00, FX32_CONST(2));
 }
 
 void sub_0200D34C (CellActorData * param0, fx32 param1)
 {
-    GraphicElementData_UpdateAnim(param0->unk_00, param1);
+    CellActor_UpdateAnim(param0->unk_00, param1);
 }
 
 u32 sub_0200D358 (CellActorData * param0)
 {
-    return GraphicElementData_GetAnimCount(param0->unk_00);
+    return CellActor_GetAnimCount(param0->unk_00);
 }
 
 void sub_0200D364 (CellActorData * param0, u32 param1)
 {
-    GraphicElementData_SetAnim(param0->unk_00, param1);
+    CellActor_SetAnim(param0->unk_00, param1);
 }
 
 void sub_0200D370 (CellActorData * param0, u32 param1)
 {
-    GraphicElementData_SetAnimNoRestart(param0->unk_00, param1);
+    CellActor_SetAnimNoRestart(param0->unk_00, param1);
 }
 
 u32 sub_0200D37C (CellActorData * param0)
 {
-    return GraphicElementData_GetActiveAnim(param0->unk_00);
+    return CellActor_GetActiveAnim(param0->unk_00);
 }
 
-void sub_0200D388 (GraphicElementData * param0, int param1)
+void sub_0200D388 (CellActor * param0, int param1)
 {
-    GraphicElementData_SetAnimateFlag(param0, param1);
+    CellActor_SetAnimateFlag(param0, param1);
 }
 
 void sub_0200D390 (CellActorData * param0, int param1)
@@ -838,9 +838,9 @@ void sub_0200D390 (CellActorData * param0, int param1)
     sub_0200D388(param0->unk_00, param1);
 }
 
-void sub_0200D39C (GraphicElementData * param0, fx32 param1)
+void sub_0200D39C (CellActor * param0, fx32 param1)
 {
-    GraphicElementData_SetAnimSpeed(param0, param1);
+    CellActor_SetAnimSpeed(param0, param1);
 }
 
 void sub_0200D3A4 (CellActorData * param0, fx32 param1)
@@ -848,9 +848,9 @@ void sub_0200D3A4 (CellActorData * param0, fx32 param1)
     sub_0200D39C(param0->unk_00, param1);
 }
 
-BOOL sub_0200D3B0 (GraphicElementData * param0)
+BOOL sub_0200D3B0 (CellActor * param0)
 {
-    return GraphicElementData_IsAnimated(param0);
+    return CellActor_IsAnimated(param0);
 }
 
 BOOL sub_0200D3B8 (CellActorData * param0)
@@ -858,7 +858,7 @@ BOOL sub_0200D3B8 (CellActorData * param0)
     return sub_0200D3B0(param0->unk_00);
 }
 
-void sub_0200D3C4 (GraphicElementData * param0, u16 param1)
+void sub_0200D3C4 (CellActor * param0, u16 param1)
 {
     SpriteActor_SetAnimFrame(param0, param1);
 }
@@ -868,9 +868,9 @@ void sub_0200D3CC (CellActorData * param0, u16 param1)
     sub_0200D3C4(param0->unk_00, param1);
 }
 
-u16 sub_0200D3D8 (GraphicElementData * param0)
+u16 sub_0200D3D8 (CellActor * param0)
 {
-    return GraphicElementData_GetAnimFrame(param0);
+    return CellActor_GetAnimFrame(param0);
 }
 
 u16 sub_0200D3E0 (CellActorData * param0)
@@ -878,9 +878,9 @@ u16 sub_0200D3E0 (CellActorData * param0)
     return sub_0200D3D8(param0->unk_00);
 }
 
-void SpriteActor_DrawSprite (GraphicElementData * param0, int param1)
+void SpriteActor_DrawSprite (CellActor * param0, int param1)
 {
-    GraphicElementData_SetDrawFlag(param0, param1);
+    CellActor_SetDrawFlag(param0, param1);
 }
 
 void SpriteActor_EnableObject (CellActorData * param0, int param1)
@@ -888,9 +888,9 @@ void SpriteActor_EnableObject (CellActorData * param0, int param1)
     SpriteActor_DrawSprite(param0->unk_00, param1);
 }
 
-int sub_0200D400 (GraphicElementData * param0)
+int sub_0200D400 (CellActor * param0)
 {
-    return GraphicElementData_GetDrawFlag(param0);
+    return CellActor_GetDrawFlag(param0);
 }
 
 int sub_0200D408 (CellActorData * param0)
@@ -898,9 +898,9 @@ int sub_0200D408 (CellActorData * param0)
     return sub_0200D400(param0->unk_00);
 }
 
-void sub_0200D414 (GraphicElementData * param0, int param1)
+void sub_0200D414 (CellActor * param0, int param1)
 {
-    GraphicElementData_SetExplicitPalette(param0, param1);
+    CellActor_SetExplicitPalette(param0, param1);
 }
 
 void sub_0200D41C (CellActorData * param0, int param1)
@@ -908,9 +908,9 @@ void sub_0200D41C (CellActorData * param0, int param1)
     sub_0200D414(param0->unk_00, param1);
 }
 
-void sub_0200D428 (GraphicElementData * param0, int param1)
+void sub_0200D428 (CellActor * param0, int param1)
 {
-    GraphicElementData_SetExplicitPaletteOffset(param0, param1);
+    CellActor_SetExplicitPaletteOffset(param0, param1);
 }
 
 void sub_0200D430 (CellActorData * param0, int param1)
@@ -920,17 +920,17 @@ void sub_0200D430 (CellActorData * param0, int param1)
 
 int sub_0200D43C (CellActorData * param0)
 {
-    return GraphicElementData_GetExplicitPaletteOffset(param0->unk_00);
+    return CellActor_GetExplicitPaletteOffset(param0->unk_00);
 }
 
-void sub_0200D448 (GraphicElementData * param0, int param1)
+void sub_0200D448 (CellActor * param0, int param1)
 {
-    GraphicElementData_SetExplicitPriority(param0, param1);
+    CellActor_SetExplicitPriority(param0, param1);
 }
 
 int sub_0200D454 (CellActorData * param0)
 {
-    return GraphicElementData_GetExplicitPriority(param0->unk_00);
+    return CellActor_GetExplicitPriority(param0->unk_00);
 }
 
 void sub_0200D460 (CellActorData * param0, int param1)
@@ -938,9 +938,9 @@ void sub_0200D460 (CellActorData * param0, int param1)
     sub_0200D448(param0->unk_00, param1);
 }
 
-void sub_0200D46C (GraphicElementData * param0, int param1)
+void sub_0200D46C (CellActor * param0, int param1)
 {
-    GraphicElementData_SetPriority(param0, param1);
+    CellActor_SetPriority(param0, param1);
 }
 
 void sub_0200D474 (CellActorData * param0, int param1)
@@ -948,9 +948,9 @@ void sub_0200D474 (CellActorData * param0, int param1)
     sub_0200D46C(param0->unk_00, param1);
 }
 
-u32 sub_0200D480 (GraphicElementData * param0)
+u32 sub_0200D480 (CellActor * param0)
 {
-    return GraphicElementData_GetPriority(param0);
+    return CellActor_GetPriority(param0);
 }
 
 u32 sub_0200D488 (CellActorData * param0)
@@ -958,20 +958,20 @@ u32 sub_0200D488 (CellActorData * param0)
     return sub_0200D480(param0->unk_00);
 }
 
-void SpriteActor_SetPositionXY (GraphicElementData * param0, s16 param1, s16 param2)
+void SpriteActor_SetPositionXY (CellActor * param0, s16 param1, s16 param2)
 {
     VecFx32 v0;
 
     v0.x = param1 * FX32_ONE;
     v0.y = param2 * FX32_ONE;
 
-    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         v0.y += (192 << FX32_SHIFT);
     }
 
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 void SpriteActor_SetSpritePositionXY (CellActorData * param0, s16 param1, s16 param2)
@@ -979,20 +979,20 @@ void SpriteActor_SetSpritePositionXY (CellActorData * param0, s16 param1, s16 pa
     SpriteActor_SetPositionXY(param0->unk_00, param1, param2);
 }
 
-void sub_0200D4D0 (GraphicElementData * param0, s16 param1, s16 param2, fx32 param3)
+void sub_0200D4D0 (CellActor * param0, s16 param1, s16 param2, fx32 param3)
 {
     VecFx32 v0;
 
     v0.x = param1 * FX32_ONE;
     v0.y = param2 * FX32_ONE;
 
-    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         v0.y += param3;
     }
 
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0, &v0);
+    CellActor_SetPosition(param0, &v0);
 }
 
 void sub_0200D500 (CellActorData * param0, s16 param1, s16 param2, fx32 param3)
@@ -1000,14 +1000,14 @@ void sub_0200D500 (CellActorData * param0, s16 param1, s16 param2, fx32 param3)
     sub_0200D4D0(param0->unk_00, param1, param2, param3);
 }
 
-void sub_0200D50C (GraphicElementData * param0, s16 * param1, s16 * param2)
+void sub_0200D50C (CellActor * param0, s16 * param1, s16 * param2)
 {
     const VecFx32 * v0;
 
-    v0 = GraphicElementData_GetPosition(param0);
+    v0 = CellActor_GetPosition(param0);
     *param1 = v0->x / FX32_ONE;
 
-    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = (v0->y - (192 << FX32_SHIFT)) / FX32_ONE;
     } else {
         *param2 = v0->y / FX32_ONE;
@@ -1019,14 +1019,14 @@ void SpriteActor_GetSpritePositionXY (CellActorData * param0, s16 * param1, s16
     sub_0200D50C(param0->unk_00, param1, param2);
 }
 
-void sub_0200D55C (GraphicElementData * param0, s16 * param1, s16 * param2, fx32 param3)
+void sub_0200D55C (CellActor * param0, s16 * param1, s16 * param2, fx32 param3)
 {
     const VecFx32 * v0;
 
-    v0 = GraphicElementData_GetPosition(param0);
+    v0 = CellActor_GetPosition(param0);
     *param1 = v0->x / FX32_ONE;
 
-    if (GraphicElementData_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = (v0->y - param3) / FX32_ONE;
     } else {
         *param2 = v0->y / FX32_ONE;
@@ -1038,18 +1038,18 @@ void sub_0200D5A0 (CellActorData * param0, s16 * param1, s16 * param2, fx32 para
     sub_0200D55C(param0->unk_00, param1, param2, param3);
 }
 
-void sub_0200D5AC (GraphicElementData * param0, s16 param1, s16 param2)
+void sub_0200D5AC (CellActor * param0, s16 param1, s16 param2)
 {
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0);
+    v0 = CellActor_GetPosition(param0);
 
     v1.x = v0->x + (param1 * FX32_ONE);
     v1.y = v0->y + (param2 * FX32_ONE);
     v1.z = v0->z;
 
-    GraphicElementData_SetPosition(param0, &v1);
+    CellActor_SetPosition(param0, &v1);
 }
 
 void sub_0200D5DC (CellActorData * param0, s16 param1, s16 param2)
@@ -1062,13 +1062,13 @@ void sub_0200D5E8 (CellActorData * param0, fx32 param1, fx32 param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_00);
+    v0 = CellActor_GetPosition(param0->unk_00);
 
     v1.x = v0->x + param1;
     v1.y = v0->y + param2;
     v1.z = v0->z;
 
-    GraphicElementData_SetPosition(param0->unk_00, &v1);
+    CellActor_SetPosition(param0->unk_00, &v1);
 }
 
 void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2)
@@ -1076,13 +1076,13 @@ void sub_0200D614 (CellActorData * param0, fx32 param1, fx32 param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_00);
+    v0 = CellActor_GetPosition(param0->unk_00);
 
     v1.x = param1;
     v1.y = param2;
     v1.z = v0->z;
 
-    GraphicElementData_SetPosition(param0->unk_00, &v1);
+    CellActor_SetPosition(param0->unk_00, &v1);
 }
 
 void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
@@ -1090,7 +1090,7 @@ void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
     const VecFx32 * v0;
     VecFx32 v1;
 
-    v0 = GraphicElementData_GetPosition(param0->unk_00);
+    v0 = CellActor_GetPosition(param0->unk_00);
 
     *param1 = v0->x;
     *param2 = v0->y;
@@ -1098,7 +1098,7 @@ void sub_0200D638 (CellActorData * param0, fx32 * param1, fx32 * param2)
 
 void sub_0200D650 (CellActorData * param0, fx32 param1, fx32 param2, fx32 param3)
 {
-    if (GraphicElementData_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
         sub_0200D614(param0, param1, param2 + param3);
     } else {
         sub_0200D614(param0, param1, param2);
@@ -1109,14 +1109,14 @@ void sub_0200D67C (CellActorData * param0, fx32 * param1, fx32 * param2, fx32 pa
 {
     sub_0200D638(param0, param1, param2);
 
-    if (GraphicElementData_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (CellActor_GetVRamType(param0->unk_00) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *param2 = *param2 - param3;
     }
 }
 
-void sub_0200D69C (GraphicElementData * param0, int param1)
+void sub_0200D69C (CellActor * param0, int param1)
 {
-    GraphicElementData_SetAffineOverwriteMode(param0, param1);
+    CellActor_SetAffineOverwriteMode(param0, param1);
 }
 
 void sub_0200D6A4 (CellActorData * param0, int param1)
@@ -1124,18 +1124,18 @@ void sub_0200D6A4 (CellActorData * param0, int param1)
     sub_0200D69C(param0->unk_00, param1);
 }
 
-void sub_0200D6B0 (GraphicElementData * param0, f32 param1, f32 param2)
+void sub_0200D6B0 (CellActor * param0, f32 param1, f32 param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = GraphicElementData_GetAffineScale(param0);
+    v0 = CellActor_GetAffineScale(param0);
     v1 = (VecFx32 *)v0;
 
     v1->x = (param1 * FX32_ONE);
     v1->y = (param2 * FX32_ONE);
 
-    GraphicElementData_SetAffineScale(param0, v1);
+    CellActor_SetAffineScale(param0, v1);
 }
 
 void sub_0200D6E8 (CellActorData * param0, f32 param1, f32 param2)
@@ -1143,18 +1143,18 @@ void sub_0200D6E8 (CellActorData * param0, f32 param1, f32 param2)
     sub_0200D6B0(param0->unk_00, param1, param2);
 }
 
-void sub_0200D6F4 (GraphicElementData * param0, f32 param1, f32 param2)
+void sub_0200D6F4 (CellActor * param0, f32 param1, f32 param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = GraphicElementData_GetAffineScale(param0);
+    v0 = CellActor_GetAffineScale(param0);
     v1 = (VecFx32 *)v0;
 
     v1->x = v0->x + (param1 * FX32_ONE);
     v1->y = v0->y + (param2 * FX32_ONE);
 
-    GraphicElementData_SetAffineScale(param0, v1);
+    CellActor_SetAffineScale(param0, v1);
 }
 
 void sub_0200D74C (CellActorData * param0, f32 param1, f32 param2)
@@ -1162,12 +1162,12 @@ void sub_0200D74C (CellActorData * param0, f32 param1, f32 param2)
     sub_0200D6F4(param0->unk_00, param1, param2);
 }
 
-void sub_0200D758 (GraphicElementData * param0, f32 * param1, f32 * param2)
+void sub_0200D758 (CellActor * param0, f32 * param1, f32 * param2)
 {
     const VecFx32 * v0;
     VecFx32 * v1;
 
-    v0 = GraphicElementData_GetAffineScale(param0);
+    v0 = CellActor_GetAffineScale(param0);
 
     *param1 = FX_FX32_TO_F32(v0->x);
     *param2 = FX_FX32_TO_F32(v0->y);
@@ -1178,9 +1178,9 @@ void sub_0200D788 (CellActorData * param0, f32 * param1, f32 * param2)
     sub_0200D758(param0->unk_00, param1, param2);
 }
 
-void sub_0200D794 (GraphicElementData * param0, u16 param1)
+void sub_0200D794 (CellActor * param0, u16 param1)
 {
-    GraphicElementData_SetAffineZRotation(param0, param1);
+    CellActor_SetAffineZRotation(param0, param1);
 }
 
 void sub_0200D79C (CellActorData * param0, u16 param1)
@@ -1188,14 +1188,14 @@ void sub_0200D79C (CellActorData * param0, u16 param1)
     sub_0200D794(param0->unk_00, param1);
 }
 
-void sub_0200D7A8 (GraphicElementData * param0, s32 param1)
+void sub_0200D7A8 (CellActor * param0, s32 param1)
 {
     u16 v0;
 
-    v0 = GraphicElementData_GetAffineZRotation(param0);
+    v0 = CellActor_GetAffineZRotation(param0);
     v0 += param1;
 
-    GraphicElementData_SetAffineZRotation(param0, v0);
+    CellActor_SetAffineZRotation(param0, v0);
 }
 
 void sub_0200D7C0 (CellActorData * param0, s32 param1)
@@ -1203,9 +1203,9 @@ void sub_0200D7C0 (CellActorData * param0, s32 param1)
     sub_0200D7A8(param0->unk_00, param1);
 }
 
-void sub_0200D7CC (GraphicElementData * param0, int param1)
+void sub_0200D7CC (CellActor * param0, int param1)
 {
-    GraphicElementData_SetFlipMode(param0, param1);
+    CellActor_SetFlipMode(param0, param1);
 }
 
 void sub_0200D7D4 (CellActorData * param0, int param1)
@@ -1221,17 +1221,17 @@ void sub_0200D7E0 (CellActorData * param0, s16 param1, s16 param2)
     v0.y = param2 << FX32_SHIFT;
     v0.z = 0;
 
-    GraphicElementData_SetAffineTranslation(param0->unk_00, &v0);
+    CellActor_SetAffineTranslation(param0->unk_00, &v0);
 }
 
 void sub_0200D7FC (CellActorData * param0, BOOL param1)
 {
-    GraphicElementData_SetPixelated(param0->unk_00, param1);
+    CellActor_SetPixelated(param0->unk_00, param1);
 }
 
-void sub_0200D808 (GraphicElementData * param0, GXOamMode param1)
+void sub_0200D808 (CellActor * param0, GXOamMode param1)
 {
-    GraphicElementData_SetExplicitOAMMode(param0, param1);
+    CellActor_SetExplicitOAMMode(param0, param1);
 }
 
 void SpriteActor_SetOAMMode (CellActorData * param0, GXOamMode param1)
@@ -1241,7 +1241,7 @@ void SpriteActor_SetOAMMode (CellActorData * param0, GXOamMode param1)
 
 u32 sub_0200D81C (CellActorData * param0)
 {
-    return GraphicElementData_GetUserAttrForCurrentAnimFrame(param0->unk_00);
+    return CellActor_GetUserAttrForCurrentAnimFrame(param0->unk_00);
 }
 
 BOOL sub_0200D828 (SpriteRenderer * param0, SpriteGfxHandler * param1, int param2, int param3, BOOL param4, int param5, int param6)
@@ -1330,7 +1330,7 @@ void sub_0200D97C (SpriteRenderer * param0, SpriteGfxHandler * param1, int param
     sub_0200A6B8(v0);
 }
 
-GraphicElementManager * sub_0200D9B0 (SpriteGfxHandler * param0)
+CellActorCollection * sub_0200D9B0 (SpriteGfxHandler * param0)
 {
     return param0->unk_00;
 }
diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c
index 795202ee24..928814d60c 100644
--- a/src/unk_0200DA60.c
+++ b/src/unk_0200DA60.c
@@ -589,16 +589,16 @@ static void sub_0200EC9C (SysTask * param0, void * param1)
         return;
     case 2:
         v0->unk_1D3 = 3;
-        GraphicElementData_SetAnim(v0->unk_1C8->unk_00, 1);
+        CellActor_SetAnim(v0->unk_1C8->unk_00, 1);
         break;
     case 3:
-        if (GraphicElementData_GetAnimFrame(v0->unk_1C8->unk_00) == 6) {
+        if (CellActor_GetAnimFrame(v0->unk_1C8->unk_00) == 6) {
             v0->unk_1D3 = 0;
         }
     }
 
-    GraphicElementData_UpdateAnim(v0->unk_1C8->unk_00, FX32_ONE);
-    GraphicElementManager_Update(v0->unk_00.unk_00);
+    CellActor_UpdateAnim(v0->unk_1C8->unk_00, FX32_ONE);
+    CellActorCollection_Update(v0->unk_00.unk_00);
 }
 
 static UnkStruct_0200ED50 * sub_0200ED14 (BGL * param0, u8 param1, u8 param2, u8 param3, u32 param4)
@@ -637,7 +637,7 @@ static void sub_0200EDD4 (UnkStruct_0200ED50 * param0, u8 param1, u8 param2)
 
     param0->unk_1C8 = ov5_021D3584(&param0->unk_00, &v0);
 
-    GraphicElementManager_Update(param0->unk_00.unk_00);
+    CellActorCollection_Update(param0->unk_00.unk_00);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index f4558fb729..3eff3dd06e 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -15,7 +15,7 @@
 #include "unk_020218BC.h"
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * 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 GraphicElementData * unk_08;
+    const CellActor * 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 GraphicElementData * sub_02013100(const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2);
+static CellActor * 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);
@@ -205,7 +205,7 @@ void sub_020128C4 (FontOAM * param0, int param1, int param2)
     param2 *= FX32_ONE;
 
     if (param0->unk_08) {
-        v2 = GraphicElementData_GetPosition(param0->unk_08);
+        v2 = CellActor_GetPosition(param0->unk_08);
 
         param1 += v2->x;
         param2 += v2->y;
@@ -217,7 +217,7 @@ void sub_020128C4 (FontOAM * param0, int param1, int param2)
         v1.x = param1 + (param0->unk_00[v0].unk_04 << FX32_SHIFT);
         v1.y = param2 + (param0->unk_00[v0].unk_08 << FX32_SHIFT);
 
-        GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
+        CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
     }
 }
 
@@ -233,7 +233,7 @@ void sub_02012938 (FontOAM * param0)
     if (param0->unk_08) {
         v3 = param0->unk_0C << FX32_SHIFT;
         v4 = param0->unk_10 << FX32_SHIFT;
-        v2 = GraphicElementData_GetPosition(param0->unk_08);
+        v2 = CellActor_GetPosition(param0->unk_08);
 
         v3 += v2->x;
         v4 += v2->y;
@@ -244,7 +244,7 @@ void sub_02012938 (FontOAM * param0)
             v1.x = v3 + (param0->unk_00[v0].unk_04 << FX32_SHIFT);
             v1.y = v4 + (param0->unk_00[v0].unk_08 << FX32_SHIFT);
 
-            GraphicElementData_SetPosition(param0->unk_00[v0].unk_00, &v1);
+            CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
         }
     }
 }
@@ -266,7 +266,7 @@ void sub_020129D0 (FontOAM * param0, BOOL param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -277,7 +277,7 @@ void sub_02012A00 (FontOAM * param0, u8 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetExplicitPriority(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetExplicitPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -288,7 +288,7 @@ void sub_02012A30 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetPriority(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -299,7 +299,7 @@ void sub_02012A60 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetExplicitPalette(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetExplicitPalette(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -310,7 +310,7 @@ void sub_02012A90 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetExplicitPaletteOffset(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetExplicitPaletteOffset(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -321,7 +321,7 @@ void sub_02012AC0 (FontOAM * param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -332,7 +332,7 @@ void sub_02012AF0 (FontOAM * param0, GXOamMode param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_SetExplicitOAMMode(param0->unk_00[v0].unk_00, param1);
+        CellActor_SetExplicitOAMMode(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -396,10 +396,10 @@ void sub_02012BE0 (FontOAM * param0, const UnkStruct_02012B20 * param1, const Wi
     int v0;
     char * v1;
     NNSG2dImageProxy * v2;
-    GraphicElementData * v3 = param0->unk_00[0].unk_00;
+    CellActor * v3 = param0->unk_00[0].unk_00;
     int v4;
 
-    v4 = GraphicElementData_GetVRamType(v3);
+    v4 = CellActor_GetVRamType(v3);
     v0 = sub_02012B58(param1, v4);
     v1 = (char *)Heap_AllocFromHeapAtEnd(param3, v0);
 
@@ -721,11 +721,11 @@ static void sub_020130DC (FontOAM * param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        GraphicElementData_Delete(param0->unk_00[v0].unk_00);
+        CellActor_Delete(param0->unk_00[v0].unk_00);
     }
 }
 
-static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
+static CellActor * sub_02013100 (const UnkStruct_020127E8 * param0, const UnkStruct_02013034 * param1, const NNSG2dImageProxy * param2)
 {
     CellActorInitParams v0;
     CellActorResourceData v1;
@@ -740,7 +740,7 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     v1.isVRamTransfer = 0;
     v1.priority = param0->unk_20;
 
-    v0.manager = param0->unk_08;
+    v0.collection = param0->unk_08;
     v0.resourceData = &v1;
     v0.priority = param0->unk_24;
     v0.vramType = param0->unk_28;
@@ -752,14 +752,14 @@ static GraphicElementData * sub_02013100 (const UnkStruct_020127E8 * param0, con
     if (param0->unk_10) {
         const VecFx32 * v2;
 
-        v2 = GraphicElementData_GetPosition(param0->unk_10);
+        v2 = CellActor_GetPosition(param0->unk_10);
         v0.position = *v2;
     }
 
     v0.position.x += (param0->unk_18 << FX32_SHIFT) + ((param1->unk_00 * 8) << FX32_SHIFT);
     v0.position.y += (param0->unk_1C << FX32_SHIFT) + ((param1->unk_04 * 8) << FX32_SHIFT);
 
-    return GraphicElementManager_AddElement(&v0);
+    return CellActorCollection_Add(&v0);
 }
 
 static UnkStruct_02013034 * sub_02013188 (int param0)
@@ -803,7 +803,7 @@ static void sub_020131D0 (UnkStruct_02013034 * param0, UnkStruct_02013034 * para
     param1->unk_0C = param0;
 }
 
-void sub_020131E0 (FontOAM * param0, const GraphicElementData * param1)
+void sub_020131E0 (FontOAM * param0, const CellActor * param1)
 {
     param0->unk_08 = param1;
     sub_02012938(param0);
diff --git a/src/unk_020218BC.c b/src/unk_020218BC.c
index b145e446a3..3336502d0f 100644
--- a/src/unk_020218BC.c
+++ b/src/unk_020218BC.c
@@ -13,14 +13,14 @@
 #include "heap.h"
 #include "unk_020218BC.h"
 
-#define GRAPHIC_ELEMENT_ANIM_DATA_SIZE  29
-#define MAX_SIMULTANEOUS_SPRITES        128
-
-enum CellType {
-    CELL_TYPE_NONE = 0,
-    CELL_TYPE_CELL,
-    CELL_TYPE_MULTI_CELL,
-    CELL_TYPE_VRAM_CELL,
+#define CELL_ACTOR_ANIM_DATA_SIZE   29
+#define MAX_SIMULTANEOUS_SPRITES    128
+
+enum CellAnimType {
+    CELL_ANIM_TYPE_NONE = 0,
+    CELL_ANIM_TYPE_CELL,
+    CELL_ANIM_TYPE_MULTI_CELL,
+    CELL_ANIM_TYPE_VRAM_CELL,
 };
 
 typedef struct CellAnimationData {
@@ -46,7 +46,7 @@ typedef struct MultiCellAnimationData {
     NNSG2dCellAnimation *cellAnims;
 } MultiCellAnimationData;
 
-typedef struct GraphicElementData {
+typedef struct CellActor {
     VecFx32 position;
     VecFx32 affineTranslation;
     VecFx32 affineScale;
@@ -61,11 +61,11 @@ typedef struct GraphicElementData {
     u8 draw;
     u8 animate;
     fx32 animSpeed;
-    GraphicElementManager *manager;
+    CellActorCollection *collection; // The collection this actor belongs to
 
     // This field is supposed to be a union between CellAnimationData, VRamCellAnimationData, and MultiCellAnimationData
     // but it's actually too small to hold the largest of these types. This should really be u32 animData[31].
-    u32 animData[GRAPHIC_ELEMENT_ANIM_DATA_SIZE];
+    u32 animData[CELL_ACTOR_ANIM_DATA_SIZE];
     NNSG2dImageProxy imageProxy;
     NNSG2dImagePaletteProxy paletteProxy;
     u32 type;
@@ -73,238 +73,238 @@ typedef struct GraphicElementData {
     u8 explicitPriority;
     u16 priority;
     NNS_G2D_VRAM_TYPE vramType;
-    struct GraphicElementData *prev;
-    struct GraphicElementData *next;
-} GraphicElementData;
-
-typedef struct GraphicElementManager {
-    GraphicElementData *elements;
-    int maxElements;
-    GraphicElementData **elementStack; // Stack of currently unused elements
+    struct CellActor *prev;
+    struct CellActor *next;
+} CellActor;
+
+typedef struct CellActorCollection {
+    CellActor *actors;
+    int maxActors;
+    CellActor **actorStack; // Stack of currently unused elements
     int stackPointer;
-    GraphicElementData sentinelData;
+    CellActor sentinelData;
     NNSG2dRendererInstance *renderer;
     void *rawAnimData;
     NNSG2dCellAnimBankData *defaultAnimBank;
     BOOL active;
-} GraphicElementManager;
-
-typedef void (* GraphicElementDrawFunc)(const GraphicElementManager *, GraphicElementData *);
-typedef void (* GraphicElementAnimUpdateFunc)(GraphicElementData *);
-
-static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr);
-static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData);
-static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, GraphicElementData *elem);
-static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem);
-static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem);
-static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, GraphicElementData *elem);
-static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum HeapId heapID);
-static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID);
-static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enum HeapId heapID);
-static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
-    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID);
+} CellActorCollection;
+
+typedef void (* CellActorDrawFunc)(const CellActorCollection *, CellActor *);
+typedef void (* CellActorAnimUpdateFunc)(CellActor *);
+
+static void CellActorCollection_Reset(CellActorCollection *collection);
+static enum CellAnimType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData);
+static void CellActor_SetCellBank(const NNSG2dCellDataBank *cellBank, CellActor *actor);
+static void CellActor_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, CellActor *actor);
+static void CellActor_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, CellActor *actor);
+static void CellActor_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, CellActor *actor);
+static void CellActor_CreateCellAnim(CellActor *actor, enum HeapId heapID);
+static void CellActor_CreateVRamCellAnim(const CellActorResourceData *resourceData, CellActor *actor, enum HeapId heapID);
+static void CellActor_CreateMultiCellAnim(CellActor *actor, enum HeapId heapID);
+static BOOL CellActorCollection_InitActor(const CellActorCollection *collection, 
+    const CellActorResourceData *resourceData, CellActor *actor, enum HeapId heapID);
 static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType);
-static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
-static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
-static void GraphicElementData_UpdateAnimInternal(GraphicElementData *gfxElemMgr);
-static void GraphicElementData_UpdateAnimInternal_Stub(GraphicElementData *gfxElemMgr);
-static void GraphicElementManager_InsertElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
-static void GraphicElementManager_RemoveElement(GraphicElementData *elem);
-static void GraphicElementManager_InitElements(GraphicElementManager *gfxElemMgr);
-static GraphicElementData *GraphicElementManager_AllocElement(GraphicElementManager *gfxElemMgr);
-static BOOL GraphicElementManager_FreeElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem);
-
-GraphicElementManager *GraphicElementManager_New(const GraphicElementManagerParams *params)
+static void CellActorCollection_DrawActor(const CellActorCollection *collection, CellActor *actor);
+static void CellActorCollection_DrawActor_Stub(const CellActorCollection *collection, CellActor *actor);
+static void CellActor_UpdateAnimInternal(CellActor *collection);
+static void CellActor_UpdateAnimInternal_Stub(CellActor *collection);
+static void CellActorCollection_Insert(CellActorCollection *collection, CellActor *actor);
+static void CellActorCollection_Remove(CellActor *actor);
+static void CellActorCollection_InitActors(CellActorCollection *collection);
+static CellActor *CellActorCollection_AllocActor(CellActorCollection *collection);
+static BOOL CellActorCollection_FreeActor(CellActorCollection *collection, CellActor *actor);
+
+CellActorCollection *CellActorCollection_New(const CellActorCollectionParams *params)
 {
     GF_ASSERT(params);
     GF_ASSERT(params->renderer);
 
-    GraphicElementManager *gfxElemMgr = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementManager));
-    GF_ASSERT(gfxElemMgr);
+    CellActorCollection *collection = Heap_AllocFromHeap(params->heapID, sizeof(CellActorCollection));
+    GF_ASSERT(collection);
 
-    GraphicElementManager_Reset(gfxElemMgr);
+    CellActorCollection_Reset(collection);
 
-    gfxElemMgr->elements = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData) * params->maxElements);
-    GF_ASSERT(gfxElemMgr->elements);
-    gfxElemMgr->maxElements = params->maxElements;
+    collection->actors = Heap_AllocFromHeap(params->heapID, sizeof(CellActor) * params->maxElements);
+    GF_ASSERT(collection->actors);
+    collection->maxActors = params->maxElements;
 
-    gfxElemMgr->elementStack = Heap_AllocFromHeap(params->heapID, sizeof(GraphicElementData *) * params->maxElements);
-    GF_ASSERT(gfxElemMgr->elementStack);
+    collection->actorStack = Heap_AllocFromHeap(params->heapID, sizeof(CellActor *) * params->maxElements);
+    GF_ASSERT(collection->actorStack);
 
-    GraphicElementManager_InitElements(gfxElemMgr);
-    GraphicElementData_Reset(&gfxElemMgr->sentinelData);
+    CellActorCollection_InitActors(collection);
+    CellActor_Reset(&collection->sentinelData);
 
-    gfxElemMgr->sentinelData.prev = &gfxElemMgr->sentinelData;
-    gfxElemMgr->sentinelData.next = &gfxElemMgr->sentinelData;
-    gfxElemMgr->renderer = params->renderer;
-    gfxElemMgr->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
+    collection->sentinelData.prev = &collection->sentinelData;
+    collection->sentinelData.next = &collection->sentinelData;
+    collection->renderer = params->renderer;
+    collection->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
 
-    NNS_G2dGetUnpackedAnimBank(gfxElemMgr->rawAnimData, &gfxElemMgr->defaultAnimBank);
-    gfxElemMgr->active = TRUE;
+    NNS_G2dGetUnpackedAnimBank(collection->rawAnimData, &collection->defaultAnimBank);
+    collection->active = TRUE;
 
-    return gfxElemMgr;
+    return collection;
 }
 
-BOOL GraphicElementManager_Delete(GraphicElementManager *gfxElemMgr)
+BOOL CellActorCollection_Delete(CellActorCollection *collection)
 {
-    if (gfxElemMgr == NULL) {
+    if (collection == NULL) {
         return FALSE;
     }
 
-    if (gfxElemMgr->elements == NULL) {
+    if (collection->actors == NULL) {
         return TRUE;
     }
 
-    GraphicElementManager_DeleteAll(gfxElemMgr);
+    CellActorCollection_DeleteAll(collection);
 
-    Heap_FreeToHeap(gfxElemMgr->rawAnimData);
-    Heap_FreeToHeap(gfxElemMgr->elementStack);
-    Heap_FreeToHeap(gfxElemMgr->elements);
+    Heap_FreeToHeap(collection->rawAnimData);
+    Heap_FreeToHeap(collection->actorStack);
+    Heap_FreeToHeap(collection->actors);
 
-    GraphicElementManager_Reset(gfxElemMgr);
-    Heap_FreeToHeap(gfxElemMgr);
+    CellActorCollection_Reset(collection);
+    Heap_FreeToHeap(collection);
 
-    gfxElemMgr = NULL;
+    collection = NULL;
 
     return TRUE;
 }
 
-BOOL GraphicElementManager_SetActive(GraphicElementManager *gfxElemMgr, u8 active)
+BOOL CellActorCollection_SetActive(CellActorCollection *collection, u8 active)
 {
-    if (gfxElemMgr == NULL) {
+    if (collection == NULL) {
         return FALSE;
     }
 
-    if (gfxElemMgr->elements == NULL) {
+    if (collection->actors == NULL) {
         return FALSE;
     }
 
-    gfxElemMgr->active = active;
+    collection->active = active;
 
     return TRUE;
 }
 
-BOOL GraphicElementManager_DeleteAll(GraphicElementManager *gfxElemMgr)
+BOOL CellActorCollection_DeleteAll(CellActorCollection *collection)
 {
-    if (gfxElemMgr == NULL) {
+    if (collection == NULL) {
         return FALSE;
     }
 
-    if (gfxElemMgr->elements == NULL) {
+    if (collection->actors == NULL) {
         return TRUE;
     }
 
-    GraphicElementData *elem = gfxElemMgr->sentinelData.next;
-    while (elem != &gfxElemMgr->sentinelData) {
-        GraphicElementData *next = elem->next;
-        GraphicElementData_Delete(elem);
-        elem = next;
+    CellActor *actor = collection->sentinelData.next;
+    while (actor != &collection->sentinelData) {
+        CellActor *next = actor->next;
+        CellActor_Delete(actor);
+        actor = next;
     }
 
     return TRUE;
 }
 
-void GraphicElementManager_Update(const GraphicElementManager *gfxElemMgr)
+void CellActorCollection_Update(const CellActorCollection *collection)
 {
-    static const GraphicElementDrawFunc sDrawFuncs[] = {
-        GraphicElementManager_DrawElement_Stub,
-        GraphicElementManager_DrawElement
+    static const CellActorDrawFunc sDrawFuncs[] = {
+        CellActorCollection_DrawActor_Stub,
+        CellActorCollection_DrawActor
     };
-    static const GraphicElementAnimUpdateFunc sAnimUpdateFuncs[] = {
-        GraphicElementData_UpdateAnimInternal_Stub,
-        GraphicElementData_UpdateAnimInternal
+    static const CellActorAnimUpdateFunc sAnimUpdateFuncs[] = {
+        CellActor_UpdateAnimInternal_Stub,
+        CellActor_UpdateAnimInternal
     };
 
-    GF_ASSERT(gfxElemMgr);
+    GF_ASSERT(collection);
 
-    if (gfxElemMgr->active == FALSE) {
+    if (collection->active == FALSE) {
         return;
     }
 
-    GraphicElementData *elem = gfxElemMgr->sentinelData.next;
+    CellActor *actor = collection->sentinelData.next;
 
-    while (elem != &gfxElemMgr->sentinelData) {
-        sDrawFuncs[elem->draw](gfxElemMgr, elem);
-        sAnimUpdateFuncs[elem->animate](elem);
-        elem = elem->next;
+    while (actor != &collection->sentinelData) {
+        sDrawFuncs[actor->draw](collection, actor);
+        sAnimUpdateFuncs[actor->animate](actor);
+        actor = actor->next;
     }
 }
 
-static void GraphicElementManager_Reset(GraphicElementManager *gfxElemMgr)
+static void CellActorCollection_Reset(CellActorCollection *collection)
 {
-    gfxElemMgr->elements = NULL;
-    gfxElemMgr->maxElements = 0;
-    gfxElemMgr->elementStack = NULL;
-    gfxElemMgr->stackPointer = 0;
-    gfxElemMgr->renderer = NULL;
+    collection->actors = NULL;
+    collection->maxActors = 0;
+    collection->actorStack = NULL;
+    collection->stackPointer = 0;
+    collection->renderer = NULL;
 
-    GraphicElementData_Reset(&gfxElemMgr->sentinelData);
-    gfxElemMgr->active = FALSE;
+    CellActor_Reset(&collection->sentinelData);
+    collection->active = FALSE;
 }
 
-void GraphicElementData_Reset(GraphicElementData *elem)
+void CellActor_Reset(CellActor *actor)
 {
-    elem->manager = NULL;
-    memset(elem, 0, sizeof(GraphicElementData));
+    actor->collection = NULL;
+    memset(actor, 0, sizeof(CellActor));
 
-    NNS_G2dInitImageProxy(&elem->imageProxy);
-    NNS_G2dInitImagePaletteProxy(&elem->paletteProxy);
+    NNS_G2dInitImageProxy(&actor->imageProxy);
+    NNS_G2dInitImagePaletteProxy(&actor->paletteProxy);
 
-    elem->explicitOamMode = GX_OAM_MODE_NORMAL;
+    actor->explicitOamMode = GX_OAM_MODE_NORMAL;
 }
 
-GraphicElementData *GraphicElementManager_AddElementEx(const CellActorInitParamsEx *params)
+CellActor *CellActorCollection_AddEx(const CellActorInitParamsEx *params)
 {
-    GraphicElementData *elem = GraphicElementManager_AllocElement(params->manager);
-    if (elem == NULL) {
+    CellActor *actor = CellActorCollection_AllocActor(params->collection);
+    if (actor == NULL) {
         return NULL;
     }
 
-    elem->manager = params->manager;
-    elem->activeAnimID = 0;
-    elem->position = params->position;
-    elem->affineScale = params->affineScale;
-    elem->affineZRotation = params->affineZRotation;
-    elem->vramType = params->vramType;
-    elem->priority = params->priority;
-    elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
-    elem->flip = GRAPHIC_ELEMENT_DATA_FLIP_NONE;
-    elem->explicitMosaic = FALSE;
-    elem->explicitOamMode = GX_OAM_MODE_NORMAL;
-    elem->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
+    actor->collection = params->collection;
+    actor->activeAnimID = 0;
+    actor->position = params->position;
+    actor->affineScale = params->affineScale;
+    actor->affineZRotation = params->affineZRotation;
+    actor->vramType = params->vramType;
+    actor->priority = params->priority;
+    actor->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+    actor->flip = CELL_ACTOR_FLIP_NONE;
+    actor->explicitMosaic = FALSE;
+    actor->explicitOamMode = GX_OAM_MODE_NORMAL;
+    actor->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
 
     NNS_G2dSetRndCoreAffineOverwriteMode(
-        &params->manager->renderer->rendererCore, 
-        elem->affineOverwriteMode
+        &params->collection->renderer->rendererCore, 
+        actor->affineOverwriteMode
     );
     NNS_G2dSetRndCoreFlipMode(
-        &params->manager->renderer->rendererCore, 
-        elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_H,
-        elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_V
+        &params->collection->renderer->rendererCore, 
+        actor->flip & CELL_ACTOR_FLIP_H,
+        actor->flip & CELL_ACTOR_FLIP_V
     );
 
-    elem->draw = TRUE;
-    elem->animate = 0;
-    elem->animSpeed = (FX32_ONE * 2);
+    actor->draw = TRUE;
+    actor->animate = FALSE;
+    actor->animSpeed = (FX32_ONE * 2);
 
-    if (GraphicElementManager_InitElement(params->manager, params->resourceData, elem, params->heapID) == FALSE) {
-        GraphicElementData_Delete(elem);
+    if (CellActorCollection_InitActor(params->collection, params->resourceData, actor, params->heapID) == FALSE) {
+        CellActor_Delete(actor);
         return NULL;
     }
 
-    elem->explicitPaletteOffset = GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
-    elem->explicitPalette = elem->explicitPaletteOffset;
+    actor->explicitPaletteOffset = GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
+    actor->explicitPalette = actor->explicitPaletteOffset;
 
-    GraphicElementManager_InsertElement(params->manager, elem);
+    CellActorCollection_Insert(params->collection, actor);
 
-    return elem;
+    return actor;
 }
 
-GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParams *params)
+CellActor *CellActorCollection_Add(const CellActorInitParams *params)
 {
     CellActorInitParamsEx paramsEx;
 
-    paramsEx.manager = params->manager;
+    paramsEx.collection = params->collection;
     paramsEx.resourceData = params->resourceData;
     paramsEx.position = params->position;
     paramsEx.affineScale.x = FX32_ONE;
@@ -315,29 +315,29 @@ GraphicElementData *GraphicElementManager_AddElement(const CellActorInitParams *
     paramsEx.vramType = params->vramType;
     paramsEx.heapID = params->heapID;
 
-    return GraphicElementManager_AddElementEx(&paramsEx);
+    return CellActorCollection_AddEx(&paramsEx);
 }
 
-void GraphicElementData_Delete(GraphicElementData *gfxElem)
+void CellActor_Delete(CellActor *actor)
 {
-    if (gfxElem->type == CELL_TYPE_NONE) {
+    if (actor->type == CELL_ANIM_TYPE_NONE) {
         return;
     }
 
-    if (gfxElem->prev != NULL) {
-        GraphicElementManager_RemoveElement(gfxElem);
+    if (actor->prev != NULL) {
+        CellActorCollection_Remove(actor);
     }
 
-    if (gfxElem->type == CELL_TYPE_VRAM_CELL) {
-        VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&gfxElem->animData;
+    if (actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&actor->animData;
 
-        if (NNS_G2dGetImageLocation(&gfxElem->imageProxy, gfxElem->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
+        if (NNS_G2dGetImageLocation(&actor->imageProxy, actor->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
             NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
         }
     }
 
-    if (gfxElem->type == CELL_TYPE_MULTI_CELL) {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&gfxElem->animData;
+    if (actor->type == CELL_ANIM_TYPE_MULTI_CELL) {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
 
         if (multiCellAnim->nodes != NULL) {
             Heap_FreeToHeap(multiCellAnim->nodes);
@@ -348,129 +348,129 @@ void GraphicElementData_Delete(GraphicElementData *gfxElem)
         }
     }
 
-    gfxElem->type = CELL_TYPE_NONE;
+    actor->type = CELL_ANIM_TYPE_NONE;
 
-    GraphicElementManager_FreeElement(gfxElem->manager, gfxElem);
+    CellActorCollection_FreeActor(actor->collection, actor);
 }
 
-void GraphicElementData_SetPosition(GraphicElementData *elem, const VecFx32 *position)
+void CellActor_SetPosition(CellActor *actor, const VecFx32 *position)
 {
-    elem->position = *position;
+    actor->position = *position;
 }
 
-void GraphicElementData_SetAffineTranslation(GraphicElementData *elem, const VecFx32 *translation)
+void CellActor_SetAffineTranslation(CellActor *actor, const VecFx32 *translation)
 {
-    elem->affineTranslation = *translation;
+    actor->affineTranslation = *translation;
 }
 
-void GraphicElementData_SetAffineScale(GraphicElementData *elem, const VecFx32 *scale)
+void CellActor_SetAffineScale(CellActor *actor, const VecFx32 *scale)
 {
-    elem->affineScale = *scale;
+    actor->affineScale = *scale;
 }
 
-void GraphicElementData_SetAffineScaleEx(GraphicElementData *elem, const VecFx32 *scale, enum AffineOverwriteMode mode)
+void CellActor_SetAffineScaleEx(CellActor *actor, const VecFx32 *scale, enum AffineOverwriteMode mode)
 {
-    GraphicElementData_SetAffineScale(elem, scale);
-    GraphicElementData_SetAffineOverwriteMode(elem, mode);
+    CellActor_SetAffineScale(actor, scale);
+    CellActor_SetAffineOverwriteMode(actor, mode);
 }
 
-void GraphicElementData_SetAffineZRotation(GraphicElementData *elem, u16 angle)
+void CellActor_SetAffineZRotation(CellActor *actor, u16 angle)
 {
-    elem->affineZRotation = angle;
+    actor->affineZRotation = angle;
 }
 
-void GraphicElementData_SetAffineZRotationEx(GraphicElementData *elem, u16 angle, enum AffineOverwriteMode mode)
+void CellActor_SetAffineZRotationEx(CellActor *actor, u16 angle, enum AffineOverwriteMode mode)
 {
-    GraphicElementData_SetAffineZRotation(elem, angle);
-    GraphicElementData_SetAffineOverwriteMode(elem, mode);
+    CellActor_SetAffineZRotation(actor, angle);
+    CellActor_SetAffineOverwriteMode(actor, mode);
 }
 
-void GraphicElementData_SetDrawFlag(GraphicElementData *elem, BOOL draw)
+void CellActor_SetDrawFlag(CellActor *actor, BOOL draw)
 {
-    GF_ASSERT(elem);
-    GF_ASSERT(draw < 2); // This value is used as an index into an array of size 2 inside GraphicElementManager_Update
+    GF_ASSERT(actor);
+    GF_ASSERT(draw < 2); // This value is used as an index into an array of size 2 inside CellActorCollection_Update
 
-    elem->draw = draw;
+    actor->draw = draw;
 }
 
-void GraphicElementData_SetAnimateFlag(GraphicElementData *elem, BOOL animate)
+void CellActor_SetAnimateFlag(CellActor *actor, BOOL animate)
 {
-    GF_ASSERT(elem);
-    GF_ASSERT(animate < 2); // This value is used as an index into an array of size 2 inside GraphicElementManager_Update
+    GF_ASSERT(actor);
+    GF_ASSERT(animate < 2); // This value is used as an index into an array of size 2 inside CellActorCollection_Update
 
-    elem->animate = animate;
+    actor->animate = animate;
 }
 
-void GraphicElementData_SetAnimSpeed(GraphicElementData *elem, fx32 speed)
+void CellActor_SetAnimSpeed(CellActor *actor, fx32 speed)
 {
-    GF_ASSERT(elem);
-    elem->animSpeed = speed;
+    GF_ASSERT(actor);
+    actor->animSpeed = speed;
 }
 
-void GraphicElementData_SetAffineOverwriteMode(GraphicElementData *elem, enum AffineOverwriteMode mode)
+void CellActor_SetAffineOverwriteMode(CellActor *actor, enum AffineOverwriteMode mode)
 {
-    GF_ASSERT(elem);
-    elem->affineOverwriteMode = mode;
+    GF_ASSERT(actor);
+    actor->affineOverwriteMode = mode;
 }
 
-void GraphicElementData_SetFlipMode(GraphicElementData *elem, u32 mode)
+void CellActor_SetFlipMode(CellActor *actor, u32 mode)
 {
-    GF_ASSERT(elem);
-    elem->flip = mode;
-    elem->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+    GF_ASSERT(actor);
+    actor->flip = mode;
+    actor->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
 }
 
-const VecFx32 *GraphicElementData_GetPosition(const GraphicElementData *elem)
+const VecFx32 *CellActor_GetPosition(const CellActor *actor)
 {
-    return &elem->position;
+    return &actor->position;
 }
 
-const VecFx32 *GraphicElementData_GetAffineScale(const GraphicElementData *elem)
+const VecFx32 *CellActor_GetAffineScale(const CellActor *actor)
 {
-    return &elem->affineScale;
+    return &actor->affineScale;
 }
 
-u16 GraphicElementData_GetAffineZRotation(const GraphicElementData *elem)
+u16 CellActor_GetAffineZRotation(const CellActor *actor)
 {
-    return elem->affineZRotation;
+    return actor->affineZRotation;
 }
 
-BOOL GraphicElementData_GetDrawFlag(const GraphicElementData *elem)
+BOOL CellActor_GetDrawFlag(const CellActor *actor)
 {
-    return elem->draw;
+    return actor->draw;
 }
 
-BOOL GraphicElementData_GetAnimateFlag(const GraphicElementData *elem)
+BOOL CellActor_GetAnimateFlag(const CellActor *actor)
 {
-    return elem->animate;
+    return actor->animate;
 }
 
-u32 GraphicElementData_GetAnimCount(const GraphicElementData *elem)
+u32 CellActor_GetAnimCount(const CellActor *actor)
 {
-    GF_ASSERT(elem);
+    GF_ASSERT(actor);
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         return cellAnim->animBank->numSequences;
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         return multiCellAnim->animBank->numSequences;
     }
 }
 
-void GraphicElementData_SetAnim(GraphicElementData *elem, u32 animID)
+void CellActor_SetAnim(CellActor *actor, u32 animID)
 {
-    GF_ASSERT(GraphicElementData_GetAnimCount(elem) > animID);
-    elem->activeAnimID = animID;
+    GF_ASSERT(CellActor_GetAnimCount(actor) > animID);
+    actor->activeAnimID = animID;
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
 
         const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, animID);
         NNS_G2dSetCellAnimationSequence(&cellAnim->anim, animSequence);
         NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
 
         const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, animID);
         NNS_G2dSetAnimSequenceToMCAnimation(&multiCellAnim->anim, animSequence);
@@ -478,191 +478,191 @@ void GraphicElementData_SetAnim(GraphicElementData *elem, u32 animID)
     }
 }
 
-void GraphicElementData_SetAnimNoRestart(GraphicElementData *elem, u32 animID)
+void CellActor_SetAnimNoRestart(CellActor *actor, u32 animID)
 {
-    if (elem->activeAnimID != animID) {
-        GraphicElementData_SetAnim(elem, animID);
+    if (actor->activeAnimID != animID) {
+        CellActor_SetAnim(actor, animID);
     }
 }
 
-void GraphicElementData_RestartAnim(GraphicElementData *elem)
+void CellActor_RestartAnim(CellActor *actor)
 {
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
 
         NNS_G2dResetAnimCtrlState(&cellAnim->anim.animCtrl);
         NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
-        SpriteActor_SetAnimFrame(elem, 0);
+        SpriteActor_SetAnimFrame(actor, 0);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
 
         NNS_G2dResetAnimCtrlState(&multiCellAnim->anim.animCtrl);
         NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
-        SpriteActor_SetAnimFrame(elem, 0);
+        SpriteActor_SetAnimFrame(actor, 0);
     }
 }
 
-u32 GraphicElementData_GetActiveAnim(const GraphicElementData *elem)
+u32 CellActor_GetActiveAnim(const CellActor *actor)
 {
-    return elem->activeAnimID;
+    return actor->activeAnimID;
 }
 
-void GraphicElementData_UpdateAnim(GraphicElementData *elem, fx32 frames)
+void CellActor_UpdateAnim(CellActor *actor, fx32 frames)
 {
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         NNS_G2dTickCellAnimation(&cellAnim->anim, frames);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         NNS_G2dTickMCAnimation(&multiCellAnim->anim, frames);
     }
 }
 
-void SpriteActor_SetAnimFrame(GraphicElementData *elem, u16 frame)
+void SpriteActor_SetAnimFrame(CellActor *actor, u16 frame)
 {
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         NNS_G2dSetCellAnimationCurrentFrame(&cellAnim->anim, frame);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         NNS_G2dSetMCAnimationCurrentFrame(&multiCellAnim->anim, frame);
     }
 }
 
-u16 GraphicElementData_GetAnimFrame(const GraphicElementData *elem)
+u16 CellActor_GetAnimFrame(const CellActor *actor)
 {
     NNSG2dAnimController *controller;
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         controller = NNS_G2dGetCellAnimationAnimCtrl(&cellAnim->anim);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         controller = NNS_G2dGetMCAnimAnimCtrl(&multiCellAnim->anim);
     }
 
     return NNS_G2dGetAnimCtrlCurrentFrame(controller);
 }
 
-void GraphicElementData_SetExplicitPriority(GraphicElementData *elem, u8 priority)
+void CellActor_SetExplicitPriority(CellActor *actor, u8 priority)
 {
-    elem->explicitPriority = priority;
+    actor->explicitPriority = priority;
 }
 
-u8 GraphicElementData_GetExplicitPriority(const GraphicElementData *elem)
+u8 CellActor_GetExplicitPriority(const CellActor *actor)
 {
-    return elem->explicitPriority;
+    return actor->explicitPriority;
 }
 
-void GraphicElementData_SetExplicitPalette(GraphicElementData *elem, u32 palette)
+void CellActor_SetExplicitPalette(CellActor *actor, u32 palette)
 {
-    GF_ASSERT(elem);
+    GF_ASSERT(actor);
 
-    elem->explicitPalette = palette;
-    elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
-    elem->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    actor->explicitPalette = palette;
+    actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
+    actor->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
 }
 
-void GraphicElementData_SetExplicitPaletteWithOffset(GraphicElementData *elem, u32 palette)
+void CellActor_SetExplicitPaletteWithOffset(CellActor *actor, u32 palette)
 {
-    GraphicElementData_SetExplicitPalette(elem, palette);
-    elem->explicitPalette += GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
+    CellActor_SetExplicitPalette(actor, palette);
+    actor->explicitPalette += GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
 }
 
-u32 GraphicElementData_GetExplicitPalette(const GraphicElementData *elem)
+u32 CellActor_GetExplicitPalette(const CellActor *actor)
 {
-    return elem->explicitPalette;
+    return actor->explicitPalette;
 }
 
-void GraphicElementData_SetExplicitPaletteOffset(GraphicElementData *elem, u32 paletteOffset)
+void CellActor_SetExplicitPaletteOffset(CellActor *actor, u32 paletteOffset)
 {
-    GF_ASSERT(elem);
+    GF_ASSERT(actor);
 
-    elem->explicitPaletteOffset = paletteOffset;
-    elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
-    elem->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
+    actor->explicitPaletteOffset = paletteOffset;
+    actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    actor->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
 }
 
-void GraphicElementData_SetExplicitPaletteOffsetAutoAdjust(GraphicElementData *elem, u32 paletteOffset)
+void CellActor_SetExplicitPaletteOffsetAutoAdjust(CellActor *actor, u32 paletteOffset)
 {
-    GraphicElementData_SetExplicitPaletteOffset(elem, paletteOffset);
-    elem->explicitPaletteOffset += GetPaletteIndexForProxy(&elem->paletteProxy, elem->vramType);
+    CellActor_SetExplicitPaletteOffset(actor, paletteOffset);
+    actor->explicitPaletteOffset += GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
 }
 
-u32 GraphicElementData_GetExplicitPaletteOffset(const GraphicElementData *elem)
+u32 CellActor_GetExplicitPaletteOffset(const CellActor *actor)
 {
-    GF_ASSERT(elem);
-    return elem->explicitPaletteOffset;
+    GF_ASSERT(actor);
+    return actor->explicitPaletteOffset;
 }
 
-void GraphicElementData_SetPriority(GraphicElementData *elem, u32 priority)
+void CellActor_SetPriority(CellActor *actor, u32 priority)
 {
-    GraphicElementManager *gfxElemMgr = elem->manager; // Required to match
-    elem->priority = priority;
+    CellActorCollection *collection = actor->collection; // Required to match
+    actor->priority = priority;
 
-    GraphicElementManager_RemoveElement(elem);
-    GraphicElementManager_InsertElement(gfxElemMgr, elem);
+    CellActorCollection_Remove(actor);
+    CellActorCollection_Insert(collection, actor);
 }
 
-u32 GraphicElementData_GetPriority(const GraphicElementData *elem)
+u32 CellActor_GetPriority(const CellActor *actor)
 {
-    return elem->priority;
+    return actor->priority;
 }
 
-void GraphicElementData_SetImageProxy(GraphicElementData *elem, const NNSG2dImageProxy *imageProxy)
+void CellActor_SetImageProxy(CellActor *actor, const NNSG2dImageProxy *imageProxy)
 {
-    elem->imageProxy = *imageProxy;
+    actor->imageProxy = *imageProxy;
 }
 
-NNSG2dImageProxy *SpriteActor_ImageProxy(GraphicElementData *elem)
+NNSG2dImageProxy *SpriteActor_ImageProxy(CellActor *actor)
 {
-    return &elem->imageProxy;
+    return &actor->imageProxy;
 }
 
-NNSG2dImagePaletteProxy *GraphicElementData_GetPaletteProxy(GraphicElementData *paletteProxy)
+NNSG2dImagePaletteProxy *CellActor_GetPaletteProxy(CellActor *paletteProxy)
 {
     return &paletteProxy->paletteProxy;
 }
 
-void GraphicElementData_SetPixelated(GraphicElementData *elem, BOOL pixelated)
+void CellActor_SetPixelated(CellActor *actor, BOOL pixelated)
 {
-    elem->explicitMosaic = pixelated;
+    actor->explicitMosaic = pixelated;
 
     if (pixelated == TRUE) {
-        elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
+        actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
     } else {
-        elem->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
+        actor->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
     }
 }
 
-NNS_G2D_VRAM_TYPE GraphicElementData_GetVRamType(const GraphicElementData *elem)
+NNS_G2D_VRAM_TYPE CellActor_GetVRamType(const CellActor *actor)
 {
-    return elem->vramType;
+    return actor->vramType;
 }
 
-BOOL GraphicElementData_IsAnimated(GraphicElementData *elem)
+BOOL CellActor_IsAnimated(CellActor *actor)
 {
-    GF_ASSERT(elem);
+    GF_ASSERT(actor);
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         return NNS_G2dIsAnimCtrlActive(&cellAnim->anim.animCtrl);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         return NNS_G2dIsAnimCtrlActive(&multiCellAnim->anim.animCtrl);
     }
 }
 
-void GraphicElementData_SetExplicitOAMMode(GraphicElementData *elem, GXOamMode mode)
+void CellActor_SetExplicitOAMMode(CellActor *actor, GXOamMode mode)
 {
-    GF_ASSERT(elem);
+    GF_ASSERT(actor);
 
-    elem->explicitOamMode = mode;
+    actor->explicitOamMode = mode;
 
     if (mode == GX_OAM_MODE_NORMAL) {
-        elem->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
+        actor->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
     } else {
-        elem->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
+        actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
     }
 }
 
@@ -688,15 +688,15 @@ void Utility_Clear2DSubOAM(enum HeapId heapID)
     Heap_FreeToHeap(oam);
 }
 
-u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData *elem, u32 animID, u32 frame)
+u32 CellActor_GetUserAttrForAnimFrame(const CellActor *actor, u32 animID, u32 frame)
 {
     const NNSG2dAnimBankData *animBank;
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         animBank = cellAnim->animBank;
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         animBank = multiCellAnim->animBank;
     }
 
@@ -718,84 +718,84 @@ u32 GraphicElementData_GetUserAttrForAnimFrame(const GraphicElementData *elem, u
     return 0;
 }
 
-u32 GraphicElementData_GetUserAttrForCurrentAnimFrame(const GraphicElementData *elem)
+u32 CellActor_GetUserAttrForCurrentAnimFrame(const CellActor *actor)
 {
-    u32 animID = GraphicElementData_GetActiveAnim(elem);
-    u32 frame = GraphicElementData_GetAnimFrame(elem);
+    u32 animID = CellActor_GetActiveAnim(actor);
+    u32 frame = CellActor_GetAnimFrame(actor);
 
-    return GraphicElementData_GetUserAttrForAnimFrame(elem, animID, frame);
+    return CellActor_GetUserAttrForAnimFrame(actor, animID, frame);
 }
 
-static BOOL GraphicElementManager_InitElement(const GraphicElementManager *gfxElemMgr, 
-    const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID)
+static BOOL CellActorCollection_InitActor(const CellActorCollection *collection, 
+    const CellActorResourceData *resourceData, CellActor *actor, enum HeapId heapID)
 {
-    elem->type = CellActorResourceData_GetCellType(resourceData);
-    elem->imageProxy = *resourceData->imageProxy;
-    elem->paletteProxy = *resourceData->paletteProxy;
+    actor->type = CellActorResourceData_GetCellType(resourceData);
+    actor->imageProxy = *resourceData->imageProxy;
+    actor->paletteProxy = *resourceData->paletteProxy;
 
-    GraphicElementData_SetCellBank(resourceData->cellBank, elem);
+    CellActor_SetCellBank(resourceData->cellBank, actor);
 
     if (resourceData->cellAnimBank) {
-        GraphicElementData_SetCellAnimBank(resourceData->cellAnimBank, elem);
+        CellActor_SetCellAnimBank(resourceData->cellAnimBank, actor);
     } else {
-        GraphicElementData_SetCellAnimBank(gfxElemMgr->defaultAnimBank, elem);
+        CellActor_SetCellAnimBank(collection->defaultAnimBank, actor);
     }
 
-    if (elem->type == CELL_TYPE_MULTI_CELL) {
-        GraphicElementData_SetMultiCellBank(resourceData->multiCellBank, elem);
-        GraphicElementData_SetMultiCellAnimBank(resourceData->multiCellAnimBank, elem);
-        GraphicElementData_CreateMultiCellAnim(elem, heapID);
-    } else if (elem->type == CELL_TYPE_VRAM_CELL) {
-        GraphicElementData_CreateVRamCellAnim(resourceData, elem, heapID);
+    if (actor->type == CELL_ANIM_TYPE_MULTI_CELL) {
+        CellActor_SetMultiCellBank(resourceData->multiCellBank, actor);
+        CellActor_SetMultiCellAnimBank(resourceData->multiCellAnimBank, actor);
+        CellActor_CreateMultiCellAnim(actor, heapID);
+    } else if (actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellActor_CreateVRamCellAnim(resourceData, actor, heapID);
     } else {
-        GraphicElementData_CreateCellAnim(elem, heapID);
+        CellActor_CreateCellAnim(actor, heapID);
     }
 
-    elem->explicitPriority = resourceData->priority;
+    actor->explicitPriority = resourceData->priority;
 
     return TRUE;
 }
 
-static enum CellType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData)
+static enum CellAnimType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData)
 {
     if (resourceData->multiCellBank != NULL) {
-        return CELL_TYPE_MULTI_CELL;
+        return CELL_ANIM_TYPE_MULTI_CELL;
     }
 
     if (resourceData->isVRamTransfer == TRUE) {
-        return CELL_TYPE_VRAM_CELL;
+        return CELL_ANIM_TYPE_VRAM_CELL;
     }
 
-    return CELL_TYPE_CELL;
+    return CELL_ANIM_TYPE_CELL;
 }
 
-static void GraphicElementData_SetCellBank(const NNSG2dCellDataBank *cellBank, GraphicElementData *elem)
+static void CellActor_SetCellBank(const NNSG2dCellDataBank *cellBank, CellActor *actor)
 {
-    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
     cellAnim->cellBank = cellBank;
 }
 
-static void GraphicElementData_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, GraphicElementData *elem)
+static void CellActor_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, CellActor *actor)
 {
-    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
     cellAnim->animBank = cellAnimBank;
 }
 
-static void GraphicElementData_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, GraphicElementData *elem)
+static void CellActor_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, CellActor *actor)
 {
-    MultiCellAnimationData *multiCell = (MultiCellAnimationData *)&elem->animData;
+    MultiCellAnimationData *multiCell = (MultiCellAnimationData *)&actor->animData;
     multiCell->cellBank = multiCellBank;
 }
 
-static void GraphicElementData_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, GraphicElementData *elem)
+static void CellActor_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, CellActor *actor)
 {
-    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
     multiCellAnim->animBank = multiCellAnimBank;
 }
 
-static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum HeapId heapID)
+static void CellActor_CreateCellAnim(CellActor *actor, enum HeapId heapID)
 {
-    CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
     NNS_G2dInitCellAnimation(
         &cellAnim->anim, 
         NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, 0), 
@@ -803,9 +803,9 @@ static void GraphicElementData_CreateCellAnim(GraphicElementData *elem, enum Hea
     );
 }
 
-static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *resourceData, GraphicElementData *elem, enum HeapId heapID)
+static void CellActor_CreateVRamCellAnim(const CellActorResourceData *resourceData, CellActor *actor, enum HeapId heapID)
 {
-    VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&elem->animData;
+    VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&actor->animData;
     vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
     const NNSG2dCharacterData *charData = resourceData->charData;
 
@@ -815,17 +815,17 @@ static void GraphicElementData_CreateVRamCellAnim(const CellActorResourceData *r
         vramCellAnim->cellBank, 
         vramCellAnim->transferHandle, 
         NNS_G2D_VRAM_ADDR_NONE, 
-        NNS_G2dGetImageLocation(&elem->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), 
-        NNS_G2dGetImageLocation(&elem->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), 
+        NNS_G2dGetImageLocation(&actor->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN), 
+        NNS_G2dGetImageLocation(&actor->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB), 
         charData->pRawData, 
         NULL, 
         charData->szByte
     );
 }
 
-static void GraphicElementData_CreateMultiCellAnim(GraphicElementData *elem, enum HeapId heapID)
+static void CellActor_CreateMultiCellAnim(CellActor *actor, enum HeapId heapID)
 {
-    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
     const NNSG2dMultiCellAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, 0);
     u16 maxNodes = NNS_G2dGetMCBankNumNodesRequired(multiCellAnim->cellBank);
     multiCellAnim->nodes = Heap_AllocFromHeap(heapID, sizeof(NNSG2dNode) * maxNodes);
@@ -866,55 +866,55 @@ static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy,
         : 0;
 }
 
-static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
+static void CellActorCollection_DrawActor(const CellActorCollection *collection, CellActor *actor)
 {
-    VecFx32 pos = elem->position;
+    VecFx32 pos = actor->position;
 
-    NNS_G2dSetRendererImageProxy(gfxElemMgr->renderer, &elem->imageProxy, &elem->paletteProxy);
-    NNS_G2dBeginRendering(gfxElemMgr->renderer);
+    NNS_G2dSetRendererImageProxy(collection->renderer, &actor->imageProxy, &actor->paletteProxy);
+    NNS_G2dBeginRendering(collection->renderer);
     NNS_G2dPushMtx();
 
-    NNS_G2dSetRndCoreAffineOverwriteMode(&gfxElemMgr->renderer->rendererCore, elem->affineOverwriteMode);
+    NNS_G2dSetRndCoreAffineOverwriteMode(&collection->renderer->rendererCore, actor->affineOverwriteMode);
 
-    if (elem->affineOverwriteMode == NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+    if (actor->affineOverwriteMode == NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
         NNS_G2dSetRndCoreFlipMode(
-            &gfxElemMgr->renderer->rendererCore, 
-            elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_H, 
-            elem->flip & GRAPHIC_ELEMENT_DATA_FLIP_V
+            &collection->renderer->rendererCore, 
+            actor->flip & CELL_ACTOR_FLIP_H, 
+            actor->flip & CELL_ACTOR_FLIP_V
         );
     } else {
-        NNS_G2dSetRndCoreFlipMode(&gfxElemMgr->renderer->rendererCore, FALSE, FALSE);
+        NNS_G2dSetRndCoreFlipMode(&collection->renderer->rendererCore, FALSE, FALSE);
     }
 
     NNS_G2dTranslate(pos.x, pos.y, pos.z);
 
-    if (elem->affineOverwriteMode != NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
-        NNS_G2dTranslate(elem->affineTranslation.x, elem->affineTranslation.y, elem->affineTranslation.z);
-        NNS_G2dScale(elem->affineScale.x, elem->affineScale.y, elem->affineScale.z);
-        NNS_G2dRotZ(FX_SinIdx(elem->affineZRotation), FX_CosIdx(elem->affineZRotation));
+    if (actor->affineOverwriteMode != NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+        NNS_G2dTranslate(actor->affineTranslation.x, actor->affineTranslation.y, actor->affineTranslation.z);
+        NNS_G2dScale(actor->affineScale.x, actor->affineScale.y, actor->affineScale.z);
+        NNS_G2dRotZ(FX_SinIdx(actor->affineZRotation), FX_CosIdx(actor->affineZRotation));
 
         // affineTranslation only serves as a pivot point for rotation and scaling
         // so we undo this translation after applying these transformations.
-        NNS_G2dTranslate(-elem->affineTranslation.x, -elem->affineTranslation.y, -elem->affineTranslation.z);
+        NNS_G2dTranslate(-actor->affineTranslation.x, -actor->affineTranslation.y, -actor->affineTranslation.z);
     }
 
     // Set the overwrite parameters
     // We always want the actual overwrite flags to be equal to overwriteParam
     // so we set the flags that are not in overwriteParam to 0 with the second call
-    NNS_G2dSetRendererOverwriteEnable(gfxElemMgr->renderer, elem->overwriteFlags);
-    NNS_G2dSetRendererOverwriteDisable(gfxElemMgr->renderer, ~elem->overwriteFlags);
+    NNS_G2dSetRendererOverwriteEnable(collection->renderer, actor->overwriteFlags);
+    NNS_G2dSetRendererOverwriteDisable(collection->renderer, ~actor->overwriteFlags);
 
-    NNS_G2dSetRendererOverwritePlttNo(gfxElemMgr->renderer, elem->explicitPalette);
-    NNS_G2dSetRendererOverwritePlttNoOffset(gfxElemMgr->renderer, elem->explicitPaletteOffset);
-    NNS_G2dSetRendererOverwriteMosaicFlag(gfxElemMgr->renderer, elem->explicitMosaic);
-    NNS_G2dSetRendererOverwriteOBJMode(gfxElemMgr->renderer, elem->explicitOamMode);
-    NNS_G2dSetRendererOverwritePriority(gfxElemMgr->renderer, elem->explicitPriority);
+    NNS_G2dSetRendererOverwritePlttNo(collection->renderer, actor->explicitPalette);
+    NNS_G2dSetRendererOverwritePlttNoOffset(collection->renderer, actor->explicitPaletteOffset);
+    NNS_G2dSetRendererOverwriteMosaicFlag(collection->renderer, actor->explicitMosaic);
+    NNS_G2dSetRendererOverwriteOBJMode(collection->renderer, actor->explicitOamMode);
+    NNS_G2dSetRendererOverwritePriority(collection->renderer, actor->explicitPriority);
 
-    if (elem->type == CELL_TYPE_CELL || elem->type == CELL_TYPE_VRAM_CELL) {
-        CellAnimationData *cellAnim = (CellAnimationData *)&elem->animData;
+    if (actor->type == CELL_ANIM_TYPE_CELL || actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
         NNS_G2dDrawCellAnimation(&cellAnim->anim);
     } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&elem->animData;
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
         NNS_G2dDrawMultiCellAnimation(&multiCellAnim->anim);
     }
 
@@ -922,49 +922,49 @@ static void GraphicElementManager_DrawElement(const GraphicElementManager *gfxEl
     NNS_G2dEndRendering();
 }
 
-static void GraphicElementManager_DrawElement_Stub(const GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
+static void CellActorCollection_DrawActor_Stub(const CellActorCollection *collection, CellActor *actor)
 {
     return;
 }
 
-static void GraphicElementData_UpdateAnimInternal(GraphicElementData *elem)
+static void CellActor_UpdateAnimInternal(CellActor *actor)
 {
-    GraphicElementData_UpdateAnim(elem, elem->animSpeed);
+    CellActor_UpdateAnim(actor, actor->animSpeed);
 }
 
-static void GraphicElementData_UpdateAnimInternal_Stub(GraphicElementData *elem)
+static void CellActor_UpdateAnimInternal_Stub(CellActor *actor)
 {
     return;
 }
 
-static void GraphicElementManager_InsertElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
+static void CellActorCollection_Insert(CellActorCollection *collection, CellActor *actor)
 {
-    // If the list is empty, insert the element as the only element
-    if (gfxElemMgr->sentinelData.next == &gfxElemMgr->sentinelData) {
-        gfxElemMgr->sentinelData.next = elem;
-        gfxElemMgr->sentinelData.prev = elem;
-        elem->prev = &gfxElemMgr->sentinelData;
-        elem->next = &gfxElemMgr->sentinelData;
+    // If the list is empty, insert the actor as the only actor
+    if (collection->sentinelData.next == &collection->sentinelData) {
+        collection->sentinelData.next = actor;
+        collection->sentinelData.prev = actor;
+        actor->prev = &collection->sentinelData;
+        actor->next = &collection->sentinelData;
         return;
     }
 
-    // Check if the element should be inserted at the end of the list (lowest priority)
-    if (gfxElemMgr->sentinelData.prev->priority <= elem->priority) {
-        elem->prev = gfxElemMgr->sentinelData.prev;
-        gfxElemMgr->sentinelData.prev->next = elem;
-        elem->next = &gfxElemMgr->sentinelData;
-        gfxElemMgr->sentinelData.prev = elem;
+    // Check if the actor should be inserted at the end of the list (lowest priority)
+    if (collection->sentinelData.prev->priority <= actor->priority) {
+        actor->prev = collection->sentinelData.prev;
+        collection->sentinelData.prev->next = actor;
+        actor->next = &collection->sentinelData;
+        collection->sentinelData.prev = actor;
         return;
     }
 
-    // Insert the element in the correct position according to its priority
-    GraphicElementData *cur = gfxElemMgr->sentinelData.next;
-    while (cur != &gfxElemMgr->sentinelData) {
-        if (cur->priority > elem->priority) {
-            cur->prev->next = elem;
-            elem->prev = cur->prev;
-            cur->prev = elem;
-            elem->next = cur;
+    // Insert the actor in the correct position according to its priority
+    CellActor *cur = collection->sentinelData.next;
+    while (cur != &collection->sentinelData) {
+        if (cur->priority > actor->priority) {
+            cur->prev->next = actor;
+            actor->prev = cur->prev;
+            cur->prev = actor;
+            actor->next = cur;
             break;
         }
 
@@ -972,44 +972,44 @@ static void GraphicElementManager_InsertElement(GraphicElementManager *gfxElemMg
     }
 }
 
-static void GraphicElementManager_RemoveElement(GraphicElementData *elem)
+static void CellActorCollection_Remove(CellActor *actor)
 {
-    elem->prev->next = elem->next;
-    elem->next->prev = elem->prev;
+    actor->prev->next = actor->next;
+    actor->next->prev = actor->prev;
 }
 
-static void GraphicElementManager_InitElements(GraphicElementManager *gfxElemMgr)
+static void CellActorCollection_InitActors(CellActorCollection *collection)
 {
-    for (int i = 0; i < gfxElemMgr->maxElements; i++) {
-        GraphicElementData_Reset(&gfxElemMgr->elements[i]);
-        gfxElemMgr->elementStack[i] = gfxElemMgr->elements + i;
+    for (int i = 0; i < collection->maxActors; i++) {
+        CellActor_Reset(&collection->actors[i]);
+        collection->actorStack[i] = collection->actors + i;
     }
 
-    gfxElemMgr->stackPointer = 0;
+    collection->stackPointer = 0;
 }
 
-static GraphicElementData *GraphicElementManager_AllocElement(GraphicElementManager *gfxElemMgr)
+static CellActor *CellActorCollection_AllocActor(CellActorCollection *collection)
 {
-    if (gfxElemMgr->stackPointer >= gfxElemMgr->maxElements) {
+    if (collection->stackPointer >= collection->maxActors) {
         return NULL;
     }
 
-    GraphicElementData *elem = gfxElemMgr->elementStack[gfxElemMgr->stackPointer];
-    gfxElemMgr->stackPointer++;
+    CellActor *actor = collection->actorStack[collection->stackPointer];
+    collection->stackPointer++;
 
-    return elem;
+    return actor;
 }
 
-static BOOL GraphicElementManager_FreeElement(GraphicElementManager *gfxElemMgr, GraphicElementData *elem)
+static BOOL CellActorCollection_FreeActor(CellActorCollection *collection, CellActor *actor)
 {
-    if (gfxElemMgr->stackPointer <= 0) {
+    if (collection->stackPointer <= 0) {
         return FALSE;
     }
 
-    GraphicElementData_Reset(elem);
+    CellActor_Reset(actor);
 
-    gfxElemMgr->stackPointer--;
-    gfxElemMgr->elementStack[gfxElemMgr->stackPointer] = elem;
+    collection->stackPointer--;
+    collection->actorStack[collection->stackPointer] = actor;
 
     return TRUE;
 }
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index d538e3885f..d498e33afa 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -32,7 +32,7 @@
 #include "map_object.h"
 
 typedef struct {
-    GraphicElementManager * unk_00;
+    CellActorCollection * unk_00;
     UnkStruct_02009508 * unk_04;
     UnkStruct_02009714 * unk_08[4];
     UnkStruct_02009CFC * unk_18[2];
@@ -59,20 +59,20 @@ typedef struct {
 
 typedef struct {
     VecFx32 unk_00;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
     int unk_10;
 } UnkStruct_0205D3C4;
 
 typedef struct {
     VecFx32 unk_00;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
     int unk_10;
     int unk_14;
 } UnkStruct_0205D5E0;
 
 typedef struct {
     VecFx32 unk_00;
-    GraphicElementData * unk_0C;
+    CellActor * unk_0C;
     int unk_10;
 } UnkStruct_0205D4A4;
 
@@ -85,7 +85,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 GraphicElementData * sub_0205D344(UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4);
+static CellActor * 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);
@@ -132,7 +132,7 @@ void sub_0205CA94 (SysTask * param0, void * param1)
     v3 = v0->unk_1E4;
 
     if (v0->unk_04.unk_00) {
-        GraphicElementManager_Update(v0->unk_04.unk_00);
+        CellActorCollection_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -195,7 +195,7 @@ void sub_0205CBFC (SysTask * param0, void * param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 5) {
-        GraphicElementManager_Update(v0->unk_04.unk_00);
+        CellActorCollection_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -250,7 +250,7 @@ void sub_0205CD3C (SysTask * param0, void * param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 6) {
-        GraphicElementManager_Update(v0->unk_04.unk_00);
+        CellActorCollection_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -313,7 +313,7 @@ void sub_0205CE7C (SysTask * param0, void * param1)
     v3 = v0->unk_1E4;
 
     if (v3 != 6) {
-        GraphicElementManager_Update(v0->unk_04.unk_00);
+        CellActorCollection_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -501,7 +501,7 @@ static void sub_0205D22C (UnkStruct_0205D094 * param0)
 {
     int v0;
 
-    GraphicElementManager_Delete(param0->unk_00);
+    CellActorCollection_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     sub_020095A8(param0->unk_04);
@@ -559,15 +559,15 @@ void sub_0205D274 (UnkStruct_0205D274 * param0, UnkStruct_0205D3AC * param1, int
     param1->unk_04(&param0->unk_04, param1);
 }
 
-static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4)
+static CellActor * sub_0205D344 (UnkStruct_0205D094 * param0, int param1, VecFx32 * param2, int param3, int param4)
 {
     CellActorInitParamsEx v0;
-    GraphicElementData * v1;
+    CellActor * v1;
     VecFx32 v2 = {FX32_ONE, FX32_ONE, FX32_ONE};
 
     memset(&v0, 0, sizeof(CellActorInitParamsEx));
 
-    v0.manager = param0->unk_00;
+    v0.collection = param0->unk_00;
     v0.resourceData = &param0->unk_04->unk_00[param1];
     v0.position = *param2;
     v0.affineScale = v2;
@@ -575,7 +575,7 @@ static GraphicElementData * sub_0205D344 (UnkStruct_0205D094 * param0, int param
     v0.vramType = param4;
     v0.heapID = 4;
 
-    v1 = GraphicElementManager_AddElementEx(&v0);
+    v1 = CellActorCollection_AddEx(&v0);
     GF_ASSERT(v1);
 
     return v1;
@@ -606,7 +606,7 @@ void sub_0205D404 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -622,9 +622,9 @@ int sub_0205D424 (struct UnkStruct_0205D3AC_t * param0)
         v0 = v1->unk_00;
         v0.y -= FX_Mul(FX_SinIdx(v1->unk_10), (16 * FX32_ONE));
 
-        GraphicElementData_SetPosition(v1->unk_0C, &v0);
+        CellActor_SetPosition(v1->unk_0C, &v0);
         v1->unk_10 += (0x8000 / 16);
-        GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
+        CellActor_UpdateAnim(v1->unk_0C, FX32_ONE);
 
         if (v1->unk_10 == ((0x8000 / 16) * 16)) {
             return 2;
@@ -655,7 +655,7 @@ void sub_0205D4E0 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -667,7 +667,7 @@ int sub_0205D500 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 7) {
-        GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
+        CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
@@ -694,7 +694,7 @@ void sub_0205D564 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D3C4 * v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -706,8 +706,8 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0)
 
     v0->unk_00.y += (FX32_ONE * 8);
 
-    GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
-    GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
+    CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
+    CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
 
     if (v0->unk_10 == 0) {
         if (v0->unk_00.y >= (384 * FX32_ONE)) {
@@ -717,7 +717,7 @@ int sub_0205D584 (struct UnkStruct_0205D3AC_t * param0)
     } else {
         if (v0->unk_00.y >= ((69 * FX32_ONE))) {
             v0->unk_00.y = ((69 * FX32_ONE));
-            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
+            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
             return 0;
         }
     }
@@ -738,7 +738,7 @@ void sub_0205D5E0 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    GraphicElementData_SetAnim(v0->unk_0C, 1);
+    CellActor_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0)
@@ -746,7 +746,7 @@ void sub_0205D624 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -761,7 +761,7 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     switch (v0->unk_10) {
     case 0:
         v0->unk_14 += (FX32_CONST(0.20f));
-        GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
+        CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if (v0->unk_14 >= (2 * FX32_ONE)) {
             v0->unk_10++;
@@ -770,8 +770,8 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 1:
         if (v0->unk_00.y > (-32 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
-            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
-            GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
+            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
+            CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_00.y = (384 * FX32_ONE);
             v0->unk_10++;
@@ -780,8 +780,8 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 2:
         v0->unk_00.y -= (FX32_ONE * 8);
 
-        GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
-        GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
+        CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
+        CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if ((v0->unk_00.y < (300 * FX32_ONE))) {
             v1 = 2;
@@ -791,8 +791,8 @@ int sub_0205D644 (struct UnkStruct_0205D3AC_t * param0)
     case 3:
         if (v0->unk_00.y > (192 * FX32_ONE)) {
             v0->unk_00.y -= (FX32_ONE * 8);
-            GraphicElementData_SetPosition(v0->unk_0C, &v0->unk_00);
-            GraphicElementData_UpdateAnim(v0->unk_0C, v0->unk_14);
+            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
+            CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_10++;
         }
@@ -818,9 +818,9 @@ void sub_0205D714 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    GraphicElementData_SetAnim(v0->unk_0C, 1);
+    CellActor_SetAnim(v0->unk_0C, 1);
     v0->unk_14 = (2 * FX32_ONE);
-    GraphicElementData_SetDrawFlag(v0->unk_0C, 0);
+    CellActor_SetDrawFlag(v0->unk_0C, 0);
 }
 
 void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0)
@@ -828,7 +828,7 @@ void sub_0205D768 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D5E0 * v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -842,7 +842,7 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0)
 
     switch (v1->unk_10) {
     case 0:
-        GraphicElementData_SetDrawFlag(v1->unk_0C, 1);
+        CellActor_SetDrawFlag(v1->unk_0C, 1);
         v1->unk_10++;
         break;
     case 1:
@@ -850,16 +850,16 @@ int sub_0205D788 (struct UnkStruct_0205D3AC_t * param0)
             v0 = v1->unk_00;
             v0.y -= FX_Mul(FX_SinIdx(v1->unk_14), (32 * FX32_ONE));
 
-            GraphicElementData_SetPosition(v1->unk_0C, &v0);
+            CellActor_SetPosition(v1->unk_0C, &v0);
             v1->unk_14 += (0x8000 / 8);
-            GraphicElementData_UpdateAnim(v1->unk_0C, FX32_ONE);
+            CellActor_UpdateAnim(v1->unk_0C, FX32_ONE);
         } else {
             v1->unk_10++;
         }
         break;
     case 2:
         v1->unk_14 -= (FX32_CONST(0.40f));
-        GraphicElementData_UpdateAnim(v1->unk_0C, v1->unk_14);
+        CellActor_UpdateAnim(v1->unk_0C, v1->unk_14);
 
         if (v1->unk_14 <= 0) {
             v1->unk_10++;
@@ -886,7 +886,7 @@ void sub_0205D844 (UnkStruct_0205D094 * param0, struct UnkStruct_0205D3AC_t * pa
     v0->unk_00.y = 96 * FX32_ONE;
     v0->unk_0C = sub_0205D344(param0, 1, &v0->unk_00, 1, 1);
 
-    GraphicElementData_SetAnim(v0->unk_0C, 1);
+    CellActor_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0)
@@ -894,7 +894,7 @@ void sub_0205D888 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        GraphicElementData_Delete(v0->unk_0C);
+        CellActor_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -905,7 +905,7 @@ int sub_0205D8A8 (struct UnkStruct_0205D3AC_t * param0)
     UnkStruct_0205D4A4 * v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 8) {
-        GraphicElementData_UpdateAnim(v0->unk_0C, FX32_ONE);
+        CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index d81172fba1..ca3c5654c6 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -90,11 +90,11 @@ void sub_0206A870 (UnkStruct_0206A844 * param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_1C8[v0] != NULL) {
-            GraphicElementData_UpdateAnim(param0->unk_1C8[v0]->unk_00, FX32_ONE);
+            CellActor_UpdateAnim(param0->unk_1C8[v0]->unk_00, FX32_ONE);
         }
     }
 
-    GraphicElementManager_Update(param0->unk_00.unk_00);
+    CellActorCollection_Update(param0->unk_00.unk_00);
 }
 
 void sub_0206A8A0 (UnkStruct_0206A844 * param0, s16 param1, s16 param2, s16 param3)
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index dee6ccd753..b707373bb6 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -867,31 +867,31 @@ static BOOL sub_020702D0 (TaskManager * param0)
         break;
     case 2:
         v1->unk_00 = sub_0206F488(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 3:
         v1->unk_00 = sub_0206F498(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 4:
         v1->unk_00 = sub_0206F508(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 5:
         v1->unk_00 = sub_0206F514(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 6:
         v1->unk_00 = sub_0206F554(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 7:
         v1->unk_00 = sub_0206F658(v1->unk_08);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 8:
         v1->unk_00 = sub_0206F748(v2);
-        GraphicElementManager_Update(v1->unk_08->unk_134.unk_00);
+        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 9:
         if (!(gCoreSys.pressedKeys & PAD_BUTTON_A)) {
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 62ac92b8b3..43ba1b9d40 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -1013,8 +1013,8 @@ static void sub_0207EE14 (GameWindowLayout * param0)
     }
 
     if ((param0->unk_5A4->unk_20 != 2) && (param0->unk_5A4->unk_20 != 17) && (param0->unk_5A4->unk_20 != 23) && (param0->unk_5A4->unk_20 != 22)) {
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[8], 0);
-        GraphicElementData_SetAnim(param0->unk_5B0[9], 0);
+        CellActor_SetDrawFlag(param0->unk_5B0[8], 0);
+        CellActor_SetAnim(param0->unk_5B0[9], 0);
 
         {
             s16 v1, v2;
@@ -1027,7 +1027,7 @@ static void sub_0207EE14 (GameWindowLayout * param0)
     }
 
     if ((param0->unk_5A4->unk_20 == 4) || (param0->unk_5A4->unk_20 == 21)) {
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[9], 0);
+        CellActor_SetDrawFlag(param0->unk_5B0[9], 0);
         v0 ^= 2;
     }
 
@@ -1399,7 +1399,7 @@ static void sub_0207F9A0 (GameWindowLayout * param0)
     u8 v0, v1;
 
     sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-    GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+    CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
     SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
 }
 
@@ -1467,10 +1467,10 @@ static u8 sub_0207FA24 (GameWindowLayout * param0)
 
     if ((v0 != param0->unk_B11) && (v0 != 0xff)) {
         if ((v0 == 6) || (v0 == 7)) {
-            GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
+            CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
         } else {
-            GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
-            GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
+            CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
+            CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
             SpriteActor_SetPositionXY(param0->unk_5B0[6], v2, v3);
         }
 
@@ -1557,8 +1557,8 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
         }
 
         sub_0201E028(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, 4);
-        GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
+        CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v1, v2);
 
         param0->unk_B0C = 1;
@@ -1579,13 +1579,13 @@ static u8 sub_0207FC94 (GameWindowLayout * param0)
 void sub_0207FD68 (GameWindowLayout * param0, u8 param1)
 {
     if ((param1 == 6) || (param1 == 7)) {
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
+        CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
     } else {
         u8 v0, v1;
 
         sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-        GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
+        CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
         SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     }
 
@@ -1988,7 +1988,7 @@ u8 sub_02080488 (GameWindowLayout * param0, u8 param1)
 static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
     if (param1 == 6) {
-        u8 v0 = GraphicElementData_GetActiveAnim(param0->unk_5B0[8]);
+        u8 v0 = CellActor_GetActiveAnim(param0->unk_5B0[8]);
 
         if (param2 == 0) {
             v0 = (v0 & 2);
@@ -1996,12 +1996,12 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
             v0 = (v0 & 2) + 1;
         }
 
-        GraphicElementData_SetAnim(param0->unk_5B0[8], v0);
+        CellActor_SetAnim(param0->unk_5B0[8], v0);
         return;
     }
 
     if (param1 == 7) {
-        u8 v1 = GraphicElementData_GetActiveAnim(param0->unk_5B0[9]);
+        u8 v1 = CellActor_GetActiveAnim(param0->unk_5B0[9]);
 
         if (param2 == 0) {
             v1 = (v1 & 2);
@@ -2009,7 +2009,7 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
             v1 = (v1 & 2) + 1;
         }
 
-        GraphicElementData_SetAnim(param0->unk_5B0[9], v1);
+        CellActor_SetAnim(param0->unk_5B0[9], v1);
         return;
     }
 
@@ -2017,12 +2017,12 @@ static void sub_02080500 (GameWindowLayout * param0, u8 param1, u8 param2)
         param0->unk_704[param1].unk_16 -= 2;
         param0->unk_704[param1].unk_18 -= 2;
 
-        GraphicElementData_SetAnim(param0->unk_5B0[0 + param1], 0);
+        CellActor_SetAnim(param0->unk_5B0[0 + param1], 0);
     } else {
         param0->unk_704[param1].unk_16 += 2;
         param0->unk_704[param1].unk_18 += 2;
 
-        GraphicElementData_SetAnim(param0->unk_5B0[0 + param1], 1);
+        CellActor_SetAnim(param0->unk_5B0[0 + param1], 1);
     }
 
     sub_0207F8F8(param0, param1);
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index e6183c3d04..39181e4039 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -170,13 +170,13 @@ void sub_02082E58 (GameWindowLayout * param0)
         param0->unk_5B0[10 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[4 + v0]);
         param0->unk_704[v0].unk_1A = Unk_020F20C0[4 + v0].unk_04;
         param0->unk_704[v0].unk_1C = Unk_020F20C0[4 + v0].unk_06;
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[10 + v0], 0);
+        CellActor_SetDrawFlag(param0->unk_5B0[10 + v0], 0);
         param0->unk_5B0[16 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[10 + v0]);
         param0->unk_5B0[22 + v0] = sub_0200CA08(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[16 + v0]);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 0);
+    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
+    CellActor_SetDrawFlag(param0->unk_5B0[28], 0);
 }
 
 void sub_02082FAC (GameWindowLayout * param0, u8 param1, u16 param2, u16 param3)
@@ -207,46 +207,46 @@ void sub_02082FF4 (GameWindowLayout * param0)
 
 void sub_02083014 (GameWindowLayout * param0, u8 param1, u8 param2)
 {
-    GraphicElementData ** v0 = &param0->unk_5B0[10 + param1];
+    CellActor ** v0 = &param0->unk_5B0[10 + param1];
 
     if (param2 == 7) {
-        GraphicElementData_SetDrawFlag(*v0, 0);
+        CellActor_SetDrawFlag(*v0, 0);
         return;
     }
 
-    GraphicElementData_SetAnim(*v0, param2);
-    GraphicElementData_SetDrawFlag(*v0, 1);
+    CellActor_SetAnim(*v0, param2);
+    CellActor_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083040 (GameWindowLayout * param0, u8 param1, u16 param2)
 {
-    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
+    CellActor ** v0 = &param0->unk_5B0[16 + param1];
 
     if (param2 == 0) {
-        GraphicElementData_SetDrawFlag(*v0, 0);
+        CellActor_SetDrawFlag(*v0, 0);
         return;
     }
 
     if (Item_IsMail(param2) == 1) {
-        GraphicElementData_SetAnim(*v0, 1);
+        CellActor_SetAnim(*v0, 1);
     } else {
-        GraphicElementData_SetAnim(*v0, 0);
+        CellActor_SetAnim(*v0, 0);
     }
 
-    GraphicElementData_SetDrawFlag(*v0, 1);
+    CellActor_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083080 (GameWindowLayout * param0, u8 param1)
 {
-    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
+    CellActor ** v0 = &param0->unk_5B0[16 + param1];
 
-    GraphicElementData_SetAnim(*v0, 1);
-    GraphicElementData_SetDrawFlag(*v0, 1);
+    CellActor_SetAnim(*v0, 1);
+    CellActor_SetDrawFlag(*v0, 1);
 }
 
 void sub_020830A0 (GameWindowLayout * param0, u8 param1, s16 param2, s16 param3)
 {
-    GraphicElementData ** v0 = &param0->unk_5B0[16 + param1];
+    CellActor ** v0 = &param0->unk_5B0[16 + param1];
 
     param0->unk_704[param1].unk_1E = param2 + 8;
     param0->unk_704[param1].unk_20 = param3 + 8;
@@ -261,24 +261,24 @@ void sub_020830D4 (GameWindowLayout * param0, u8 param1)
 
 void sub_02083104 (GameWindowLayout * param0, u8 param1)
 {
-    GraphicElementData ** v0 = &param0->unk_5B0[22 + param1];
+    CellActor ** v0 = &param0->unk_5B0[22 + param1];
 
     if (param0->unk_704[param1].unk_12 == 0) {
-        GraphicElementData_SetDrawFlag(*v0, 0);
+        CellActor_SetDrawFlag(*v0, 0);
         return;
     }
 
-    GraphicElementData_SetDrawFlag(*v0, 1);
+    CellActor_SetDrawFlag(*v0, 1);
 }
 
-static void sub_02083138 (GraphicElementData * param0, u8 param1)
+static void sub_02083138 (CellActor * param0, u8 param1)
 {
-    if (GraphicElementData_GetActiveAnim(param0) == param1) {
+    if (CellActor_GetActiveAnim(param0) == param1) {
         return;
     }
 
     SpriteActor_SetAnimFrame(param0, 0);
-    GraphicElementData_SetAnim(param0, param1);
+    CellActor_SetAnim(param0, param1);
 }
 
 static u8 sub_02083158 (StrBufWrapper * param0)
@@ -325,10 +325,10 @@ void sub_020831B4 (GameWindowLayout * param0)
         }
 
         sub_02083138(v0->unk_24, v2);
-        GraphicElementData_UpdateAnim(v0->unk_24, FX32_ONE);
+        CellActor_UpdateAnim(v0->unk_24, FX32_ONE);
 
         if ((param0->unk_B11 == v1) && (v2 != 0) && (v2 != 5)) {
-            if (GraphicElementData_GetAnimFrame(v0->unk_24) == 0) {
+            if (CellActor_GetAnimFrame(v0->unk_24) == 0) {
                 SpriteActor_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 - 3);
             } else {
                 SpriteActor_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 + 1);
@@ -346,8 +346,8 @@ void sub_0208327C (GameWindowLayout * param0, u8 param1, u8 param2)
     u8 v0, v1;
 
     sub_0201E010(&param0->unk_7F4[param1], &v0, &v1);
-    GraphicElementData_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
+    CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+    CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
     SpriteActor_SetPositionXY(param0->unk_5B0[6], v0, v1);
     sub_0200D414(param0->unk_5B0[6], param2);
 }
@@ -361,19 +361,19 @@ void sub_020832E4 (GameWindowLayout * param0, s16 param1, s16 param2)
     v0.y += (256 * FX32_ONE);
     v0.z = 0;
 
-    GraphicElementData_SetPosition(param0->unk_5B0[28], &v0);
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 1);
+    CellActor_SetPosition(param0->unk_5B0[28], &v0);
+    CellActor_SetDrawFlag(param0->unk_5B0[28], 1);
     SpriteActor_SetAnimFrame(param0->unk_5B0[28], 0);
-    GraphicElementData_SetAnim(param0->unk_5B0[28], 0);
+    CellActor_SetAnim(param0->unk_5B0[28], 0);
 }
 
 void sub_02083334 (GameWindowLayout * param0)
 {
-    if (GraphicElementData_GetDrawFlag(param0->unk_5B0[28]) == 1) {
-        GraphicElementData_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
+    if (CellActor_GetDrawFlag(param0->unk_5B0[28]) == 1) {
+        CellActor_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
 
-        if (GraphicElementData_GetAnimFrame(param0->unk_5B0[28]) == 2) {
-            GraphicElementData_SetDrawFlag(param0->unk_5B0[28], 0);
+        if (CellActor_GetAnimFrame(param0->unk_5B0[28]) == 2) {
+            CellActor_SetDrawFlag(param0->unk_5B0[28], 0);
         }
     }
 }
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 43c2386aef..81f7dcadee 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -441,8 +441,8 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
     sub_0200D414(param0->unk_5B0[6], 0);
     sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
     SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
-    GraphicElementData_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
+    CellActor_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+    CellActor_SetDrawFlag(param0->unk_5B0[7], 1);
     sub_0207F8F8(param0, param0->unk_B0F_0);
     sub_0200E084(&param0->unk_04[33], 1);
     sub_0208337C(param0);
@@ -454,7 +454,7 @@ static void sub_02083AD0 (GameWindowLayout * param0, int * param1)
 void sub_02083B88 (GameWindowLayout * param0)
 {
     param0->unk_B0F_6 = 0;
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
+    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
 
     if (param0->unk_B11 < 6) {
         sub_0207F8F8(param0, param0->unk_B11);
@@ -504,8 +504,8 @@ void sub_02083BD4 (GameWindowLayout * param0)
         memcpy(&param0->unk_7F8.unk_180[1][v6 * 16], &v1[v4 + (v5 + v6) * 32], 16 * 2);
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 0);
+    CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
+    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
 }
 
 BOOL sub_02083D1C (GameWindowLayout * param0)
@@ -554,7 +554,7 @@ BOOL sub_02083D1C (GameWindowLayout * param0)
 
     case 4:
         Party_SwapSlots(param0->unk_5A4->unk_00, v0->unk_300[0], v0->unk_300[1]);
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[6], 1);
+        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
 
         v0->unk_304 = 0;
         param0->unk_B0F_6 = 0;
@@ -847,7 +847,7 @@ int sub_02084780 (GameWindowLayout * param0)
 
     if (Pokemon_GetValue(v0, MON_DATA_MAIL_ID, NULL) == 0) {
         MessageLoader_GetStrbuf(param0->unk_69C, 129, param0->unk_6A4);
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
+        CellActor_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
     } else {
         MessageLoader_GetStrbuf(param0->unk_69C, 130, param0->unk_6A4);
         param0->unk_B11 = 7;
@@ -1020,8 +1020,8 @@ static int sub_02084A18 (GameWindowLayout * param0)
         sub_0200D414(param0->unk_5B0[6], 0);
         sub_0200D50C(param0->unk_5B0[6], &v0, &v1);
         SpriteActor_SetPositionXY(param0->unk_5B0[7], v0, v1);
-        GraphicElementData_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
-        GraphicElementData_SetDrawFlag(param0->unk_5B0[7], 1);
+        CellActor_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+        CellActor_SetDrawFlag(param0->unk_5B0[7], 1);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 36, 1);
 
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index b94a911a73..9f7b577275 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -99,15 +99,15 @@ struct UnkStruct_02087A10_t {
     Strbuf* unk_17C;
     Strbuf* unk_180;
     Strbuf* unk_184;
-    GraphicElementManager * unk_188;
+    CellActorCollection * unk_188;
     UnkStruct_0200C738 unk_18C;
     UnkStruct_02009714 * unk_318[4];
     UnkStruct_02009DC8 * unk_328[2][4];
     CellActorResourceData unk_348;
     CellActorResourceData unk_36C;
-    GraphicElementData * unk_390[14];
-    GraphicElementData * unk_3C8[12];
-    GraphicElementData * unk_3F8[2];
+    CellActor * unk_390[14];
+    CellActor * unk_3C8[12];
+    CellActor * unk_3F8[2];
     SysTask * unk_400[7];
     Window unk_41C[10];
     int unk_4BC;
@@ -133,14 +133,14 @@ struct UnkStruct_02087A10_t {
 };
 
 typedef struct {
-    GraphicElementData * unk_00;
-    GraphicElementData * unk_04;
+    CellActor * unk_00;
+    CellActor * unk_04;
     int unk_08;
     int unk_0C;
 } UnkStruct_020879DC;
 
 typedef struct {
-    GraphicElementData * unk_00;
+    CellActor * unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;
@@ -165,7 +165,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[], GraphicElementData ** param6, void * param7);
+static void sub_02087D64(BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], CellActor ** param6, void * param7);
 static void sub_0208737C(UnkStruct_02087A10 * param0, OverlayManager * param1);
 static void sub_02088240(BGL * param0, int param1, VecFx32 param2[]);
 static void sub_02088260(VecFx32 param0[], int param1);
@@ -182,11 +182,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(GraphicElementData ** param0, int param1, int param2);
+static void sub_02088E1C(CellActor ** 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[], GraphicElementData ** param1, int param2);
+static void sub_02088F40(int param0[], CellActor ** 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);
@@ -1029,7 +1029,7 @@ static int sub_02086B64 (OverlayManager * param0, int * param1)
         break;
     }
 
-    GraphicElementManager_Update(v0->unk_188);
+    CellActorCollection_Update(v0->unk_188);
 
     return 0;
 }
@@ -1039,8 +1039,8 @@ static int sub_02086D38 (UnkStruct_02087A10 * param0, int param1)
     sub_02088350(param0);
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_SELECT) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) {
-            GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        if (CellActor_GetDrawFlag(param0->unk_390[8]) == 0) {
+            CellActor_SetDrawFlag(param0->unk_390[8], 1);
             return param1;
         }
 
@@ -1164,7 +1164,7 @@ static int sub_02086F3C (OverlayManager * param0, int * param1)
         sub_02009754(v0->unk_318[v2]);
     }
 
-    GraphicElementManager_Delete(v0->unk_188);
+    CellActorCollection_Delete(v0->unk_188);
     sub_0200A878();
     Heap_FreeToHeapExplicit(18, v0->unk_510);
 
@@ -1592,12 +1592,12 @@ static void sub_020879DC (SysTask * param0, void * param1)
     VecFx32 v1;
     UnkStruct_020879DC * v2 = (UnkStruct_020879DC *)param1;
 
-    v0 = GraphicElementData_GetPosition(v2->unk_00);
+    v0 = CellActor_GetPosition(v2->unk_00);
     v1.x = v0->x + v2->unk_08;
     v1.y = FX32_ONE * Unk_020F2984[v2->unk_0C][1];
     v1.z = 0;
 
-    GraphicElementData_SetPosition(v2->unk_04, &v1);
+    CellActor_SetPosition(v2->unk_04, &v1);
 }
 
 static void sub_02087A10 (UnkStruct_02087A10 * param0)
@@ -1610,7 +1610,7 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
     {
         CellActorInitParamsEx v1;
 
-        v1.manager = param0->unk_188;
+        v1.collection = param0->unk_188;
         v1.resourceData = &param0->unk_348;
         v1.position.x = FX32_CONST(32);
         v1.position.y = FX32_CONST(96);
@@ -1627,15 +1627,15 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.position.x = FX32_ONE * Unk_020F2984[v0][0];
             v1.position.y = FX32_ONE * Unk_020F2984[v0][1];
 
-            param0->unk_390[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_390[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_390[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_390[v0], Unk_020F2984[v0][2]);
-            GraphicElementData_SetPriority(param0->unk_390[v0], Unk_020F2984[v0][3]);
+            CellActor_SetAnimateFlag(param0->unk_390[v0], 1);
+            CellActor_SetAnim(param0->unk_390[v0], Unk_020F2984[v0][2]);
+            CellActor_SetPriority(param0->unk_390[v0], Unk_020F2984[v0][3]);
         }
 
-        GraphicElementData_SetDrawFlag(param0->unk_390[4], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 0);
+        CellActor_SetDrawFlag(param0->unk_390[4], 0);
+        CellActor_SetDrawFlag(param0->unk_390[8], 0);
 
         for (v0 = 0; v0 < 7; v0++) {
             UnkStruct_020879DC * v2;
@@ -1652,10 +1652,10 @@ static void sub_02087A10 (UnkStruct_02087A10 * param0)
             v1.position.x = FX32_ONE * ((10 * 8) + v0 * 12);
             v1.position.y = FX32_ONE * (4 * 8 + 7);
 
-            param0->unk_3C8[v0] = GraphicElementManager_AddElementEx(&v1);
+            param0->unk_3C8[v0] = CellActorCollection_AddEx(&v1);
 
-            GraphicElementData_SetAnimateFlag(param0->unk_3C8[v0], 1);
-            GraphicElementData_SetAnim(param0->unk_3C8[v0], 43);
+            CellActor_SetAnimateFlag(param0->unk_3C8[v0], 1);
+            CellActor_SetAnim(param0->unk_3C8[v0], 43);
         }
 
         sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
@@ -1670,46 +1670,46 @@ static void sub_02087BE4 (UnkStruct_02087A10 * param0, CellActorInitParamsEx * p
 {
     param1->position.x = FX32_ONE * 24;
     param1->position.y = FX32_ONE * (16 - 8);
-    param0->unk_3F8[0] = GraphicElementManager_AddElementEx(param1);
+    param0->unk_3F8[0] = CellActorCollection_AddEx(param1);
 
-    GraphicElementData_SetAnimateFlag(param0->unk_3F8[0], 1);
+    CellActor_SetAnimateFlag(param0->unk_3F8[0], 1);
 
     switch (param0->unk_00) {
     case 0:
         if (param0->unk_04 == 0) {
-            GraphicElementData_SetAnim(param0->unk_3F8[0], 48);
+            CellActor_SetAnim(param0->unk_3F8[0], 48);
         } else {
-            GraphicElementData_SetAnim(param0->unk_3F8[0], 49);
+            CellActor_SetAnim(param0->unk_3F8[0], 49);
         }
         break;
     case 3:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 51);
+        CellActor_SetAnim(param0->unk_3F8[0], 51);
         break;
     case 6:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 55);
+        CellActor_SetAnim(param0->unk_3F8[0], 55);
         break;
     case 5:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 54);
+        CellActor_SetAnim(param0->unk_3F8[0], 54);
         break;
     case 4:
     case 7:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 53);
+        CellActor_SetAnim(param0->unk_3F8[0], 53);
         break;
     case 2:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 47);
+        CellActor_SetAnim(param0->unk_3F8[0], 47);
         break;
     case 1:
-        GraphicElementData_SetAnim(param0->unk_3F8[0], 50);
+        CellActor_SetAnim(param0->unk_3F8[0], 50);
 
         if (param0->unk_10 != 2) {
             param1->position.x = FX32_ONE * ((10 * 8) + param0->unk_0C * 13);
             param1->position.y = FX32_ONE * ((4 * 8 + 7) - 12);
-            param0->unk_3F8[1] = GraphicElementManager_AddElementEx(param1);
+            param0->unk_3F8[1] = CellActorCollection_AddEx(param1);
 
             if (param0->unk_10 == 0) {
-                GraphicElementData_SetAnim(param0->unk_3F8[1], 45);
+                CellActor_SetAnim(param0->unk_3F8[1], 45);
             } else {
-                GraphicElementData_SetAnim(param0->unk_3F8[1], 46);
+                CellActor_SetAnim(param0->unk_3F8[1], 46);
             }
         }
         break;
@@ -1727,19 +1727,19 @@ static void sub_02087CDC (SysTask * param0, void * param1)
     switch (v0->unk_04) {
     case 0:
         v1.x = v0->unk_08 + 4 * FX32_ONE;
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
         break;
     case 2:
         v1.x = v0->unk_08 - 3 * FX32_ONE;
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
         break;
     case 4:
         v1.x = v0->unk_08 + 2 * FX32_ONE;
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
         break;
     case 6:
         v1.x = v0->unk_08;
-        GraphicElementData_SetPosition(v0->unk_00, &v1);
+        CellActor_SetPosition(v0->unk_00, &v1);
         SysTask_FinishAndFreeParam(param0);
         break;
     }
@@ -1747,7 +1747,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[], GraphicElementData ** param6, void * param7)
+static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param3, int * param4, VecFx32 param5[], CellActor ** param6, void * param7)
 {
     int v0 = *param4;
     int v1 = v0 ^ 1;
@@ -1780,8 +1780,8 @@ static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param
             v4 = SysTask_GetParam(v5);
             v4->unk_00 = param6[7];
             v4->unk_04 = 0;
-            v4->unk_08 = GraphicElementData_GetPosition(param6[7])->x;
-            v4->unk_0C = GraphicElementData_GetPosition(param6[7])->y;
+            v4->unk_08 = CellActor_GetPosition(param6[7])->x;
+            v4->unk_0C = CellActor_GetPosition(param6[7])->y;
 
             param5[v0].x = -11;
             (*param2)++;
@@ -1967,41 +1967,41 @@ static void sub_02088350 (UnkStruct_02087A10 * param0)
     int v1 = 0;
     BOOL v2 = 0;
 
-    if (GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) {
+    if (CellActor_GetDrawFlag(param0->unk_390[8]) == 0) {
         v2 = 1;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_UP) {
         Sound_PlayEffect(1500);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 1;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_DOWN) {
         Sound_PlayEffect(1500);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 2;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_LEFT) {
         Sound_PlayEffect(1500);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 3;
         v0++;
     }
 
     if (gCoreSys.pressedKeysRepeatable & PAD_KEY_RIGHT) {
         Sound_PlayEffect(1500);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 4;
         v0++;
     }
 
     if (gCoreSys.pressedKeys & PAD_BUTTON_START) {
         Sound_PlayEffect(1500);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         param0->unk_1C.unk_00 = 12;
         param0->unk_1C.unk_04 = 0;
         v0++;
@@ -2031,12 +2031,12 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
         VecFx32 v0;
 
         if ((param0->unk_1C.unk_0C == 0) && (param0->unk_1C.unk_0C != param0->unk_1C.unk_04)) {
-            GraphicElementData_SetAnim(param0->unk_390[8], 39);
+            CellActor_SetAnim(param0->unk_390[8], 39);
         }
 
         v0.x = FX32_ONE * (26 + param0->unk_1C.unk_00 * 16);
         v0.y = FX32_ONE * ((111 - 20) + (param0->unk_1C.unk_04 - 1) * 19);
-        GraphicElementData_SetPosition(param0->unk_390[8], &v0);
+        CellActor_SetPosition(param0->unk_390[8], &v0);
     } else {
         VecFx32 v1;
         int v2 = param0->unk_3A[param0->unk_1C.unk_04][param0->unk_1C.unk_00] - (0xe001 + 1);
@@ -2044,8 +2044,8 @@ static void sub_02088454 (UnkStruct_02087A10 * param0, int param1)
         v1.x = FX32_ONE * Unk_020F251C[v2];
         v1.y = FX32_ONE * (88 - 20);
 
-        GraphicElementData_SetAnim(param0->unk_390[8], Unk_020F24E8[v2]);
-        GraphicElementData_SetPosition(param0->unk_390[8], &v1);
+        CellActor_SetAnim(param0->unk_390[8], Unk_020F24E8[v2]);
+        CellActor_SetPosition(param0->unk_390[8], &v1);
     }
 
     param0->unk_38 = 180;
@@ -2242,8 +2242,8 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
         }
     }
 
-    if ((GraphicElementData_GetDrawFlag(param0->unk_390[8]) == 0) && (gCoreSys.touchPressed == 0)) {
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
+    if ((CellActor_GetDrawFlag(param0->unk_390[8]) == 0) && (gCoreSys.touchPressed == 0)) {
+        CellActor_SetDrawFlag(param0->unk_390[8], 1);
         return 2;
     }
 
@@ -2280,7 +2280,7 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
             sub_02088844(param0->unk_3A, param0->unk_4C4);
             param0->unk_4F4[param1 - (0xe001 + 1)]++;
             Sound_PlayEffect(1694);
-            GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
+            CellActor_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 6):
@@ -2302,12 +2302,12 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
             param0->unk_4F4[5]++;
 
             Sound_PlayEffect(1500);
-            GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
+            CellActor_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 7):
         sub_02015760(param0->unk_628);
-        GraphicElementData_SetDrawFlag(param0->unk_390[8], param2);
+        CellActor_SetDrawFlag(param0->unk_390[8], param2);
 
         if (param0->unk_14 == 0) {
             Sound_PlayEffect(1506);
@@ -2333,11 +2333,11 @@ static int sub_02088898 (UnkStruct_02087A10 * param0, u16 param1, int param2)
 
             sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
             Sound_PlayEffect(1515);
-            GraphicElementData_SetDrawFlag(param0->unk_390[8], 1);
-            GraphicElementData_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_XLU);
+            CellActor_SetDrawFlag(param0->unk_390[8], 1);
+            CellActor_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_XLU);
 
             G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2, 8, 8);
-            GraphicElementData_SetAnim(param0->unk_390[8], 60);
+            CellActor_SetAnim(param0->unk_390[8], 60);
 
             param0->unk_1C.unk_18 = 1;
 
@@ -2438,16 +2438,16 @@ static int sub_02088D08 (int param0, int param1, int param2, int param3, u16 * p
     return 0;
 }
 
-static void sub_02088E1C (GraphicElementData ** param0, int param1, int param2)
+static void sub_02088E1C (CellActor ** param0, int param1, int param2)
 {
     int v0;
 
     for (v0 = 0; v0 < param2; v0++) {
-        GraphicElementData_SetAnim(param0[v0], 43);
+        CellActor_SetAnim(param0[v0], 43);
     }
 
     if (param1 != param2) {
-        GraphicElementData_SetAnim(param0[param1], 44);
+        CellActor_SetAnim(param0[param1], 44);
     }
 }
 
@@ -2483,24 +2483,24 @@ static void sub_02088E58 (Window * param0, u16 param1, int param2, u32 param3, u
     sub_0201A954(param0);
 }
 
-static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2)
+static void sub_02088F40 (int param0[], CellActor ** param1, int param2)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0[v0]) {
             for (v1 = 0; v1 < 3; v1++) {
-                GraphicElementData_SetAnim(param1[v1], Unk_020F2984[v1][2]);
+                CellActor_SetAnim(param1[v1], Unk_020F2984[v1][2]);
             }
 
-            GraphicElementData_SetAnim(param1[v0], Unk_020F2984[v0][2] - 3);
+            CellActor_SetAnim(param1[v0], Unk_020F2984[v0][2] - 3);
             break;
         }
     }
 
     for (v0 = 5; v0 < 7; v0++) {
         if (param0[v0]) {
-            GraphicElementData_SetAnim(param1[v0], Unk_020F2984[v0][2] + 1);
+            CellActor_SetAnim(param1[v0], Unk_020F2984[v0][2] + 1);
         }
     }
 
@@ -2511,24 +2511,24 @@ static void sub_02088F40 (int param0[], GraphicElementData ** param1, int param2
 
 static void sub_02088FD0 (UnkStruct_02087A10 * param0)
 {
-    if (!GraphicElementData_IsAnimated(param0->unk_390[8])) {
+    if (!CellActor_IsAnimated(param0->unk_390[8])) {
         if (param0->unk_158 == param0->unk_0C) {
             param0->unk_1C.unk_00 = 12;
             param0->unk_1C.unk_04 = 0;
-            GraphicElementData_SetAnim(param0->unk_390[8], 39);
+            CellActor_SetAnim(param0->unk_390[8], 39);
         } else {
-            GraphicElementData_SetAnim(param0->unk_390[8], 39);
+            CellActor_SetAnim(param0->unk_390[8], 39);
         }
 
         if (param0->unk_1C.unk_14 == 0) {
-            GraphicElementData_SetDrawFlag(param0->unk_390[8], 0);
+            CellActor_SetDrawFlag(param0->unk_390[8], 0);
         } else {
             sub_02088454(param0, 0);
         }
 
         param0->unk_1C.unk_18 = 0;
 
-        GraphicElementData_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_NORMAL);
+        CellActor_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_NORMAL);
     }
 }
 
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index c00b491710..6317f958f8 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -26,7 +26,7 @@
 
 static void sub_0208F194(PokemonSummaryApp * param0, u8 param1, u8 param2, u8 param3);
 static void sub_0208EF0C(PokemonSummaryApp * param0);
-static void sub_0208FC30(GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3);
+static void sub_0208FC30(CellActor * 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},
@@ -183,11 +183,11 @@ void sub_0208EAF4 (PokemonSummaryApp * param0)
 
 void sub_0208EB14 (PokemonSummaryApp * param0)
 {
-    GraphicElementData_UpdateAnim(param0->unk_41C[21], FX32_ONE);
-    GraphicElementData_UpdateAnim(param0->unk_41C[22], FX32_ONE);
-    GraphicElementData_UpdateAnim(param0->unk_41C[41], FX32_ONE);
-    GraphicElementData_UpdateAnim(param0->unk_41C[68], FX32_ONE);
-    GraphicElementData_UpdateAnim(param0->unk_41C[69], FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_41C[21], FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_41C[22], FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_41C[41], FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_41C[68], FX32_ONE);
+    CellActor_UpdateAnim(param0->unk_41C[69], FX32_ONE);
 }
 
 void sub_0208EB64 (PokemonSummaryApp * param0)
@@ -200,31 +200,31 @@ void sub_0208EB64 (PokemonSummaryApp * param0)
 
     sub_0208EF0C(param0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[9], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[10], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[41], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[9], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[10], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[41], 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[42], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[43], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[44], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[45], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[46], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[42], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[43], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[44], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[45], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[46], 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[47], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[47], 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[48], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[49], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[50], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[51], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[52], 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[71], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[72], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[73], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[74], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[75], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[71], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[72], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[73], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[74], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[75], 0);
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[76], 0);
 }
 
 static u8 sub_0208ECB8 (PokemonSummaryApp * param0)
@@ -242,7 +242,7 @@ static u8 sub_0208ECB8 (PokemonSummaryApp * param0)
 
 void sub_0208ECF4 (PokemonSummaryApp * param0)
 {
-    GraphicElementData ** v0;
+    CellActor ** v0;
     s16 v1, v2;
     s16 v3;
     u16 v4;
@@ -255,19 +255,19 @@ void sub_0208ECF4 (PokemonSummaryApp * param0)
 
     for (v5 = 0; v5 < 8; v5++) {
         if (PokemonSummary_PageIsVisble(param0, v5) == 0) {
-            GraphicElementData_SetDrawFlag(v0[v5], 0);
+            CellActor_SetDrawFlag(v0[v5], 0);
             continue;
         }
 
-        v4 = GraphicElementData_GetActiveAnim(v0[v5]);
+        v4 = CellActor_GetActiveAnim(v0[v5]);
 
         if (param0->page == v5) {
             if (v4 < 8) {
-                GraphicElementData_SetAnim(v0[v5], v4 + 8);
+                CellActor_SetAnim(v0[v5], v4 + 8);
             }
         } else {
             if (v4 >= 8) {
-                GraphicElementData_SetAnim(v0[v5], v4 - 8);
+                CellActor_SetAnim(v0[v5], v4 - 8);
             }
         }
 
@@ -280,7 +280,7 @@ void sub_0208ECF4 (PokemonSummaryApp * param0)
         }
 
         SpriteActor_SetPositionXY(param0->unk_41C[v5], v1, v2);
-        GraphicElementData_SetDrawFlag(v0[v5], 1);
+        CellActor_SetDrawFlag(v0[v5], 1);
 
         v6++;
     }
@@ -306,8 +306,8 @@ void sub_0208EE10 (PokemonSummaryApp * param0, u8 param1)
         param1 = 0;
     }
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[21], param1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[22], param1);
+    CellActor_SetDrawFlag(param0->unk_41C[21], param1);
+    CellActor_SetDrawFlag(param0->unk_41C[22], param1);
 }
 
 void sub_0208EE3C (PokemonSummaryApp * param0)
@@ -327,15 +327,15 @@ void sub_0208EE3C (PokemonSummaryApp * param0)
 void sub_0208EE9C (PokemonSummaryApp * param0)
 {
     if (param0->monData.status == 7) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[20], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[76], 0);
     } else if (param0->monData.status != 0) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 0);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 1);
-        GraphicElementData_SetAnim(param0->unk_41C[20], param0->monData.status);
+        CellActor_SetDrawFlag(param0->unk_41C[76], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[20], 1);
+        CellActor_SetAnim(param0->unk_41C[20], param0->monData.status);
     } else {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[76], 1);
-        GraphicElementData_SetDrawFlag(param0->unk_41C[20], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[76], 1);
+        CellActor_SetDrawFlag(param0->unk_41C[20], 0);
     }
 }
 
@@ -480,7 +480,7 @@ void sub_0208F310 (PokemonSummaryApp * param0)
 
     sub_0200D50C(param0->unk_41C[9], &v0, &v1);
     SpriteActor_SetPositionXY(param0->unk_41C[10], v0, v1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[10], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[10], 1);
 }
 
 void sub_0208F34C (PokemonSummaryApp * param0)
@@ -500,7 +500,7 @@ void sub_0208F34C (PokemonSummaryApp * param0)
     }
 
     for (v0 = 29; v0 <= 40; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[v0], 0);
         SpriteActor_SetAnimFrame(param0->unk_41C[v0], 0);
     }
 }
@@ -529,9 +529,9 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
         break;
     case 1:
         if (param0->sheenCount == 0) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[29 + param0->sheenPos], 1);
+            CellActor_SetDrawFlag(param0->unk_41C[29 + param0->sheenPos], 1);
             SpriteActor_SetAnimFrame(param0->unk_41C[29 + param0->sheenPos], 0);
-            GraphicElementData_SetAnim(param0->unk_41C[29 + param0->sheenPos], 0);
+            CellActor_SetAnim(param0->unk_41C[29 + param0->sheenPos], 0);
 
             param0->sheenPos++;
 
@@ -544,7 +544,7 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
         param0->sheenCount = (param0->sheenCount + 1) % 10;
         break;
     case 2:
-        if (GraphicElementData_GetDrawFlag(param0->unk_41C[29 + param0->sheenMax - 1]) == 0) {
+        if (CellActor_GetDrawFlag(param0->unk_41C[29 + param0->sheenMax - 1]) == 0) {
             param0->sheenCount = 0;
             param0->sheenState = 3;
             break;
@@ -555,9 +555,9 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
 
         if (param0->sheenCount == 32) {
             for (v0 = 29; v0 < 29 + param0->sheenMax; v0++) {
-                GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 1);
+                CellActor_SetDrawFlag(param0->unk_41C[v0], 1);
                 SpriteActor_SetAnimFrame(param0->unk_41C[v0], 0);
-                GraphicElementData_SetAnim(param0->unk_41C[v0], 0);
+                CellActor_SetAnim(param0->unk_41C[v0], 0);
             }
 
             param0->sheenCount = 0;
@@ -576,14 +576,14 @@ void sub_0208F3B0 (PokemonSummaryApp * param0)
     }
 
     for (v0 = 29; v0 < 29 + param0->sheenMax; v0++) {
-        if (GraphicElementData_GetDrawFlag(param0->unk_41C[v0]) == 0) {
+        if (CellActor_GetDrawFlag(param0->unk_41C[v0]) == 0) {
             continue;
         }
 
-        GraphicElementData_UpdateAnim(param0->unk_41C[v0], FX32_ONE);
+        CellActor_UpdateAnim(param0->unk_41C[v0], FX32_ONE);
 
-        if (GraphicElementData_GetAnimFrame(param0->unk_41C[v0]) == 6) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
+        if (CellActor_GetAnimFrame(param0->unk_41C[v0]) == 6) {
+            CellActor_SetDrawFlag(param0->unk_41C[v0], 0);
         }
     }
 }
@@ -594,9 +594,9 @@ void sub_0208F574 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->monData.markings & (1 << v0)) {
-            GraphicElementData_SetAnim(param0->unk_41C[23 + v0], 1);
+            CellActor_SetAnim(param0->unk_41C[23 + v0], 1);
         } else {
-            GraphicElementData_SetAnim(param0->unk_41C[23 + v0], 0);
+            CellActor_SetAnim(param0->unk_41C[23 + v0], 0);
         }
     }
 
@@ -617,9 +617,9 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 {
     s16 v0, v1;
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[41], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[41], 1);
     SpriteActor_SetAnimFrame(param0->unk_41C[41], 0);
-    GraphicElementData_SetAnim(param0->unk_41C[41], 0);
+    CellActor_SetAnim(param0->unk_41C[41], 0);
 
     sub_02092368(param0, &v0, &v1);
 
@@ -632,8 +632,8 @@ void sub_0208F600 (PokemonSummaryApp * param0)
 
 void sub_0208F684 (PokemonSummaryApp * param0)
 {
-    if (GraphicElementData_GetAnimFrame(param0->unk_41C[41]) == 2) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[41], 0);
+    if (CellActor_GetAnimFrame(param0->unk_41C[41]) == 2) {
+        CellActor_SetDrawFlag(param0->unk_41C[41], 0);
     }
 }
 
@@ -643,7 +643,7 @@ void sub_0208F6A4 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 5; v0++) {
         if ((param0->subscreen & (1 << v0))) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[42 + v0], 1);
+            CellActor_SetDrawFlag(param0->unk_41C[42 + v0], 1);
         }
     }
 }
@@ -651,12 +651,12 @@ void sub_0208F6A4 (PokemonSummaryApp * param0)
 void sub_0208F6DC (PokemonSummaryApp * param0, Window * param1)
 {
     if (param1 == NULL) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[47], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[47], 0);
         return;
     }
 
     SpriteActor_SetPositionXY(param0->unk_41C[47], sub_0201C29C(param1) * 8 - 10, 8);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[47], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[47], 1);
 }
 
 void sub_0208F71C (PokemonSummaryApp * param0)
@@ -672,7 +672,7 @@ void sub_0208F71C (PokemonSummaryApp * param0)
 
     sub_0200D948(param0->renderer, param0->gfxHandler, 19, v1, 0, 11);
     sub_0200D414(param0->unk_41C[19], PokeIconPaletteIndex(param0->monData.species, param0->monData.form, param0->monData.isEgg) + 7);
-    GraphicElementData_SetFlipMode(param0->unk_41C[19], (PokemonPersonalData_GetFormValue(param0->monData.species, param0->monData.form, 28) ^ 1));
+    CellActor_SetFlipMode(param0->unk_41C[19], (PokemonPersonalData_GetFormValue(param0->monData.species, param0->monData.form, 28) ^ 1));
 }
 
 void sub_0208F7A4 (PokemonSummaryApp * param0)
@@ -715,20 +715,20 @@ void sub_0208F844 (PokemonSummaryApp * param0)
     SpriteActor_SetPositionXY(param0->unk_41C[51], sub_0208F800(param0->monData.smart, 72, 87), sub_0208F800(param0->monData.smart, 92, 73));
     SpriteActor_SetPositionXY(param0->unk_41C[52], sub_0208F800(param0->monData.tough, 65, 87), sub_0208F800(param0->monData.tough, 65, 73));
 
-    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 1);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[48], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[49], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[50], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[51], 1);
+    CellActor_SetDrawFlag(param0->unk_41C[52], 1);
 }
 
 void sub_0208F964 (PokemonSummaryApp * param0)
 {
-    GraphicElementData_SetDrawFlag(param0->unk_41C[48], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[49], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[50], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[51], 0);
-    GraphicElementData_SetDrawFlag(param0->unk_41C[52], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[48], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[49], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[50], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[51], 0);
+    CellActor_SetDrawFlag(param0->unk_41C[52], 0);
 }
 
 static void sub_0208F9B0 (PokemonSummaryApp * param0, u8 param1, u8 param2)
@@ -742,7 +742,7 @@ void sub_0208FA04 (PokemonSummaryApp * param0)
     u16 v0;
 
     for (v0 = 55; v0 <= 70; v0++) {
-        GraphicElementData_SetDrawFlag(param0->unk_41C[v0], 0);
+        CellActor_SetDrawFlag(param0->unk_41C[v0], 0);
     }
 
     if (param0->page != 6) {
@@ -753,12 +753,12 @@ void sub_0208FA04 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 12; v0++) {
         if (v0 < param0->ribbonMax) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 1);
+            CellActor_SetDrawFlag(param0->unk_41C[55 + v0], 1);
             sub_0208F9B0(param0, PokemonSummary_RibbonAt(param0, v0), v0);
         }
     }
 
-    GraphicElementData_SetAnim(param0->unk_41C[70], 0);
+    CellActor_SetAnim(param0->unk_41C[70], 0);
 }
 
 void sub_0208FAA4 (PokemonSummaryApp * param0)
@@ -767,10 +767,10 @@ void sub_0208FAA4 (PokemonSummaryApp * param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if ((param0->ribbonState * 4 + v0) < param0->ribbonMax) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 1);
+            CellActor_SetDrawFlag(param0->unk_41C[55 + v0], 1);
             sub_0208F9B0(param0, PokemonSummary_RibbonAt(param0, v0), v0);
         } else {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[55 + v0], 0);
+            CellActor_SetDrawFlag(param0->unk_41C[55 + v0], 0);
         }
     }
 }
@@ -783,8 +783,8 @@ void sub_0208FB00 (PokemonSummaryApp * param0)
 
 void sub_0208FB30 (PokemonSummaryApp * param0)
 {
-    if (GraphicElementData_GetDrawFlag(param0->unk_41C[70]) == 1) {
-        GraphicElementData_UpdateAnim(param0->unk_41C[70], FX32_ONE);
+    if (CellActor_GetDrawFlag(param0->unk_41C[70]) == 1) {
+        CellActor_UpdateAnim(param0->unk_41C[70], FX32_ONE);
     }
 }
 
@@ -802,7 +802,7 @@ void sub_0208FB54 (PokemonSummaryApp * param0, u8 param1)
 
     if (param1 == 0) {
         for (v0 = 0; v0 < 5; v0++) {
-            GraphicElementData_SetDrawFlag(param0->unk_41C[71 + v0], 0);
+            CellActor_SetDrawFlag(param0->unk_41C[71 + v0], 0);
         }
     } else {
         v1 = param0->monData.cool;
@@ -831,16 +831,16 @@ void sub_0208FB54 (PokemonSummaryApp * param0, u8 param1)
     }
 }
 
-static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, const s16 * param3)
+static void sub_0208FC30 (CellActor * param0, u32 param1, u32 param2, const s16 * param3)
 {
     s32 v0, v1;
 
     if ((param1 == 0) || (param1 != param2)) {
-        GraphicElementData_SetDrawFlag(param0, 0);
+        CellActor_SetDrawFlag(param0, 0);
         return;
     }
 
-    GraphicElementData_SetDrawFlag(param0, 1);
+    CellActor_SetDrawFlag(param0, 1);
 
     if (param3[0] >= param3[2]) {
         v0 = param3[2] + (((((param3[0] - param3[2]) << 8) / 256) * param1) >> 8);
@@ -856,7 +856,7 @@ static void sub_0208FC30 (GraphicElementData * param0, u32 param1, u32 param2, c
 
     SpriteActor_SetPositionXY(param0, v0, v1);
     SpriteActor_SetAnimFrame(param0, 0);
-    GraphicElementData_SetAnim(param0, 0);
+    CellActor_SetAnim(param0, 0);
 }
 
 void sub_0208FCD4 (PokemonSummaryApp * param0)
@@ -864,6 +864,6 @@ void sub_0208FCD4 (PokemonSummaryApp * param0)
     u32 v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        GraphicElementData_UpdateAnim(param0->unk_41C[71 + v0], FX32_ONE);
+        CellActor_UpdateAnim(param0->unk_41C[71 + v0], FX32_ONE);
     }
 }
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 96ed7487dd..b9d1412d50 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -87,7 +87,7 @@ static void sub_02099118 (UnkStruct_0209903C * param0)
     u32 v0;
 
     Heap_FreeToHeap(param0->unk_1C4);
-    GraphicElementManager_Delete(param0->unk_10);
+    CellActorCollection_Delete(param0->unk_10);
     sub_0200A508(param0->unk_1B4[0]);
     sub_0200A700(param0->unk_1B4[1]);
 
@@ -99,7 +99,7 @@ static void sub_02099118 (UnkStruct_0209903C * param0)
 
 void sub_02099160 (UnkStruct_0209903C * param0)
 {
-    GraphicElementManager_Update(param0->unk_10);
+    CellActorCollection_Update(param0->unk_10);
 }
 
 UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16 param2, u16 param3, u16 param4, u8 param5, u8 param6, int param7)
@@ -142,7 +142,7 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
 
     sub_020093B4(v4->unk_04, 0xe000, 0xe000 + v1, 0xe000, 0xe000, 0xffffffff, 0xffffffff, 0, param5, param0->unk_1A4[0], param0->unk_1A4[1], param0->unk_1A4[2], param0->unk_1A4[3], NULL, NULL);
 
-    v5.manager = param0->unk_10;
+    v5.collection = param0->unk_10;
     v5.resourceData = v4->unk_04;
     v5.position.x = FX32_CONST(param2);
     v5.position.y = FX32_CONST(param3);
@@ -160,13 +160,13 @@ UnkStruct_0209916C * sub_0209916C (UnkStruct_0209903C * param0, int param1, u16
     v5.vramType = v0;
     v5.heapID = param0->unk_00;
 
-    v4->unk_00 = GraphicElementManager_AddElementEx(&v5);
+    v4->unk_00 = CellActorCollection_AddEx(&v5);
 
     if (v4->unk_00 != NULL) {
-        GraphicElementData_SetAnim(v4->unk_00, 0);
+        CellActor_SetAnim(v4->unk_00, 0);
         v2 = sub_0200A760(
             v6, v0);
-        GraphicElementData_SetExplicitPalette(v4->unk_00, v2);
+        CellActor_SetExplicitPalette(v4->unk_00, v2);
     } else {
         GF_ASSERT(FALSE);
     }

From 90f74076c317b528a572b39cab2fd609a93e1786 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Wed, 26 Jun 2024 21:20:21 +0200
Subject: [PATCH 16/19] Rename files accordingly

---
 include/{unk_020218BC.h => cell_actor.h}      | 140 ++++++++++++++++--
 include/overlay005/encounter_effect.h         |   2 +-
 include/overlay005/ov5_021D2F14.h             |   2 +-
 include/overlay005/struct_ov5_021D30A8.h      |   2 +-
 include/overlay005/struct_ov5_021DE47C.h      |   2 +-
 include/overlay005/struct_ov5_021DE5A4.h      |   2 +-
 include/overlay007/struct_ov7_0224D008.h      |   2 +-
 include/overlay012/funcptr_ov12_02239E64_1.h  |   2 +-
 include/overlay019/ov19_021D61B0.h            |   5 +-
 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     |   3 +-
 include/overlay019/struct_ov19_021DA384.h     |   2 +-
 include/overlay019/struct_ov19_021DA864.h     |  20 ---
 include/overlay019/struct_ov19_021DA8D8.h     |   3 +-
 include/overlay019/struct_ov19_021DA9E0.h     |   3 +-
 include/overlay019/struct_ov19_021DBA9C.h     |   3 +-
 include/overlay019/struct_ov19_021DC680.h     |   2 +-
 include/overlay019/struct_ov19_021DCD18.h     |   2 +-
 include/overlay020/ov20_021D2098.h            |   5 +-
 include/overlay021/ov21_021D0D80.h            |   2 +-
 include/overlay021/ov21_021D1FA4.h            |   3 +-
 include/overlay021/ov21_021D57B4.h            |   2 +-
 include/overlay021/struct_ov21_021D13FC.h     |   2 +-
 include/overlay021/struct_ov21_021D1FA4.h     |   2 +-
 include/overlay021/struct_ov21_021D22F8.h     |   2 +-
 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     |   2 +-
 include/overlay022/struct_ov22_02259C58.h     |   2 +-
 include/overlay022/struct_ov22_02259C58_1.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/overlay063/ov63_0222AE60.h            |   3 +-
 include/overlay063/ov63_0222CCE4.h            |   2 +-
 include/overlay065/struct_ov65_0222EBE0_t.h   |   2 +-
 include/overlay065/struct_ov65_02234E50.h     |   2 +-
 include/overlay065/struct_ov65_022358CC.h     |   2 +-
 .../overlay065/struct_ov65_022358CC_sub1.h    |   3 +-
 include/overlay071/struct_ov71_0223D238.h     |   3 +-
 include/overlay072/struct_ov72_0223DB98_t.h   |   5 +-
 include/overlay077/ov77_021D6670.h            |   2 +-
 include/overlay079/struct_ov79_021D0E1C.h     |   2 +-
 include/overlay080/struct_ov80_021D2C5C.h     |   2 +-
 include/overlay083/ov83_0223D6A8.h            |   2 +-
 include/overlay083/struct_ov83_0223D784.h     |   2 +-
 include/overlay083/struct_ov83_0223D95C.h     |   2 +-
 include/overlay083/struct_ov83_0223D9A8.h     |  18 ---
 include/overlay083/struct_ov83_0223DB30.h     |   2 +-
 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/overlay094/ov94_0223BCB0.h            |   5 +-
 include/overlay094/struct_ov94_0223FD4C.h     |   5 +-
 include/overlay095/ov95_02246C20.h            |   3 +-
 include/overlay096/ov96_0223B6A0.h            |   3 +-
 include/overlay096/struct_ov96_0223BF40_t.h   |   5 +-
 include/overlay097/ov97_02237694.h            |   2 +-
 include/overlay097/struct_ov97_0222D04C.h     |   5 +-
 include/overlay097/struct_ov97_02237AEC.h     |   3 +-
 include/overlay101/ov101_021D7E48.h           |   2 +-
 include/overlay101/struct_ov101_021D8544.h    |   2 +-
 include/overlay104/ov104_0222DCE0.h           |   2 +-
 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    |   5 +-
 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    |  20 ---
 include/struct_decls/struct_020218BC_decl.h   |   6 -
 include/struct_decls/struct_02022550_decl.h   |   6 -
 include/struct_defs/pokemon_summary_app.h     |   2 +-
 include/struct_defs/struct_02009508.h         |   2 +-
 include/struct_defs/struct_020095C4.h         |  13 --
 include/struct_defs/struct_0200D0F4.h         |   3 +-
 include/struct_defs/struct_020127E8.h         |   3 +-
 include/struct_defs/struct_0207F248.h         |   2 +-
 include/struct_defs/struct_020831B4.h         |   2 +-
 include/struct_defs/struct_02095E80_t.h       |   5 +-
 include/struct_defs/struct_02095EAC_t.h       |   5 +-
 include/struct_defs/struct_020961E8_t.h       |   5 +-
 include/struct_defs/struct_0209903C.h         |   2 +-
 include/unk_020093B4.h                        |   3 +-
 include/unk_0200C6E4.h                        |   3 +-
 include/unk_02012744.h                        |   2 +-
 platinum.us/main.lsf                          |   2 +-
 src/battle/battle_script.c                    |   2 +-
 src/battle/healthbar.c                        |   2 +-
 src/battle/ov16_0223DF00.c                    |   2 +-
 src/battle/ov16_0226871C.c                    |   2 +-
 src/battle/party_gauge.c                      |   2 +-
 src/{unk_020218BC.c => cell_actor.c}          |  82 +---------
 src/choose_starter/choose_starter_app.c       |   9 +-
 src/field_menu.c                              |   3 +-
 src/meson.build                               |   2 +-
 src/overlay005/encounter_effect.c             |   5 +-
 src/overlay005/encounter_effect_core.c        |   3 +-
 src/overlay005/ov5_021D2F14.c                 |   7 +-
 src/overlay005/ov5_021D5EB8.c                 |  11 +-
 src/overlay006/ov6_022426AC.c                 |   9 +-
 src/overlay006/ov6_02243258.c                 |   9 +-
 src/overlay007/ov7_0224BE9C.c                 |   9 +-
 src/overlay007/ov7_0224CD28.c                 |   2 +-
 src/overlay009/ov9_02249960.c                 |   9 +-
 src/overlay010/ov10_0221F800.c                |   2 +-
 src/overlay012/ov12_0221FC20.c                |   2 +-
 src/overlay012/ov12_02225864.c                |   2 +-
 src/overlay012/ov12_022269C0.c                |   2 +-
 src/overlay012/ov12_02226B84.c                |   2 +-
 src/overlay012/ov12_0222AC70.c                |   2 +-
 src/overlay012/ov12_0222E91C.c                |   2 +-
 src/overlay012/ov12_0222F700.c                |   2 +-
 src/overlay017/ov17_0224A0FC.c                |   2 +-
 src/overlay017/ov17_02250744.c                |   2 +-
 src/overlay019/ov19_021D61B0.c                |   9 +-
 src/overlay019/ov19_021D79F8.c                |   3 +-
 src/overlay019/ov19_021D8B54.c                |   7 +-
 src/overlay019/ov19_021DA270.c                |   5 +-
 src/overlay019/ov19_021DA814.c                |   5 +-
 src/overlay019/ov19_021DA92C.c                |   5 +-
 src/overlay019/ov19_021DB2FC.c                |   2 +-
 src/overlay019/ov19_021DB8E4.c                |   5 +-
 src/overlay019/ov19_021DC5F0.c                |   3 +-
 src/overlay019/ov19_021DCF88.c                |   7 +-
 src/overlay019/ov19_021DE3E8.c                |   7 +-
 src/overlay019/ov19_021DEC04.c                |   7 +-
 src/overlay020/ov20_021D2098.c                |   9 +-
 src/overlay020/ov20_021D2EA4.c                |   5 +-
 src/overlay020/ov20_021D3864.c                |   5 +-
 src/overlay020/ov20_021D3A54.c                |   5 +-
 src/overlay020/ov20_021D40E8.c                |   5 +-
 src/overlay020/ov20_021D4728.c                |   9 +-
 src/overlay021/ov21_021D0D80.c                |   3 +-
 src/overlay021/ov21_021D1FA4.c                |   9 +-
 src/overlay021/ov21_021D4C0C.c                |   2 +-
 src/overlay021/ov21_021D57B4.c                |   3 +-
 src/overlay021/ov21_021D5AEC.c                |   7 +-
 src/overlay021/ov21_021D76B0.c                |   7 +-
 src/overlay021/ov21_021D85B0.c                |   7 +-
 src/overlay021/ov21_021D94BC.c                |   7 +-
 src/overlay021/ov21_021DC9BC.c                |   7 +-
 src/overlay021/ov21_021DDD2C.c                |   7 +-
 src/overlay021/ov21_021DE668.c                |   7 +-
 src/overlay021/ov21_021DF734.c                |   7 +-
 src/overlay021/ov21_021E0C68.c                |   7 +-
 src/overlay021/ov21_021E1924.c                |   7 +-
 src/overlay021/ov21_021E29DC.c                |   7 +-
 src/overlay021/ov21_021E3FFC.c                |   7 +-
 src/overlay021/ov21_021E4CA4.c                |   7 +-
 src/overlay021/ov21_021E6014.c                |   7 +-
 src/overlay021/ov21_021E68F4.c                |   7 +-
 src/overlay021/ov21_021E737C.c                |   7 +-
 src/overlay021/ov21_021E8484.c                |   7 +-
 src/overlay021/ov21_021E8D48.c                |   9 +-
 src/overlay022/ov22_02255094.c                |   7 +-
 src/overlay022/ov22_02255D44.c                |   2 +-
 src/overlay022/ov22_02259C58.c                |   5 +-
 src/overlay022/ov22_0225A428.c                |   7 +-
 src/overlay022/ov22_0225B660.c                |   3 +-
 src/overlay023/ov23_0223E140.c                |   9 +-
 src/overlay023/ov23_0224340C.c                |   9 +-
 src/overlay023/ov23_02248F1C.c                |   9 +-
 src/overlay023/ov23_0224F294.c                |   3 +-
 src/overlay056/ov56_022561C0.c                |   9 +-
 src/overlay058/ov58_021D0D80.c                |   5 +-
 src/overlay059/ov59_021D0D80.c                |   3 +-
 src/overlay063/ov63_0222AE60.c                |   9 +-
 src/overlay063/ov63_0222CCE4.c                |   3 +-
 src/overlay064/ov64_0222DCE0.c                |   9 +-
 src/overlay065/ov65_0222DCE0.c                |   5 +-
 src/overlay065/ov65_02235060.c                |   3 +-
 src/overlay065/ov65_0223648C.c                |   3 +-
 src/overlay068/ov68_0225C700.c                |   9 +-
 src/overlay069/ov69_0225C700.c                |   9 +-
 src/overlay070/ov70_0225D9A4.c                |   9 +-
 src/overlay071/ov71_0223B140.c                |   2 +-
 src/overlay071/ov71_0223CF0C.c                |   5 +-
 src/overlay072/ov72_0223D7A0.c                |   5 +-
 src/overlay076/ov76_0223B870.c                |   2 +-
 src/overlay077/ov77_021D54B0.c                |   9 +-
 src/overlay077/ov77_021D6670.c                |   9 +-
 src/overlay079/ov79_021D0D80.c                |   2 +-
 src/overlay079/ov79_021D183C.c                |   2 +-
 src/overlay079/ov79_021D20F4.c                |   2 +-
 src/overlay079/ov79_021D2268.c                |   3 +-
 src/overlay080/ov80_021D1458.c                |   3 +-
 src/overlay080/ov80_021D2AF4.c                |   2 +-
 src/overlay083/ov83_0223B5A0.c                |   2 +-
 src/overlay083/ov83_0223C958.c                |   2 +-
 src/overlay083/ov83_0223D6A8.c                |   5 +-
 src/overlay084/ov84_022403F4.c                |   2 +-
 src/overlay086/ov86_0223B140.c                |   9 +-
 src/overlay087/ov87_021D106C.c                |   9 +-
 src/overlay088/ov88_0223B140.c                |   5 +-
 src/overlay090/ov90_021D0D80.c                |   3 +-
 src/overlay091/ov91_021D0D80.c                |   2 +-
 src/overlay094/ov94_0223BCB0.c                |   7 +-
 src/overlay094/ov94_0223C610.c                |   3 +-
 src/overlay094/ov94_0223D0C4.c                |   3 +-
 src/overlay094/ov94_0223DC04.c                |   3 +-
 src/overlay094/ov94_0223E46C.c                |   3 +-
 src/overlay094/ov94_0223FB48.c                |   5 +-
 src/overlay094/ov94_02243EF8.c                |   5 +-
 src/overlay095/ov95_02246C20.c                |   9 +-
 src/overlay095/ov95_02247B6C.c                |   5 +-
 src/overlay095/ov95_02248590.c                |   5 +-
 src/overlay095/ov95_02249740.c                |   5 +-
 src/overlay095/ov95_0224A390.c                |   5 +-
 src/overlay095/ov95_0224B3D8.c                |   5 +-
 src/overlay096/ov96_0223B6A0.c                |   5 +-
 src/overlay096/ov96_0223BCE0.c                |   2 +-
 src/overlay097/ov97_0222AE60.c                |   3 +-
 src/overlay097/ov97_0222C174.c                |   3 +-
 src/overlay097/ov97_0222D30C.c                |   7 +-
 src/overlay097/ov97_02230410.c                |   7 +-
 src/overlay097/ov97_02233B18.c                |   9 +-
 src/overlay097/ov97_02237694.c                |   5 +-
 src/overlay099/ov99_021D4134.c                |   2 +-
 src/overlay101/ov101_021D59AC.c               |   3 +-
 src/overlay101/ov101_021D7E48.c               |   9 +-
 src/overlay104/ov104_0222DCE0.c               |   3 +-
 src/overlay104/ov104_02231F74.c               |   2 +-
 src/overlay104/ov104_02237378.c               |   3 +-
 src/overlay104/ov104_02237DD8.c               |   2 +-
 src/overlay104/ov104_0223DC7C.c               |   2 +-
 src/overlay105/ov105_02241AE0.c               |   2 +-
 src/overlay105/ov105_02245AAC.c               |   7 +-
 src/overlay105/ov105_02245DC4.c               |   3 +-
 src/overlay105/ov105_02245E54.c               |   3 +-
 src/overlay105/ov105_02245FB8.c               |   3 +-
 src/overlay106/ov106_02241AE0.c               |   2 +-
 src/overlay106/ov106_02243310.c               |   7 +-
 src/overlay106/ov106_022435FC.c               |   3 +-
 src/overlay107/ov107_02241AE0.c               |   2 +-
 src/overlay107/ov107_02245EB0.c               |   2 +-
 src/overlay107/ov107_02249604.c               |   7 +-
 src/overlay107/ov107_02249B1C.c               |   3 +-
 src/overlay108/ov108_02241AE0.c               |   2 +-
 src/overlay108/ov108_02243030.c               |   7 +-
 src/overlay108/ov108_0224351C.c               |   3 +-
 src/overlay109/ov109_021D3D50.c               |   3 +-
 src/overlay111/ov111_021D0D80.c               |   2 +-
 src/overlay111/ov111_021D2F80.c               |   7 +-
 src/overlay111/ov111_021D33F4.c               |   3 +-
 src/overlay112/ov112_0225C700.c               |   3 +-
 src/overlay113/ov113_0225C700.c               |   2 +-
 src/overlay114/ov114_0225C700.c               |   9 +-
 src/overlay115/ov115_02260CEC.c               |  11 +-
 src/overlay119/ov119_021D191C.c               |   2 +-
 src/pokemon.c                                 |   2 +-
 src/pokemon_summary_app.c                     |   2 +-
 src/unk_020093B4.c                            |   7 +-
 src/unk_0200A784.c                            |   2 +-
 src/unk_0200C6E4.c                            |   9 +-
 src/unk_0200DA60.c                            |   2 +-
 src/unk_02012744.c                            |   7 +-
 src/unk_0205CA94.c                            |   7 +-
 src/unk_0206A780.c                            |   2 +-
 src/unk_0206F314.c                            |   2 +-
 src/unk_0207E0B8.c                            |   2 +-
 src/unk_02082C2C.c                            |   3 +-
 src/unk_02083370.c                            |   2 +-
 src/unk_0208694C.c                            |   9 +-
 src/unk_0208EA44.c                            |   3 +-
 src/unk_02098FFC.c                            |   5 +-
 287 files changed, 608 insertions(+), 812 deletions(-)
 rename include/{unk_020218BC.h => cell_actor.h} (50%)
 delete mode 100644 include/overlay019/struct_ov19_021DA864.h
 delete mode 100644 include/overlay083/struct_ov83_0223D9A8.h
 delete mode 100644 include/overlay115/struct_ov115_02261520.h
 delete mode 100644 include/struct_decls/struct_020218BC_decl.h
 delete mode 100644 include/struct_decls/struct_02022550_decl.h
 delete mode 100644 include/struct_defs/struct_020095C4.h
 rename src/{unk_020218BC.c => cell_actor.c} (92%)

diff --git a/include/unk_020218BC.h b/include/cell_actor.h
similarity index 50%
rename from include/unk_020218BC.h
rename to include/cell_actor.h
index 18e1660142..8682048274 100644
--- a/include/unk_020218BC.h
+++ b/include/cell_actor.h
@@ -1,21 +1,25 @@
-#ifndef POKEPLATINUM_UNK_020218BC_H
-#define POKEPLATINUM_UNK_020218BC_H
-
-#include "struct_defs/struct_020095C4.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
-#include "overlay115/struct_ov115_02261520.h"
-
-#include "constants/heap.h"
+#ifndef POKEPLATINUM_CELL_ACTOR_H
+#define POKEPLATINUM_CELL_ACTOR_H
 
 #include <nitro/gx.h>
 #include <nnsys.h>
 #include <nitro/fx/fx.h>
 
-#define CELL_ACTOR_FLIP_NONE  0
-#define CELL_ACTOR_FLIP_H     1
-#define CELL_ACTOR_FLIP_V     2
+#include "constants/heap.h"
+
+#define CELL_ACTOR_FLIP_NONE        0
+#define CELL_ACTOR_FLIP_H           1
+#define CELL_ACTOR_FLIP_V           2
+
+#define CELL_ACTOR_ANIM_DATA_SIZE   29
+#define MAX_SIMULTANEOUS_SPRITES    128
+
+enum CellAnimType {
+    CELL_ANIM_TYPE_NONE = 0,
+    CELL_ANIM_TYPE_CELL,
+    CELL_ANIM_TYPE_MULTI_CELL,
+    CELL_ANIM_TYPE_VRAM_CELL,
+};
 
 enum AffineOverwriteMode {
     AFFINE_OVERWRITE_MODE_NONE = 0,
@@ -23,6 +27,114 @@ enum AffineOverwriteMode {
     AFFINE_OVERWRITE_MODE_DOUBLE, // Extends the cell actor's drawable area by 2x, use when the cell actor is scaled up
 };
 
+typedef struct CellActorCollection CellActorCollection;
+
+typedef struct CellAnimationData {
+    const NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *animBank;
+    NNSG2dCellAnimation anim;
+} CellAnimationData;
+
+typedef struct VRamCellAnimationData {
+    NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *animBank;
+    NNSG2dCellAnimation anim;
+    u32 transferHandle;
+} VRamCellAnimationData;
+
+typedef struct MultiCellAnimationData {
+    const NNSG2dCellDataBank *individualCellBank;
+    const NNSG2dCellAnimBankData *individualAnimBank;
+    NNSG2dMultiCellAnimation anim;
+    const NNSG2dMultiCellDataBank *cellBank;
+    const NNSG2dMultiCellAnimBankData *animBank;
+    NNSG2dNode *nodes;
+    NNSG2dCellAnimation *cellAnims;
+} MultiCellAnimationData;
+
+typedef struct CellActor {
+    VecFx32 position;
+    VecFx32 affineTranslation;
+    VecFx32 affineScale;
+    u16 affineZRotation;
+    u8 affineOverwriteMode;
+    u8 flip;
+    u8 overwriteFlags; // Specifies which of the 'explicit' fields are used. Overwrites data provided by the OAM.
+    u8 explicitPalette; // An explicit palette index.
+    u8 explicitPaletteOffset; // An explicit palette index offset added onto the index specified by the OAM.
+    BOOL explicitMosaic;
+    GXOamMode explicitOamMode;
+    u8 draw;
+    u8 animate;
+    fx32 animSpeed;
+    CellActorCollection *collection; // The collection this actor belongs to
+
+    // This field is supposed to be a union between CellAnimationData, VRamCellAnimationData, and MultiCellAnimationData
+    // but it's actually too small to hold the largest of these types. This should really be u32 animData[31].
+    u32 animData[CELL_ACTOR_ANIM_DATA_SIZE];
+    NNSG2dImageProxy imageProxy;
+    NNSG2dImagePaletteProxy paletteProxy;
+    u32 type;
+    u16 activeAnimID;
+    u8 explicitPriority;
+    u16 priority;
+    NNS_G2D_VRAM_TYPE vramType;
+    struct CellActor *prev;
+    struct CellActor *next;
+} CellActor;
+
+struct CellActorCollection {
+    CellActor *actors;
+    int maxActors;
+    CellActor **actorStack; // Stack of currently unused actors
+    int stackPointer;
+    CellActor sentinelData;
+    NNSG2dRendererInstance *renderer;
+    void *rawAnimData;
+    NNSG2dCellAnimBankData *defaultAnimBank;
+    BOOL active;
+};
+
+typedef struct CellActorCollectionParams {
+    int maxElements;
+    NNSG2dRendererInstance *renderer;
+    int heapID;
+} CellActorCollectionParams;
+
+typedef struct CellActorResourceData {
+    const NNSG2dImageProxy *imageProxy;
+    const NNSG2dCharacterData *charData;
+    const NNSG2dImagePaletteProxy *paletteProxy;
+    NNSG2dCellDataBank *cellBank;
+    const NNSG2dCellAnimBankData *cellAnimBank;
+    const NNSG2dMultiCellDataBank *multiCellBank;
+    const NNSG2dMultiCellAnimBankData *multiCellAnimBank;
+    BOOL isVRamTransfer;
+    u8 priority;
+    u8 padding_21[3];
+} CellActorResourceData;
+
+typedef struct CellActorInitParams {
+    CellActorCollection * collection;
+    const CellActorResourceData * resourceData;
+    VecFx32 position;
+    u32 priority;
+    int vramType;
+    int heapID;
+} CellActorInitParams;
+
+typedef struct CellActorInitParamsEx {
+    CellActorCollection *collection;
+    const CellActorResourceData *resourceData;
+    VecFx32 position;
+    VecFx32 affineScale;
+    u16 affineZRotation;
+    u32 priority;
+    int vramType;
+    int heapID;
+} CellActorInitParamsEx;
+
+
 CellActorCollection *CellActorCollection_New(const CellActorCollectionParams *params);
 BOOL CellActorCollection_Delete(CellActorCollection *collection);
 BOOL CellActorCollection_SetActive(CellActorCollection *collection, u8 active);
@@ -78,4 +190,4 @@ void Utility_Clear2DSubOAM(enum HeapId heapID);
 u32 CellActor_GetUserAttrForAnimFrame(const CellActor *actor, u32 animID, u32 frame);
 u32 CellActor_GetUserAttrForCurrentAnimFrame(const CellActor *actor);
 
-#endif // POKEPLATINUM_UNK_020218BC_H
+#endif // POKEPLATINUM_CELL_ACTOR_H
diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h
index d4f2a69be7..846c02e58e 100644
--- a/include/overlay005/encounter_effect.h
+++ b/include/overlay005/encounter_effect.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "field/field_system_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay005/encounter_effect.h"
diff --git a/include/overlay005/ov5_021D2F14.h b/include/overlay005/ov5_021D2F14.h
index d13295fcd1..0aa4a08904 100644
--- a/include/overlay005/ov5_021D2F14.h
+++ b/include/overlay005/ov5_021D2F14.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/cell_actor_data.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay005/struct_ov5_021D30A8.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h
index ebb76c1340..2dbef26bf7 100644
--- a/include/overlay005/struct_ov5_021D30A8.h
+++ b/include/overlay005/struct_ov5_021D30A8.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_02009CFC.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay005/struct_ov5_021DE47C.h b/include/overlay005/struct_ov5_021DE47C.h
index 684eb2fcb8..f2c8fb75a1 100644
--- a/include/overlay005/struct_ov5_021DE47C.h
+++ b/include/overlay005/struct_ov5_021DE47C.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay005/struct_ov5_021DE5A4.h b/include/overlay005/struct_ov5_021DE5A4.h
index 46b244b1d6..f22364a736 100644
--- a/include/overlay005/struct_ov5_021DE5A4.h
+++ b/include/overlay005/struct_ov5_021DE5A4.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV5_021DE5A4_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
index c359c508c6..22341f0ef6 100644
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "camera.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/include/overlay012/funcptr_ov12_02239E64_1.h b/include/overlay012/funcptr_ov12_02239E64_1.h
index 85debc46a8..20a8c6ff10 100644
--- a/include/overlay012/funcptr_ov12_02239E64_1.h
+++ b/include/overlay012/funcptr_ov12_02239E64_1.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
 typedef void (* UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteRenderer *, SpriteGfxHandler *, CellActor *);
diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index b89f4f7820..e94ed2babb 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -3,8 +3,7 @@
 
 #include "struct_decls/struct_02007768_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -12,7 +11,7 @@
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021D8E00.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
 #include "overlay019/struct_ov19_021DC680.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
diff --git a/include/overlay019/ov19_021D79F8.h b/include/overlay019/ov19_021D79F8.h
index 3af15ff15e..78274cdaaf 100644
--- a/include/overlay019/ov19_021D79F8.h
+++ b/include/overlay019/ov19_021D79F8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021D79F8_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D4F5C.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay019/ov19_021D8B54.h b/include/overlay019/ov19_021D8B54.h
index 8d5a0e06e7..09cd485d89 100644
--- a/include/overlay019/ov19_021D8B54.h
+++ b/include/overlay019/ov19_021D8B54.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021D8B54_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8E00.h"
diff --git a/include/overlay019/ov19_021DA270.h b/include/overlay019/ov19_021DA270.h
index d2d3f1a90f..c8cbf82ab1 100644
--- a/include/overlay019/ov19_021DA270.h
+++ b/include/overlay019/ov19_021DA270.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021DA270_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay019/ov19_021DA814.h b/include/overlay019/ov19_021DA814.h
index 2677d19059..ae265dbab8 100644
--- a/include/overlay019/ov19_021DA814.h
+++ b/include/overlay019/ov19_021DA814.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021DA814_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
diff --git a/include/overlay019/ov19_021DA92C.h b/include/overlay019/ov19_021DA92C.h
index 26b97ba62d..5c8afc6dcc 100644
--- a/include/overlay019/ov19_021DA92C.h
+++ b/include/overlay019/ov19_021DA92C.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
diff --git a/include/overlay019/ov19_021DB2FC.h b/include/overlay019/ov19_021DB2FC.h
index 220b279ecd..88339beab2 100644
--- a/include/overlay019/ov19_021DB2FC.h
+++ b/include/overlay019/ov19_021DB2FC.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DB6F0.h"
diff --git a/include/overlay019/ov19_021DB8E4.h b/include/overlay019/ov19_021DB8E4.h
index e11d85962c..0079b5f0e3 100644
--- a/include/overlay019/ov19_021DB8E4.h
+++ b/include/overlay019/ov19_021DB8E4.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
diff --git a/include/overlay019/ov19_021DC5F0.h b/include/overlay019/ov19_021DC5F0.h
index 6f43390c33..1b76c6ed42 100644
--- a/include/overlay019/ov19_021DC5F0.h
+++ b/include/overlay019/ov19_021DC5F0.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DC680.h"
diff --git a/include/overlay019/ov19_021DCF88.h b/include/overlay019/ov19_021DCF88.h
index 871adbb355..4ed3ba03f5 100644
--- a/include/overlay019/ov19_021DCF88.h
+++ b/include/overlay019/ov19_021DCF88.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
diff --git a/include/overlay019/ov19_021DE3E8.h b/include/overlay019/ov19_021DE3E8.h
index ce2191d5d1..6a09e55f1f 100644
--- a/include/overlay019/ov19_021DE3E8.h
+++ b/include/overlay019/ov19_021DE3E8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV19_021DE3E8_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
diff --git a/include/overlay019/ov19_021DEC04.h b/include/overlay019/ov19_021DEC04.h
index d917468dfa..34195e0524 100644
--- a/include/overlay019/ov19_021DEC04.h
+++ b/include/overlay019/ov19_021DEC04.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DEC04_decl.h"
diff --git a/include/overlay019/struct_ov19_021D8E00.h b/include/overlay019/struct_ov19_021D8E00.h
index 8d3275d31b..e96f097f9f 100644
--- a/include/overlay019/struct_ov19_021D8E00.h
+++ b/include/overlay019/struct_ov19_021D8E00.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D8E00_H
 #define POKEPLATINUM_STRUCT_OV19_021D8E00_H
 
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8318.h"
diff --git a/include/overlay019/struct_ov19_021DA384.h b/include/overlay019/struct_ov19_021DA384.h
index 779cc7ad3f..b5fd8fd15e 100644
--- a/include/overlay019/struct_ov19_021DA384.h
+++ b/include/overlay019/struct_ov19_021DA384.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV19_021DA384_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
diff --git a/include/overlay019/struct_ov19_021DA864.h b/include/overlay019/struct_ov19_021DA864.h
deleted file mode 100644
index e7221d3447..0000000000
--- a/include/overlay019/struct_ov19_021DA864.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_OV19_021DA864_H
-#define POKEPLATINUM_STRUCT_OV19_021DA864_H
-
-
-#include <nnsys.h>
-
-typedef struct {
-    const NNSG2dImageProxy *imageProxy;
-    const NNSG2dCharacterData *charData;
-    const NNSG2dImagePaletteProxy *paletteProxy;
-    NNSG2dCellDataBank *cellBank;
-    const NNSG2dCellAnimBankData *cellAnimBank;
-    const NNSG2dMultiCellDataBank *multiCellBank;
-    const NNSG2dMultiCellAnimBankData *multiCellAnimBank;
-    BOOL isVRamTransfer;
-    u8 priority;
-    u8 padding_21[3];
-} CellActorResourceData;
-
-#endif // POKEPLATINUM_STRUCT_OV19_021DA864_H
diff --git a/include/overlay019/struct_ov19_021DA8D8.h b/include/overlay019/struct_ov19_021DA8D8.h
index f296904436..c1921c1373 100644
--- a/include/overlay019/struct_ov19_021DA8D8.h
+++ b/include/overlay019/struct_ov19_021DA8D8.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021DA8D8_H
 #define POKEPLATINUM_STRUCT_OV19_021DA8D8_H
 
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
diff --git a/include/overlay019/struct_ov19_021DA9E0.h b/include/overlay019/struct_ov19_021DA9E0.h
index 16f36e22fc..1ff2d9513f 100644
--- a/include/overlay019/struct_ov19_021DA9E0.h
+++ b/include/overlay019/struct_ov19_021DA9E0.h
@@ -6,8 +6,7 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
diff --git a/include/overlay019/struct_ov19_021DBA9C.h b/include/overlay019/struct_ov19_021DBA9C.h
index e1655060ce..f3a75006cb 100644
--- a/include/overlay019/struct_ov19_021DBA9C.h
+++ b/include/overlay019/struct_ov19_021DBA9C.h
@@ -6,8 +6,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0201AE08.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
diff --git a/include/overlay019/struct_ov19_021DC680.h b/include/overlay019/struct_ov19_021DC680.h
index 6c191aa53b..4a5c52fe53 100644
--- a/include/overlay019/struct_ov19_021DC680.h
+++ b/include/overlay019/struct_ov19_021DC680.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV19_021DC680_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8318.h"
diff --git a/include/overlay019/struct_ov19_021DCD18.h b/include/overlay019/struct_ov19_021DCD18.h
index 492f7813a3..97d93278ac 100644
--- a/include/overlay019/struct_ov19_021DCD18.h
+++ b/include/overlay019/struct_ov19_021DCD18.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021DCD18_H
 #define POKEPLATINUM_STRUCT_OV19_021DCD18_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include <nnsys.h>
 
diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h
index 737f857442..85264ae44b 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -3,10 +3,9 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_020998EC_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
diff --git a/include/overlay021/ov21_021D0D80.h b/include/overlay021/ov21_021D0D80.h
index 356e66268f..5f821ae494 100644
--- a/include/overlay021/ov21_021D0D80.h
+++ b/include/overlay021/ov21_021D0D80.h
@@ -3,7 +3,7 @@
 
 #include "overlay_manager.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "touch_screen.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h
index 583c6a85b0..db5da572b8 100644
--- a/include/overlay021/ov21_021D1FA4.h
+++ b/include/overlay021/ov21_021D1FA4.h
@@ -6,8 +6,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D22F8.h"
 #include "overlay021/struct_ov21_021D23F8.h"
diff --git a/include/overlay021/ov21_021D57B4.h b/include/overlay021/ov21_021D57B4.h
index cafa85a09f..3a04c098b8 100644
--- a/include/overlay021/ov21_021D57B4.h
+++ b/include/overlay021/ov21_021D57B4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D57B4_H
 #define POKEPLATINUM_OV21_021D57B4_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D5844.h"
 #include "overlay021/struct_ov21_021D5868.h"
 #include "overlay021/struct_ov21_021D5890.h"
diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h
index 37132b6dd0..3caee74d71 100644
--- a/include/overlay021/struct_ov21_021D13FC.h
+++ b/include/overlay021/struct_ov21_021D13FC.h
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D22F8.h"
 #include "overlay021/struct_ov21_021D23F8.h"
diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h
index 7ff9908a6b..e64aa0bca6 100644
--- a/include/overlay021/struct_ov21_021D1FA4.h
+++ b/include/overlay021/struct_ov21_021D1FA4.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV21_021D1FA4_H
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay021/struct_ov21_021D22F8.h b/include/overlay021/struct_ov21_021D22F8.h
index cdac8bb411..fba787fdc0 100644
--- a/include/overlay021/struct_ov21_021D22F8.h
+++ b/include/overlay021/struct_ov21_021D22F8.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV21_021D22F8_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
 
 #include <nitro/fx/fx.h>
diff --git a/include/overlay021/struct_ov21_021D2584.h b/include/overlay021/struct_ov21_021D2584.h
index ce7c58089f..95d51e2e6b 100644
--- a/include/overlay021/struct_ov21_021D2584.h
+++ b/include/overlay021/struct_ov21_021D2584.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV21_021D2584_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActor * unk_00[4];
diff --git a/include/overlay021/struct_ov21_021D4CB8.h b/include/overlay021/struct_ov21_021D4CB8.h
index 55935ac0ce..7f0dc539ed 100644
--- a/include/overlay021/struct_ov21_021D4CB8.h
+++ b/include/overlay021/struct_ov21_021D4CB8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV21_021D4CB8_H
 #define POKEPLATINUM_STRUCT_OV21_021D4CB8_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
diff --git a/include/overlay022/ov22_02255094.h b/include/overlay022/ov22_02255094.h
index e6a8bcc2b6..171de3d362 100644
--- a/include/overlay022/ov22_02255094.h
+++ b/include/overlay022/ov22_02255094.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_02255CB8.h"
 #include "overlay022/struct_ov22_0225A0E4.h"
diff --git a/include/overlay022/struct_ov22_02256BAC.h b/include/overlay022/struct_ov22_02256BAC.h
index 7b2a1d4974..3e39ae12da 100644
--- a/include/overlay022/struct_ov22_02256BAC.h
+++ b/include/overlay022/struct_ov22_02256BAC.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "game_options.h"
 #include "struct_defs/struct_02095C60.h"
 
diff --git a/include/overlay022/struct_ov22_02259C58.h b/include/overlay022/struct_ov22_02259C58.h
index dd5a0d8c21..d7606d8946 100644
--- a/include/overlay022/struct_ov22_02259C58.h
+++ b/include/overlay022/struct_ov22_02259C58.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_02259C58_H
 #define POKEPLATINUM_STRUCT_OV22_02259C58_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 typedef struct UnkStruct_ov22_02259C58_tag {
     CellActor * unk_00;
diff --git a/include/overlay022/struct_ov22_02259C58_1.h b/include/overlay022/struct_ov22_02259C58_1.h
index ae257e5cc0..782ea77520 100644
--- a/include/overlay022/struct_ov22_02259C58_1.h
+++ b/include/overlay022/struct_ov22_02259C58_1.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_02259C58_1_H
 #define POKEPLATINUM_STRUCT_OV22_02259C58_1_H
 
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 #include "overlay022/funcptr_ov22_02259D78.h"
 
diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h
index d01e303cf5..8da36e608d 100644
--- a/include/overlay022/struct_ov22_0225A0E4.h
+++ b/include/overlay022/struct_ov22_0225A0E4.h
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "resource_collection.h"
 
 #include <nnsys.h>
diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h
index 2c147515a0..b1127df046 100644
--- a/include/overlay022/struct_ov22_0225A428.h
+++ b/include/overlay022/struct_ov22_0225A428.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV22_0225A428_H
 
 #include "struct_decls/struct_02009714_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay022/struct_ov22_022597BC.h"
diff --git a/include/overlay022/struct_ov22_0225A914.h b/include/overlay022/struct_ov22_0225A914.h
index 1a42517800..8a78098581 100644
--- a/include/overlay022/struct_ov22_0225A914.h
+++ b/include/overlay022/struct_ov22_0225A914.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV22_0225A914_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
diff --git a/include/overlay022/struct_ov22_0225AB54.h b/include/overlay022/struct_ov22_0225AB54.h
index 2a91be9b7f..a335c25e22 100644
--- a/include/overlay022/struct_ov22_0225AB54.h
+++ b/include/overlay022/struct_ov22_0225AB54.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C60.h"
 #include "overlay022/struct_ov22_0225AE9C.h"
diff --git a/include/overlay022/struct_ov22_0225AE9C.h b/include/overlay022/struct_ov22_0225AE9C.h
index 033ef35ff7..67f194ef5b 100644
--- a/include/overlay022/struct_ov22_0225AE9C.h
+++ b/include/overlay022/struct_ov22_0225AE9C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_0225AE9C_H
 #define POKEPLATINUM_STRUCT_OV22_0225AE9C_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_0225AD68.h"
 
 #include <nitro/fx/fx.h>
diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h
index 23ca4bb663..c55588fc70 100644
--- a/include/overlay063/ov63_0222AE60.h
+++ b/include/overlay063/ov63_0222AE60.h
@@ -2,8 +2,7 @@
 #define POKEPLATINUM_OV63_0222AE60_H
 
 #include "struct_decls/struct_02002F38_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay063/struct_ov63_0222AE60_decl.h"
 #include "overlay063/struct_ov63_0222BB38_decl.h"
 #include "overlay064/struct_ov64_022302EC.h"
diff --git a/include/overlay063/ov63_0222CCE4.h b/include/overlay063/ov63_0222CCE4.h
index 840cf396c0..383a6b0650 100644
--- a/include/overlay063/ov63_0222CCE4.h
+++ b/include/overlay063/ov63_0222CCE4.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV63_0222CCE4_H
 
 #include "struct_decls/struct_02002F38_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay063/struct_ov63_0222BEC0_decl.h"
 #include "overlay063/struct_ov63_0222CC3C.h"
 #include "overlay063/struct_ov63_0222CD2C.h"
diff --git a/include/overlay065/struct_ov65_0222EBE0_t.h b/include/overlay065/struct_ov65_0222EBE0_t.h
index f8adc448fe..4cab7470a4 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/include/overlay065/struct_ov65_02234E50.h b/include/overlay065/struct_ov65_02234E50.h
index 39c747c5e2..78be2e0fc6 100644
--- a/include/overlay065/struct_ov65_02234E50.h
+++ b/include/overlay065/struct_ov65_02234E50.h
@@ -5,7 +5,7 @@
 #include "string_template.h"
 #include "struct_decls/font_oam.h"
 #include "struct_defs/sprite_manager_allocation.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 
diff --git a/include/overlay065/struct_ov65_022358CC.h b/include/overlay065/struct_ov65_022358CC.h
index 3b0175e2eb..e1e50ef61a 100644
--- a/include/overlay065/struct_ov65_022358CC.h
+++ b/include/overlay065/struct_ov65_022358CC.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay065/struct_ov65_022358CC_sub1.h"
 
 typedef struct {
diff --git a/include/overlay065/struct_ov65_022358CC_sub1.h b/include/overlay065/struct_ov65_022358CC_sub1.h
index 3fd7055d15..2a62ff4d4a 100644
--- a/include/overlay065/struct_ov65_022358CC_sub1.h
+++ b/include/overlay065/struct_ov65_022358CC_sub1.h
@@ -2,8 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
diff --git a/include/overlay071/struct_ov71_0223D238.h b/include/overlay071/struct_ov71_0223D238.h
index f007ec48fd..c65e3d28d8 100644
--- a/include/overlay071/struct_ov71_0223D238.h
+++ b/include/overlay071/struct_ov71_0223D238.h
@@ -4,8 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include <nnsys.h>
 
diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h
index 819d8d905f..d6cd9494f5 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -8,13 +8,12 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "game_records.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay072/struct_ov72_0223E7D8.h"
 #include "overlay072/struct_ov72_0223E80C.h"
 #include "overlay072/struct_ov72_0223EAD8.h"
diff --git a/include/overlay077/ov77_021D6670.h b/include/overlay077/ov77_021D6670.h
index 4c83c29e13..9ed8fac0ab 100644
--- a/include/overlay077/ov77_021D6670.h
+++ b/include/overlay077/ov77_021D6670.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV77_021D6670_H
 #define POKEPLATINUM_OV77_021D6670_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay077/struct_ov77_021D670C_decl.h"
 #include "overlay077/struct_ov77_021D6734_decl.h"
 
diff --git a/include/overlay079/struct_ov79_021D0E1C.h b/include/overlay079/struct_ov79_021D0E1C.h
index 4237ae7da1..066230e612 100644
--- a/include/overlay079/struct_ov79_021D0E1C.h
+++ b/include/overlay079/struct_ov79_021D0E1C.h
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_defs/struct_020158A8.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0203D9B8.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0209903C.h"
diff --git a/include/overlay080/struct_ov80_021D2C5C.h b/include/overlay080/struct_ov80_021D2C5C.h
index 8b20381a43..5a6b2967b8 100644
--- a/include/overlay080/struct_ov80_021D2C5C.h
+++ b/include/overlay080/struct_ov80_021D2C5C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV80_021D2C5C_H
 #define POKEPLATINUM_STRUCT_OV80_021D2C5C_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay080/struct_ov80_021D2C5C_sub1.h"
 
 typedef struct {
diff --git a/include/overlay083/ov83_0223D6A8.h b/include/overlay083/ov83_0223D6A8.h
index 05259169ff..7d0141fa2e 100644
--- a/include/overlay083/ov83_0223D6A8.h
+++ b/include/overlay083/ov83_0223D6A8.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 #include "overlay083/struct_ov83_0223D784.h"
 #include "overlay083/struct_ov83_0223D95C.h"
diff --git a/include/overlay083/struct_ov83_0223D784.h b/include/overlay083/struct_ov83_0223D784.h
index adb57acfa3..9f691bb2a1 100644
--- a/include/overlay083/struct_ov83_0223D784.h
+++ b/include/overlay083/struct_ov83_0223D784.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay083/struct_ov83_0223D95C.h b/include/overlay083/struct_ov83_0223D95C.h
index b983688456..fc7bde5d6f 100644
--- a/include/overlay083/struct_ov83_0223D95C.h
+++ b/include/overlay083/struct_ov83_0223D95C.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV83_0223D95C_H
 
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct {
     UnkStruct_02009DC8 * unk_00[4];
diff --git a/include/overlay083/struct_ov83_0223D9A8.h b/include/overlay083/struct_ov83_0223D9A8.h
deleted file mode 100644
index 4c6f34a3a1..0000000000
--- a/include/overlay083/struct_ov83_0223D9A8.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_OV83_0223D9A8_H
-#define POKEPLATINUM_STRUCT_OV83_0223D9A8_H
-
-#include "struct_decls/struct_020218BC_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
-
-#include <nitro/fx/fx.h>
-
-typedef struct {
-    CellActorCollection * collection;
-    const CellActorResourceData * resourceData;
-    VecFx32 position;
-    u32 priority;
-    int vramType;
-    int heapID;
-} CellActorInitParams;
-
-#endif // POKEPLATINUM_STRUCT_OV83_0223D9A8_H
diff --git a/include/overlay083/struct_ov83_0223DB30.h b/include/overlay083/struct_ov83_0223DB30.h
index a5fd0eddf0..19834dbbde 100644
--- a/include/overlay083/struct_ov83_0223DB30.h
+++ b/include/overlay083/struct_ov83_0223DB30.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223DB30_H
 #define POKEPLATINUM_STRUCT_OV83_0223DB30_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay083/struct_ov83_0223D95C.h"
 #include "overlay083/struct_ov83_0223DA94.h"
 
diff --git a/include/overlay083/struct_ov83_0223E244.h b/include/overlay083/struct_ov83_0223E244.h
index 49c0e39a20..faffc49f91 100644
--- a/include/overlay083/struct_ov83_0223E244.h
+++ b/include/overlay083/struct_ov83_0223E244.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223E244_H
 #define POKEPLATINUM_STRUCT_OV83_0223E244_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     BOOL unk_00;
diff --git a/include/overlay083/struct_ov83_0223E5C0.h b/include/overlay083/struct_ov83_0223E5C0.h
index c90e051143..49fd1fdad8 100644
--- a/include/overlay083/struct_ov83_0223E5C0.h
+++ b/include/overlay083/struct_ov83_0223E5C0.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223E5C0_H
 #define POKEPLATINUM_STRUCT_OV83_0223E5C0_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 #include "overlay083/struct_ov83_0223FE50.h"
 
diff --git a/include/overlay083/struct_ov83_0223F054.h b/include/overlay083/struct_ov83_0223F054.h
index fe8953d3b6..694389c125 100644
--- a/include/overlay083/struct_ov83_0223F054.h
+++ b/include/overlay083/struct_ov83_0223F054.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223F054_H
 #define POKEPLATINUM_STRUCT_OV83_0223F054_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay083/struct_ov83_0223DA94.h"
 
 #include <nitro/fx/fx.h>
diff --git a/include/overlay083/struct_ov83_0223F410.h b/include/overlay083/struct_ov83_0223F410.h
index e62ef51720..b82fd4394d 100644
--- a/include/overlay083/struct_ov83_0223F410.h
+++ b/include/overlay083/struct_ov83_0223F410.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223F410_H
 #define POKEPLATINUM_STRUCT_OV83_0223F410_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActor * unk_00;
diff --git a/include/overlay083/struct_ov83_0223F670.h b/include/overlay083/struct_ov83_0223F670.h
index da84c30171..806f5cb3db 100644
--- a/include/overlay083/struct_ov83_0223F670.h
+++ b/include/overlay083/struct_ov83_0223F670.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223F670_H
 #define POKEPLATINUM_STRUCT_OV83_0223F670_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay083/struct_ov83_0223DA94.h"
 
 #include <nitro/fx/fx.h>
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index 4cb43b12d3..85b67539e0 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -3,10 +3,9 @@
 
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 int ov94_0223BCB0(OverlayManager * param0, int * param1);
 int ov94_0223BE2C(OverlayManager * param0, int * param1);
diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index 98ee45b2d6..40266fc47e 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -12,8 +12,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -23,7 +22,7 @@
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_defs/pokemon_summary.h"
 #include "overlay006/struct_ov6_02246254.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay061/struct_ov61_0222C3B0.h"
 #include "overlay094/struct_ov94_0223BA88.h"
 #include "overlay094/struct_ov94_0223BA88_sub2.h"
diff --git a/include/overlay095/ov95_02246C20.h b/include/overlay095/ov95_02246C20.h
index 491a4bc0de..61447b05f3 100644
--- a/include/overlay095/ov95_02246C20.h
+++ b/include/overlay095/ov95_02246C20.h
@@ -5,9 +5,8 @@
 #include "message.h"
 #include "string_template.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "pokemon.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
 #include "overlay095/struct_ov95_022472C4_decl.h"
 #include "overlay095/struct_ov95_02247568.h"
diff --git a/include/overlay096/ov96_0223B6A0.h b/include/overlay096/ov96_0223B6A0.h
index 118871bac4..c601e55d83 100644
--- a/include/overlay096/ov96_0223B6A0.h
+++ b/include/overlay096/ov96_0223B6A0.h
@@ -4,9 +4,8 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "overlay_manager.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay096/struct_ov96_0223BF40_decl.h"
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 int ov96_0223B6A0(OverlayManager * param0, int * param1);
 int ov96_0223B7F8(OverlayManager * param0, int * param1);
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index 3403e9933b..bad19c6f26 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -8,13 +8,12 @@
 #include "string_template.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206BC70.h"
 #include "pokemon.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay061/struct_ov61_0222C3B0.h"
 #include "overlay096/struct_ov96_0223B450.h"
 #include "overlay096/struct_ov96_0223B450_sub1.h"
diff --git a/include/overlay097/ov97_02237694.h b/include/overlay097/ov97_02237694.h
index 1155df9d31..6dc473802b 100644
--- a/include/overlay097/ov97_02237694.h
+++ b/include/overlay097/ov97_02237694.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0202DF40.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "savedata.h"
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index 7c26eab628..214893d258 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -9,13 +9,12 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "savedata.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay097/union_ov97_0222D2B0.h"
 #include "overlay097/struct_ov97_0223829C.h"
 
diff --git a/include/overlay097/struct_ov97_02237AEC.h b/include/overlay097/struct_ov97_02237AEC.h
index 5237137337..df9bfb3794 100644
--- a/include/overlay097/struct_ov97_02237AEC.h
+++ b/include/overlay097/struct_ov97_02237AEC.h
@@ -4,8 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay101/ov101_021D7E48.h b/include/overlay101/ov101_021D7E48.h
index 3e482a9d97..15a15c6925 100644
--- a/include/overlay101/ov101_021D7E48.h
+++ b/include/overlay101/ov101_021D7E48.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV101_021D7E48_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D7E48_decl.h"
 #include "overlay101/struct_ov101_021D8544.h"
 
diff --git a/include/overlay101/struct_ov101_021D8544.h b/include/overlay101/struct_ov101_021D8544.h
index 65c27c7c4b..f8d6504b2f 100644
--- a/include/overlay101/struct_ov101_021D8544.h
+++ b/include/overlay101/struct_ov101_021D8544.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV101_021D8544_H
 #define POKEPLATINUM_STRUCT_OV101_021D8544_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include <nnsys.h>
 
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index a4cbb843a6..a21bb9653a 100644
--- a/include/overlay104/ov104_0222DCE0.h
+++ b/include/overlay104/ov104_0222DCE0.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV104_0222DCE0_H
 
 #include "string_template.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0204B184.h"
 #include "struct_defs/struct_0204B1E8.h"
diff --git a/include/overlay105/ov105_02245AAC.h b/include/overlay105/ov105_02245AAC.h
index 5e605f6561..102f7a9d5d 100644
--- a/include/overlay105/ov105_02245AAC.h
+++ b/include/overlay105/ov105_02245AAC.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV105_02245AAC_H
 #define POKEPLATINUM_OV105_02245AAC_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay105/struct_ov105_02245AAC.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0);
diff --git a/include/overlay105/struct_ov105_02245AAC.h b/include/overlay105/struct_ov105_02245AAC.h
index deb8bb4b27..5251914b36 100644
--- a/include/overlay105/struct_ov105_02245AAC.h
+++ b/include/overlay105/struct_ov105_02245AAC.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay106/ov106_02243310.h b/include/overlay106/ov106_02243310.h
index ed715e65b3..5353623e78 100644
--- a/include/overlay106/ov106_02243310.h
+++ b/include/overlay106/ov106_02243310.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV106_02243310_H
 #define POKEPLATINUM_OV106_02243310_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay106/struct_ov106_02243310.h"
 
diff --git a/include/overlay106/struct_ov106_02243310.h b/include/overlay106/struct_ov106_02243310.h
index 67536bd8be..15d4cf8572 100644
--- a/include/overlay106/struct_ov106_02243310.h
+++ b/include/overlay106/struct_ov106_02243310.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h
index e34ca36702..57cfabb97e 100644
--- a/include/overlay107/ov107_02249604.h
+++ b/include/overlay107/ov107_02249604.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV107_02249604_H
 #define POKEPLATINUM_OV107_02249604_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay107/struct_ov107_02249954.h"
 
diff --git a/include/overlay107/struct_ov107_02249954.h b/include/overlay107/struct_ov107_02249954.h
index 898c049359..02bb0589ad 100644
--- a/include/overlay107/struct_ov107_02249954.h
+++ b/include/overlay107/struct_ov107_02249954.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h
index 6ecd76e1ec..d0984acf2c 100644
--- a/include/overlay108/ov108_02243030.h
+++ b/include/overlay108/ov108_02243030.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV108_02243030_H
 #define POKEPLATINUM_OV108_02243030_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay108/struct_ov108_02243030.h"
 
diff --git a/include/overlay108/struct_ov108_02243030.h b/include/overlay108/struct_ov108_02243030.h
index b47d6c8da9..498e90a041 100644
--- a/include/overlay108/struct_ov108_02243030.h
+++ b/include/overlay108/struct_ov108_02243030.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index bc761cded3..f13793c1e7 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -9,14 +9,13 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0209BDF8.h"
 #include "struct_decls/struct_0209C194_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay109/struct_ov109_021D5140_sub1.h"
 #include "overlay109/struct_ov109_021D5140_sub2.h"
 #include "overlay109/struct_ov109_021D5140_sub3.h"
diff --git a/include/overlay111/ov111_021D2F80.h b/include/overlay111/ov111_021D2F80.h
index 1dbfb13485..782f6b8295 100644
--- a/include/overlay111/ov111_021D2F80.h
+++ b/include/overlay111/ov111_021D2F80.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV111_021D2F80_H
 #define POKEPLATINUM_OV111_021D2F80_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay111/struct_ov111_021D2F80.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0);
diff --git a/include/overlay111/struct_ov111_021D2F80.h b/include/overlay111/struct_ov111_021D2F80.h
index 5817cac83e..19b8397144 100644
--- a/include/overlay111/struct_ov111_021D2F80.h
+++ b/include/overlay111/struct_ov111_021D2F80.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorCollection * unk_00;
diff --git a/include/overlay114/ov114_0225C700.h b/include/overlay114/ov114_0225C700.h
index a5fd569d9d..281c63bd24 100644
--- a/include/overlay114/ov114_0225C700.h
+++ b/include/overlay114/ov114_0225C700.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV114_0225C700_H
 #define POKEPLATINUM_OV114_0225C700_H
 
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "trainer_info.h"
 #include "savedata.h"
 #include "overlay066/struct_ov66_02230DBC.h"
diff --git a/include/overlay115/struct_ov115_02261520.h b/include/overlay115/struct_ov115_02261520.h
deleted file mode 100644
index 71a4e5a323..0000000000
--- a/include/overlay115/struct_ov115_02261520.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_OV115_02261520_H
-#define POKEPLATINUM_STRUCT_OV115_02261520_H
-
-#include "struct_decls/struct_020218BC_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
-
-#include <nitro/fx/fx.h>
-
-typedef struct {
-    CellActorCollection * collection;
-    const CellActorResourceData * resourceData;
-    VecFx32 position;
-    VecFx32 affineScale;
-    u16 affineZRotation;
-    u32 priority;
-    int vramType;
-    int heapID;
-} CellActorInitParamsEx;
-
-#endif // POKEPLATINUM_STRUCT_OV115_02261520_H
diff --git a/include/struct_decls/struct_020218BC_decl.h b/include/struct_decls/struct_020218BC_decl.h
deleted file mode 100644
index f34fb28204..0000000000
--- a/include/struct_decls/struct_020218BC_decl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_020218BC_DECL_H
-#define POKEPLATINUM_STRUCT_020218BC_DECL_H
-
-typedef struct CellActorCollection CellActorCollection;
-
-#endif // POKEPLATINUM_STRUCT_020218BC_DECL_H
diff --git a/include/struct_decls/struct_02022550_decl.h b/include/struct_decls/struct_02022550_decl.h
deleted file mode 100644
index cb7fbf9649..0000000000
--- a/include/struct_decls/struct_02022550_decl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_02022550_DECL_H
-#define POKEPLATINUM_STRUCT_02022550_DECL_H
-
-typedef struct CellActor CellActor;
-
-#endif // POKEPLATINUM_STRUCT_02022550_DECL_H
diff --git a/include/struct_defs/pokemon_summary_app.h b/include/struct_defs/pokemon_summary_app.h
index 374a72a870..e27d589e99 100644
--- a/include/struct_defs/pokemon_summary_app.h
+++ b/include/struct_defs/pokemon_summary_app.h
@@ -14,7 +14,7 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "camera.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/archived_poke_sprite_data.h"
 #include "struct_defs/sprite_animation_frame.h"
diff --git a/include/struct_defs/struct_02009508.h b/include/struct_defs/struct_02009508.h
index 1b35558186..c8293de045 100644
--- a/include/struct_defs/struct_02009508.h
+++ b/include/struct_defs/struct_02009508.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02009508_H
 #define POKEPLATINUM_STRUCT_02009508_H
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActorResourceData * unk_00;
diff --git a/include/struct_defs/struct_020095C4.h b/include/struct_defs/struct_020095C4.h
deleted file mode 100644
index e12898a42d..0000000000
--- a/include/struct_defs/struct_020095C4.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_020095C4_H
-#define POKEPLATINUM_STRUCT_020095C4_H
-
-
-#include <nnsys.h>
-
-typedef struct {
-    int maxElements;
-    NNSG2dRendererInstance * renderer;
-    int heapID;
-} CellActorCollectionParams;
-
-#endif // POKEPLATINUM_STRUCT_020095C4_H
diff --git a/include/struct_defs/struct_0200D0F4.h b/include/struct_defs/struct_0200D0F4.h
index 13a313181e..9bd9bc77b7 100644
--- a/include/struct_defs/struct_0200D0F4.h
+++ b/include/struct_defs/struct_0200D0F4.h
@@ -2,8 +2,7 @@
 #define POKEPLATINUM_STRUCT_0200D0F4_H
 
 #include "struct_defs/struct_02009508.h"
-#include "struct_decls/struct_02022550_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 typedef struct CellActorData {
     CellActor * unk_00;
diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h
index cf78e332b9..3bea700bbf 100644
--- a/include/struct_defs/struct_020127E8.h
+++ b/include/struct_defs/struct_020127E8.h
@@ -2,8 +2,7 @@
 #define POKEPLATINUM_STRUCT_020127E8_H
 
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0205AA50.h"
 
 #include <nnsys.h>
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index fb673bca9c..2f277fbad7 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -10,7 +10,7 @@
 #include "struct_decls/cell_actor_data.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index 77066e219a..825c58588c 100644
--- a/include/struct_defs/struct_020831B4.h
+++ b/include/struct_defs/struct_020831B4.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_020831B4_H
 #define POKEPLATINUM_STRUCT_020831B4_H
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 
 typedef struct {
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index 08f665a995..e955404d72 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -13,8 +13,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_02027F8C.h"
 #include "struct_decls/struct_02027F8C_decl.h"
@@ -27,7 +26,7 @@
 #include "struct_defs/struct_02095E80_sub1.h"
 #include "struct_defs/pokemon_summary.h"
 #include "savedata.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay088/struct_ov88_0223C370.h"
 #include "overlay088/struct_ov88_0223C8AC.h"
 
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 65b47504bc..62e73bc0ef 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -8,14 +8,13 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0203DDFC.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095EAC_sub1.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay058/struct_ov58_021D2754.h"
 #include "overlay058/struct_ov58_021D2820.h"
 
diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h
index 79141627ad..25200d8261 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -9,15 +9,14 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0203DE34.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_020961E8_sub1.h"
 #include "savedata.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay059/struct_ov59_021D109C.h"
 #include "overlay059/struct_ov59_021D30E0.h"
 
diff --git a/include/struct_defs/struct_0209903C.h b/include/struct_defs/struct_0209903C.h
index d5b92736fd..32abff08f3 100644
--- a/include/struct_defs/struct_0209903C.h
+++ b/include/struct_defs/struct_0209903C.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_02009CFC.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0209903C_sub1.h"
 
 typedef struct {
diff --git a/include/unk_020093B4.h b/include/unk_020093B4.h
index 3668a1ba06..b2ed4e6aca 100644
--- a/include/unk_020093B4.h
+++ b/include/unk_020093B4.h
@@ -5,8 +5,7 @@
 #include "struct_defs/struct_02009508_1.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 
 #include <nitro/gx.h>
 
diff --git a/include/unk_0200C6E4.h b/include/unk_0200C6E4.h
index 08341f86c2..b387963f5a 100644
--- a/include/unk_0200C6E4.h
+++ b/include/unk_0200C6E4.h
@@ -9,8 +9,7 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/cell_actor_data.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
 #include "struct_defs/sprite_template.h"
diff --git a/include/unk_02012744.h b/include/unk_02012744.h
index 75a1d19254..54c390ada7 100644
--- a/include/unk_02012744.h
+++ b/include/unk_02012744.h
@@ -5,7 +5,7 @@
 #include "struct_defs/struct_020127E8.h"
 #include "struct_decls/struct_02012B20_decl.h"
 #include "struct_decls/font_oam.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0205AA50.h"
 
 #include <nitro/gx.h>
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 610018bbeb..bae66d0b4c 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -87,7 +87,7 @@ Static main
 	Object main.nef.p/src_gx_layers.c.o
 	Object main.nef.p/src_camera.c.o
 	Object main.nef.p/src_unk_02020AEC.c.o
-	Object main.nef.p/src_unk_020218BC.c.o
+	Object main.nef.p/src_cell_actor.c.o
 	Object main.nef.p/src_touch_screen.c.o
 	Object main.nef.p/src_unk_02022844.c.o
 	Object main.nef.p/src_error_handling.c.o
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index dfda6113c9..7faf0fe764 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -75,7 +75,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "unk_0201E86C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "touch_screen.h"
 #include "unk_020797C8.h"
 #include "pokemon_icon.h"
diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c
index 25c19148ec..3beaf6d863 100644
--- a/src/battle/healthbar.c
+++ b/src/battle/healthbar.c
@@ -36,7 +36,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "unk_0208C098.h"
diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c
index baed17fc0e..31b7f35f1a 100644
--- a/src/battle/ov16_0223DF00.c
+++ b/src/battle/ov16_0223DF00.c
@@ -58,7 +58,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index bdd83fd3be..17ca437b55 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -55,7 +55,7 @@
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
 #include "unk_0201E86C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "move_table.h"
diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c
index 8bd42767d1..36b293b2b2 100644
--- a/src/battle/party_gauge.c
+++ b/src/battle/party_gauge.c
@@ -24,7 +24,7 @@
 #include "unk_0200C6E4.h"
 #include "sys_task.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "battle/ov16_0223DF00.h"
 #include "battle/party_gauge.h"
 
diff --git a/src/unk_020218BC.c b/src/cell_actor.c
similarity index 92%
rename from src/unk_020218BC.c
rename to src/cell_actor.c
index 3336502d0f..0e03f73d9d 100644
--- a/src/unk_020218BC.c
+++ b/src/cell_actor.c
@@ -4,90 +4,10 @@
 #include "nitro/gx/g2_oam.h"
 #include "nnsys/g2d/g2d_Image.h"
 #include "nnsys/g2d/g2d_RendererCore.h"
-#include "struct_defs/struct_020095C4.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02017728.h"
 #include "heap.h"
-#include "unk_020218BC.h"
-
-#define CELL_ACTOR_ANIM_DATA_SIZE   29
-#define MAX_SIMULTANEOUS_SPRITES    128
-
-enum CellAnimType {
-    CELL_ANIM_TYPE_NONE = 0,
-    CELL_ANIM_TYPE_CELL,
-    CELL_ANIM_TYPE_MULTI_CELL,
-    CELL_ANIM_TYPE_VRAM_CELL,
-};
-
-typedef struct CellAnimationData {
-    const NNSG2dCellDataBank *cellBank;
-    const NNSG2dCellAnimBankData *animBank;
-    NNSG2dCellAnimation anim;
-} CellAnimationData;
-
-typedef struct VRamCellAnimationData {
-    NNSG2dCellDataBank *cellBank;
-    const NNSG2dCellAnimBankData *animBank;
-    NNSG2dCellAnimation anim;
-    u32 transferHandle;
-} VRamCellAnimationData;
-
-typedef struct MultiCellAnimationData {
-    const NNSG2dCellDataBank *individualCellBank;
-    const NNSG2dCellAnimBankData *individualAnimBank;
-    NNSG2dMultiCellAnimation anim;
-    const NNSG2dMultiCellDataBank *cellBank;
-    const NNSG2dMultiCellAnimBankData *animBank;
-    NNSG2dNode *nodes;
-    NNSG2dCellAnimation *cellAnims;
-} MultiCellAnimationData;
-
-typedef struct CellActor {
-    VecFx32 position;
-    VecFx32 affineTranslation;
-    VecFx32 affineScale;
-    u16 affineZRotation;
-    u8 affineOverwriteMode;
-    u8 flip;
-    u8 overwriteFlags; // Specifies which of the 'explicit' fields are used. Overwrites data provided by the OAM.
-    u8 explicitPalette; // An explicit palette index.
-    u8 explicitPaletteOffset; // An explicit palette index offset added onto the index specified by the OAM.
-    BOOL explicitMosaic;
-    GXOamMode explicitOamMode;
-    u8 draw;
-    u8 animate;
-    fx32 animSpeed;
-    CellActorCollection *collection; // The collection this actor belongs to
-
-    // This field is supposed to be a union between CellAnimationData, VRamCellAnimationData, and MultiCellAnimationData
-    // but it's actually too small to hold the largest of these types. This should really be u32 animData[31].
-    u32 animData[CELL_ACTOR_ANIM_DATA_SIZE];
-    NNSG2dImageProxy imageProxy;
-    NNSG2dImagePaletteProxy paletteProxy;
-    u32 type;
-    u16 activeAnimID;
-    u8 explicitPriority;
-    u16 priority;
-    NNS_G2D_VRAM_TYPE vramType;
-    struct CellActor *prev;
-    struct CellActor *next;
-} CellActor;
-
-typedef struct CellActorCollection {
-    CellActor *actors;
-    int maxActors;
-    CellActor **actorStack; // Stack of currently unused elements
-    int stackPointer;
-    CellActor sentinelData;
-    NNSG2dRendererInstance *renderer;
-    void *rawAnimData;
-    NNSG2dCellAnimBankData *defaultAnimBank;
-    BOOL active;
-} CellActorCollection;
+#include "cell_actor.h"
 
 typedef void (* CellActorDrawFunc)(const CellActorCollection *, CellActor *);
 typedef void (* CellActorAnimUpdateFunc)(CellActor *);
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index d93b1a1893..0b59d6cdcd 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -20,8 +20,8 @@
 #include "struct_decls/struct_02015214_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 
 #include "struct_defs/archived_sprite.h"
@@ -29,14 +29,13 @@
 #include "struct_defs/choose_starter_data.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021E7F40.h"
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_022557A0.h"
 #include "overlay022/struct_ov22_02255800.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay115/camera_angle.h"
@@ -69,7 +68,7 @@
 #include "unk_0201F834.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "game_options.h"
diff --git a/src/field_menu.c b/src/field_menu.c
index c1e5045c1b..76ad6753f2 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/pokedexdata_decl.h"
@@ -51,7 +50,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata.h"
 #include "save_player.h"
diff --git a/src/meson.build b/src/meson.build
index 3d15d9af22..3495155b29 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -81,7 +81,7 @@ pokeplatinum_c = files(
     'unk_0201F834.c',
     'camera.c',
     'unk_02020AEC.c',
-    'unk_020218BC.c',
+    'cell_actor.c',
     'touch_screen.c',
     'unk_02022844.c',
     'resource_collection.c',
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index f9fb815078..516104c9aa 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 
 #include "field/field_system.h"
@@ -25,7 +25,6 @@
 #include "overlay005/struct_ov5_021DE5A4.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
 #include "overlay006/battle_params.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -43,7 +42,7 @@
 #include "sys_task_manager.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02054884.h"
 #include "pokemon.h"
 #include "overlay005/ov5_021D0D80.h"
diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c
index f129af8e9d..d2a679de62 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -5,7 +5,6 @@
 #include "constants/trainer.h"
 #include "message.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "overlay005/encounter_effect.h"
@@ -36,7 +35,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "save_player.h"
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index e4ffc5ae2d..d14a2e1d3f 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009CFC.h"
@@ -12,17 +12,16 @@
 #include "overlay005/struct_ov5_021D30A8.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "struct_defs/sprite_template.h"
 #include "overlay104/struct_ov104_02241308.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
 #include "unk_0200A328.h"
 #include "unk_02017728.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay005/ov5_021D2F14.h"
 
 static BOOL ov5_021D3478(UnkStruct_02009CFC * param0, UnkStruct_02009DC8 * param1);
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 43f0889cbf..7be3717fbd 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -8,15 +8,14 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay005/struct_ov5_021D57D8_decl.h"
 
-#include "struct_defs/struct_020095C4.h"
+#include "cell_actor.h"
 #include "field/field_system.h"
 #include "field/field_system_sub2_t.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 #include "unk_02005474.h"
 #include "narc.h"
@@ -33,7 +32,7 @@
 #include "unk_0201E190.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202309C.h"
 #include "overlay005/ov5_021D57BC.h"
 #include "overlay005/ov5_021D5EB8.h"
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 036fd5c8fd..fa4c3a1544 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -5,13 +5,12 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -21,7 +20,7 @@
 #include "unk_020131EC.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay006/ov6_022426AC.h"
 
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 8aa4002176..e1ab607945 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -5,8 +5,8 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_020711EC_decl.h"
 #include "pokemon.h"
@@ -15,8 +15,7 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D86B0.h"
 
 #include "unk_02005474.h"
@@ -32,7 +31,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D15C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0205D8CC.h"
 #include "player_avatar.h"
 #include "map_object.h"
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index eda9f99e29..ca3a19ffd4 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -11,8 +11,8 @@
 #include "message.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02029D04_decl.h"
 #include "savedata.h"
@@ -21,9 +21,8 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02013A04_t.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay061/struct_ov61_0222C884.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 
 #include "unk_0200112C.h"
@@ -40,7 +39,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index bae38647ee..7f8700f162 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -37,7 +37,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 6dfdae73c7..430ef8b600 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -6,8 +6,8 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
 #include "struct_decls/struct_020216E0_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02027860_decl.h"
 #include "struct_decls/struct_02039E30_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
@@ -32,8 +32,7 @@
 #include "overlay005/map_object_anim_cmd.h"
 #include "overlay005/struct_ov5_02201C58.h"
 #include "overlay009/struct_ov9_02249FF4.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D86B0.h"
 #include "overlay115/camera_angle.h"
 
@@ -51,7 +50,7 @@
 #include "gx_layers.h"
 #include "camera.h"
 #include "unk_02020AEC.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "resource_collection.h"
 #include "savedata_misc.h"
 #include "unk_02027F50.h"
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 4fb0651873..dae7fc7092 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -53,7 +53,7 @@
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c
index e0b685f424..b2bdc1a4c2 100644
--- a/src/overlay012/ov12_0221FC20.c
+++ b/src/overlay012/ov12_0221FC20.c
@@ -46,7 +46,7 @@
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_022237EC.h"
diff --git a/src/overlay012/ov12_02225864.c b/src/overlay012/ov12_02225864.c
index 8215c65cc6..1e5daab07c 100644
--- a/src/overlay012/ov12_02225864.c
+++ b/src/overlay012/ov12_02225864.c
@@ -23,7 +23,7 @@
 #include "buffer_manager.h"
 #include "heap.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_02225864.h"
 #include "overlay012/ov12_02235254.h"
diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c
index 623b60efa2..4a34edd92b 100644
--- a/src/overlay012/ov12_022269C0.c
+++ b/src/overlay012/ov12_022269C0.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c
index 09d10c1ecb..a7311761dd 100644
--- a/src/overlay012/ov12_02226B84.c
+++ b/src/overlay012/ov12_02226B84.c
@@ -34,7 +34,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_02225864.h"
 #include "overlay012/ov12_02226B84.h"
diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c
index 84249693c8..5592c8eec6 100644
--- a/src/overlay012/ov12_0222AC70.c
+++ b/src/overlay012/ov12_0222AC70.c
@@ -26,7 +26,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_02225864.h"
 #include "overlay012/ov12_0222AC70.h"
diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c
index 0362ad1692..16367727f3 100644
--- a/src/overlay012/ov12_0222E91C.c
+++ b/src/overlay012/ov12_0222E91C.c
@@ -22,7 +22,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_02225864.h"
diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c
index d0e78e6d1e..b6ffe40311 100644
--- a/src/overlay012/ov12_0222F700.c
+++ b/src/overlay012/ov12_0222F700.c
@@ -25,7 +25,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/ov12_02225864.h"
 #include "overlay012/ov12_0222F700.h"
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 872fb7deba..c3e830d98e 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -52,7 +52,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "pokemon.h"
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index a46e897530..ec40baffec 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -31,7 +31,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "pokemon.h"
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index ec531bbcca..7b0f99c4bd 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -6,8 +6,8 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
@@ -21,13 +21,12 @@
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021D8E00.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
 #include "overlay019/struct_ov19_021DB6F0.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
 #include "overlay019/struct_ov19_021DC680.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -45,7 +44,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay019/ov19_021D0D80.h"
 #include "overlay019/ov19_021D61B0.h"
 #include "overlay019/ov19_021D79F8.h"
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index 93ca6acac9..70d4058228 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
 #include "pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
@@ -22,7 +21,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "unk_020797C8.h"
 #include "pokemon_icon.h"
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 201f8bd001..a329cb0fd7 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -3,21 +3,20 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D8E00.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "unk_02006E3C.h"
 #include "sys_task.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay019/ov19_021D0D80.h"
 #include "overlay019/ov19_021D61B0.h"
 #include "overlay019/ov19_021D79F8.h"
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 45d7b30f6b..8e7e84b361 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -2,19 +2,18 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "narc.h"
 #include "unk_02006E3C.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "overlay019/ov19_021D0D80.h"
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index 14fd41f7c2..b56f31995d 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -2,16 +2,15 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 
 #include "unk_02006E3C.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay019/ov19_021D61B0.h"
 #include "overlay019/ov19_021DA814.h"
 
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 53c876c803..1c485fb4f3 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
@@ -12,7 +12,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D5BAC.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
 #include "overlay061/struct_ov61_0222C884.h"
 
@@ -25,7 +24,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "unk_0207C908.h"
diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c
index 0c648339b0..5a0c4763d2 100644
--- a/src/overlay019/ov19_021DB2FC.c
+++ b/src/overlay019/ov19_021DB2FC.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index acc477fc96..9357a0947c 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -12,7 +12,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
 #include "overlay061/struct_ov61_0222C884.h"
 
@@ -24,7 +23,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "unk_020797C8.h"
diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c
index a11444836f..672dfc665b 100644
--- a/src/overlay019/ov19_021DC5F0.c
+++ b/src/overlay019/ov19_021DC5F0.c
@@ -4,7 +4,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -17,7 +16,7 @@
 #include "sys_task.h"
 #include "heap.h"
 #include "unk_02018340.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "party.h"
 #include "overlay019/ov19_021D0D80.h"
 #include "overlay019/ov19_021D61B0.h"
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index f50ade5088..e1517c2843 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -5,8 +5,8 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
@@ -14,7 +14,6 @@
 #include "sys_task_manager.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
 
 #include "unk_02006E3C.h"
@@ -23,7 +22,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_020797C8.h"
 #include "overlay019/ov19_021D0D80.h"
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index 0c4572d735..d7bd98b3e1 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -3,20 +3,19 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D8E00.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
 
 #include "unk_02006E3C.h"
 #include "sys_task.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "item.h"
 #include "overlay019/ov19_021D0D80.h"
 #include "overlay019/ov19_021D61B0.h"
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 53924bad9e..53b6ab01d5 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -7,8 +7,8 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
@@ -18,7 +18,6 @@
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D5FAC.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay061/struct_ov61_0222C884.h"
 
 #include "unk_02002B7C.h"
@@ -28,7 +27,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon_icon.h"
 #include "overlay019/ov19_021D0D80.h"
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index b6b57e4e76..db2da8ae2f 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -3,8 +3,8 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D30F8_decl.h"
@@ -15,8 +15,7 @@
 
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -31,7 +30,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay020/ov20_021D0D80.h"
 #include "overlay020/ov20_021D2098.h"
 #include "overlay020/ov20_021D2EA4.h"
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 1cf529f231..477e2e4c2b 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -5,14 +5,13 @@
 #include "message.h"
 #include "struct_decls/struct_020149F0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02006E3C.h"
@@ -25,7 +24,7 @@
 #include "unk_02018340.h"
 #include "charcode.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay020/ov20_021D0D80.h"
 #include "overlay020/ov20_021D2098.h"
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index c763beeedd..bca1944e96 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -3,14 +3,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay061/struct_ov61_0222C884.h"
 
 #include "unk_02002B7C.h"
@@ -19,7 +18,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay020/ov20_021D2098.h"
 #include "overlay020/ov20_021D3864.h"
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index c89cb6ea6d..cb81050489 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -7,14 +7,13 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay020/struct_ov20_021D4E8C.h"
 #include "overlay020/struct_ov20_021D4FF0.h"
 
@@ -24,7 +23,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_020998EC.h"
 #include "overlay020/ov20_021D0D80.h"
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 47e5c3797e..42ab9d6196 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -4,21 +4,20 @@
 #include "enums.h"
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay020/struct_ov20_021D4E8C.h"
 #include "overlay020/struct_ov20_021D4FF0.h"
 
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay020/ov20_021D0D80.h"
 #include "overlay020/ov20_021D2098.h"
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index b03fa0a918..076487a30f 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -4,16 +4,15 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02006E3C.h"
@@ -22,7 +21,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay020/ov20_021D0D80.h"
 #include "overlay020/ov20_021D2098.h"
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index 9f4a6d09da..b5fd83f81a 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -5,7 +5,6 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0209ACBC_decl.h"
 #include "overlay021/struct_ov21_021D3FE0_decl.h"
@@ -48,7 +47,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_0202631C.h"
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 0f389e0a89..6247250823 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -7,12 +7,12 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
 #include "struct_defs/archived_sprite.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D22F8.h"
@@ -22,7 +22,6 @@
 #include "overlay021/struct_ov21_021D3124.h"
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay022/struct_ov22_022550D4.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -38,7 +37,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay021/ov21_021D1FA4.h"
 #include "overlay021/ov21_021D4C0C.h"
diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c
index f54d10d041..e2dd66fabd 100644
--- a/src/overlay021/ov21_021D4C0C.c
+++ b/src/overlay021/ov21_021D4C0C.c
@@ -4,7 +4,7 @@
 #include "message.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay021/ov21_021D57B4.c b/src/overlay021/ov21_021D57B4.c
index 19eb6a0e28..a7a94f9099 100644
--- a/src/overlay021/ov21_021D57B4.c
+++ b/src/overlay021/ov21_021D57B4.c
@@ -1,7 +1,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 
 #include "overlay021/struct_ov21_021D5844.h"
 #include "overlay021/struct_ov21_021D5868.h"
@@ -9,7 +8,7 @@
 
 #include "unk_02006E3C.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay021/ov21_021D57B4.h"
 
 void ov21_021D57B4 (UnkStruct_ov21_021D5844 * param0, int param1, int param2, int param3)
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 37a944e00e..1d65cbf41a 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -8,12 +8,12 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D157C.h"
 #include "overlay021/struct_ov21_021D2648.h"
@@ -24,7 +24,6 @@
 #include "overlay021/struct_ov21_021D5B68.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -39,7 +38,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index 66b89bfb91..b77d1fbca5 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -6,13 +6,13 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -21,7 +21,6 @@
 #include "overlay021/struct_ov21_021D5B68.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -35,7 +34,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index d07644b134..3db8b21372 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D157C.h"
 #include "overlay021/struct_ov21_021D3320.h"
@@ -16,7 +16,6 @@
 #include "overlay021/struct_ov21_021D5B68.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -30,7 +29,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 073b592464..83b0a34299 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
@@ -13,7 +13,7 @@
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
@@ -23,7 +23,6 @@
 #include "overlay021/struct_ov21_021D4FE4.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -36,7 +35,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 8ddf3d0677..978721316f 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -4,11 +4,11 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
@@ -19,7 +19,6 @@
 #include "overlay021/struct_ov21_021D5890.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -32,7 +31,7 @@
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
 #include "overlay021/ov21_021D3208.h"
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 54f05119e2..91fffe0b13 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -5,18 +5,17 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -28,7 +27,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 7621677e0e..6018bfa8e1 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -5,13 +5,13 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
@@ -19,7 +19,6 @@
 #include "overlay021/struct_ov21_021DE6D4.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -34,7 +33,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "unk_02098988.h"
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index 2038e27369..1caf09bd5d 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -5,11 +5,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
@@ -17,7 +17,6 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -29,7 +28,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 7c6d9dbee6..8dd26c3b18 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -5,12 +5,12 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
@@ -18,7 +18,6 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -32,7 +31,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 43227ed3ec..2ea17d658b 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -5,13 +5,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -20,7 +20,6 @@
 #include "overlay021/struct_ov21_021DE6D4.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -34,7 +33,7 @@
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 3931d7edf5..e318a3b32d 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -5,14 +5,14 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -23,7 +23,6 @@
 #include "overlay021/struct_ov21_021DE6D4.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -36,7 +35,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index 560a0240e1..070ddc671a 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -4,17 +4,16 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -26,7 +25,7 @@
 #include "unk_0200A328.h"
 #include "heap.h"
 #include "unk_02018340.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
 #include "overlay021/ov21_021D3208.h"
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index acfe0060fb..5e7c2f391c 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -5,13 +5,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -19,7 +19,6 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -35,7 +34,7 @@
 #include "unk_0201D15C.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index 18cbd0f004..b158241f03 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -5,17 +5,16 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -29,7 +28,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02098700.h"
 #include "unk_02098988.h"
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index f7c65f123d..bc5e7423fc 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -5,13 +5,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -19,7 +19,6 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -33,7 +32,7 @@
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index 5050f32bed..7751a6a61e 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -8,11 +8,11 @@
 #include "struct_decls/struct_020151A4_decl.h"
 #include "struct_decls/struct_02015214_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021E68F4.h"
@@ -20,7 +20,6 @@
 #include "overlay021/struct_ov21_021E7F40.h"
 #include "overlay022/struct_ov22_022557A0.h"
 #include "overlay022/struct_ov22_02255800.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -38,7 +37,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon_icon.h"
 #include "unk_02098700.h"
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 9b61ccb3c4..5545fe4142 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -5,13 +5,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
@@ -19,7 +19,6 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 #include "overlay021/struct_ov21_021E6B20.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "overlay021/struct_ov21_021E6A68.h"
 
@@ -32,7 +31,7 @@
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02023FCC.h"
 #include "overlay021/ov21_021D0D80.h"
 #include "overlay021/ov21_021D1FA4.h"
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index 6e5b75b448..d2d4796f75 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -10,8 +10,8 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
@@ -19,14 +19,13 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D22F8.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021E8E0C.h"
 #include "overlay022/struct_ov22_022559F8.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
 #include "unk_02002F38.h"
@@ -45,7 +44,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E86C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "unk_02098988.h"
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 7f05d8b284..3b4aa28a9b 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -8,17 +8,16 @@
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_022557A0.h"
 #include "overlay022/struct_ov22_02255800.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay022/struct_ov22_02255CB8.h"
 #include "overlay022/struct_ov22_0225A0E4.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -35,7 +34,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "resource_collection.h"
 #include "unk_0202419C.h"
 #include "overlay022/ov22_02255094.h"
diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c
index a8e56b203c..6010b31909 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -58,7 +58,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index e90c924f39..fedd29001f 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -9,14 +9,13 @@
 #include "struct_defs/struct_020127E8.h"
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_02259C58.h"
 #include "overlay022/struct_ov22_02259C58_1.h"
 #include "overlay022/struct_ov22_02259C9C.h"
 #include "overlay022/struct_ov22_02259D2C.h"
 #include "overlay022/struct_ov22_0225A0E4.h"
 #include "overlay022/struct_ov22_0225A154.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "overlay022/funcptr_ov22_02259D78.h"
 
@@ -31,7 +30,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "error_handling.h"
 #include "strbuf.h"
 #include "unk_02023FCC.h"
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 48d2520c60..6033bd30fe 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -6,12 +6,12 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C60.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_02256BAC.h"
 #include "overlay022/struct_ov22_022597BC.h"
 #include "overlay022/struct_ov22_022599A0.h"
@@ -20,7 +20,6 @@
 #include "overlay022/struct_ov22_0225AB54.h"
 #include "overlay022/struct_ov22_0225AD68.h"
 #include "overlay022/struct_ov22_0225AE9C.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02005474.h"
@@ -32,7 +31,7 @@
 #include "unk_0200DA60.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_02095AF0.h"
diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c
index df1b121700..5eb0b0f9aa 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -4,7 +4,6 @@
 #include "core_sys.h"
 
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_02029C88_decl.h"
@@ -27,7 +26,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_020298BC.h"
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 079686737a..9b4be3baf4 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -11,8 +11,8 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
 #include "camera.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202855C_decl.h"
@@ -23,13 +23,12 @@
 #include "field/field_system.h"
 #include "field/field_system_sub2_t.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay023/struct_ov23_0224271C.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_020041CC.h"
@@ -53,7 +52,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0202631C.h"
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index fdfce43d2b..35c62fd14f 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -10,8 +10,8 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
 #include "camera.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202855C_decl.h"
@@ -21,9 +21,8 @@
 
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay023/struct_ov23_0224271C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
@@ -40,7 +39,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202854C.h"
 #include "game_records.h"
 #include "communication_information.h"
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index b89f60419b..6dac8453c3 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -5,8 +5,8 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0205E884_decl.h"
 #include "overlay023/struct_ov23_0224942C_decl.h"
@@ -14,9 +14,8 @@
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_0200679C.h"
 #include "narc.h"
@@ -31,7 +30,7 @@
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "communication_system.h"
 #include "comm_player_manager.h"
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 274647eab6..d990f3c646 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -7,7 +7,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_020298B0_decl.h"
@@ -40,7 +39,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index b4062861ac..d80fe71dd8 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -7,8 +7,8 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02027F8C_decl.h"
@@ -24,9 +24,8 @@
 #include "struct_defs/struct_0205C22C.h"
 #include "struct_defs/struct_0205C924.h"
 #include "struct_defs/struct_0205C95C.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02005474.h"
@@ -45,7 +44,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index c431efb7f6..40ba6d1604 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02095EAC_decl.h"
@@ -23,7 +23,6 @@
 #include "overlay072/struct_ov72_0223E2A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002B7C.h"
 #include "unk_020041CC.h"
@@ -50,7 +49,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c
index c6ad340046..1f73aad7ce 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -21,7 +21,6 @@
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -49,7 +48,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 406d16fc79..8b9094eda3 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -5,12 +5,11 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay064/struct_ov64_022302EC.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002F38.h"
 #include "narc.h"
@@ -18,7 +17,7 @@
 #include "unk_02009714.h"
 #include "unk_0200A328.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay063/ov63_0222AE60.h"
 
 typedef struct {
diff --git a/src/overlay063/ov63_0222CCE4.c b/src/overlay063/ov63_0222CCE4.c
index cca6fb9971..537f9a4c71 100644
--- a/src/overlay063/ov63_0222CCE4.c
+++ b/src/overlay063/ov63_0222CCE4.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02002F38_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
 #include "overlay063/struct_ov63_0222BB38_decl.h"
 #include "overlay063/struct_ov63_0222BEC0_decl.h"
 
@@ -12,7 +11,7 @@
 #include "overlay064/struct_ov64_022302EC.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay063/ov63_0222AE60.h"
 #include "overlay063/ov63_0222BE18.h"
 #include "overlay063/ov63_0222CCE4.h"
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index 3b039e7f87..e1b10e0ab7 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -15,8 +15,8 @@
 #include "message.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -34,14 +34,13 @@
 #include "struct_defs/struct_0208737C.h"
 #include "struct_defs/struct_02089438.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay064/struct_ov64_022302EC.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_0200112C.h"
 #include "unk_02001AF4.h"
@@ -72,7 +71,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202309C.h"
 #include "strbuf.h"
 #include "save_player.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index e1de2383d2..adac2355a2 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -29,7 +29,7 @@
 #include "struct_defs/struct_0207DFAC.h"
 #include "struct_defs/struct_0207E060.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay065/struct_ov65_0222E99C.h"
@@ -41,7 +41,6 @@
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay098/struct_ov98_02247168.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_0200112C.h"
 #include "unk_02001AF4.h"
@@ -74,7 +73,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "error_handling.h"
 #include "strbuf.h"
 #include "unk_02023FCC.h"
diff --git a/src/overlay065/ov65_02235060.c b/src/overlay065/ov65_02235060.c
index 6848e00683..9746aabd58 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -16,7 +16,6 @@
 #include "overlay065/struct_ov65_022358CC.h"
 #include "overlay065/struct_ov65_02236318.h"
 #include "overlay065/struct_ov65_022376D0.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02006E3C.h"
 #include "unk_020093B4.h"
@@ -26,7 +25,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "unk_0201DBEC.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay063/ov63_0222BCE8.h"
 #include "overlay063/ov63_0222BE18.h"
 #include "overlay063/ov63_0222CA88.h"
diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c
index 2d8a4f1002..248d0fa677 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "journal.h"
@@ -57,7 +56,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index 0b39ecc194..e9b08e41dc 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -11,8 +11,8 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02030EC4_decl.h"
@@ -23,13 +23,12 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay066/struct_ov66_0222E908.h"
 #include "overlay066/struct_ov66_02231374.h"
 #include "overlay068/struct_ov68_0225DC74.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
@@ -55,7 +54,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 1a0cd69dcf..1e069051a1 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -10,8 +10,8 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "savedata.h"
@@ -21,13 +21,12 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay066/struct_ov66_02230F50.h"
 #include "overlay066/struct_ov66_02231428.h"
 #include "overlay066/struct_ov66_02231560.h"
 #include "overlay069/struct_ov69_0225C980.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay092/struct_ov92_021D1530.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -59,7 +58,7 @@
 #include "unk_0201F834.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index d96d15355b..4e6bb09071 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -14,8 +14,8 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "trainer_info.h"
@@ -37,14 +37,13 @@
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay065/struct_ov65_0222F6EC.h"
 #include "overlay066/struct_ov66_02230914.h"
 #include "overlay066/struct_ov66_02230E68.h"
 #include "overlay070/struct_ov70_02263910.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -74,7 +73,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "error_handling.h"
 #include "strbuf.h"
 #include "unk_02023FCC.h"
diff --git a/src/overlay071/ov71_0223B140.c b/src/overlay071/ov71_0223B140.c
index 4eb6e39b3e..670cbde04d 100644
--- a/src/overlay071/ov71_0223B140.c
+++ b/src/overlay071/ov71_0223B140.c
@@ -28,7 +28,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_020393C8.h"
 #include "overlay071/ov71_0223B140.h"
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 8d1160e80e..03d8fa4422 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -3,10 +3,9 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay071/struct_ov71_0223D238.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -17,7 +16,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay071/ov71_0223CF0C.h"
 
 typedef struct {
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index f714c0e6a4..19d9c53b12 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata.h"
 #include "overlay072/struct_ov72_0223DB98_decl.h"
@@ -26,7 +26,6 @@
 #include "overlay072/struct_ov72_0223EAD8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002B7C.h"
 #include "unk_020041CC.h"
@@ -54,7 +53,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index fda2208c9b..7e1f554fbd 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -46,7 +46,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201E86C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 317548a2f3..f198300a46 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -5,14 +5,13 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "overlay077/struct_ov77_021D6734_decl.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -22,7 +21,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay077/ov77_021D54B0.h"
 #include "overlay077/ov77_021D6670.h"
 
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 2e450b2f7c..8153d68a39 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -4,13 +4,12 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -22,7 +21,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay077/ov77_021D6670.h"
 
 typedef struct {
diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c
index 3bfbe0553a..ac658d5dcf 100644
--- a/src/overlay079/ov79_021D0D80.c
+++ b/src/overlay079/ov79_021D0D80.c
@@ -32,7 +32,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_0208C098.h"
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 6189d1d20d..1c12805745 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -22,7 +22,7 @@
 #include "unk_020158A8.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02098FFC.h"
 #include "overlay079/ov79_021D183C.h"
diff --git a/src/overlay079/ov79_021D20F4.c b/src/overlay079/ov79_021D20F4.c
index 66ee004379..c5d2559513 100644
--- a/src/overlay079/ov79_021D20F4.c
+++ b/src/overlay079/ov79_021D20F4.c
@@ -10,7 +10,7 @@
 #include "unk_0200C6E4.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "communication_system.h"
 #include "unk_020393C8.h"
 #include "unk_02098FFC.h"
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 8ea337cbce..75ea2bb40f 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -8,7 +8,6 @@
 #include "message.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 
 #include "struct_defs/struct_0200D0F4.h"
@@ -46,7 +45,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "communication_system.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index 645757425d..5c53bd8a74 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -4,7 +4,6 @@
 #include "core_sys.h"
 
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02039EBC_decl.h"
 
@@ -28,7 +27,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02039C80.h"
 #include "unk_02071CFC.h"
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 6c5311e95d..8fad912dc5 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -13,7 +13,7 @@
 
 #include "unk_0200C6E4.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay080/ov80_021D2AF4.h"
 
 #include "overlay080/struct_ov80_021D2C5C_sub1.h"
diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c
index b68db114ba..a5999ca420 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -20,7 +20,7 @@
 #include "heap.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "savedata/save_table.h"
 #include "game_options.h"
 #include "poffin.h"
diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c
index 9da5ece32b..e9a2e8ac58 100644
--- a/src/overlay083/ov83_0223C958.c
+++ b/src/overlay083/ov83_0223C958.c
@@ -23,7 +23,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "overlay083/ov83_0223C958.h"
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index a6b1c4f86e..c5dce86e96 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02015214_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 
@@ -20,7 +20,6 @@
 #include "overlay022/struct_ov22_02255800.h"
 #include "overlay083/struct_ov83_0223D784.h"
 #include "overlay083/struct_ov83_0223D95C.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay083/struct_ov83_0223D9EC.h"
 #include "overlay083/struct_ov83_0223DA94.h"
 #include "overlay083/struct_ov83_0223DB30.h"
@@ -60,7 +59,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201E3BC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02098FFC.h"
 #include "overlay083/ov83_0223D4CC.h"
 #include "overlay083/ov83_0223D6A8.h"
diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c
index 49cd321c66..111c7303eb 100644
--- a/src/overlay084/ov84_022403F4.c
+++ b/src/overlay084/ov84_022403F4.c
@@ -12,7 +12,7 @@
 #include "unk_0200C6E4.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "move_table.h"
 #include "unk_0207C908.h"
 #include "item.h"
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index bed0c42af6..f7a6a186e4 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -7,8 +7,8 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
 #include "struct_defs/sprite_animation_frame.h"
 #include "struct_defs/struct_02008900.h"
@@ -19,8 +19,7 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay115/camera_angle.h"
@@ -47,7 +46,7 @@
 #include "unk_0201D670.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "play_time.h"
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 8c362853dc..96cc3cf32a 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -5,8 +5,8 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay087/struct_ov87_021D0D80_decl.h"
@@ -16,8 +16,7 @@
 #include "struct_defs/struct_02013610.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay087/struct_ov87_021D12C0.h"
 #include "overlay087/struct_ov87_021D1640.h"
@@ -39,7 +38,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay087/ov87_021D106C.h"
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 414bd7b1c6..416d43b545 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -36,7 +36,6 @@
 #include "overlay088/struct_ov88_0223C370.h"
 #include "overlay088/struct_ov88_0223C8AC.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_0200112C.h"
 #include "unk_02001AF4.h"
@@ -69,7 +68,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c
index eac64bb986..655a26c77b 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202D750_decl.h"
 #include "struct_decls/struct_0202D764_decl.h"
@@ -46,7 +45,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "unk_0202D05C.h"
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index aff7787af9..32865bf196 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -51,7 +51,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "pokemon.h"
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 8af4051f98..22f7262fa9 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -7,16 +7,15 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_0203E0FC.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_020041CC.h"
@@ -38,7 +37,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "trainer_info.h"
 #include "game_options.h"
 #include "unk_02033200.h"
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 55d7bd1c93..e637a499b1 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -13,7 +13,6 @@
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -27,7 +26,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index b2199482d6..8cd2688e05 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -18,7 +18,6 @@
 #include "overlay094/struct_ov94_0223BA88_sub2.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -35,7 +34,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c
index 21f29f52d8..eea7248577 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -14,7 +14,6 @@
 #include "overlay094/struct_ov94_0223BA88_sub3.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -27,7 +26,7 @@
 #include "unk_0200F174.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c
index 5d902df655..e846fd02fb 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -18,7 +18,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 #include "overlay094/struct_ov94_0223FD4C_sub3.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_0200112C.h"
 #include "unk_02001AF4.h"
@@ -33,7 +32,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_0202DA40.h"
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 956fdc137d..d6c69bc3a0 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -6,7 +6,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
@@ -21,7 +21,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 #include "overlay094/struct_ov94_0223FD4C_sub2.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -37,7 +36,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index 2beea64253..b2d204ade8 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -2,18 +2,17 @@
 #include <string.h>
 #include <dwc.h>
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include "touch_screen.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02005474.h"
 #include "unk_0200679C.h"
 #include "unk_02006E3C.h"
 #include "heap.h"
 #include "sys_task_manager.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0205C980.h"
 #include "overlay094/ov94_0223BCB0.h"
 #include "overlay094/ov94_02243EF8.h"
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index 156f4a2c21..a8a6f2c6d5 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -3,8 +3,8 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
@@ -15,8 +15,7 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02013610.h"
 #include "overlay006/struct_ov6_02246254.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247568.h"
 
 #include "unk_020041CC.h"
@@ -35,7 +34,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index e841ed01ac..d2f6aef00d 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -6,7 +6,7 @@
 #include "struct_decls/sprite_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
@@ -17,7 +17,6 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay095/struct_ov95_02247568.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -36,7 +35,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_020393C8.h"
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 52d7d26ced..087d1fe86c 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
 #include "overlay095/struct_ov95_022472C4_decl.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
@@ -12,7 +12,6 @@
 #include "overlay095/struct_ov95_02247958_decl.h"
 
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay095/struct_ov95_02247568.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -27,7 +26,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D15C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202419C.h"
 #include "overlay095/ov95_02246C20.h"
 #include "overlay095/ov95_022476F0.h"
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 403dbd9528..5f6155202e 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -5,13 +5,12 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
 #include "overlay095/struct_ov95_02247958_decl.h"
 
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay095/struct_ov95_02247568.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -26,7 +25,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202419C.h"
 #include "overlay095/ov95_02246C20.h"
 #include "overlay095/ov95_022476F0.h"
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index d32d87fd32..1784cbffe5 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -5,13 +5,12 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
 #include "overlay095/struct_ov95_02247958_decl.h"
 
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay095/struct_ov95_02247568.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -26,7 +25,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202419C.h"
 #include "unk_020393C8.h"
 #include "overlay095/ov95_02246C20.h"
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index a6e5f49200..7a62bda0ce 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -8,7 +8,7 @@
 #include "struct_decls/sprite_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
@@ -19,7 +19,6 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay095/struct_ov95_02247568.h"
 #include "overlay097/struct_ov97_0222DB78.h"
@@ -38,7 +37,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "pokemon.h"
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index e61739774c..3908617f8b 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -11,12 +11,11 @@
 
 #include "struct_defs/struct_0206BC70.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay096/struct_ov96_0223BF40_t.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_020041CC.h"
@@ -36,7 +35,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02033200.h"
 #include "unk_020393C8.h"
 #include "unk_02099550.h"
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index af60161f80..3c9c1dadcb 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -31,7 +31,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata.h"
 #include "unk_02025CB0.h"
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index c07c26c168..248f55b883 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -5,7 +5,6 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "play_time.h"
@@ -43,7 +42,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02024358.h"
 #include "savedata/save_table.h"
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index a0187ef47e..3055b19cc8 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -7,7 +7,6 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "trainer_info.h"
@@ -41,7 +40,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "save_player.h"
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index dba88d356b..88b212dc48 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -7,7 +7,7 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025CCC_decl.h"
@@ -19,7 +19,7 @@
 #include "struct_defs/struct_0202DF40.h"
 #include "struct_defs/struct_0203CC84.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222D04C.h"
@@ -29,7 +29,6 @@
 #include "overlay097/struct_ov97_02237808.h"
 #include "overlay097/struct_ov97_02237AEC.h"
 #include "overlay097/struct_ov97_0223829C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02000C88.h"
 #include "unk_0200112C.h"
@@ -55,7 +54,7 @@
 #include "unk_0201D15C.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "save_player.h"
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 66cec1a47f..6b1ae821a0 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -10,8 +10,8 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "trainer_info.h"
@@ -22,7 +22,6 @@
 #include "struct_defs/struct_0202DBAC.h"
 #include "struct_defs/struct_0203CC84.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222D04C.h"
 #include "overlay097/struct_ov97_0222D250.h"
@@ -46,7 +45,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 21b17283c5..959a7f0ce9 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -9,8 +9,8 @@
 #include "message.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02024440_decl.h"
 #include "trainer_info.h"
@@ -25,13 +25,12 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "pokemon.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay097/struct_ov97_02236340.h"
 #include "overlay097/box_pokemon_gba.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02000C88.h"
 #include "unk_02002328.h"
@@ -58,7 +57,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata/save_table.h"
 #include "savedata.h"
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index 6d3531c473..f668320c02 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0200112C_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "savedata.h"
@@ -22,7 +22,6 @@
 #include "overlay097/struct_ov97_02237808.h"
 #include "overlay097/struct_ov97_02237AEC.h"
 #include "overlay097/struct_ov97_0223829C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02005474.h"
@@ -46,7 +45,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata.h"
 #include "unk_02033200.h"
diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c
index a7cabe06ec..04b6ab1db5 100644
--- a/src/overlay099/ov99_021D4134.c
+++ b/src/overlay099/ov99_021D4134.c
@@ -14,7 +14,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay099/ov99_021D4134.h"
 
 typedef struct {
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index 0260cff0a4..c2f034118c 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "sys_task_manager.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "overlay101/struct_ov101_021D5D90_decl.h"
 
 #include "overlay101/struct_ov101_021D13C8.h"
@@ -16,7 +15,7 @@
 #include "unk_02005474.h"
 #include "sys_task.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_020711EC.h"
 #include "overlay101/ov101_021D1A28.h"
 #include "overlay101/ov101_021D59AC.h"
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index 086d9393a2..b6b5119230 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -4,12 +4,11 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D8544.h"
 
 #include "unk_020093B4.h"
@@ -17,7 +16,7 @@
 #include "unk_0200A328.h"
 #include "heap.h"
 #include "unk_0201DBEC.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay101/ov101_021D7E48.h"
 
 typedef struct {
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 8a7a100215..5405cb8887 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "message.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202C878_decl.h"
@@ -24,7 +23,7 @@
 #include "string_template.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index de479beb4d..742b0d2240 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -55,7 +55,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 2d2be2b4d6..cab6fd937b 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02014014_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "struct_decls/struct_party_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
 #include "overlay104/struct_ov104_022320B4_decl.h"
@@ -26,7 +25,7 @@
 #include "unk_02014000.h"
 #include "heap.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "save_player.h"
 #include "trainer_info.h"
 #include "unk_02030494.h"
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 121767a817..e83fc1c2e0 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -23,7 +23,7 @@
 #include "unk_02018340.h"
 #include "unk_0201D15C.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02030494.h"
 #include "unk_0203061C.h"
 #include "vars_flags.h"
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index db022944a0..729f8ba600 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -33,7 +33,7 @@
 #include "sys_task_manager.h"
 #include "unk_0201D670.h"
 #include "unk_0201E86C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 
 typedef struct {
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index a73517c0d2..e72d687d72 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -51,7 +51,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02024220.h"
 #include "save_player.h"
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index 338cb802aa..fd05dc2ae5 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -1,12 +1,11 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay105/struct_ov105_02245AAC.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -15,7 +14,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay105/ov105_02245AAC.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC * param0);
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index 54ab1699be..27c709e10d 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -1,13 +1,12 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "overlay105/struct_ov105_02245E1C_decl.h"
 
 #include "overlay105/struct_ov105_02245AAC.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay105/ov105_02245AAC.h"
 #include "overlay105/ov105_02245DC4.h"
 
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 28ebf9e939..973cf37521 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -1,13 +1,12 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "overlay105/struct_ov105_02245EA8_decl.h"
 
 #include "overlay105/struct_ov105_02245AAC.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay105/ov105_02245AAC.h"
 #include "overlay105/ov105_02245E54.h"
 
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index 79eb50a92f..bfb3ef4f3e 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -3,14 +3,13 @@
 
 #include "core_sys.h"
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "overlay105/struct_ov105_02246060_decl.h"
 
 #include "overlay105/struct_ov105_02245AAC.h"
 #include "overlay105/struct_ov105_02246394.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay105/ov105_02245AAC.h"
 #include "overlay105/ov105_02245FB8.h"
 
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 5ef25e0bb3..1d5617c34c 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -47,7 +47,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 6d8290e2c8..a4b47b1eff 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -2,13 +2,12 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay106/struct_ov106_02243310.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -18,7 +17,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "overlay106/ov106_02243310.h"
 
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 95fcd28870..22471fcb55 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -1,14 +1,13 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "pokemon.h"
 #include "overlay106/struct_ov106_02243650_decl.h"
 
 #include "overlay106/struct_ov106_02243310.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "overlay106/ov106_02243310.h"
 #include "overlay106/ov106_022435FC.h"
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index d272aea3af..26aa178de6 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -55,7 +55,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 3e1e1a8931..b98e2ee150 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -55,7 +55,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "trainer_info.h"
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 92328e7b19..818fe3a718 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -3,14 +3,13 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay107/struct_ov107_02249954.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -21,7 +20,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "party.h"
 #include "item.h"
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 822e72c5fc..04248638ea 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -1,7 +1,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "pokemon.h"
 #include "overlay107/struct_ov107_02249B8C_decl.h"
 
@@ -9,7 +8,7 @@
 
 #include "unk_02005474.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "overlay104/ov104_0222DCE0.h"
 #include "overlay107/ov107_02249604.h"
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index d931b034c1..3e4e31c645 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -49,7 +49,7 @@
 #include "unk_0201D15C.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "unk_02030494.h"
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index f13d2d8eb7..2d6b77e7b3 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -2,14 +2,13 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay108/struct_ov108_02243030.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -20,7 +19,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "party.h"
 #include "unk_0207E0B8.h"
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index 53c9791ce1..4ff18acc96 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -1,14 +1,13 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "pokemon.h"
 #include "overlay108/struct_ov108_02243594_decl.h"
 
 #include "overlay108/struct_ov108_02243030.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon_icon.h"
 #include "overlay108/ov108_02243030.h"
 #include "overlay108/ov108_0224351C.h"
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index b553f8f0b9..6fedd02265 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -22,7 +22,6 @@
 #include "overlay109/struct_ov109_021D5140.h"
 #include "overlay109/struct_ov109_021D5140_sub1.h"
 #include "overlay109/struct_ov109_021D5140_sub2.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02001AF4.h"
 #include "unk_02002B7C.h"
@@ -50,7 +49,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c
index e4ace515de..e8af48e56b 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -46,7 +46,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index d7626cdb2b..5f03bf6b5d 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -3,12 +3,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay111/struct_ov111_021D2F80.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -18,7 +17,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay111/ov111_021D2F80.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 * param0);
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index b19c3f5385..56be705524 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -1,13 +1,12 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 #include "overlay111/struct_ov111_021D33F4_decl.h"
 
 #include "overlay111/struct_ov111_021D2F80.h"
 
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "overlay111/ov111_021D2F80.h"
 #include "overlay111/ov111_021D33F4.h"
 
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index af7aa17b47..9b00d06cdf 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
 #include "strbuf.h"
 #include "overlay066/struct_ov66_0222DFF8_decl.h"
 #include "overlay066/struct_ov66_0223177C_decl.h"
@@ -43,7 +42,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_020393C8.h"
 #include "overlay066/ov66_0222DDF0.h"
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 16cc0f974d..75075df758 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -70,7 +70,7 @@
 #include "unk_0201E86C.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 7c301ce620..39580cc3d6 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -12,8 +12,8 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -23,10 +23,9 @@
 #include "struct_defs/struct_02015958.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay066/struct_ov66_02230DBC.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay114/struct_ov114_0225C76C.h"
@@ -57,7 +56,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 588de4070a..698b39a6ae 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -12,8 +12,8 @@
 #include "struct_decls/struct_02012B20_decl.h"
 #include "struct_decls/font_oam.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay114/struct_ov114_0225CAD4_decl.h"
 
@@ -23,15 +23,14 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay072/struct_ov72_0223E2A8.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay092/struct_ov92_021D28C0.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay115/struct_ov115_022612BC.h"
-#include "overlay115/struct_ov115_02261520.h"
 #include "overlay115/struct_ov115_02262DC4.h"
 #include "overlay115/struct_ov115_02262F50.h"
 #include "overlay115/camera_angle.h"
@@ -63,7 +62,7 @@
 #include "unk_0201F834.h"
 #include "gx_layers.h"
 #include "camera.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_0202419C.h"
 #include "unk_02024220.h"
diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c
index 0c9b9e5ac6..4ee085722c 100644
--- a/src/overlay119/ov119_021D191C.c
+++ b/src/overlay119/ov119_021D191C.c
@@ -16,7 +16,7 @@
 #include "unk_0201D670.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay119/ov119_021D0D80.h"
 #include "overlay119/ov119_021D191C.h"
diff --git a/src/pokemon.c b/src/pokemon.c
index fb8e7f8001..0645ae35cf 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -48,7 +48,7 @@
 #include "unk_02017038.h"
 #include "heap.h"
 #include "unk_0201D15C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "unk_02028124.h"
diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_app.c
index f057e6e78c..7939616c63 100644
--- a/src/pokemon_summary_app.c
+++ b/src/pokemon_summary_app.c
@@ -38,7 +38,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "game_options.h"
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index f5f3c25068..c3362e7c77 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -3,13 +3,12 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009508_1.h"
-#include "struct_defs/struct_020095C4.h"
+#include "cell_actor.h"
 #include "struct_defs/struct_0200C738.h"
-#include "overlay019/struct_ov19_021DA864.h"
 
 #include "unk_020093B4.h"
 #include "unk_02009714.h"
@@ -18,7 +17,7 @@
 #include "heap.h"
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202309C.h"
 
 void sub_020093B4 (CellActorResourceData * param0, int param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, UnkStruct_02009714 * param9, UnkStruct_02009714 * param10, UnkStruct_02009714 * param11, UnkStruct_02009714 * param12, UnkStruct_02009714 * param13, UnkStruct_02009714 * param14)
diff --git a/src/unk_0200A784.c b/src/unk_0200A784.c
index 62255595c5..69c5792d8c 100644
--- a/src/unk_0200A784.c
+++ b/src/unk_0200A784.c
@@ -3,7 +3,7 @@
 
 #include "unk_0200A784.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0202309C.h"
 
 typedef struct {
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 93d4fc816c..4efc3ef5ed 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -6,8 +6,8 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009CFC.h"
@@ -15,13 +15,12 @@
 #include "struct_defs/struct_0200D0F4.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "struct_defs/sprite_template.h"
 #include "overlay104/struct_ov104_022412F4.h"
 #include "overlay104/struct_ov104_02241308.h"
 #include "overlay104/struct_ov104_0224133C.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02002F38.h"
 #include "unk_020093B4.h"
@@ -34,7 +33,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 
 typedef struct CellTransferStateData_t {
     int unk_00;
diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c
index 928814d60c..ee32c25c65 100644
--- a/src/unk_0200DA60.c
+++ b/src/unk_0200DA60.c
@@ -30,7 +30,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay005/ov5_021D2F14.h"
 
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 3eff3dd06e..d7349f317c 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -1,18 +1,17 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
 
 #include "struct_defs/struct_020127E8.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay083/struct_ov83_0223D9A8.h"
+#include "cell_actor.h"
 
 #include "unk_02006E3C.h"
 #include "unk_02012744.h"
 #include "heap.h"
 #include "unk_0201E86C.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 
 typedef struct {
     CellActor * unk_00;
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index d498e33afa..a0992df5e8 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -3,15 +3,14 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "trainer_info.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009CFC.h"
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_02005474.h"
 #include "unk_0200679C.h"
@@ -24,7 +23,7 @@
 #include "unk_02018340.h"
 #include "sys_task_manager.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "save_player.h"
 #include "trainer_info.h"
 #include "unk_0205CA94.h"
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index ca3c5654c6..a3f724fdbd 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -10,7 +10,7 @@
 #include "narc.h"
 #include "unk_0200C6E4.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0206A780.h"
 #include "overlay005/ov5_021D2F14.h"
 
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index b707373bb6..7ba473ef6c 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -39,7 +39,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "save_player.h"
 #include "game_options.h"
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index 43ba1b9d40..fa06e9e03f 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -44,7 +44,7 @@
 #include "unk_0201E010.h"
 #include "unk_0201E3D8.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "unk_02024220.h"
 #include "unk_0202602C.h"
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index 39181e4039..6d7654d04a 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
 #include "pokemon.h"
 
 #include "struct_defs/struct_0200C738.h"
@@ -21,7 +20,7 @@
 #include "unk_0201DBEC.h"
 #include "unk_0201E010.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "party.h"
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 81f7dcadee..d3970b6079 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -23,7 +23,7 @@
 #include "heap.h"
 #include "unk_02018340.h"
 #include "unk_0201D670.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_0207070C.h"
 #include "pokemon.h"
 #include "party.h"
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 9f7b577275..b21576aa88 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -8,8 +8,8 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "struct_decls/struct_020218BC_decl.h"
-#include "struct_decls/struct_02022550_decl.h"
+#include "cell_actor.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "struct_decls/struct_02087A10_decl.h"
@@ -20,11 +20,10 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208737C.h"
 #include "struct_defs/struct_02099F80.h"
-#include "overlay019/struct_ov19_021DA864.h"
+#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
-#include "overlay115/struct_ov115_02261520.h"
 
 #include "unk_020021B0.h"
 #include "unk_02002B7C.h"
@@ -55,7 +54,7 @@
 #include "unk_0201E86C.h"
 #include "unk_0201F834.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "pokemon.h"
diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c
index 6317f958f8..77068d438c 100644
--- a/src/unk_0208EA44.c
+++ b/src/unk_0208EA44.c
@@ -1,7 +1,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02022550_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/pokemon_summary_app.h"
@@ -14,7 +13,7 @@
 #include "unk_02018340.h"
 #include "unk_0201DBEC.h"
 #include "gx_layers.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "pokemon.h"
 #include "move_table.h"
 #include "pokemon_icon.h"
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index b9d1412d50..2605493448 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -11,8 +11,7 @@
 #include "struct_defs/struct_0209903C.h"
 #include "struct_defs/struct_0209903C_sub1.h"
 #include "struct_defs/struct_0209916C.h"
-#include "overlay019/struct_ov19_021DA864.h"
-#include "overlay115/struct_ov115_02261520.h"
+#include "cell_actor.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
@@ -20,7 +19,7 @@
 #include "unk_0200A328.h"
 #include "unk_0200C6E4.h"
 #include "heap.h"
-#include "unk_020218BC.h"
+#include "cell_actor.h"
 #include "unk_02098FFC.h"
 
 static void sub_02099058(UnkStruct_0209903C * param0);

From fb280a33c243c6ee3ce6782d741cd4aa269b87d4 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Thu, 27 Jun 2024 15:54:48 +0200
Subject: [PATCH 17/19] Align pointers

---
 include/cell_actor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/cell_actor.h b/include/cell_actor.h
index 8682048274..4a85c5ce4f 100644
--- a/include/cell_actor.h
+++ b/include/cell_actor.h
@@ -115,8 +115,8 @@ typedef struct CellActorResourceData {
 } CellActorResourceData;
 
 typedef struct CellActorInitParams {
-    CellActorCollection * collection;
-    const CellActorResourceData * resourceData;
+    CellActorCollection *collection;
+    const CellActorResourceData *resourceData;
     VecFx32 position;
     u32 priority;
     int vramType;

From 1b4fa0f4c8e5f2d94916491a8d76cebb1fb2c59b Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Thu, 27 Jun 2024 16:33:46 +0200
Subject: [PATCH 18/19] Use enums where appropriate

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

diff --git a/include/cell_actor.h b/include/cell_actor.h
index 4a85c5ce4f..40e1e98663 100644
--- a/include/cell_actor.h
+++ b/include/cell_actor.h
@@ -98,7 +98,7 @@ struct CellActorCollection {
 typedef struct CellActorCollectionParams {
     int maxElements;
     NNSG2dRendererInstance *renderer;
-    int heapID;
+    enum HeapId heapID;
 } CellActorCollectionParams;
 
 typedef struct CellActorResourceData {
@@ -119,8 +119,8 @@ typedef struct CellActorInitParams {
     const CellActorResourceData *resourceData;
     VecFx32 position;
     u32 priority;
-    int vramType;
-    int heapID;
+    NNS_G2D_VRAM_TYPE vramType;
+    enum HeapId heapID;
 } CellActorInitParams;
 
 typedef struct CellActorInitParamsEx {
@@ -130,8 +130,8 @@ typedef struct CellActorInitParamsEx {
     VecFx32 affineScale;
     u16 affineZRotation;
     u32 priority;
-    int vramType;
-    int heapID;
+    NNS_G2D_VRAM_TYPE vramType;
+    enum HeapId heapID;
 } CellActorInitParamsEx;
 
 

From 89099a699cd34647e88697d8c9b8870f3fefbbf2 Mon Sep 17 00:00:00 2001
From: Fexty12573 <bogofogo1@gmail.com>
Date: Sat, 29 Jun 2024 14:30:16 +0200
Subject: [PATCH 19/19] Remove duplicate includes

---
 include/overlay019/ov19_021D61B0.h          | 1 -
 include/overlay020/ov20_021D2098.h          | 1 -
 include/overlay072/struct_ov72_0223DB98_t.h | 1 -
 include/overlay094/ov94_0223BCB0.h          | 1 -
 include/overlay094/struct_ov94_0223FD4C.h   | 1 -
 include/overlay096/struct_ov96_0223BF40_t.h | 1 -
 include/overlay097/struct_ov97_0222D04C.h   | 1 -
 include/overlay109/struct_ov109_021D5140.h  | 1 -
 include/struct_defs/struct_02095E80_t.h     | 1 -
 include/struct_defs/struct_02095EAC_t.h     | 1 -
 include/struct_defs/struct_020961E8_t.h     | 1 -
 src/choose_starter/choose_starter_app.c     | 3 ---
 src/overlay005/encounter_effect.c           | 1 -
 src/overlay005/ov5_021D2F14.c               | 2 --
 src/overlay005/ov5_021D5EB8.c               | 4 ----
 src/overlay006/ov6_022426AC.c               | 3 ---
 src/overlay006/ov6_02243258.c               | 3 ---
 src/overlay007/ov7_0224BE9C.c               | 3 ---
 src/overlay009/ov9_02249960.c               | 3 ---
 src/overlay019/ov19_021D61B0.c              | 3 ---
 src/overlay019/ov19_021D8B54.c              | 2 --
 src/overlay019/ov19_021DA270.c              | 1 -
 src/overlay019/ov19_021DA814.c              | 1 -
 src/overlay019/ov19_021DA92C.c              | 1 -
 src/overlay019/ov19_021DB8E4.c              | 1 -
 src/overlay019/ov19_021DCF88.c              | 2 --
 src/overlay019/ov19_021DE3E8.c              | 2 --
 src/overlay019/ov19_021DEC04.c              | 2 --
 src/overlay020/ov20_021D2098.c              | 3 ---
 src/overlay020/ov20_021D2EA4.c              | 1 -
 src/overlay020/ov20_021D3864.c              | 1 -
 src/overlay020/ov20_021D3A54.c              | 1 -
 src/overlay020/ov20_021D40E8.c              | 1 -
 src/overlay020/ov20_021D4728.c              | 3 ---
 src/overlay021/ov21_021D1FA4.c              | 3 ---
 src/overlay021/ov21_021D5AEC.c              | 2 --
 src/overlay021/ov21_021D76B0.c              | 2 --
 src/overlay021/ov21_021D85B0.c              | 2 --
 src/overlay021/ov21_021D94BC.c              | 2 --
 src/overlay021/ov21_021DC9BC.c              | 2 --
 src/overlay021/ov21_021DDD2C.c              | 2 --
 src/overlay021/ov21_021DE668.c              | 2 --
 src/overlay021/ov21_021DF734.c              | 2 --
 src/overlay021/ov21_021E0C68.c              | 2 --
 src/overlay021/ov21_021E1924.c              | 2 --
 src/overlay021/ov21_021E29DC.c              | 2 --
 src/overlay021/ov21_021E3FFC.c              | 2 --
 src/overlay021/ov21_021E4CA4.c              | 2 --
 src/overlay021/ov21_021E6014.c              | 2 --
 src/overlay021/ov21_021E68F4.c              | 2 --
 src/overlay021/ov21_021E737C.c              | 2 --
 src/overlay021/ov21_021E8484.c              | 2 --
 src/overlay021/ov21_021E8D48.c              | 3 ---
 src/overlay022/ov22_02255094.c              | 2 --
 src/overlay022/ov22_02259C58.c              | 1 -
 src/overlay022/ov22_0225A428.c              | 2 --
 src/overlay023/ov23_0223E140.c              | 3 ---
 src/overlay023/ov23_0224340C.c              | 3 ---
 src/overlay023/ov23_02248F1C.c              | 3 ---
 src/overlay056/ov56_022561C0.c              | 3 ---
 src/overlay058/ov58_021D0D80.c              | 1 -
 src/overlay063/ov63_0222AE60.c              | 3 ---
 src/overlay064/ov64_0222DCE0.c              | 3 ---
 src/overlay065/ov65_0222DCE0.c              | 1 -
 src/overlay068/ov68_0225C700.c              | 3 ---
 src/overlay069/ov69_0225C700.c              | 3 ---
 src/overlay070/ov70_0225D9A4.c              | 3 ---
 src/overlay071/ov71_0223CF0C.c              | 1 -
 src/overlay072/ov72_0223D7A0.c              | 1 -
 src/overlay077/ov77_021D54B0.c              | 3 ---
 src/overlay077/ov77_021D6670.c              | 3 ---
 src/overlay083/ov83_0223D6A8.c              | 1 -
 src/overlay086/ov86_0223B140.c              | 3 ---
 src/overlay087/ov87_021D106C.c              | 3 ---
 src/overlay088/ov88_0223B140.c              | 1 -
 src/overlay094/ov94_0223BCB0.c              | 2 --
 src/overlay094/ov94_0223FB48.c              | 1 -
 src/overlay094/ov94_02243EF8.c              | 1 -
 src/overlay095/ov95_02246C20.c              | 3 ---
 src/overlay095/ov95_02247B6C.c              | 1 -
 src/overlay095/ov95_02248590.c              | 1 -
 src/overlay095/ov95_02249740.c              | 1 -
 src/overlay095/ov95_0224A390.c              | 1 -
 src/overlay095/ov95_0224B3D8.c              | 1 -
 src/overlay096/ov96_0223B6A0.c              | 1 -
 src/overlay097/ov97_0222D30C.c              | 2 --
 src/overlay097/ov97_02230410.c              | 2 --
 src/overlay097/ov97_02233B18.c              | 3 ---
 src/overlay097/ov97_02237694.c              | 1 -
 src/overlay101/ov101_021D7E48.c             | 3 ---
 src/overlay105/ov105_02245AAC.c             | 2 --
 src/overlay106/ov106_02243310.c             | 2 --
 src/overlay107/ov107_02249604.c             | 2 --
 src/overlay108/ov108_02243030.c             | 2 --
 src/overlay111/ov111_021D2F80.c             | 2 --
 src/overlay114/ov114_0225C700.c             | 3 ---
 src/overlay115/ov115_02260CEC.c             | 4 ----
 src/unk_020093B4.c                          | 2 --
 src/unk_0200C6E4.c                          | 3 ---
 src/unk_02012744.c                          | 2 --
 src/unk_0205CA94.c                          | 2 --
 src/unk_0208694C.c                          | 3 ---
 src/unk_02098FFC.c                          | 1 -
 103 files changed, 202 deletions(-)

diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index e94ed2babb..9b092af18d 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02007768_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/include/overlay020/ov20_021D2098.h b/include/overlay020/ov20_021D2098.h
index 85264ae44b..6458fbc99e 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "cell_actor.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
diff --git a/include/overlay072/struct_ov72_0223DB98_t.h b/include/overlay072/struct_ov72_0223DB98_t.h
index d6cd9494f5..f46358dc2a 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -8,7 +8,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "game_records.h"
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index 85b67539e0..afb9e56e2b 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
 #include "cell_actor.h"
 
diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h
index 40266fc47e..9cc54a9175 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -12,7 +12,6 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/include/overlay096/struct_ov96_0223BF40_t.h b/include/overlay096/struct_ov96_0223BF40_t.h
index bad19c6f26..7632236444 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -8,7 +8,6 @@
 #include "string_template.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206BC70.h"
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index 214893d258..9e8726e322 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -9,7 +9,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "game_options.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index f13793c1e7..91794c326d 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -9,7 +9,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0205AA50.h"
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index e955404d72..40cad6e735 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -13,7 +13,6 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_defs/struct_02027F8C.h"
 #include "struct_decls/struct_02027F8C_decl.h"
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 62e73bc0ef..f401f5ee75 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -8,7 +8,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0203DDFC.h"
diff --git a/include/struct_defs/struct_020961E8_t.h b/include/struct_defs/struct_020961E8_t.h
index 25200d8261..1826c93e20 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -9,7 +9,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_defs/struct_0203DE34.h"
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 0b59d6cdcd..b7d99b1ff9 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -20,8 +20,6 @@
 #include "struct_decls/struct_02015214_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 
 #include "struct_defs/archived_sprite.h"
@@ -29,7 +27,6 @@
 #include "struct_defs/choose_starter_data.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021E7F40.h"
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_022557A0.h"
diff --git a/src/overlay005/encounter_effect.c b/src/overlay005/encounter_effect.c
index 516104c9aa..43b56678f1 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 
 #include "field/field_system.h"
diff --git a/src/overlay005/ov5_021D2F14.c b/src/overlay005/ov5_021D2F14.c
index d14a2e1d3f..f01ac58bb4 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -4,7 +4,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009CFC.h"
@@ -12,7 +11,6 @@
 #include "overlay005/struct_ov5_021D30A8.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
-#include "cell_actor.h"
 #include "struct_defs/sprite_template.h"
 #include "overlay104/struct_ov104_02241308.h"
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 7be3717fbd..6d68dcf4f5 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -8,14 +8,10 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay005/struct_ov5_021D57D8_decl.h"
 
-#include "cell_actor.h"
 #include "field/field_system.h"
 #include "field/field_system_sub2_t.h"
-#include "cell_actor.h"
 
 #include "unk_02005474.h"
 #include "narc.h"
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index fa4c3a1544..c6d407e474 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -5,12 +5,9 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
-#include "cell_actor.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index e1ab607945..43b47f892e 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -5,8 +5,6 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_020711EC_decl.h"
 #include "pokemon.h"
@@ -15,7 +13,6 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
-#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D86B0.h"
 
 #include "unk_02005474.h"
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index ca3a19ffd4..cdcde22dee 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -11,8 +11,6 @@
 #include "message.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02029D04_decl.h"
 #include "savedata.h"
@@ -21,7 +19,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02013A04_t.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 430ef8b600..e563f3e38f 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -6,8 +6,6 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
 #include "struct_decls/struct_020216E0_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02027860_decl.h"
 #include "struct_decls/struct_02039E30_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
@@ -32,7 +30,6 @@
 #include "overlay005/map_object_anim_cmd.h"
 #include "overlay005/struct_ov5_02201C58.h"
 #include "overlay009/struct_ov9_02249FF4.h"
-#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D86B0.h"
 #include "overlay115/camera_angle.h"
 
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index 7b0f99c4bd..d24df6bb3c 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -6,8 +6,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
@@ -21,7 +19,6 @@
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021D8E00.h"
 #include "overlay019/struct_ov19_021DA384.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
 #include "overlay019/struct_ov19_021DB6F0.h"
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index a329cb0fd7..315523e675 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -3,8 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D5DF8_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
diff --git a/src/overlay019/ov19_021DA270.c b/src/overlay019/ov19_021DA270.c
index 8e7e84b361..0c8a5981de 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
diff --git a/src/overlay019/ov19_021DA814.c b/src/overlay019/ov19_021DA814.c
index b56f31995d..f0d17760ab 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index 1c485fb4f3..2feadc8a68 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -4,7 +4,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
diff --git a/src/overlay019/ov19_021DB8E4.c b/src/overlay019/ov19_021DB8E4.c
index 9357a0947c..fc387e292e 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index e1517c2843..643ce1e5ed 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -5,8 +5,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index d7bd98b3e1..5c74ea9e0b 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -3,8 +3,6 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 53b6ab01d5..ab68cb3609 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -7,8 +7,6 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index db2da8ae2f..cf3464f59b 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -3,8 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D30F8_decl.h"
@@ -15,7 +13,6 @@
 
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 477e2e4c2b..066b3c7a5a 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -5,7 +5,6 @@
 #include "message.h"
 #include "struct_decls/struct_020149F0_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index bca1944e96..f7b6e68547 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c
index cb81050489..ecdef1535d 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -7,7 +7,6 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c
index 42ab9d6196..fd53ceec80 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -4,7 +4,6 @@
 #include "enums.h"
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c
index 076487a30f..c19a899a81 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -4,15 +4,12 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_020998EC_decl.h"
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 
 #include "unk_02002B7C.h"
 #include "unk_02006E3C.h"
diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c
index 6247250823..0f1b811228 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -7,12 +7,9 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
 #include "struct_defs/archived_sprite.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D22F8.h"
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 1d65cbf41a..1faf4206db 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -8,12 +8,10 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D157C.h"
 #include "overlay021/struct_ov21_021D2648.h"
diff --git a/src/overlay021/ov21_021D76B0.c b/src/overlay021/ov21_021D76B0.c
index b77d1fbca5..1af29dbca5 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -6,13 +6,11 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021D85B0.c b/src/overlay021/ov21_021D85B0.c
index 3db8b21372..4b313ab703 100644
--- a/src/overlay021/ov21_021D85B0.c
+++ b/src/overlay021/ov21_021D85B0.c
@@ -4,11 +4,9 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D157C.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 83b0a34299..155e2cb78f 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
@@ -13,7 +12,6 @@
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021DC9BC.c b/src/overlay021/ov21_021DC9BC.c
index 978721316f..7291789c6c 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -4,11 +4,9 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 91fffe0b13..16b3414bca 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -5,12 +5,10 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021DE668.c b/src/overlay021/ov21_021DE668.c
index 6018bfa8e1..59556f957e 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -5,13 +5,11 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
diff --git a/src/overlay021/ov21_021DF734.c b/src/overlay021/ov21_021DF734.c
index 1caf09bd5d..96037ac262 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -5,11 +5,9 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 8dd26c3b18..7d3d178c38 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -5,12 +5,10 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021E1924.c b/src/overlay021/ov21_021E1924.c
index 2ea17d658b..cf223e6770 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -5,13 +5,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index e318a3b32d..bda8528840 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -5,14 +5,12 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index 070ddc671a..8b65c80a29 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -4,11 +4,9 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D2648.h"
 #include "overlay021/struct_ov21_021D3320.h"
diff --git a/src/overlay021/ov21_021E4CA4.c b/src/overlay021/ov21_021E4CA4.c
index 5e7c2f391c..4e2b3e7f51 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -5,13 +5,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E6014.c b/src/overlay021/ov21_021E6014.c
index b158241f03..bb4a3e9830 100644
--- a/src/overlay021/ov21_021E6014.c
+++ b/src/overlay021/ov21_021E6014.c
@@ -5,11 +5,9 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index bc5e7423fc..6e1657095a 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -5,13 +5,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E737C.c b/src/overlay021/ov21_021E737C.c
index 7751a6a61e..af71b90987 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -8,11 +8,9 @@
 #include "struct_decls/struct_020151A4_decl.h"
 #include "struct_decls/struct_02015214_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021E68F4.h"
diff --git a/src/overlay021/ov21_021E8484.c b/src/overlay021/ov21_021E8484.c
index 5545fe4142..e85c4f125c 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -5,13 +5,11 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D3320.h"
 #include "overlay021/struct_ov21_021D4660.h"
diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c
index d2d4796f75..fab355286d 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -10,8 +10,6 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
@@ -19,7 +17,6 @@
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D22F8.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 3b4aa28a9b..7f6803ca65 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -8,10 +8,8 @@
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_022557A0.h"
 #include "overlay022/struct_ov22_02255800.h"
diff --git a/src/overlay022/ov22_02259C58.c b/src/overlay022/ov22_02259C58.c
index fedd29001f..8e350a125f 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -9,7 +9,6 @@
 #include "struct_defs/struct_020127E8.h"
 #include "touch_screen.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_02259C58.h"
 #include "overlay022/struct_ov22_02259C58_1.h"
 #include "overlay022/struct_ov22_02259C9C.h"
diff --git a/src/overlay022/ov22_0225A428.c b/src/overlay022/ov22_0225A428.c
index 6033bd30fe..e91d013a6f 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -6,12 +6,10 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C60.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_02256BAC.h"
 #include "overlay022/struct_ov22_022597BC.h"
 #include "overlay022/struct_ov22_022599A0.h"
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 9b4be3baf4..b9b0aa9e26 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -11,8 +11,6 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
 #include "camera.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202855C_decl.h"
@@ -23,7 +21,6 @@
 #include "field/field_system.h"
 #include "field/field_system_sub2_t.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay023/struct_ov23_0224271C.h"
 #include "overlay061/struct_ov61_0222C884.h"
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 35c62fd14f..e1de4ce3d9 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -10,8 +10,6 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
 #include "camera.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202855C_decl.h"
@@ -21,7 +19,6 @@
 
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
-#include "cell_actor.h"
 #include "overlay023/struct_ov23_0224271C.h"
 
 #include "unk_020041CC.h"
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 6dac8453c3..ad65d61125 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -5,8 +5,6 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0205E884_decl.h"
 #include "overlay023/struct_ov23_0224942C_decl.h"
@@ -14,7 +12,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "field/field_system.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
 #include "unk_0200679C.h"
diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c
index d80fe71dd8..e8b0250d84 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -7,8 +7,6 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02027F8C_decl.h"
@@ -24,7 +22,6 @@
 #include "struct_defs/struct_0205C22C.h"
 #include "struct_defs/struct_0205C924.h"
 #include "struct_defs/struct_0205C95C.h"
-#include "cell_actor.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 
 #include "unk_02002B7C.h"
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 40ba6d1604..8a4cd98b76 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02095EAC_decl.h"
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 8b9094eda3..9320265fe7 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -5,10 +5,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
-#include "cell_actor.h"
 #include "overlay064/struct_ov64_022302EC.h"
 
 #include "unk_02002F38.h"
diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c
index e1b10e0ab7..9993a2d7ba 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -15,8 +15,6 @@
 #include "message.h"
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -34,7 +32,6 @@
 #include "struct_defs/struct_0208737C.h"
 #include "struct_defs/struct_02089438.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay064/struct_ov64_022302EC.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index adac2355a2..d8c5dcf93a 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -29,7 +29,6 @@
 #include "struct_defs/struct_0207DFAC.h"
 #include "struct_defs/struct_0207E060.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay065/struct_ov65_0222E99C.h"
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index e9b08e41dc..279ead4738 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -11,8 +11,6 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_02030EC4_decl.h"
@@ -23,7 +21,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay066/struct_ov66_0222E908.h"
diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c
index 1e069051a1..24ea0541d7 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -10,8 +10,6 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "savedata.h"
@@ -21,7 +19,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay066/struct_ov66_02230F50.h"
 #include "overlay066/struct_ov66_02231428.h"
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index 4e6bb09071..730cdbaa67 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -14,8 +14,6 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "trainer_info.h"
@@ -37,7 +35,6 @@
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay065/struct_ov65_0222F6EC.h"
diff --git a/src/overlay071/ov71_0223CF0C.c b/src/overlay071/ov71_0223CF0C.c
index 03d8fa4422..a2a9b03c9c 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -3,7 +3,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay071/struct_ov71_0223D238.h"
 
diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c
index 19d9c53b12..44ef7d35f2 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "savedata.h"
 #include "overlay072/struct_ov72_0223DB98_decl.h"
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index f198300a46..792ee2f1e8 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -5,12 +5,9 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "overlay077/struct_ov77_021D6734_decl.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 
 #include "unk_020093B4.h"
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index 8153d68a39..5c72530fc2 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -4,11 +4,8 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 
 #include "unk_020093B4.h"
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index c5dce86e96..ecb2547ec3 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_02015214_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index f7a6a186e4..f0a30d93ea 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -7,8 +7,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
 #include "struct_defs/sprite_animation_frame.h"
 #include "struct_defs/struct_02008900.h"
@@ -19,7 +17,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
-#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
 #include "overlay115/camera_angle.h"
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 96cc3cf32a..c3ad917872 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -5,8 +5,6 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay087/struct_ov87_021D0D80_decl.h"
@@ -16,7 +14,6 @@
 #include "struct_defs/struct_02013610.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay087/struct_ov87_021D12C0.h"
 #include "overlay087/struct_ov87_021D1640.h"
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 416d43b545..c8bdf9ecbd 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index 22f7262fa9..e1ac3a7c02 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -7,11 +7,9 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_0203E0FC.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index d6c69bc3a0..f2a83a1f09 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -6,7 +6,6 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "struct_decls/struct_020797DC_decl.h"
diff --git a/src/overlay094/ov94_02243EF8.c b/src/overlay094/ov94_02243EF8.c
index b2d204ade8..f69cca1128 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <dwc.h>
 
-#include "cell_actor.h"
 
 #include "touch_screen.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c
index a8a6f2c6d5..b5e4d4fce7 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -3,8 +3,6 @@
 
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
@@ -15,7 +13,6 @@
 #include "struct_defs/struct_0200C738.h"
 #include "struct_defs/struct_02013610.h"
 #include "overlay006/struct_ov6_02246254.h"
-#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247568.h"
 
 #include "unk_020041CC.h"
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index d2f6aef00d..62e77821e6 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -6,7 +6,6 @@
 #include "struct_decls/sprite_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index 087d1fe86c..43e3f108d4 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247004_decl.h"
 #include "overlay095/struct_ov95_022472C4_decl.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index 5f6155202e..e4d2b9e3b6 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
 #include "overlay095/struct_ov95_02247958_decl.h"
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index 1784cbffe5..76ce332cf6 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
 #include "overlay095/struct_ov95_0224773C_decl.h"
 #include "overlay095/struct_ov95_02247958_decl.h"
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index 7a62bda0ce..079604ec44 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -8,7 +8,6 @@
 #include "struct_decls/sprite_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "overlay095/struct_ov95_02247628_decl.h"
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 3908617f8b..90c43bb5b8 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -11,7 +11,6 @@
 
 #include "struct_defs/struct_0206BC70.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay061/struct_ov61_0222C884.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 88b212dc48..667631c1ea 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -7,7 +7,6 @@
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "struct_decls/struct_02025CCC_decl.h"
@@ -19,7 +18,6 @@
 #include "struct_defs/struct_0202DF40.h"
 #include "struct_defs/struct_0203CC84.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 #include "overlay097/struct_ov97_0222D04C.h"
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index 6b1ae821a0..0075bc6031 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -10,8 +10,6 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_0202442C_decl.h"
 #include "trainer_info.h"
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 959a7f0ce9..b965292996 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -9,8 +9,6 @@
 #include "message.h"
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "struct_decls/struct_02024440_decl.h"
 #include "trainer_info.h"
@@ -25,7 +23,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "pokemon.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index f668320c02..dc313a37cd 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -7,7 +7,6 @@
 #include "struct_decls/struct_0200112C_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "savedata.h"
diff --git a/src/overlay101/ov101_021D7E48.c b/src/overlay101/ov101_021D7E48.c
index b6b5119230..9963b7d01e 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -4,11 +4,8 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_0200C738.h"
-#include "cell_actor.h"
 #include "overlay101/struct_ov101_021D8544.h"
 
 #include "unk_020093B4.h"
diff --git a/src/overlay105/ov105_02245AAC.c b/src/overlay105/ov105_02245AAC.c
index fd05dc2ae5..73e1551549 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -1,9 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "cell_actor.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay105/struct_ov105_02245AAC.h"
 
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index a4b47b1eff..3f5b7d0f6e 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -2,10 +2,8 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay106/struct_ov106_02243310.h"
 
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 818fe3a718..5dc2b83019 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -3,11 +3,9 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay107/struct_ov107_02249954.h"
 
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 2d6b77e7b3..6cd462cdb8 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -2,11 +2,9 @@
 #include <string.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "cell_actor.h"
 #include "pokemon.h"
 #include "struct_decls/struct_party_decl.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay108/struct_ov108_02243030.h"
 
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index 5f03bf6b5d..662a1b245b 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -3,9 +3,7 @@
 
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay111/struct_ov111_021D2F80.h"
 
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 39580cc3d6..5c1b86e87d 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -12,8 +12,6 @@
 #include "struct_decls/struct_02015920_decl.h"
 #include "struct_decls/struct_02018340_decl.h"
 #include "sys_task_manager.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "trainer_info.h"
 #include "struct_decls/struct_0202B370_decl.h"
@@ -23,7 +21,6 @@
 #include "struct_defs/struct_02015958.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay066/struct_ov66_02230DBC.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c
index 698b39a6ae..46960e7535 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -12,8 +12,6 @@
 #include "struct_decls/struct_02012B20_decl.h"
 #include "struct_decls/font_oam.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "overlay114/struct_ov114_0225CAD4_decl.h"
 
@@ -23,10 +21,8 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay072/struct_ov72_0223E2A8.h"
-#include "cell_actor.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay092/struct_ov92_021D28C0.h"
 #include "overlay097/struct_ov97_0222DB78.h"
diff --git a/src/unk_020093B4.c b/src/unk_020093B4.c
index c3362e7c77..573ff6efb8 100644
--- a/src/unk_020093B4.c
+++ b/src/unk_020093B4.c
@@ -3,11 +3,9 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009508_1.h"
-#include "cell_actor.h"
 #include "struct_defs/struct_0200C738.h"
 
 #include "unk_020093B4.h"
diff --git a/src/unk_0200C6E4.c b/src/unk_0200C6E4.c
index 4efc3ef5ed..3c24a5f5a6 100644
--- a/src/unk_0200C6E4.c
+++ b/src/unk_0200C6E4.c
@@ -6,8 +6,6 @@
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 
 #include "struct_defs/struct_02009508.h"
 #include "struct_defs/struct_02009CFC.h"
@@ -15,7 +13,6 @@
 #include "struct_defs/struct_0200D0F4.h"
 #include "overlay007/struct_ov7_0224F2EC.h"
 #include "overlay007/struct_ov7_0224F358.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "struct_defs/sprite_template.h"
 #include "overlay104/struct_ov104_022412F4.h"
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index d7349f317c..f540d73c3f 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -1,11 +1,9 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "cell_actor.h"
 
 #include "struct_defs/struct_020127E8.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "cell_actor.h"
 
 #include "unk_02006E3C.h"
 #include "unk_02012744.h"
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index a0992df5e8..9ce886d705 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -3,8 +3,6 @@
 
 #include "struct_decls/struct_02009714_decl.h"
 #include "struct_decls/struct_02009F38_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "trainer_info.h"
 
 #include "struct_defs/struct_02009508.h"
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index b21576aa88..c1de79f72c 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -8,8 +8,6 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "message.h"
 #include "struct_decls/struct_02018340_decl.h"
-#include "cell_actor.h"
-#include "cell_actor.h"
 #include "strbuf.h"
 #include "pokemon.h"
 #include "struct_decls/struct_02087A10_decl.h"
@@ -20,7 +18,6 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0208737C.h"
 #include "struct_defs/struct_02099F80.h"
-#include "cell_actor.h"
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay084/struct_ov84_0223BA5C.h"
 #include "overlay097/struct_ov97_0222DB78.h"
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 2605493448..f9e1788cc1 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -11,7 +11,6 @@
 #include "struct_defs/struct_0209903C.h"
 #include "struct_defs/struct_0209903C_sub1.h"
 #include "struct_defs/struct_0209916C.h"
-#include "cell_actor.h"
 
 #include "narc.h"
 #include "unk_020093B4.h"