diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h
index c2d4708d0d..6afc7dda35 100644
--- a/include/applications/pokemon_summary_screen/main.h
+++ b/include/applications/pokemon_summary_screen/main.h
@@ -14,12 +14,12 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "message.h"
 #include "narc.h"
 #include "pokemon.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -401,7 +401,7 @@ typedef struct PokemonSummaryMonSpriteData {
     void *spriteManager;
     SpriteAnimationFrame frames[MAX_ANIMATION_FRAMES];
     PokemonAnimationSys *animationSys;
-    Sprite *sprite;
+    PokemonSprite *sprite;
     BOOL flip;
 } PokemonSummaryMonSpriteData;
 
@@ -422,8 +422,8 @@ typedef struct PokemonSummaryScreen {
 
     SpriteSystem *renderer;
     SpriteManager *gfxHandler;
-    CellActor *sprites[SUMMARY_SPRITE_MAX];
-    CellActorData *actor[SUMMARY_SPRITE_MAX];
+    Sprite *sprites[SUMMARY_SPRITE_MAX];
+    ManagedSprite *sprite[SUMMARY_SPRITE_MAX];
 
     UnkStruct_0200C440 *unk_684;
     MessageLoader *msgLoader;
diff --git a/include/applications/pokemon_summary_screen/sprite.h b/include/applications/pokemon_summary_screen/sprites.h
similarity index 94%
rename from include/applications/pokemon_summary_screen/sprite.h
rename to include/applications/pokemon_summary_screen/sprites.h
index 19a4ec2f1d..182642dfcc 100644
--- a/include/applications/pokemon_summary_screen/sprite.h
+++ b/include/applications/pokemon_summary_screen/sprites.h
@@ -1,5 +1,5 @@
-#ifndef POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITE_H
-#define POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITE_H
+#ifndef POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITES_H
+#define POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITES_H
 
 #include "applications/pokemon_summary_screen/main.h"
 
@@ -38,4 +38,4 @@ void PokemonSummaryScreen_UpdateRibbonFlashAnim(PokemonSummaryScreen *summaryScr
 void PokemonSummaryScreen_UpdateConditionFlashSprites(PokemonSummaryScreen *summaryScreen, BOOL showFlashes);
 void PokemonSummaryScreen_UpdateConditionFlashAnim(PokemonSummaryScreen *summaryScreen);
 
-#endif // POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITE_H
+#endif // POKEPLATINUM_POKEMON_SUMMARY_SCREEN_SPRITES_H
diff --git a/include/battle/battle_context.h b/include/battle/battle_context.h
index 0e907e04d3..421c39d98d 100644
--- a/include/battle/battle_context.h
+++ b/include/battle/battle_context.h
@@ -107,7 +107,7 @@ typedef struct BattleScriptTaskData {
     BattleSystem *battleSys;
     BattleContext *battleCtx;
     BallRotation *ballRotation;
-    CellActorData *cellActorData[2];
+    ManagedSprite *sprites[2];
     FontOAM *fontOAM;
     CharTransferAllocation charTransferAllocation;
     int flag;
diff --git a/include/battle/battle_display.h b/include/battle/battle_display.h
index 65db80ff11..719bce24ae 100644
--- a/include/battle/battle_display.h
+++ b/include/battle/battle_display.h
@@ -153,7 +153,7 @@ void ov16_0225E4C8(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
 void ov16_02263730(BattleSystem *param0, BattlerData *param1);
 u8 Battler_Type(BattlerData *param0);
 u8 Battler_BootState(BattlerData *param0);
-Sprite *ov16_02263AFC(BattlerData *param0);
+PokemonSprite *ov16_02263AFC(BattlerData *param0);
 Healthbar *ov16_02263B08(BattlerData *param0);
 UnkStruct_ov16_0226C378 *ov16_02263B0C(BattlerData *param0);
 void ov16_02263B10(BattlerData *param0);
diff --git a/include/battle/healthbar.h b/include/battle/healthbar.h
index 1c44cb81ec..52c9729721 100644
--- a/include/battle/healthbar.h
+++ b/include/battle/healthbar.h
@@ -63,7 +63,7 @@ enum HealthbarGaugeType {
  * @param healthbarType
  */
 void Healthbar_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler, NARC *narc, PaletteData *palette, enum HealthbarType healthbarType);
-CellActorData *Healthbar_LoadCellActor(SpriteSystem *renderer, SpriteManager *handler, int type);
+ManagedSprite *Healthbar_LoadCellActor(SpriteSystem *renderer, SpriteManager *handler, int type);
 
 /**
  * @brief Draw the informational parts of the healthbar, according to a set
diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h
index 777ce41617..a8cd3dbde4 100644
--- a/include/battle/ov16_0223DF00.h
+++ b/include/battle/ov16_0223DF00.h
@@ -270,7 +270,7 @@ void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSys);
 u8 BattleSystem_RecordedChatter(BattleSystem *battleSys, int param1);
 void ov16_0223F858(BattleSystem *battleSys, u8 *param1);
 void ov16_0223F87C(BattleSystem *battleSys, u8 *param1);
-void ov16_0223F8AC(BattleSystem *battleSys, Sprite **param1);
+void ov16_0223F8AC(BattleSystem *battleSys, PokemonSprite **param1);
 void BattleSystem_SetGaugePriority(BattleSystem *battleSys, int param1);
 
 /**
diff --git a/include/battle/struct_ov16_0225BFFC_t.h b/include/battle/struct_ov16_0225BFFC_t.h
index 3da01fe057..b8eeddc40d 100644
--- a/include/battle/struct_ov16_0225BFFC_t.h
+++ b/include/battle/struct_ov16_0225BFFC_t.h
@@ -11,16 +11,16 @@
 
 #include "bg_window.h"
 #include "narc.h"
-#include "sprite_system.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 
 #define DATA_BUF_SIZE 256
 
 struct BattlerData {
     UnkStruct_ov16_0225BFFC_sub1 unk_00;
-    CellActorData *unk_18;
-    Sprite *unk_1C;
-    Sprite *unk_20;
+    ManagedSprite *unk_18;
+    PokemonSprite *unk_1C;
+    PokemonSprite *unk_20;
     Window *unk_24;
     Healthbar healthbar;
     UnkStruct_ov16_0226C378 unk_7B;
diff --git a/include/battle/struct_ov16_0225D1C4.h b/include/battle/struct_ov16_0225D1C4.h
index eff720fab7..95243fb5bb 100644
--- a/include/battle/struct_ov16_0225D1C4.h
+++ b/include/battle/struct_ov16_0225D1C4.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     BattleSystem *unk_00;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
diff --git a/include/battle/struct_ov16_0225D9A8.h b/include/battle/struct_ov16_0225D9A8.h
index 300f6ffad8..31fac7cc1d 100644
--- a/include/battle/struct_ov16_0225D9A8.h
+++ b/include/battle/struct_ov16_0225D9A8.h
@@ -11,7 +11,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov12_0221FCDC *unk_0C;
     UnkStruct_ov16_02265BBC unk_10;
     u8 unk_68;
diff --git a/include/battle/struct_ov16_0225DA44.h b/include/battle/struct_ov16_0225DA44.h
index 64c30c1316..b888fee565 100644
--- a/include/battle/struct_ov16_0225DA44.h
+++ b/include/battle/struct_ov16_0225DA44.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     BattleSystem *unk_00;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
diff --git a/include/battle/struct_ov16_0225DB74.h b/include/battle/struct_ov16_0225DB74.h
index 7f049e7447..2a96eea57f 100644
--- a/include/battle/struct_ov16_0225DB74.h
+++ b/include/battle/struct_ov16_0225DB74.h
@@ -10,7 +10,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov16_02265BBC unk_0C;
     u8 unk_64;
     u8 unk_65;
diff --git a/include/battle/struct_ov16_0225E0F4.h b/include/battle/struct_ov16_0225E0F4.h
index 375c7718ba..398b93d8b9 100644
--- a/include/battle/struct_ov16_0225E0F4.h
+++ b/include/battle/struct_ov16_0225E0F4.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     BattleSystem *unk_00;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
diff --git a/include/battle/struct_ov16_0225E2C8.h b/include/battle/struct_ov16_0225E2C8.h
index f5932163a0..beb5b2ae4a 100644
--- a/include/battle/struct_ov16_0225E2C8.h
+++ b/include/battle/struct_ov16_0225E2C8.h
@@ -9,7 +9,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     u8 unk_0C;
     u8 unk_0D;
     u8 unk_0E;
diff --git a/include/battle/struct_ov16_0225E300.h b/include/battle/struct_ov16_0225E300.h
index e27d0b50f4..74616448f8 100644
--- a/include/battle/struct_ov16_0225E300.h
+++ b/include/battle/struct_ov16_0225E300.h
@@ -9,7 +9,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     u8 unk_0C;
     u8 unk_0D;
     u8 unk_0E;
diff --git a/include/battle/struct_ov16_0225E4E8.h b/include/battle/struct_ov16_0225E4E8.h
index c32c4a97ef..3eaf4522de 100644
--- a/include/battle/struct_ov16_0225E4E8.h
+++ b/include/battle/struct_ov16_0225E4E8.h
@@ -10,7 +10,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov16_02268520 *unk_0C;
     u8 unk_10;
     u8 unk_11;
diff --git a/include/battle/struct_ov16_0225F764.h b/include/battle/struct_ov16_0225F764.h
index e95233a31e..edbddd45d6 100644
--- a/include/battle/struct_ov16_0225F764.h
+++ b/include/battle/struct_ov16_0225F764.h
@@ -11,7 +11,7 @@
 typedef struct {
     BattleSystem *unk_00;
     BattlerData *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     BallRotation *unk_0C;
     UnkStruct_ov16_02265BBC unk_10;
     u8 unk_68;
diff --git a/include/battle/struct_ov16_02260384.h b/include/battle/struct_ov16_02260384.h
index 809a88adfa..81d1613f12 100644
--- a/include/battle/struct_ov16_02260384.h
+++ b/include/battle/struct_ov16_02260384.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     BattleSystem *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     u8 unk_08;
     u8 unk_09;
     u8 unk_0A;
diff --git a/include/battle/struct_ov16_02264408.h b/include/battle/struct_ov16_02264408.h
index 15ecae155a..c789e3e866 100644
--- a/include/battle/struct_ov16_02264408.h
+++ b/include/battle/struct_ov16_02264408.h
@@ -17,7 +17,7 @@ typedef struct {
     PaletteData *unk_08;
     UnkStruct_ov16_0223E0C8 *unk_0C[4];
     u8 unk_1C[4];
-    Sprite *unk_20[4];
+    PokemonSprite *unk_20[4];
     u32 unk_30;
     u16 unk_34[4];
     u8 unk_3C[4];
diff --git a/include/battle/struct_ov16_02264650_1.h b/include/battle/struct_ov16_02264650_1.h
index f089edc67c..52dfae4c1d 100644
--- a/include/battle/struct_ov16_02264650_1.h
+++ b/include/battle/struct_ov16_02264650_1.h
@@ -10,7 +10,7 @@
 typedef struct {
     BattleSystem *unk_00;
     UnkStruct_ov16_02268520 *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
     u8 unk_0C;
     u8 unk_0D;
     u8 unk_0E;
diff --git a/include/battle/struct_ov16_022674C4.h b/include/battle/struct_ov16_022674C4.h
index 4e878e3caf..819e81d473 100644
--- a/include/battle/struct_ov16_022674C4.h
+++ b/include/battle/struct_ov16_022674C4.h
@@ -4,13 +4,13 @@
 #include "struct_decls/battle_system.h"
 
 #include "bg_window.h"
-#include "sprite_system.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 
 typedef struct {
     u8 state;
-    CellActorData *mainActor;
-    CellActorData *arrowActor;
+    ManagedSprite *mainSprite;
+    ManagedSprite *arrowSprite;
     BattleSystem *battleSys;
     SysTask *unk_10;
     Window unk_14;
diff --git a/include/battle/struct_ov16_02268520.h b/include/battle/struct_ov16_02268520.h
index fc4c9f1f4c..167e2f36de 100644
--- a/include/battle/struct_ov16_02268520.h
+++ b/include/battle/struct_ov16_02268520.h
@@ -6,7 +6,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     BattleSystem *unk_04;
     u8 unk_08;
     u8 unk_09;
diff --git a/include/cell_actor.h b/include/cell_actor.h
deleted file mode 100644
index eb834b3bb7..0000000000
--- a/include/cell_actor.h
+++ /dev/null
@@ -1,204 +0,0 @@
-#ifndef POKEPLATINUM_CELL_ACTOR_H
-#define POKEPLATINUM_CELL_ACTOR_H
-
-#include <nitro/fx/fx.h>
-#include <nitro/gx.h>
-#include <nnsys.h>
-
-#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,
-    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
-};
-
-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;
-    enum HeapId 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 SpriteResourcesHeaderList {
-    CellActorResourceData *headers;
-    int length;
-} SpriteResourcesHeaderList;
-
-typedef struct CellActorData {
-    CellActor *sprite;
-    CellActorResourceData *resourceHeader;
-    SpriteResourcesHeaderList *resourceHeaderList;
-    BOOL vramTransfer;
-} CellActorData;
-
-typedef struct CellActorInitParams {
-    CellActorCollection *collection;
-    const CellActorResourceData *resourceData;
-    VecFx32 position;
-    u32 priority;
-    NNS_G2D_VRAM_TYPE vramType;
-    enum HeapId heapID;
-} CellActorInitParams;
-
-typedef struct CellActorInitParamsEx {
-    CellActorCollection *collection;
-    const CellActorResourceData *resourceData;
-    VecFx32 position;
-    VecFx32 affineScale;
-    u16 affineZRotation;
-    u32 priority;
-    NNS_G2D_VRAM_TYPE vramType;
-    enum HeapId heapID;
-} CellActorInitParamsEx;
-
-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 CellActor_GetUserAttrForAnimFrame(const CellActor *actor, u32 animID, u32 frame);
-u32 CellActor_GetUserAttrForCurrentAnimFrame(const CellActor *actor);
-
-#endif // POKEPLATINUM_CELL_ACTOR_H
diff --git a/include/functypes/funcptr_02007C34.h b/include/functypes/funcptr_02007C34.h
index 68c09cd78d..32c786e55b 100644
--- a/include/functypes/funcptr_02007C34.h
+++ b/include/functypes/funcptr_02007C34.h
@@ -4,6 +4,6 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_defs/struct_02007C7C_sub1.h"
 
-typedef void(UnkFuncPtr_02007C34)(Sprite *, UnkStruct_02007C7C_sub1 *);
+typedef void(UnkFuncPtr_02007C34)(PokemonSprite *, UnkStruct_02007C7C_sub1 *);
 
 #endif // POKEPLATINUM_FUNCPTR_02007C34_H
diff --git a/include/overlay005/encounter_effect.h b/include/overlay005/encounter_effect.h
index d645f61f76..fbd70c3aa4 100644
--- a/include/overlay005/encounter_effect.h
+++ b/include/overlay005/encounter_effect.h
@@ -14,10 +14,10 @@
 #include "overlay005/struct_ov5_021DE5A4.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enc_effects.h"
 #include "field_battle_data_transfer.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 
 typedef struct EncounterEffect {
@@ -140,8 +140,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(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);
+void ov5_021DE5D0(Sprite *param0, u32 param1, u32 param2, u8 param3, u16 param4);
+Sprite *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 4995265817..cc6e125c81 100644
--- a/include/overlay005/ov5_021D2F14.h
+++ b/include/overlay005/ov5_021D2F14.h
@@ -3,13 +3,13 @@
 
 #include "overlay005/struct_ov5_021D30A8.h"
 
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_system.h"
 
 void ov5_021D2F14(UnkStruct_ov5_021D30A8 *param0, const SpriteResourceDataPaths *param1, u32 param2, u32 param3);
 void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0);
-CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1);
+Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1);
 void ov5_021D3190(UnkStruct_ov5_021D30A8 *param0, SpriteResourceCapacities *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);
@@ -19,7 +19,7 @@ void ov5_021D3388(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, int pa
 void ov5_021D339C(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, int param3, int param4);
 void ov5_021D33B0(UnkStruct_ov5_021D30A8 *param0, int param1, int param2, BOOL param3, int param4, int param5);
 void ov5_021D3414(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5);
-CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1);
+ManagedSprite *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1);
 void ov5_021D375C(UnkStruct_ov5_021D30A8 *param0);
 
 #endif // POKEPLATINUM_OV5_021D2F14_H
diff --git a/include/overlay005/struct_ov5_021D30A8.h b/include/overlay005/struct_ov5_021D30A8.h
index 8688cd875f..491d963ba0 100644
--- a/include/overlay005/struct_ov5_021D30A8.h
+++ b/include/overlay005/struct_ov5_021D30A8.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV5_021D30A8_H
 #define POKEPLATINUM_STRUCT_OV5_021D30A8_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourcesHeaderList *unk_190;
     SpriteResourceCollection *unk_194[6];
diff --git a/include/overlay005/struct_ov5_021DE47C.h b/include/overlay005/struct_ov5_021DE47C.h
index 9db5a4b816..ae0e96bb38 100644
--- a/include/overlay005/struct_ov5_021DE47C.h
+++ b/include/overlay005/struct_ov5_021DE47C.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV5_021DE47C_H
 #define POKEPLATINUM_STRUCT_OV5_021DE47C_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
 } UnkStruct_ov5_021DE47C;
diff --git a/include/overlay005/struct_ov5_021DE5A4.h b/include/overlay005/struct_ov5_021DE5A4.h
index aaed283be8..2f3438b921 100644
--- a/include/overlay005/struct_ov5_021DE5A4.h
+++ b/include/overlay005/struct_ov5_021DE5A4.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV5_021DE5A4_H
 #define POKEPLATINUM_STRUCT_OV5_021DE5A4_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorResourceData unk_10;
+    SpriteResourcesHeader unk_10;
 } UnkStruct_ov5_021DE5A4;
 
 #endif // POKEPLATINUM_STRUCT_OV5_021DE5A4_H
diff --git a/include/overlay006/ov6_022426AC.h b/include/overlay006/ov6_022426AC.h
index 147be20d5d..6580d5af43 100644
--- a/include/overlay006/ov6_022426AC.h
+++ b/include/overlay006/ov6_022426AC.h
@@ -3,7 +3,7 @@
 
 #include "struct_defs/archived_sprite.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
@@ -13,9 +13,9 @@ typedef struct GreatMarshLookout_SpriteResources {
     void *unk_20;
     void *unk_24;
     ArchivedSprite unk_28;
-    CellActorCollection *unk_38;
+    SpriteList *unk_38;
     G2dRenderer unk_3C;
-    CellActor *unk_1C8;
+    Sprite *unk_1C8;
     BOOL unk_1CC;
     BOOL unk_1D0;
 } GreatMarshLookout_SpriteResources;
diff --git a/include/overlay007/struct_ov7_0224D008.h b/include/overlay007/struct_ov7_0224D008.h
index 84f72a1d44..5c62d44aa4 100644
--- a/include/overlay007/struct_ov7_0224D008.h
+++ b/include/overlay007/struct_ov7_0224D008.h
@@ -7,7 +7,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "game_records.h"
 #include "journal.h"
@@ -15,6 +14,7 @@
 #include "menu.h"
 #include "message.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_list.h"
 #include "string_template.h"
@@ -34,7 +34,7 @@ typedef struct {
     StringTemplate *unk_8C;
     Camera *camera;
     UnkStruct_ov5_021D30A8 unk_94;
-    CellActor *unk_25C[4];
+    Sprite *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 d23b651bf5..cfcbcf8cd9 100644
--- a/include/overlay012/funcptr_ov12_02239E64_1.h
+++ b/include/overlay012/funcptr_ov12_02239E64_1.h
@@ -3,9 +3,9 @@
 
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_system.h"
 
-typedef void (*UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, CellActor *);
+typedef void (*UnkFuncPtr_ov12_02239E64_1)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, Sprite *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E64_1_H
diff --git a/include/overlay012/funcptr_ov12_02239E68.h b/include/overlay012/funcptr_ov12_02239E68.h
index 61b6728d21..81575ee21c 100644
--- a/include/overlay012/funcptr_ov12_02239E68.h
+++ b/include/overlay012/funcptr_ov12_02239E68.h
@@ -5,6 +5,6 @@
 
 #include "sprite_system.h"
 
-typedef void (*UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, CellActorData *);
+typedef void (*UnkFuncPtr_ov12_02239E68)(UnkStruct_ov12_0221FCDC *, SpriteSystem *, SpriteManager *, ManagedSprite *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV12_02239E68_H
diff --git a/include/overlay012/ov12_0221FC20.h b/include/overlay012/ov12_0221FC20.h
index 87d92afecf..03d33b9bce 100644
--- a/include/overlay012/ov12_0221FC20.h
+++ b/include/overlay012/ov12_0221FC20.h
@@ -41,8 +41,8 @@ UnkStruct_02014014 *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1);
 SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1);
 BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0);
 s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1);
-CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1);
-CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1);
+ManagedSprite *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1);
+ManagedSprite *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1);
 SpriteManager *ov12_022202EC(UnkStruct_ov12_0221FCDC *param0);
 SpriteManager *ov12_02220300(UnkStruct_ov12_0221FCDC *param0);
 SpriteSystem *ov12_02220308(UnkStruct_ov12_0221FCDC *param0);
@@ -65,7 +65,7 @@ int ov12_022232C4(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_022232D0(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_022232E0(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1);
-Sprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1);
+PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1);
 PaletteData *ov12_0222332C(UnkStruct_ov12_0221FCDC *param0);
 int ov12_02223334(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_02223344(UnkStruct_ov12_0221FCDC *param0, int param1);
diff --git a/include/overlay012/ov12_02225864.h b/include/overlay012/ov12_02225864.h
index b1a57eb3e2..da88bc82f7 100644
--- a/include/overlay012/ov12_02225864.h
+++ b/include/overlay012/ov12_02225864.h
@@ -14,32 +14,32 @@
 #include "overlay012/struct_ov12_022267D4_decl.h"
 
 #include "palette.h"
-#include "sprite_system.h"
+#include "sprite.h"
 
 void ov12_02225864(int param0, int param1, s16 *param2, s16 *param3);
 void ov12_02225898(UnkStruct_ov12_0221FCDC *param0, int param1, s16 *param2, s16 *param3);
 s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2);
-u8 ov12_02225950(CellActorData *param0);
+u8 ov12_02225950(ManagedSprite *param0);
 int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_0222598C(UnkStruct_ov12_0221FCDC *param0, int param1);
 fx32 ov12_022259A0(fx32 param0, fx32 param1, u32 param2);
 u32 ov12_022259AC(fx32 param0, fx32 param1, fx32 param2);
-void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1, s16 param2, s16 param3);
-void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1);
-void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, Sprite *param1, s16 param2, s16 param3);
-void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, Sprite *param1);
+void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1, s16 param2, s16 param3);
+void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1);
+void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1, s16 param2, s16 param3);
+void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1);
 void ov12_02225A5C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, int param7);
 void ov12_02225A8C(UnkStruct_ov12_02225F6C *param0, u16 param1, u16 param2, u16 param3, u16 param4, fx32 param5, fx32 param6, u16 param7);
 BOOL ov12_02225AE0(UnkStruct_ov12_02225F6C *param0);
-BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, CellActorData *param3);
-BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3);
+BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, ManagedSprite *param3);
+BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, PokemonSprite *param3);
 void ov12_02225BC8(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16 param3, s16 param4, u16 param5);
 BOOL ov12_02225C14(UnkStruct_ov12_02225F6C *param0);
-BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, CellActorData *param1);
-BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, Sprite *param1);
+BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1);
+BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1);
 void ov12_02225C98(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, s16 param2, s16 param3, s16 param4, s16 param5, u16 param6, fx32 param7);
 BOOL ov12_02225CE4(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1);
-BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, CellActorData *param2);
+BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, ManagedSprite *param2);
 void ov12_02225D50(UnkStruct_ov12_02225D50 *param0, s32 param1, s32 param2, u32 param3);
 void ov12_02225D78(UnkStruct_ov12_02225D50 *param0, s16 param1, s16 param2, u32 param3);
 BOOL ov12_02225DA0(UnkStruct_ov12_02225D50 *param0);
@@ -52,15 +52,15 @@ void ov12_02225EF0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, s16
 BOOL ov12_02225F6C(UnkStruct_ov12_02225F6C *param0);
 void ov12_02225FA4(UnkStruct_ov12_02225F6C *param0, f32 *param1, f32 *param2);
 s16 ov12_02225FD4(s16 param0, int param1, fx32 param2);
-void ov12_02226024(Sprite *param0, s16 param1, s16 param2, fx32 param3, int param4);
-void ov12_0222605C(CellActorData *param0, s16 param1, s16 param2, fx32 param3, int param4);
-BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, CellActorData *param1);
-BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, Sprite *param1);
-BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, Sprite *param1);
+void ov12_02226024(PokemonSprite *param0, s16 param1, s16 param2, fx32 param3, int param4);
+void ov12_0222605C(ManagedSprite *param0, s16 param1, s16 param2, fx32 param3, int param4);
+BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1);
+BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1);
+BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1);
 void ov12_02226108(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, u32 param3, u32 param4);
 BOOL ov12_02226138(UnkStruct_ov12_02225F6C *param0);
-BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3);
-void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData *param8, CellActorData *param9, CellActorData *param10, CellActorData *param11);
+BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, PokemonSprite *param3);
+void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, ManagedSprite *param8, ManagedSprite *param9, ManagedSprite *param10, ManagedSprite *param11);
 BOOL ov12_02226274(UnkStruct_ov12_02226274 *param0);
 void ov12_022263A4(UnkStruct_ov12_02225F6C *param0, int param1, int param2);
 void ov12_02226424(UnkStruct_ov12_02226454 *param0, s16 param1, s16 param2, s16 param3, s16 param4, int param5);
diff --git a/include/overlay012/ov12_022269C0.h b/include/overlay012/ov12_022269C0.h
index 889d60f2c5..0ff7d00b7a 100644
--- a/include/overlay012/ov12_022269C0.h
+++ b/include/overlay012/ov12_022269C0.h
@@ -9,6 +9,6 @@ void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022269EC(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02226A3C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02226A88(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 
 #endif // POKEPLATINUM_OV12_022269C0_H
diff --git a/include/overlay012/ov12_02226B84.h b/include/overlay012/ov12_02226B84.h
index eb09652cd4..a4847faaa3 100644
--- a/include/overlay012/ov12_02226B84.h
+++ b/include/overlay012/ov12_02226B84.h
@@ -10,7 +10,7 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02227408(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02227534(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02227828(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222797C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0);
@@ -37,10 +37,10 @@ void ov12_02229B28(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02229C5C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02229E54(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222A00C(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0222A604(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0);
diff --git a/include/overlay012/ov12_0222AC70.h b/include/overlay012/ov12_0222AC70.h
index dd15c12a3a..add53f0abe 100644
--- a/include/overlay012/ov12_0222AC70.h
+++ b/include/overlay012/ov12_0222AC70.h
@@ -5,7 +5,7 @@
 
 #include "sprite_system.h"
 
-void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0222B194(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222B45C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0);
@@ -21,8 +21,8 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222C8F8(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222CA2C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222CB90(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 
 #endif // POKEPLATINUM_OV12_0222AC70_H
diff --git a/include/overlay012/ov12_0222D6B0.h b/include/overlay012/ov12_0222D6B0.h
index 6a2cc361a8..16d29fbcb7 100644
--- a/include/overlay012/ov12_0222D6B0.h
+++ b/include/overlay012/ov12_0222D6B0.h
@@ -5,12 +5,12 @@
 
 #include "sprite_system.h"
 
-void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222E248(CellActorData *param0);
-void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222E248(ManagedSprite *param0);
+void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 
 #endif // POKEPLATINUM_OV12_0222D6B0_H
diff --git a/include/overlay012/ov12_0222E91C.h b/include/overlay012/ov12_0222E91C.h
index ab323d9971..5ed94a6fda 100644
--- a/include/overlay012/ov12_0222E91C.h
+++ b/include/overlay012/ov12_0222E91C.h
@@ -6,7 +6,7 @@
 #include "sprite_system.h"
 
 void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0);
diff --git a/include/overlay012/ov12_0222F700.h b/include/overlay012/ov12_0222F700.h
index b5deca5cfc..0a5c8652b8 100644
--- a/include/overlay012/ov12_0222F700.h
+++ b/include/overlay012/ov12_0222F700.h
@@ -7,33 +7,33 @@
 
 void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0);
 void ov12_0222F9E4(UnkStruct_ov12_0221FCDC *param0);
-void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02230754(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02230804(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02231444(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02231E7C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02232024(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_0223249C(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022326AC(UnkStruct_ov12_0221FCDC *param0);
-void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02233178(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0);
 void ov12_02233F30(UnkStruct_ov12_0221FCDC *param0);
-void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 void ov12_02234214(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0);
 void ov12_022344D0(UnkStruct_ov12_0221FCDC *param0);
diff --git a/include/overlay012/ov12_022346A4.h b/include/overlay012/ov12_022346A4.h
index 5c9e6a3477..41d66b96a9 100644
--- a/include/overlay012/ov12_022346A4.h
+++ b/include/overlay012/ov12_022346A4.h
@@ -5,9 +5,9 @@
 
 #include "sprite_system.h"
 
-void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
-void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3);
+void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
+void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3);
 
 #endif // POKEPLATINUM_OV12_022346A4_H
diff --git a/include/overlay012/ov12_02235254.h b/include/overlay012/ov12_02235254.h
index 7d9c188bed..942457a51d 100644
--- a/include/overlay012/ov12_02235254.h
+++ b/include/overlay012/ov12_02235254.h
@@ -10,7 +10,7 @@
 #include "overlay012/struct_ov12_0223595C.h"
 #include "overlay012/struct_ov12_02235998.h"
 
-#include "sprite_system.h"
+#include "sprite.h"
 
 int ov12_02235254(UnkStruct_ov12_0221FCDC *param0, int param1);
 int ov12_0223525C(UnkStruct_ov12_0221FCDC *param0, int param1);
@@ -50,8 +50,8 @@ void ov12_02235780(UnkStruct_ov12_0221FCDC *param0, int param1, int param2);
 void ov12_022357BC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2, int param3);
 void ov12_022357EC(UnkStruct_ov12_0221FCDC *param0, int param1, int param2);
 void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2);
-void ov12_02235918(Sprite *param0, UnkStruct_ov12_02235350 *param1);
-void ov12_02235950(CellActorData *param0, UnkStruct_ov12_02235350 *param1);
+void ov12_02235918(PokemonSprite *param0, UnkStruct_ov12_02235350 *param1);
+void ov12_02235950(ManagedSprite *param0, UnkStruct_ov12_02235350 *param1);
 void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1);
 void ov12_02235998(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3);
 void ov12_02235D74(UnkStruct_ov12_0221FCDC *param0, int param1, UnkStruct_ov12_02235998 *param2, int *param3);
diff --git a/include/overlay012/struct_ov12_02223764.h b/include/overlay012/struct_ov12_02223764.h
index d9077a8fd4..e9838dc499 100644
--- a/include/overlay012/struct_ov12_02223764.h
+++ b/include/overlay012/struct_ov12_02223764.h
@@ -13,10 +13,10 @@ typedef struct {
     int unk_04;
     UnkStruct_ov12_02223764_sub1 unk_08;
     int unk_14[4];
-    CellActorData *unk_24[4];
+    ManagedSprite *unk_24[4];
     UnkStruct_ov16_0223E0C8 *unk_34[4];
     u8 unk_44[4];
-    Sprite *unk_48[4];
+    PokemonSprite *unk_48[4];
 } UnkStruct_ov12_02223764;
 
 #endif // POKEPLATINUM_STRUCT_OV12_02223764_H
diff --git a/include/overlay012/struct_ov12_02226274.h b/include/overlay012/struct_ov12_02226274.h
index 7b0166a9c3..0e0614d9a0 100644
--- a/include/overlay012/struct_ov12_02226274.h
+++ b/include/overlay012/struct_ov12_02226274.h
@@ -11,7 +11,7 @@ typedef struct {
     s16 unk_02;
     UnkStruct_ov12_02225F6C unk_04[4];
     UnkFuncPtr_ov12_02226274 unk_94;
-    CellActorData *unk_98[4];
+    ManagedSprite *unk_98[4];
     u16 unk_A8;
     u16 unk_AA;
     u8 unk_AC;
diff --git a/include/overlay012/struct_ov12_02235998.h b/include/overlay012/struct_ov12_02235998.h
index 8b8c41e5c9..c013b5fb44 100644
--- a/include/overlay012/struct_ov12_02235998.h
+++ b/include/overlay012/struct_ov12_02235998.h
@@ -5,13 +5,13 @@
 
 #include "overlay012/struct_ov12_02235350.h"
 
-#include "sprite_system.h"
+#include "sprite.h"
 
 typedef struct {
     UnkStruct_ov12_02235350 unk_00;
     UnkStruct_ov12_02235350 unk_04;
-    Sprite *unk_08;
-    CellActorData *unk_0C;
+    PokemonSprite *unk_08;
+    ManagedSprite *unk_0C;
     int unk_10;
 } UnkStruct_ov12_02235998;
 
diff --git a/include/overlay012/struct_ov12_022380DC.h b/include/overlay012/struct_ov12_022380DC.h
index 152b1e1abf..94a46ca7aa 100644
--- a/include/overlay012/struct_ov12_022380DC.h
+++ b/include/overlay012/struct_ov12_022380DC.h
@@ -9,7 +9,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     UnkStruct_ov16_0223E0C8 *unk_08[4];
-    Sprite *unk_18[4];
+    PokemonSprite *unk_18[4];
     u16 unk_28[4];
     u8 unk_30[4];
     u8 unk_34[4];
diff --git a/include/overlay013/struct_ov13_022213F0.h b/include/overlay013/struct_ov13_022213F0.h
index ba5938818a..0b64a225e9 100644
--- a/include/overlay013/struct_ov13_022213F0.h
+++ b/include/overlay013/struct_ov13_022213F0.h
@@ -42,7 +42,7 @@ typedef struct {
     StringTemplate *unk_1FA8;
     Strbuf *unk_1FAC;
     SpriteManager *unk_1FB0;
-    CellActorData *unk_1FB4[38];
+    ManagedSprite *unk_1FB4[38];
     Window unk_204C[2];
     Window *unk_206C;
     u8 unk_2070;
diff --git a/include/overlay013/struct_ov13_02227244.h b/include/overlay013/struct_ov13_02227244.h
index fafb2ec635..847b33d1d4 100644
--- a/include/overlay013/struct_ov13_02227244.h
+++ b/include/overlay013/struct_ov13_02227244.h
@@ -32,7 +32,7 @@ typedef struct {
     UnkStruct_ov16_0226DEEC *unk_38;
     BagItem unk_3C[5][36];
     SpriteManager *unk_30C;
-    CellActorData *unk_310[6];
+    ManagedSprite *unk_310[6];
     u16 unk_328[3][144];
     u16 unk_688[4][130];
     u16 unk_A98[3][25];
diff --git a/include/overlay017/ov17_02241270.h b/include/overlay017/ov17_02241270.h
index a49a8a3d7a..666d44fac2 100644
--- a/include/overlay017/ov17_02241270.h
+++ b/include/overlay017/ov17_02241270.h
@@ -5,12 +5,12 @@
 #include "sprite_system.h"
 
 void ov17_02241270(SpriteSystem *param0, SpriteManager *param1, NARC *param2);
-CellActorData *ov17_022412C0(SpriteSystem *param0, SpriteManager *param1, int param2);
+ManagedSprite *ov17_022412C0(SpriteSystem *param0, SpriteManager *param1, int param2);
 void ov17_022412F0(SpriteManager *param0);
-void ov17_02241314(CellActorData *param0);
+void ov17_02241314(ManagedSprite *param0);
 void ov17_0224131C(SpriteSystem *param0, SpriteManager *param1, NARC *param2);
-CellActorData *ov17_0224136C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3, int param4);
-void ov17_022413AC(CellActorData *param0);
+ManagedSprite *ov17_0224136C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3, int param4);
+void ov17_022413AC(ManagedSprite *param0);
 void ov17_022413B4(SpriteManager *param0);
 
 #endif // POKEPLATINUM_OV17_02241270_H
diff --git a/include/overlay017/ov17_0224A0FC.h b/include/overlay017/ov17_0224A0FC.h
index cefecc614a..b3594123fc 100644
--- a/include/overlay017/ov17_0224A0FC.h
+++ b/include/overlay017/ov17_0224A0FC.h
@@ -62,7 +62,7 @@ void ov17_0224AFF8(SpriteManager *param0);
 BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 *param0);
 void ov17_0224B058(UnkStruct_ov17_0224DF54 *param0);
 void ov17_0224B068(UnkStruct_ov17_0224A1EC *param0, int param1);
-void ov17_0224B09C(Sprite *param0, UnkStruct_ov17_0224B09C *param1);
+void ov17_0224B09C(PokemonSprite *param0, UnkStruct_ov17_0224B09C *param1);
 void ov17_0224B0CC(UnkStruct_ov17_0224A1EC *param0);
 void ov17_0224B20C(UnkStruct_ov17_0224DF54 *param0, const UnkStruct_ov17_0224EDE0 *param1);
 void ov17_0224B59C(UnkStruct_ov17_0224DF54 *param0);
diff --git a/include/overlay017/ov17_0224F080.h b/include/overlay017/ov17_0224F080.h
index 821d77256d..695701e531 100644
--- a/include/overlay017/ov17_0224F080.h
+++ b/include/overlay017/ov17_0224F080.h
@@ -14,7 +14,7 @@ void ov17_0224F0BC(SpriteSystem *param0, SpriteManager *param1, NNS_G2D_VRAM_TYP
 void ov17_0224F0F0(SpriteSystem *param0, SpriteManager *param1, u32 param2, u32 param3);
 void ov17_0224F138(SpriteManager *param0, u32 param1);
 void ov17_0224F140(SpriteManager *param0, u32 param1, u32 param2);
-CellActorData *ov17_0224F154(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3);
-void ov17_0224F184(CellActorData *param0);
+ManagedSprite *ov17_0224F154(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3);
+void ov17_0224F184(ManagedSprite *param0);
 
 #endif // POKEPLATINUM_OV17_0224F080_H
diff --git a/include/overlay017/struct_ov17_0223F6E8.h b/include/overlay017/struct_ov17_0223F6E8.h
index e103f0e654..5c330eab8c 100644
--- a/include/overlay017/struct_ov17_0223F6E8.h
+++ b/include/overlay017/struct_ov17_0223F6E8.h
@@ -5,7 +5,7 @@
 #include "sys_task_manager.h"
 
 typedef struct {
-    CellActorData *unk_00[6];
+    ManagedSprite *unk_00[6];
     SysTask *unk_18;
 } UnkStruct_ov17_0223F6E8;
 
diff --git a/include/overlay017/struct_ov17_0223F88C.h b/include/overlay017/struct_ov17_0223F88C.h
index 591e9ada09..4d6566445f 100644
--- a/include/overlay017/struct_ov17_0223F88C.h
+++ b/include/overlay017/struct_ov17_0223F88C.h
@@ -20,7 +20,7 @@
 typedef struct {
     UnkStruct_02095C48_sub1 *unk_00;
     UnkStruct_02007768 *unk_04;
-    Sprite *unk_08[4];
+    PokemonSprite *unk_08[4];
     SpriteSystem *unk_18;
     SpriteManager *unk_1C;
     UnkStruct_ov12_0221FCDC *unk_20;
@@ -36,14 +36,14 @@ typedef struct {
     UnkStruct_02012744 *unk_54;
     UnkStruct_ov16_0223E0C8 unk_58[4];
     UnkStruct_ov16_0223E0C8 unk_98;
-    CellActorData *unk_A8[3];
-    CellActorData *unk_B4[3];
-    CellActorData *unk_C0;
-    CellActorData *unk_C4[4][6];
-    CellActorData *unk_124[3][5];
-    CellActorData *unk_160[4];
-    CellActorData *unk_170[3];
-    CellActorData *unk_17C;
+    ManagedSprite *unk_A8[3];
+    ManagedSprite *unk_B4[3];
+    ManagedSprite *unk_C0;
+    ManagedSprite *unk_C4[4][6];
+    ManagedSprite *unk_124[3][5];
+    ManagedSprite *unk_160[4];
+    ManagedSprite *unk_170[3];
+    ManagedSprite *unk_17C;
     UnkStruct_ov17_0223F2E4 unk_180[4];
     UnkStruct_ov17_0223F2E4 unk_1C8[4];
     u8 unk_210;
diff --git a/include/overlay017/struct_ov17_022476F8.h b/include/overlay017/struct_ov17_022476F8.h
index 040b6a8047..f82b227fbb 100644
--- a/include/overlay017/struct_ov17_022476F8.h
+++ b/include/overlay017/struct_ov17_022476F8.h
@@ -18,8 +18,8 @@
 typedef struct {
     UnkStruct_02095C48_sub1 *unk_00;
     UnkStruct_02007768 *unk_04;
-    Sprite *unk_08[4];
-    Sprite *unk_18;
+    PokemonSprite *unk_08[4];
+    PokemonSprite *unk_18;
     SpriteSystem *unk_1C;
     SpriteManager *unk_20;
     BgConfig *unk_24;
@@ -29,7 +29,7 @@ typedef struct {
     Strbuf *unk_40;
     PaletteData *unk_44;
     UnkStruct_ov16_0223E0C8 unk_48[4];
-    CellActorData *unk_88[8];
+    ManagedSprite *unk_88[8];
     UnkStruct_ov17_0223F6E8 unk_A8;
     u8 unk_C4;
 } UnkStruct_ov17_022476F8;
diff --git a/include/overlay017/struct_ov17_0224A1EC.h b/include/overlay017/struct_ov17_0224A1EC.h
index cd945f7f2d..8cf7333fc8 100644
--- a/include/overlay017/struct_ov17_0224A1EC.h
+++ b/include/overlay017/struct_ov17_0224A1EC.h
@@ -30,7 +30,7 @@ typedef struct {
     UnkStruct_02095C48_sub1 *unk_00;
     UnkStruct_ov17_0224B09C unk_04[4];
     UnkStruct_02007768 *unk_44;
-    Sprite *unk_48[4];
+    PokemonSprite *unk_48[4];
     SpriteSystem *unk_58;
     SpriteManager *unk_5C;
     BgConfig *unk_60;
@@ -41,8 +41,8 @@ typedef struct {
     PaletteData *unk_90;
     UnkStruct_02012744 *unk_94;
     UnkStruct_ov16_0223E0C8 unk_98[4];
-    CellActorData *unk_D8[68];
-    CellActorData *unk_1E8;
+    ManagedSprite *unk_D8[68];
+    ManagedSprite *unk_1E8;
     SysTask *unk_1EC;
     UnkStruct_ov17_0224C9A4 unk_1F0;
     UnkStruct_ov17_0224C384 *unk_1FC;
@@ -51,7 +51,7 @@ typedef struct {
     UnkStruct_ov17_0224AE84 unk_290[4][16];
     UnkStruct_ov17_0224B058 unk_910;
     UnkStruct_ov17_0224A8D4 unk_92C[3];
-    CellActorData *unk_960[3];
+    ManagedSprite *unk_960[3];
     UnkStruct_ov17_0223F2E4 unk_96C[3][3];
     const UnkStruct_ov17_02253084 *unk_A10;
     u8 unk_A14[4];
diff --git a/include/overlay017/struct_ov17_0224A1EC_sub1.h b/include/overlay017/struct_ov17_0224A1EC_sub1.h
index 833203504e..466f6e5fea 100644
--- a/include/overlay017/struct_ov17_0224A1EC_sub1.h
+++ b/include/overlay017/struct_ov17_0224A1EC_sub1.h
@@ -8,7 +8,7 @@ struct UnkStruct_ov17_0224DF54_t;
 
 typedef struct {
     SysTask *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     struct UnkStruct_ov17_0224DF54_t *unk_08;
     u8 unk_0C;
     u8 unk_0D;
diff --git a/include/overlay017/struct_ov17_0224A8D4.h b/include/overlay017/struct_ov17_0224A8D4.h
index 54bfe6d74e..25bbfce7f3 100644
--- a/include/overlay017/struct_ov17_0224A8D4.h
+++ b/include/overlay017/struct_ov17_0224A8D4.h
@@ -7,7 +7,7 @@
 #include "sys_task_manager.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov17_0223F2E4 *unk_04;
     SysTask *unk_08;
     s32 unk_0C;
diff --git a/include/overlay017/struct_ov17_0224ABFC.h b/include/overlay017/struct_ov17_0224ABFC.h
index 84eb38862f..d76265da8a 100644
--- a/include/overlay017/struct_ov17_0224ABFC.h
+++ b/include/overlay017/struct_ov17_0224ABFC.h
@@ -10,7 +10,7 @@ struct UnkStruct_ov17_0224DF54_t;
 
 typedef struct {
     SysTask *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     struct UnkStruct_ov17_0224DF54_t *unk_08;
     UnkStruct_ov17_0224B09C *unk_0C;
     u8 unk_10;
diff --git a/include/overlay017/struct_ov17_0224AE84.h b/include/overlay017/struct_ov17_0224AE84.h
index d4d9c5e6b3..1d1ce24353 100644
--- a/include/overlay017/struct_ov17_0224AE84.h
+++ b/include/overlay017/struct_ov17_0224AE84.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     SysTask *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     s32 unk_08;
     s32 unk_0C;
     s32 unk_10;
diff --git a/include/overlay017/struct_ov17_0224B058.h b/include/overlay017/struct_ov17_0224B058.h
index 0a45fc1d35..5c2a97608c 100644
--- a/include/overlay017/struct_ov17_0224B058.h
+++ b/include/overlay017/struct_ov17_0224B058.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     SysTask *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     s32 unk_08;
     s32 unk_0C;
     s32 unk_10;
diff --git a/include/overlay017/struct_ov17_0224BE50.h b/include/overlay017/struct_ov17_0224BE50.h
index b0bf43687e..4f0b6d3709 100644
--- a/include/overlay017/struct_ov17_0224BE50.h
+++ b/include/overlay017/struct_ov17_0224BE50.h
@@ -12,7 +12,7 @@ struct UnkStruct_ov17_0224DF54_t;
 typedef struct {
     struct UnkStruct_ov17_0224DF54_t *unk_00;
     SysTask *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov17_0224B09C *unk_0C;
     s32 unk_10;
     s32 unk_14;
diff --git a/include/overlay017/struct_ov17_0224C384.h b/include/overlay017/struct_ov17_0224C384.h
index 5fa5414311..5009bf3120 100644
--- a/include/overlay017/struct_ov17_0224C384.h
+++ b/include/overlay017/struct_ov17_0224C384.h
@@ -8,7 +8,7 @@ struct UnkStruct_ov17_0224DF54_t;
 
 typedef struct {
     SysTask *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     struct UnkStruct_ov17_0224DF54_t *unk_08;
     u8 unk_0C;
 } UnkStruct_ov17_0224C384;
diff --git a/include/overlay017/struct_ov17_0224E1F4.h b/include/overlay017/struct_ov17_0224E1F4.h
index 366aa9e0df..7855c63928 100644
--- a/include/overlay017/struct_ov17_0224E1F4.h
+++ b/include/overlay017/struct_ov17_0224E1F4.h
@@ -9,7 +9,7 @@
 
 typedef struct {
     Pokemon *unk_00;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     UnkStruct_ov17_0224B09C *unk_08;
     u8 unk_0C;
     u8 unk_0D;
diff --git a/include/overlay017/struct_ov17_022507C4.h b/include/overlay017/struct_ov17_022507C4.h
index fe2adb905b..1f86dcd19d 100644
--- a/include/overlay017/struct_ov17_022507C4.h
+++ b/include/overlay017/struct_ov17_022507C4.h
@@ -20,7 +20,7 @@
 typedef struct {
     UnkStruct_02095C48_sub1 *unk_00;
     UnkStruct_02007768 *unk_04;
-    Sprite *unk_08[4];
+    PokemonSprite *unk_08[4];
     SpriteSystem *unk_18;
     SpriteManager *unk_1C;
     BgConfig *unk_20;
@@ -33,11 +33,11 @@ typedef struct {
     UnkStruct_ov16_0223E0C8 unk_C8[4];
     UnkStruct_ov17_0223F6E8 unk_108;
     SysTask *unk_124;
-    CellActorData *unk_128[4];
-    CellActorData *unk_138[4];
-    CellActorData *unk_148[4][12];
-    CellActorData *unk_208[4][12];
-    CellActorData *unk_2C8[4][12];
+    ManagedSprite *unk_128[4];
+    ManagedSprite *unk_138[4];
+    ManagedSprite *unk_148[4][12];
+    ManagedSprite *unk_208[4][12];
+    ManagedSprite *unk_2C8[4][12];
     u8 unk_388;
 } UnkStruct_ov17_022507C4;
 
diff --git a/include/overlay019/ov19_021D61B0.h b/include/overlay019/ov19_021D61B0.h
index eca4e7f717..0cd7933dcc 100644
--- a/include/overlay019/ov19_021D61B0.h
+++ b/include/overlay019/ov19_021D61B0.h
@@ -16,7 +16,7 @@
 #include "overlay019/struct_ov19_021DC680.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 
 BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4DF0 *param1, const UnkStruct_ov19_021D5DF8 *param2);
@@ -34,9 +34,9 @@ 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(CellActorResourceData *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5);
-CellActor *ov19_021D785C(CellActorCollection *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5);
-void ov19_021D78AC(CellActor *param0, u32 param1);
+void ov19_021D783C(SpriteResourcesHeader *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5);
+Sprite *ov19_021D785C(SpriteList *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov19_021D78AC(Sprite *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 89b8b10445..32bb7c6c3e 100644
--- a/include/overlay019/ov19_021D79F8.h
+++ b/include/overlay019/ov19_021D79F8.h
@@ -8,9 +8,9 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
-BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
+BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 060e9f0e77..5584150b75 100644
--- a/include/overlay019/ov19_021D8B54.h
+++ b/include/overlay019/ov19_021D8B54.h
@@ -7,10 +7,10 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8E00.h"
 
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4);
+BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *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 b8a9c12a75..490d5f9d84 100644
--- a/include/overlay019/ov19_021DA270.h
+++ b/include/overlay019/ov19_021DA270.h
@@ -8,11 +8,11 @@
 #include "overlay019/struct_ov19_021DA384.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
-#include "cell_actor.h"
 #include "narc.h"
 #include "pokemon.h"
+#include "sprite.h"
 
-BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4);
+BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *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 480b8eaea2..38afc6fbcc 100644
--- a/include/overlay019/ov19_021DA814.h
+++ b/include/overlay019/ov19_021DA814.h
@@ -5,10 +5,10 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4);
+BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *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 e887a6d4dc..90525971ca 100644
--- a/include/overlay019/ov19_021DA92C.h
+++ b/include/overlay019/ov19_021DA92C.h
@@ -6,11 +6,11 @@
 #include "overlay019/struct_ov19_021DA9E0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6);
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 8a17a684dd..0e712da81b 100644
--- a/include/overlay019/ov19_021DB2FC.h
+++ b/include/overlay019/ov19_021DB2FC.h
@@ -7,11 +7,11 @@
 #include "overlay019/struct_ov19_021DF964.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *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, BgConfig *param3, SpriteList *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 ab7dfedea4..2f1fb03aa5 100644
--- a/include/overlay019/ov19_021DB8E4.h
+++ b/include/overlay019/ov19_021DB8E4.h
@@ -8,10 +8,10 @@
 #include "overlay019/struct_ov19_021DBA9C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5);
+BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 ab21fbce25..7e3a571d44 100644
--- a/include/overlay019/ov19_021DC5F0.h
+++ b/include/overlay019/ov19_021DC5F0.h
@@ -7,10 +7,10 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5);
+BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 8ecf969136..f5078143e4 100644
--- a/include/overlay019/ov19_021DCF88.h
+++ b/include/overlay019/ov19_021DCF88.h
@@ -6,10 +6,10 @@
 #include "overlay019/struct_ov19_021DCF88_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
+BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 cec4fe0d0d..7f2b525841 100644
--- a/include/overlay019/ov19_021DE3E8.h
+++ b/include/overlay019/ov19_021DE3E8.h
@@ -8,9 +8,9 @@
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
-BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
+BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 85c5c8a2fd..cbaf9d1e52 100644
--- a/include/overlay019/ov19_021DEC04.h
+++ b/include/overlay019/ov19_021DEC04.h
@@ -6,11 +6,11 @@
 #include "overlay019/struct_ov19_021DEC04_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6);
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *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 929ff367ca..0f66229242 100644
--- a/include/overlay019/struct_ov19_021D8E00.h
+++ b/include/overlay019/struct_ov19_021D8E00.h
@@ -11,14 +11,14 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
-    CellActor *unk_04;
-    CellActor *unk_08;
-    CellActor *unk_0C;
-    CellActor *unk_10;
+    SpriteList *unk_00;
+    Sprite *unk_04;
+    Sprite *unk_08;
+    Sprite *unk_0C;
+    Sprite *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 d13daf5e88..1fa1eebe02 100644
--- a/include/overlay019/struct_ov19_021DA384.h
+++ b/include/overlay019/struct_ov19_021DA384.h
@@ -6,8 +6,8 @@
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
 typedef struct {
     void *unk_00;
@@ -19,7 +19,7 @@ typedef struct {
     void *unk_18;
     NNSG2dCellDataBank *unk_1C;
     NNSG2dAnimBankData *unk_20;
-    CellActorCollection *unk_24;
+    SpriteList *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 09892ceb09..72e1a8f7a5 100644
--- a/include/overlay019/struct_ov19_021DA8D8.h
+++ b/include/overlay019/struct_ov19_021DA8D8.h
@@ -6,17 +6,17 @@
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
-    CellActor *unk_04;
+    SpriteList *unk_00;
+    Sprite *unk_04;
     void *unk_08;
     void *unk_0C;
     NNSG2dCellDataBank *unk_10;
     NNSG2dAnimBankData *unk_14;
     NNSG2dImageProxy unk_18;
-    CellActorCollection *unk_3C;
+    SpriteList *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 6ecca6244f..59e12e0154 100644
--- a/include/overlay019/struct_ov19_021DA9E0.h
+++ b/include/overlay019/struct_ov19_021DA9E0.h
@@ -11,7 +11,7 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task_manager.h"
 
@@ -19,19 +19,19 @@ typedef struct {
     BOOL unk_00;
     Window *unk_04;
     BgConfig *unk_08;
-    CellActorCollection *unk_0C;
+    SpriteList *unk_0C;
     const UnkStruct_ov19_021D4DF0 *unk_10;
     UnkStruct_ov19_021D61B0 *unk_14;
     UnkStruct_0200C440 *unk_18;
     UnkStruct_0200C440 *unk_1C;
     UnkStruct_02007768 *unk_20;
-    Sprite *unk_24;
+    PokemonSprite *unk_24;
     void *unk_28;
     NNSG2dCellDataBank *unk_2C;
-    CellActor *unk_30;
+    Sprite *unk_30;
     void *unk_34;
     NNSG2dCellDataBank *unk_38;
-    CellActor *unk_3C[2];
+    Sprite *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 dad97893d3..e956b6de2c 100644
--- a/include/overlay019/struct_ov19_021DBA9C.h
+++ b/include/overlay019/struct_ov19_021DBA9C.h
@@ -9,15 +9,15 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task_manager.h"
 
 typedef struct {
     UnkStruct_ov19_021D61B0 *unk_00;
     BgConfig *unk_04;
-    CellActorCollection *unk_08;
+    SpriteList *unk_08;
     const UnkStruct_ov19_021D4DF0 *unk_0C;
     Window *unk_10;
     void *unk_14;
@@ -31,8 +31,8 @@ typedef struct {
     NNSG2dScreenData *unk_38;
     Bitmap unk_3C;
     UnkStruct_0200C440 *unk_44;
-    CellActor *unk_48[18];
-    CellActor *unk_90;
+    Sprite *unk_48[18];
+    Sprite *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 838a64d644..c049b409b2 100644
--- a/include/overlay019/struct_ov19_021DC680.h
+++ b/include/overlay019/struct_ov19_021DC680.h
@@ -10,12 +10,12 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     UnkStruct_ov19_021D61B0 *unk_00;
     BgConfig *unk_04;
-    CellActorCollection *unk_08;
+    SpriteList *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 a489684904..4df4b79d5e 100644
--- a/include/overlay019/struct_ov19_021DCD18.h
+++ b/include/overlay019/struct_ov19_021DCD18.h
@@ -3,10 +3,10 @@
 
 #include <nnsys.h>
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *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 f5295122b7..d8ecaa6b92 100644
--- a/include/overlay020/ov20_021D2098.h
+++ b/include/overlay020/ov20_021D2098.h
@@ -7,7 +7,7 @@
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 
 UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, const UnkStruct_020998EC *param1);
@@ -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);
 BgConfig *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0);
-CellActorCollection *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0);
-void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3);
-CellActor *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5);
+SpriteList *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0);
+void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3);
+Sprite *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, SpriteResourcesHeader *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 e4a1ba97cb..ea1349559b 100644
--- a/include/overlay021/ov21_021D0D80.h
+++ b/include/overlay021/ov21_021D0D80.h
@@ -15,9 +15,9 @@
 #include "overlay021/struct_ov21_021E68F4.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "overlay_manager.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "touch_screen.h"
 
@@ -58,9 +58,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(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_021D144C(Sprite *param0, int param1);
+void ov21_021D1498(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2);
+void ov21_021D1524(Sprite *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 Pokedex_SetLoadingScreenParams(PokedexLoadingScreen *param0, BgConfig *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8);
 BOOL Pokedex_LoadingScreenMove(PokedexLoadingScreen *param0);
diff --git a/include/overlay021/ov21_021D1FA4.h b/include/overlay021/ov21_021D1FA4.h
index 2b15e6cd66..c53a222d5e 100644
--- a/include/overlay021/ov21_021D1FA4.h
+++ b/include/overlay021/ov21_021D1FA4.h
@@ -15,8 +15,8 @@
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1);
@@ -24,15 +24,15 @@ void ov21_021D2098(UnkStruct_ov21_021D13FC *param0);
 void ov21_021D2124(UnkStruct_ov21_021D13FC *param0);
 void ov21_021D214C(UnkStruct_ov21_021D13FC *param0);
 void ov21_021D2164(UnkStruct_ov21_021D13FC *param0, int param1, int param2);
-Sprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0);
+PokemonSprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0);
 void ov21_021D217C(const UnkStruct_ov21_021D13FC *param0, BOOL param1);
 void ov21_021D2188(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3, int param4, u8 param5, u32 param6, int param7, int param8, int param9);
 void ov21_021D222C(UnkStruct_ov21_021D13FC *param0, int param1, int param2, int param3);
 void ov21_021D2250(UnkStruct_ov21_021D13FC *param0, int *param1, int *param2, int param3);
-Sprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1);
+PokemonSprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1);
 void ov21_021D2280(const UnkStruct_ov21_021D13FC *param0, BOOL param1, int param2);
-CellActor *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0);
-CellActor *ov21_021D22C4(const UnkStruct_ov21_021D13FC *param0);
+Sprite *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0);
+Sprite *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);
 SpriteResource *ov21_021D2344(const UnkStruct_ov21_021D13FC *param0, int param1);
@@ -64,7 +64,7 @@ void *ov21_021D27E0(UnkStruct_ov21_021D13FC *param0, u32 param1, NNSG2dPaletteDa
 void *ov21_021D2808(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dCharacterData **param3, u32 param4);
 void ov21_021D2B88(UnkStruct_ov21_021D22F8 *param0, SpriteResourceCollection **param1, int param2, NARC *param3);
 void ov21_021D2C58(UnkStruct_ov21_021D22F8 *param0, SpriteResourceCollection **param1);
-void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, int param4);
+void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, SpriteList *param1, SpriteResourceCollection **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_021E8D48.h b/include/overlay021/ov21_021E8D48.h
index a4d2e98357..49076efc4b 100644
--- a/include/overlay021/ov21_021E8D48.h
+++ b/include/overlay021/ov21_021E8D48.h
@@ -9,7 +9,7 @@
 UnkStruct_ov21_021E8D48 *ov21_021E8D48(const UnkStruct_ov21_021E8E0C *param0);
 void ov21_021E8DD0(UnkStruct_ov21_021E8D48 *param0);
 BOOL ov21_021E8DEC(const UnkStruct_ov21_021E8D48 *param0);
-Sprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0);
+PokemonSprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0);
 void ov21_021E8E04(UnkStruct_ov21_021E8D48 *param0, BOOL param1);
 
 #endif // POKEPLATINUM_OV21_021E8D48_H
diff --git a/include/overlay021/pokedex_enc_data.h b/include/overlay021/pokedex_enc_data.h
index 65fce45071..b29341d5f6 100644
--- a/include/overlay021/pokedex_enc_data.h
+++ b/include/overlay021/pokedex_enc_data.h
@@ -3,8 +3,8 @@
 
 #include "constants/species.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 
 typedef struct EncounterLocations {
     int *locations;
@@ -113,7 +113,7 @@ void PokedexEncData_LocateFieldOnMap(u8 *pokedexFieldMap, u8 mapHeight, u8 mapWi
 u32 PokedexEncData_LocateVisibleFields(u8 *pokedexFieldMap, int mapHeight, int mapWidth, const FieldCoordinates *fieldCoordinatesArray, const EncounterLocations *encounterLocations, const u8 *invisibleFields, u32 numInvisibleFields);
 
 /**
- * @brief Creates a CellActor with the coordinates occupied by the dungeon
+ * @brief Creates a Sprite with the coordinates occupied by the dungeon
  *
  * coronetAnimID is used for Mt Coronet, animID otherwise.
  *
@@ -126,7 +126,7 @@ u32 PokedexEncData_LocateVisibleFields(u8 *pokedexFieldMap, int mapHeight, int m
  * @param animID
  * @param coronetAnimID
  */
-void PokedexEncData_LocateDungeonOnMap(CellActor *cellActor, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinates, int animID, int coronetAnimID);
+void PokedexEncData_LocateDungeonOnMap(Sprite *cellActor, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinates, int animID, int coronetAnimID);
 
 /**
  * @brief Creates CellActors with the coordinates occupied by visible fields
@@ -151,6 +151,6 @@ void PokedexEncData_LocateDungeonOnMap(CellActor *cellActor, int xOffset, int yO
  * @param cellActorsModified
  * @return Number of visible dungeons
  */
-int PokedexEncData_LocateVisibleDungeons(CellActor **cellActorArray, int initialNumVisibleDungeons, int maxNumDungeons, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinatesArray, const EncounterLocations *encounterLocations, int animID, int coronetAnimID, const u8 *invisibleDungeons, u32 numInvisibleDungeons, u32 *cellActorsModified);
+int PokedexEncData_LocateVisibleDungeons(Sprite **cellActorArray, int initialNumVisibleDungeons, int maxNumDungeons, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinatesArray, const EncounterLocations *encounterLocations, int animID, int coronetAnimID, const u8 *invisibleDungeons, u32 numInvisibleDungeons, u32 *cellActorsModified);
 
 #endif // POKEPLATINUM_POKEDEXENCDATA_H
diff --git a/include/overlay021/struct_ov21_021D13FC.h b/include/overlay021/struct_ov21_021D13FC.h
index d13bbc0221..69ce702136 100644
--- a/include/overlay021/struct_ov21_021D13FC.h
+++ b/include/overlay021/struct_ov21_021D13FC.h
@@ -12,8 +12,8 @@
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "sys_task_manager.h"
@@ -22,11 +22,11 @@ typedef struct {
     BgConfig *unk_00;
     Window unk_04;
     G2dRenderer unk_14;
-    CellActorCollection *unk_138;
+    SpriteList *unk_138;
     SpriteResourceCollection *unk_13C[4];
     UnkStruct_ov21_021D4C0C *unk_14C;
     UnkStruct_02007768 *unk_150;
-    Sprite *unk_154[4];
+    PokemonSprite *unk_154[4];
     UnkStruct_02015064 *unk_164;
     UnkStruct_ov21_021D23F8 unk_168;
     UnkStruct_ov21_021D23F8 unk_18C;
diff --git a/include/overlay021/struct_ov21_021D1FA4.h b/include/overlay021/struct_ov21_021D1FA4.h
index 4726993b0e..e523cd49cb 100644
--- a/include/overlay021/struct_ov21_021D1FA4.h
+++ b/include/overlay021/struct_ov21_021D1FA4.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_STRUCT_OV21_021D1FA4_H
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     BgConfig *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 58dbe0d34a..16d27181e2 100644
--- a/include/overlay021/struct_ov21_021D22F8.h
+++ b/include/overlay021/struct_ov21_021D22F8.h
@@ -5,12 +5,12 @@
 
 #include "overlay021/struct_ov21_021D4CA0.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
-    CellActor *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_00;
+    Sprite *unk_04;
     UnkStruct_ov21_021D4CA0 *unk_08;
     SpriteResource *unk_0C[4];
     VecFx32 unk_1C;
diff --git a/include/overlay021/struct_ov21_021D2584.h b/include/overlay021/struct_ov21_021D2584.h
index 25b86bbe60..ff950fd617 100644
--- a/include/overlay021/struct_ov21_021D2584.h
+++ b/include/overlay021/struct_ov21_021D2584.h
@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_OV21_021D2584_H
 #define POKEPLATINUM_STRUCT_OV21_021D2584_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
-    CellActor *unk_00[4];
+    Sprite *unk_00[4];
     SpriteResource *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 2a6e76b1ad..338f7fc706 100644
--- a/include/overlay021/struct_ov21_021D4CB8.h
+++ b/include/overlay021/struct_ov21_021D4CB8.h
@@ -6,14 +6,14 @@
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 
 typedef struct {
     UnkStruct_ov21_021D4C0C *unk_00;
     const Window *unk_04;
     const NNSG2dImagePaletteProxy *unk_08;
-    const CellActor *unk_0C;
+    const Sprite *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 627a640a9d..8b3681e541 100644
--- a/include/overlay022/ov22_02255094.h
+++ b/include/overlay022/ov22_02255094.h
@@ -9,8 +9,8 @@
 #include "overlay022/struct_ov22_0225A0E4.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
 void ov22_02255094(void);
 void ov22_022550B4(void);
@@ -19,7 +19,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);
-CellActor *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3, int param4, int param5);
+Sprite *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 6ee4b954ad..f1cac20c38 100644
--- a/include/overlay022/struct_ov22_02256BAC.h
+++ b/include/overlay022/struct_ov22_02256BAC.h
@@ -4,14 +4,14 @@
 #include "struct_defs/struct_02095C60.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     SpriteResourceCollection **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 a585182005..e5899d7fcd 100644
--- a/include/overlay022/struct_ov22_02259C58.h
+++ b/include/overlay022/struct_ov22_02259C58.h
@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_02259C58_H
 #define POKEPLATINUM_STRUCT_OV22_02259C58_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct UnkStruct_ov22_02259C58_tag {
-    CellActor *unk_00;
+    Sprite *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_02259C58_1.h b/include/overlay022/struct_ov22_02259C58_1.h
index 0494593276..6b812a4840 100644
--- a/include/overlay022/struct_ov22_02259C58_1.h
+++ b/include/overlay022/struct_ov22_02259C58_1.h
@@ -3,10 +3,10 @@
 
 #include "overlay022/funcptr_ov22_02259D78.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActorInitParamsEx *unk_00;
+    AffineSpriteListTemplate *unk_00;
     UnkFuncPtr_ov22_02259D78 unk_04;
     void *unk_08;
     int unk_0C;
diff --git a/include/overlay022/struct_ov22_0225A0E4.h b/include/overlay022/struct_ov22_0225A0E4.h
index c9f252657c..306802e9b8 100644
--- a/include/overlay022/struct_ov22_0225A0E4.h
+++ b/include/overlay022/struct_ov22_0225A0E4.h
@@ -9,9 +9,9 @@
 #include "struct_decls/struct_020151A4_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
 #include "resource_collection.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
@@ -33,7 +33,7 @@ typedef struct {
     NNSG2dCharacterData **unk_38;
     int unk_3C;
     BgConfig *unk_40;
-    CellActorCollection *unk_44;
+    SpriteList *unk_44;
     SpriteResourceCollection *unk_48[4];
     G2dRenderer unk_58;
     NARC *unk_5C;
diff --git a/include/overlay022/struct_ov22_0225A428.h b/include/overlay022/struct_ov22_0225A428.h
index 15b174a753..f97035cee7 100644
--- a/include/overlay022/struct_ov22_0225A428.h
+++ b/include/overlay022/struct_ov22_0225A428.h
@@ -6,14 +6,14 @@
 #include "overlay022/struct_ov22_0225AB54.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "strbuf.h"
 
 typedef struct {
     UnkStruct_ov22_022597BC unk_00;
     Window *unk_2C;
-    CellActorCollection *unk_30;
+    SpriteList *unk_30;
     SpriteResourceCollection **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 e40e216c6f..506172c1ee 100644
--- a/include/overlay022/struct_ov22_0225A914.h
+++ b/include/overlay022/struct_ov22_0225A914.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_0225A914_H
 #define POKEPLATINUM_STRUCT_OV22_0225A914_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActor *unk_10[20];
+    Sprite *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 ac0102121d..66e435660d 100644
--- a/include/overlay022/struct_ov22_0225AB54.h
+++ b/include/overlay022/struct_ov22_0225AB54.h
@@ -6,13 +6,13 @@
 #include "overlay022/struct_ov22_0225AE9C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sys_task_manager.h"
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActor *unk_10[2];
+    Sprite *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 2f83eb648e..1e6a8ebb32 100644
--- a/include/overlay022/struct_ov22_0225AE9C.h
+++ b/include/overlay022/struct_ov22_0225AE9C.h
@@ -5,11 +5,11 @@
 
 #include "overlay022/struct_ov22_0225AD68.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
-    CellActor *unk_04[2];
+    Sprite *unk_04[2];
     VecFx32 unk_0C[2];
     UnkStruct_ov22_0225AD68 unk_24;
     UnkStruct_ov22_0225AD68 unk_38;
diff --git a/include/overlay023/struct_ov23_02250CD4.h b/include/overlay023/struct_ov23_02250CD4.h
index 8ddbdc4611..678201719d 100644
--- a/include/overlay023/struct_ov23_02250CD4.h
+++ b/include/overlay023/struct_ov23_02250CD4.h
@@ -43,7 +43,7 @@ typedef struct {
     Strbuf *unk_6C;
     StringTemplate *unk_70;
     UnkStruct_ov5_021D30A8 unk_74;
-    CellActorData *unk_23C[8];
+    ManagedSprite *unk_23C[8];
     u32 unk_25C;
     UnkFuncPtr_ov23_0224F758 unk_260;
     UnkFuncPtr_ov23_0224FE38 unk_264;
diff --git a/include/overlay062/ov62_022300D8.h b/include/overlay062/ov62_022300D8.h
index fe88c0acc4..2b253809dc 100644
--- a/include/overlay062/ov62_022300D8.h
+++ b/include/overlay062/ov62_022300D8.h
@@ -28,8 +28,8 @@ void ov62_02230AF0(UnkStruct_0208C06C *param0);
 void ov62_02230B74(UnkStruct_0208C06C *param0);
 void ov62_02230B9C(UnkStruct_0208C06C *param0, BOOL param1);
 void ov62_02230C28(SysTask *param0, void *param1);
-void ov62_02230E68(CellActorData *param0, s16 param1, s16 param2);
-void ov62_02230E74(CellActorData *param0, s16 *param1, s16 *param2);
+void ov62_02230E68(ManagedSprite *param0, s16 param1, s16 param2);
+void ov62_02230E74(ManagedSprite *param0, s16 *param1, s16 *param2);
 void ov62_02230E80(UnkStruct_0208C06C *param0);
 void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *param1, int param2, const UnkStruct_020F3DCC *param3);
 void ov62_0223113C(UnkStruct_0208C06C *param0);
@@ -40,7 +40,7 @@ void ov62_022312CC(UnkStruct_0208C06C *param0, int param1);
 void ov62_0223131C(UnkStruct_0208C06C *param0, int param1);
 void ov62_0223136C(UnkStruct_0208C06C *param0, int param1);
 void ov62_022313BC(UnkStruct_0208C06C *param0);
-CellActorData *ov62_022313E0(UnkStruct_0208C06C *param0, int param1);
+ManagedSprite *ov62_022313E0(UnkStruct_0208C06C *param0, int param1);
 void ov62_02231454(UnkStruct_0208C06C *param0);
 void ov62_0223146C(UnkStruct_0208C06C *param0);
 void ov62_022314A8(UnkStruct_0208C06C *param0);
diff --git a/include/overlay062/ov62_02231690.h b/include/overlay062/ov62_02231690.h
index 8db72c7a23..ac5e5a3734 100644
--- a/include/overlay062/ov62_02231690.h
+++ b/include/overlay062/ov62_02231690.h
@@ -77,9 +77,9 @@ void ov62_022339DC(UnkStruct_0208C06C *param0);
 void ov62_02233A44(UnkStruct_0208C06C *param0);
 NARC *ov62_02233A68(int param0);
 void ov62_02233A74(NARC *param0);
-CellActorData *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5);
-void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, CellActorData *param2);
-void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, CellActorData *param2);
+ManagedSprite *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5);
+void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, ManagedSprite *param2);
+void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, ManagedSprite *param2);
 BOOL ov62_02233F94(UnkStruct_0202F41C *param0);
 int ov62_02233FEC(UnkStruct_ov62_02233F74 *param0);
 void ov62_02234214(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *param1);
diff --git a/include/overlay062/struct_ov62_022307C0_sub1.h b/include/overlay062/struct_ov62_022307C0_sub1.h
index bc06fdef0e..8b6904712a 100644
--- a/include/overlay062/struct_ov62_022307C0_sub1.h
+++ b/include/overlay062/struct_ov62_022307C0_sub1.h
@@ -9,7 +9,7 @@
 #include "touch_screen.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     u8 padding_04[8];
     BOOL unk_0C;
     TouchScreenRect *unk_10;
diff --git a/include/overlay062/struct_ov62_02230C28.h b/include/overlay062/struct_ov62_02230C28.h
index c06af2a90a..8f8d7b3bf8 100644
--- a/include/overlay062/struct_ov62_02230C28.h
+++ b/include/overlay062/struct_ov62_02230C28.h
@@ -5,7 +5,7 @@
 #include "sys_task_manager.h"
 
 typedef struct {
-    CellActorData *unk_00[2];
+    ManagedSprite *unk_00[2];
     SysTask *unk_08;
     fx32 unk_0C;
     f32 unk_10;
diff --git a/include/overlay062/struct_ov62_022312B0.h b/include/overlay062/struct_ov62_022312B0.h
index 69eef035bc..ab9ee1b238 100644
--- a/include/overlay062/struct_ov62_022312B0.h
+++ b/include/overlay062/struct_ov62_022312B0.h
@@ -9,7 +9,7 @@
 
 typedef struct {
     u8 padding_00[4];
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
     FontOAM *unk_0C;
     UnkStruct_02012B20 *unk_10;
     CharTransferAllocation unk_14;
diff --git a/include/overlay062/struct_ov62_022323B8.h b/include/overlay062/struct_ov62_022323B8.h
index c970c7225c..ef044e524d 100644
--- a/include/overlay062/struct_ov62_022323B8.h
+++ b/include/overlay062/struct_ov62_022323B8.h
@@ -8,8 +8,8 @@
 
 typedef struct {
     UnkStruct_02030A80 *unk_00;
-    CellActorData *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_04;
+    ManagedSprite *unk_08;
     Window unk_0C[8];
 } UnkStruct_ov62_022323B8;
 
diff --git a/include/overlay062/struct_ov62_02233310.h b/include/overlay062/struct_ov62_02233310.h
index 3f939023c7..dc08fa4b6c 100644
--- a/include/overlay062/struct_ov62_02233310.h
+++ b/include/overlay062/struct_ov62_02233310.h
@@ -18,7 +18,7 @@ typedef struct {
     int unk_14;
     Window unk_18;
     const UnkStruct_ov62_02248CDC *unk_28;
-    CellActorData *unk_2C[2];
+    ManagedSprite *unk_2C[2];
     MessageLoader *unk_34;
     UnkStruct_ov62_02233310_sub1 unk_38;
     BOOL unk_48;
diff --git a/include/overlay062/struct_ov62_0223359C.h b/include/overlay062/struct_ov62_0223359C.h
index e79838fb88..ab9abf66ff 100644
--- a/include/overlay062/struct_ov62_0223359C.h
+++ b/include/overlay062/struct_ov62_0223359C.h
@@ -11,7 +11,7 @@ typedef struct {
     s16 unk_10;
     u8 padding_12[2];
     BOOL unk_14;
-    CellActorData *unk_18[2];
+    ManagedSprite *unk_18[2];
 } UnkStruct_ov62_0223359C;
 
 #endif // POKEPLATINUM_STRUCT_OV62_0223359C_H
diff --git a/include/overlay062/struct_ov62_02233F74.h b/include/overlay062/struct_ov62_02233F74.h
index 2ff81c3c9d..ca70c0f332 100644
--- a/include/overlay062/struct_ov62_02233F74.h
+++ b/include/overlay062/struct_ov62_02233F74.h
@@ -11,7 +11,7 @@ typedef struct {
     UnkStruct_02030A80 *unk_00;
     UnkStruct_0202F41C *unk_04;
     u8 padding_08[4];
-    CellActorData *unk_0C[12];
+    ManagedSprite *unk_0C[12];
     Window unk_3C[8];
 } UnkStruct_ov62_02233F74;
 
diff --git a/include/overlay062/struct_ov62_022354A4.h b/include/overlay062/struct_ov62_022354A4.h
index cbd1b98279..0348c103e3 100644
--- a/include/overlay062/struct_ov62_022354A4.h
+++ b/include/overlay062/struct_ov62_022354A4.h
@@ -17,7 +17,7 @@ typedef struct {
     u8 unk_1C;
     u8 unk_1D;
     u8 padding_1E[2];
-    CellActorData *unk_20;
+    ManagedSprite *unk_20;
     FontOAM *unk_24;
     UnkStruct_0208B878 *unk_28;
     BOOL *unk_2C;
diff --git a/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h b/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h
index 7b0d3d4080..b4b7c25627 100644
--- a/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h
+++ b/include/overlay062/struct_ov62_0223E01C_sub1_sub1.h
@@ -5,7 +5,7 @@
 
 typedef struct {
     int unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
 } UnkStruct_ov62_0223E01C_sub1_sub1;
 
 #endif // POKEPLATINUM_STRUCT_OV62_0223E01C_SUB1_SUB1_H
diff --git a/include/overlay062/struct_ov62_02246BF4_sub1.h b/include/overlay062/struct_ov62_02246BF4_sub1.h
index 112c8d6986..6fe8c443c0 100644
--- a/include/overlay062/struct_ov62_02246BF4_sub1.h
+++ b/include/overlay062/struct_ov62_02246BF4_sub1.h
@@ -10,7 +10,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     BOOL unk_08;
-    CellActorData *unk_0C;
+    ManagedSprite *unk_0C;
     TouchScreenRect *unk_10;
     UnkStruct_ov62_02246BF4_sub1_sub1 unk_14;
     u8 padding_1A[2];
diff --git a/include/overlay063/ov63_0222AE60.h b/include/overlay063/ov63_0222AE60.h
index 13460fdba0..b6948b1308 100644
--- a/include/overlay063/ov63_0222AE60.h
+++ b/include/overlay063/ov63_0222AE60.h
@@ -5,10 +5,10 @@
 #include "overlay063/struct_ov63_0222BB38_decl.h"
 #include "overlay064/struct_ov64_022302EC.h"
 
-#include "cell_actor.h"
 #include "palette.h"
+#include "sprite.h"
 
-UnkStruct_ov63_0222AE60 *ov63_0222AE60(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3);
+UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *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 CellActor *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0);
+const Sprite *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 3b373f6054..cef97ac40c 100644
--- a/include/overlay063/ov63_0222CCE4.h
+++ b/include/overlay063/ov63_0222CCE4.h
@@ -6,11 +6,11 @@
 #include "overlay063/struct_ov63_0222CD2C.h"
 #include "overlay063/struct_ov63_0222CE44.h"
 
-#include "cell_actor.h"
 #include "palette.h"
+#include "sprite.h"
 
-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);
+UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4);
+UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *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 87d7c91395..4dbf7b3c18 100644
--- a/include/overlay065/struct_ov65_0222EBE0_t.h
+++ b/include/overlay065/struct_ov65_0222EBE0_t.h
@@ -12,12 +12,12 @@
 #include "overlay065/struct_ov65_022354D8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "list_menu.h"
 #include "menu.h"
 #include "message.h"
 #include "overlay_manager.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -48,7 +48,7 @@ struct UnkStruct_ov65_0222EBE0_t {
     int unk_180;
     Menu *unk_184;
     void *unk_188;
-    CellActorCollection *unk_18C;
+    SpriteList *unk_18C;
     G2dRenderer unk_190;
     SpriteResourceCollection *unk_31C[4];
     UnkStruct_02012744 *unk_32C;
diff --git a/include/overlay065/struct_ov65_02234E50.h b/include/overlay065/struct_ov65_02234E50.h
index 3a83a902aa..61d25e401b 100644
--- a/include/overlay065/struct_ov65_02234E50.h
+++ b/include/overlay065/struct_ov65_02234E50.h
@@ -7,8 +7,8 @@
 #include "struct_decls/struct_02023FCC_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "string_template.h"
 
@@ -35,7 +35,7 @@ typedef struct {
     Window unk_FC[8][2];
     Window unk_1FC;
     SpriteResource *unk_20C[4];
-    CellActor *unk_21C[3];
+    Sprite *unk_21C[3];
     CharTransferAllocation 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 735fa4962b..6c41abe7c9 100644
--- a/include/overlay065/struct_ov65_022358CC.h
+++ b/include/overlay065/struct_ov65_022358CC.h
@@ -3,12 +3,12 @@
 
 #include "overlay065/struct_ov65_022358CC_sub1.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *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 03c5cbbfcc..267ae76d73 100644
--- a/include/overlay065/struct_ov65_022358CC_sub1.h
+++ b/include/overlay065/struct_ov65_022358CC_sub1.h
@@ -1,14 +1,14 @@
 #ifndef POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H
 #define POKEPLATINUM_STRUCT_OV65_022358CC_SUB1_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorResourceData unk_10;
-    CellActor *unk_34;
-    CellActor *unk_38;
+    SpriteResourcesHeader unk_10;
+    Sprite *unk_34;
+    Sprite *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 936cb5c8ac..6a148db1f4 100644
--- a/include/overlay071/struct_ov71_0223D238.h
+++ b/include/overlay071/struct_ov71_0223D238.h
@@ -3,16 +3,16 @@
 
 #include <nnsys.h>
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[2][4];
-    CellActor *unk_1C0[25];
+    Sprite *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 e32e9900cd..bb1548eaa2 100644
--- a/include/overlay072/struct_ov72_0223DB98_t.h
+++ b/include/overlay072/struct_ov72_0223DB98_t.h
@@ -8,10 +8,10 @@
 #include "overlay072/struct_ov72_0223EAD8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "game_records.h"
 #include "message.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -29,15 +29,15 @@ struct UnkStruct_ov72_0223DB98_t {
     Strbuf *unk_30;
     Strbuf *unk_34;
     int unk_38;
-    CellActorCollection *unk_3C;
+    SpriteList *unk_3C;
     G2dRenderer unk_40;
     SpriteResourceCollection *unk_1CC[4];
     SpriteResource *unk_1DC[2][4];
-    CellActorResourceData unk_1FC;
-    CellActorResourceData unk_220;
-    CellActor *unk_244[14];
-    CellActor *unk_27C[14];
-    CellActor *unk_2B4[9];
+    SpriteResourcesHeader unk_1FC;
+    SpriteResourcesHeader unk_220;
+    Sprite *unk_244[14];
+    Sprite *unk_27C[14];
+    Sprite *unk_2B4[9];
     Window unk_2D8[5];
     Window unk_328;
     Window unk_338;
diff --git a/include/overlay076/ov76_0223B140.h b/include/overlay076/ov76_0223B140.h
index 61a6d5573f..5aaf95183c 100644
--- a/include/overlay076/ov76_0223B140.h
+++ b/include/overlay076/ov76_0223B140.h
@@ -8,7 +8,7 @@
 #include "sprite_system.h"
 #include "touch_screen.h"
 
-void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2);
+void ov76_0223B184(TouchScreenRect *rect, ManagedSprite *param1, BOOL param2);
 void ov76_0223B1E0(UnkStruct_ov76_0223DE00 *param0);
 void ov76_0223B208(UnkStruct_ov76_0223DE00 *param0);
 int ov76_0223B278(UnkStruct_ov76_0223DE00 *param0, u8 param1);
diff --git a/include/overlay076/ov76_0223D338.h b/include/overlay076/ov76_0223D338.h
index 1e87c520d0..c8e963e5ea 100644
--- a/include/overlay076/ov76_0223D338.h
+++ b/include/overlay076/ov76_0223D338.h
@@ -17,7 +17,7 @@ void ov76_0223D3CC(UnkStruct_ov76_0223DE00 *param0);
 int ov76_0223D430(UnkStruct_0202CA28 *param0);
 int ov76_0223D45C(UnkStruct_ov76_0223DE00 *param0, int param1);
 BOOL ov76_0223D550(UnkStruct_ov76_0223DE00 *param0);
-void ov76_0223D94C(CellActorData *param0, int param1);
+void ov76_0223D94C(ManagedSprite *param0, int param1);
 void ov76_0223DA34(u32 param0, u32 param1, void *param2);
 BOOL ov76_0223DCB0(UnkStruct_ov76_0223DE00 *param0);
 void ov76_0223DCB8(UnkStruct_ov76_0223DE00 *param0, BOOL param1);
diff --git a/include/overlay076/struct_ov76_0223B52C.h b/include/overlay076/struct_ov76_0223B52C.h
index 38c0e2e325..a17295054d 100644
--- a/include/overlay076/struct_ov76_0223B52C.h
+++ b/include/overlay076/struct_ov76_0223B52C.h
@@ -10,7 +10,7 @@ typedef struct {
     u8 unk_05;
     u8 unk_06;
     u8 padding_07;
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
     TouchScreenRect *unk_0C;
 } UnkStruct_ov76_0223B52C;
 
diff --git a/include/overlay076/struct_ov76_0223BBAC.h b/include/overlay076/struct_ov76_0223BBAC.h
index 004dbc6941..c906d395e9 100644
--- a/include/overlay076/struct_ov76_0223BBAC.h
+++ b/include/overlay076/struct_ov76_0223BBAC.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00[13];
+    ManagedSprite *unk_00[13];
 } UnkStruct_ov76_0223BBAC;
 
 #endif // POKEPLATINUM_STRUCT_OV76_0223BBAC_H
diff --git a/include/overlay076/struct_ov76_0223C398.h b/include/overlay076/struct_ov76_0223C398.h
index 56b7620132..6222b2082f 100644
--- a/include/overlay076/struct_ov76_0223C398.h
+++ b/include/overlay076/struct_ov76_0223C398.h
@@ -33,7 +33,7 @@ typedef struct {
     StringList *unk_C8;
     Menu *unk_CC;
     UnkStruct_02007768 *unk_D0;
-    Sprite *unk_D4;
+    PokemonSprite *unk_D4;
     int unk_D8;
     UnkStruct_ov22_02258A48 unk_DC;
     UnkStruct_02023FCC *unk_F8;
diff --git a/include/overlay076/struct_ov76_0223DD88_sub2.h b/include/overlay076/struct_ov76_0223DD88_sub2.h
index 1a3a4e542a..588165c949 100644
--- a/include/overlay076/struct_ov76_0223DD88_sub2.h
+++ b/include/overlay076/struct_ov76_0223DD88_sub2.h
@@ -6,7 +6,7 @@
 typedef struct {
     int unk_00;
     int unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
 } UnkStruct_ov76_0223DD88_sub2;
 
 #endif // POKEPLATINUM_STRUCT_OV76_0223DD88_SUB2_H
diff --git a/include/overlay076/struct_ov76_0223DE00.h b/include/overlay076/struct_ov76_0223DE00.h
index a71cdc3d53..39da8aa638 100644
--- a/include/overlay076/struct_ov76_0223DE00.h
+++ b/include/overlay076/struct_ov76_0223DE00.h
@@ -25,9 +25,9 @@ typedef struct {
     u8 padding_D1[3];
     UnkStruct_ov76_0223C398 unk_D4;
     UnkStruct_ov76_0223DD88_sub2 unk_264[12];
-    CellActorData *unk_2F4[2];
-    CellActorData *unk_2FC[6];
-    CellActorData *unk_314[4];
+    ManagedSprite *unk_2F4[2];
+    ManagedSprite *unk_2FC[6];
+    ManagedSprite *unk_314[4];
     UnkStruct_ov76_0223B52C unk_324[8];
     int unk_3A4[8];
     int unk_3C4[2];
diff --git a/include/overlay077/ov77_021D6670.h b/include/overlay077/ov77_021D6670.h
index 7728ae933c..005f047785 100644
--- a/include/overlay077/ov77_021D6670.h
+++ b/include/overlay077/ov77_021D6670.h
@@ -4,12 +4,12 @@
 #include "overlay077/struct_ov77_021D670C_decl.h"
 #include "overlay077/struct_ov77_021D6734_decl.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 UnkStruct_ov77_021D670C *ov77_021D670C(void);
 UnkStruct_ov77_021D6734 *ov77_021D6734(const int param0);
 void ov77_021D6760(UnkStruct_ov77_021D6734 *param0);
-CellActor **ov77_021D6794(UnkStruct_ov77_021D6734 *param0, const int param1);
+Sprite **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 dd97e2e2ae..bd89913caa 100644
--- a/include/overlay079/struct_ov79_021D0E1C.h
+++ b/include/overlay079/struct_ov79_021D0E1C.h
@@ -11,10 +11,10 @@
 #include "overlay079/struct_ov79_021D0E1C_sub1.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "list_menu.h"
 #include "menu.h"
 #include "message.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "string_list.h"
 
@@ -54,9 +54,9 @@ typedef struct UnkStruct_ov79_021D0E1C_t {
     Window unk_E8[13];
     SpriteSystem *unk_1B8;
     SpriteManager *unk_1BC;
-    CellActor *unk_1C0[3];
-    CellActor *unk_1CC[5];
-    CellActor *unk_1E0[6];
+    Sprite *unk_1C0[3];
+    Sprite *unk_1CC[5];
+    Sprite *unk_1E0[6];
     UnkStruct_0209903C *unk_1F8;
     UnkStruct_0209916C *unk_1FC;
 } UnkStruct_ov79_021D0E1C;
diff --git a/include/overlay079/struct_ov79_021D3820.h b/include/overlay079/struct_ov79_021D3820.h
index 8bff57b77b..d6dab37482 100644
--- a/include/overlay079/struct_ov79_021D3820.h
+++ b/include/overlay079/struct_ov79_021D3820.h
@@ -10,7 +10,7 @@ typedef struct {
     Camera *camera;
     void *unk_04;
     ArchivedSprite unk_08;
-    Sprite *unk_18;
+    PokemonSprite *unk_18;
 } UnkStruct_ov79_021D3820;
 
 #endif // POKEPLATINUM_STRUCT_OV79_021D3820_H
diff --git a/include/overlay080/struct_ov80_021D2A08.h b/include/overlay080/struct_ov80_021D2A08.h
index 7064ce14e2..490a11e20e 100644
--- a/include/overlay080/struct_ov80_021D2A08.h
+++ b/include/overlay080/struct_ov80_021D2A08.h
@@ -61,7 +61,7 @@ typedef struct UnkStruct_ov80_021D2A08_t {
     NNSG2dScreenData *unk_D4;
     SpriteSystem *unk_D8;
     SpriteManager *unk_DC;
-    CellActorData *unk_E0;
+    ManagedSprite *unk_E0;
 } UnkStruct_ov80_021D2A08;
 
 #endif // POKEPLATINUM_STRUCT_OV80_021D2A08_H
diff --git a/include/overlay080/struct_ov80_021D2C5C.h b/include/overlay080/struct_ov80_021D2C5C.h
index 95d515a1c0..b0ce449ab5 100644
--- a/include/overlay080/struct_ov80_021D2C5C.h
+++ b/include/overlay080/struct_ov80_021D2C5C.h
@@ -3,12 +3,12 @@
 
 #include "overlay080/struct_ov80_021D2C5C_sub1.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     UnkStruct_ov80_021D2C5C_sub1 unk_00;
     int unk_14;
-    CellActor *unk_18;
+    Sprite *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 8746715006..2928c93d51 100644
--- a/include/overlay083/ov83_0223D6A8.h
+++ b/include/overlay083/ov83_0223D6A8.h
@@ -26,8 +26,8 @@
 #include "overlay083/struct_ov83_0223FE50.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 void ov83_0223D754(UnkStruct_ov83_0223D784 *param0, int param1, int param2, int param3);
@@ -35,7 +35,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, SpriteResource *param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);
 void ov83_0223D95C(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1);
-CellActor *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6);
+Sprite *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 6c2d3bd65a..c6b0563e3b 100644
--- a/include/overlay083/struct_ov83_0223D784.h
+++ b/include/overlay083/struct_ov83_0223D784.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223D784_H
 #define POKEPLATINUM_STRUCT_OV83_0223D784_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
 } UnkStruct_ov83_0223D784;
diff --git a/include/overlay083/struct_ov83_0223D95C.h b/include/overlay083/struct_ov83_0223D95C.h
index c0e568f8cc..d0fe2834a9 100644
--- a/include/overlay083/struct_ov83_0223D95C.h
+++ b/include/overlay083/struct_ov83_0223D95C.h
@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223D95C_H
 #define POKEPLATINUM_STRUCT_OV83_0223D95C_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct {
     SpriteResource *unk_00[4];
     BOOL unk_10;
-    CellActorResourceData unk_14;
+    SpriteResourcesHeader unk_14;
 } UnkStruct_ov83_0223D95C;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223D95C_H
diff --git a/include/overlay083/struct_ov83_0223DB30.h b/include/overlay083/struct_ov83_0223DB30.h
index 9503778c80..04314d9284 100644
--- a/include/overlay083/struct_ov83_0223DB30.h
+++ b/include/overlay083/struct_ov83_0223DB30.h
@@ -4,13 +4,13 @@
 #include "overlay083/struct_ov83_0223D95C.h"
 #include "overlay083/struct_ov83_0223DA94.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
     BOOL unk_04;
-    CellActor *unk_08[4];
-    CellActor *unk_18[4];
+    Sprite *unk_08[4];
+    Sprite *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 6d72941ee4..19aea43cfd 100644
--- a/include/overlay083/struct_ov83_0223E244.h
+++ b/include/overlay083/struct_ov83_0223E244.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223E244_H
 #define POKEPLATINUM_STRUCT_OV83_0223E244_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
     BOOL unk_04;
-    CellActor *unk_08;
+    Sprite *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 2fe11b71cd..d1e6c29de0 100644
--- a/include/overlay083/struct_ov83_0223E5C0.h
+++ b/include/overlay083/struct_ov83_0223E5C0.h
@@ -4,11 +4,11 @@
 #include "overlay083/struct_ov83_0223D4CC_decl.h"
 #include "overlay083/struct_ov83_0223FE50.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
-    CellActor *unk_04[4];
+    Sprite *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 82a1827bc0..019fcdabc5 100644
--- a/include/overlay083/struct_ov83_0223F054.h
+++ b/include/overlay083/struct_ov83_0223F054.h
@@ -5,7 +5,7 @@
 
 #include "overlay083/struct_ov83_0223DA94.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
@@ -19,7 +19,7 @@ typedef struct {
     UnkStruct_ov83_0223DA94 unk_30;
     UnkStruct_ov83_0223DA94 unk_48;
     UnkStruct_ov83_0223DA94 unk_60;
-    CellActor *unk_78;
+    Sprite *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 702123b4a5..639e2a31b4 100644
--- a/include/overlay083/struct_ov83_0223F410.h
+++ b/include/overlay083/struct_ov83_0223F410.h
@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV83_0223F410_H
 #define POKEPLATINUM_STRUCT_OV83_0223F410_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *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 d43e6622af..139776d3fa 100644
--- a/include/overlay083/struct_ov83_0223F670.h
+++ b/include/overlay083/struct_ov83_0223F670.h
@@ -5,7 +5,7 @@
 
 #include "overlay083/struct_ov83_0223DA94.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     BOOL unk_00;
@@ -13,7 +13,7 @@ typedef struct {
     VecFx32 unk_08;
     UnkStruct_ov83_0223DA94 unk_14;
     UnkStruct_ov83_0223DA94 unk_2C;
-    CellActor *unk_44;
+    Sprite *unk_44;
 } UnkStruct_ov83_0223F670;
 
 #endif // POKEPLATINUM_STRUCT_OV83_0223F670_H
diff --git a/include/overlay084/struct_ov84_0223B5A0.h b/include/overlay084/struct_ov84_0223B5A0.h
index 911d708d6b..190a0f9634 100644
--- a/include/overlay084/struct_ov84_0223B5A0.h
+++ b/include/overlay084/struct_ov84_0223B5A0.h
@@ -31,7 +31,7 @@ typedef struct {
     NARC *unk_D4;
     SpriteSystem *unk_D8;
     SpriteManager *unk_DC;
-    CellActorData *unk_E0[12];
+    ManagedSprite *unk_E0[12];
     UnkStruct_0200C440 *unk_110;
     MessageLoader *unk_114;
     StringTemplate *unk_118;
diff --git a/include/overlay094/ov94_0223BCB0.h b/include/overlay094/ov94_0223BCB0.h
index ee8e66c7df..3c99199b32 100644
--- a/include/overlay094/ov94_0223BCB0.h
+++ b/include/overlay094/ov94_0223BCB0.h
@@ -4,17 +4,17 @@
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "overlay_manager.h"
+#include "sprite.h"
 
 int ov94_0223BCB0(OverlayManager *param0, int *param1);
 int ov94_0223BE2C(OverlayManager *param0, int *param1);
 int ov94_0223BF54(OverlayManager *param0, int *param1);
-void ov94_0223C300(CellActorInitParamsEx *param0, UnkStruct_ov94_0223FD4C *param1, CellActorResourceData *param2, int param3);
+void ov94_0223C300(AffineSpriteListTemplate *param0, UnkStruct_ov94_0223FD4C *param1, SpriteResourcesHeader *param2, int param3);
 Menu *ov94_0223C3C0(BgConfig *param0, int param1, int param2);
 void ov94_0223C3F4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2);
-void ov94_0223C3FC(CellActor *param0, int param1, int param2);
+void ov94_0223C3FC(Sprite *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 8965b9c891..a808ca9d08 100644
--- a/include/overlay094/struct_ov94_0223FD4C.h
+++ b/include/overlay094/struct_ov94_0223FD4C.h
@@ -22,12 +22,12 @@
 #include "overlay096/struct_ov96_0223B574_1.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "list_menu.h"
 #include "menu.h"
 #include "message.h"
 #include "overlay_manager.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -98,21 +98,21 @@ typedef struct UnkStruct_ov94_0223FD4C_t {
     Strbuf *unk_BB4[10];
     Strbuf *unk_BDC;
     int unk_BE0;
-    CellActorCollection *unk_BE4;
+    SpriteList *unk_BE4;
     G2dRenderer unk_BE8;
     SpriteResourceCollection *unk_D74[4];
     SpriteResource *unk_D84[3][4];
-    CellActorResourceData unk_DB4;
-    CellActorResourceData unk_DD8;
-    CellActorResourceData unk_DFC;
-    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];
+    SpriteResourcesHeader unk_DB4;
+    SpriteResourcesHeader unk_DD8;
+    SpriteResourcesHeader unk_DFC;
+    Sprite *unk_E20;
+    Sprite *unk_E24;
+    Sprite *unk_E28[30];
+    Sprite *unk_EA0[30];
+    Sprite *unk_F18[6];
+    Sprite *unk_F30;
+    Sprite *unk_F34[8];
+    Sprite *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 c55f68b15c..ed89a59f8a 100644
--- a/include/overlay095/ov95_02246C20.h
+++ b/include/overlay095/ov95_02246C20.h
@@ -9,10 +9,10 @@
 #include "overlay095/struct_ov95_02247628_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
 #include "overlay_manager.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "string_template.h"
 
 int ov95_02246C20(OverlayManager *param0, int *param1);
@@ -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(CellActorResourceData *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4);
-CellActor *ov95_022475E4(UnkStruct_ov95_02247628 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5);
+void ov95_022475C4(SpriteResourcesHeader *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4);
+Sprite *ov95_022475E4(UnkStruct_ov95_02247628 *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5);
 BgConfig *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 c34b66b7e2..64d7516b61 100644
--- a/include/overlay096/ov96_0223B6A0.h
+++ b/include/overlay096/ov96_0223B6A0.h
@@ -4,14 +4,14 @@
 #include "overlay096/struct_ov96_0223BF40_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "overlay_manager.h"
+#include "sprite.h"
 
 int ov96_0223B6A0(OverlayManager *param0, int *param1);
 int ov96_0223B7F8(OverlayManager *param0, int *param1);
 int ov96_0223B8CC(OverlayManager *param0, int *param1);
-void ov96_0223BAE0(CellActorInitParamsEx *param0, UnkStruct_ov96_0223BF40 *param1, CellActorResourceData *param2, int param3);
+void ov96_0223BAE0(AffineSpriteListTemplate *param0, UnkStruct_ov96_0223BF40 *param1, SpriteResourcesHeader *param2, int param3);
 Menu *ov96_0223BBC8(BgConfig *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 1474249a58..26e6b2af53 100644
--- a/include/overlay096/struct_ov96_0223BF40_t.h
+++ b/include/overlay096/struct_ov96_0223BF40_t.h
@@ -13,10 +13,10 @@
 #include "overlay096/struct_ov96_0223B574_1.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "message.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -58,14 +58,14 @@ struct UnkStruct_ov96_0223BF40_t {
     Strbuf *unk_BE8;
     Strbuf *unk_BEC;
     int unk_BF0;
-    CellActorCollection *unk_BF4;
+    SpriteList *unk_BF4;
     G2dRenderer unk_BF8;
     SpriteResourceCollection *unk_D84[4];
     SpriteResource *unk_D94[3][4];
-    CellActorResourceData unk_DC4;
-    CellActorResourceData unk_DE8;
-    CellActorResourceData unk_E0C;
-    CellActor *unk_E30[2];
+    SpriteResourcesHeader unk_DC4;
+    SpriteResourcesHeader unk_DE8;
+    SpriteResourcesHeader unk_E0C;
+    Sprite *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 cc756d09e8..1198eb8776 100644
--- a/include/overlay097/ov97_02237694.h
+++ b/include/overlay097/ov97_02237694.h
@@ -9,10 +9,10 @@
 #include "overlay097/union_ov97_0222D2B0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "list_menu.h"
 #include "overlay_manager.h"
 #include "savedata.h"
+#include "sprite.h"
 
 void ov97_02237694(int param0);
 void *ov97_022376C4(OverlayManager *param0, int param1, int param2, int param3);
@@ -34,7 +34,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);
-CellActor *ov97_02237D14(int param0, CellActor *param1, int param2, int param3, int param4);
+Sprite *ov97_02237D14(int param0, Sprite *param1, int param2, int param3, int param4);
 void ov97_02237DA0(void);
 u32 ov97_02237E4C(int param0);
 void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1);
diff --git a/include/overlay097/struct_ov97_0222D04C.h b/include/overlay097/struct_ov97_0222D04C.h
index a61f51f2d1..cc9f91f8fb 100644
--- a/include/overlay097/struct_ov97_0222D04C.h
+++ b/include/overlay097/struct_ov97_0222D04C.h
@@ -7,11 +7,11 @@
 #include "overlay097/union_ov97_0222D2B0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "list_menu.h"
 #include "message.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -42,12 +42,12 @@ typedef struct {
     int unk_438;
     int unk_43C;
     int unk_440;
-    CellActorCollection *unk_444;
+    SpriteList *unk_444;
     G2dRenderer unk_448;
     SpriteResourceCollection *unk_5D4[6];
     SpriteResource *unk_5EC[6];
-    CellActorResourceData unk_604;
-    CellActor *unk_628;
+    SpriteResourcesHeader unk_604;
+    Sprite *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 8021a21881..7e23fe155e 100644
--- a/include/overlay097/struct_ov97_02237AEC.h
+++ b/include/overlay097/struct_ov97_02237AEC.h
@@ -1,16 +1,16 @@
 #ifndef POKEPLATINUM_STRUCT_OV97_02237AEC_H
 #define POKEPLATINUM_STRUCT_OV97_02237AEC_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[6];
     SpriteResource *unk_1A8[2][6];
-    CellActorResourceData unk_1D8[2];
+    SpriteResourcesHeader unk_1D8[2];
     int unk_220;
     int unk_224;
     int unk_228;
diff --git a/include/overlay099/ov99_021D4134.h b/include/overlay099/ov99_021D4134.h
index 7760da575e..5cb110534f 100644
--- a/include/overlay099/ov99_021D4134.h
+++ b/include/overlay099/ov99_021D4134.h
@@ -9,6 +9,6 @@ void ov99_021D4134(UnkStruct_ov99_021D2CB0 *param0, int param1);
 void ov99_021D4170(UnkStruct_ov99_021D2CB0 *param0);
 BOOL ov99_021D425C(UnkStruct_ov99_021D2CB0 *param0, s32 param1);
 void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int param3);
-void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1);
+void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite *param1);
 
 #endif // POKEPLATINUM_OV99_021D4134_H
diff --git a/include/overlay099/struct_ov99_021D2CB0.h b/include/overlay099/struct_ov99_021D2CB0.h
index d261844bad..e1257d5474 100644
--- a/include/overlay099/struct_ov99_021D2CB0.h
+++ b/include/overlay099/struct_ov99_021D2CB0.h
@@ -34,7 +34,7 @@ typedef struct {
     Easy3DObject unk_6C[2][16];
     UnkStruct_ov99_021D2CB0_sub1 unk_F6C;
     UnkStruct_ov99_021D3A40 unk_FA4;
-    CellActorData *unk_10E0[5];
+    ManagedSprite *unk_10E0[5];
     u8 *unk_10F4;
     NARC *unk_10F8;
     u32 unk_10FC;
diff --git a/include/overlay100/struct_ov100_021D4104.h b/include/overlay100/struct_ov100_021D4104.h
index 07b1bae727..70032a2f62 100644
--- a/include/overlay100/struct_ov100_021D4104.h
+++ b/include/overlay100/struct_ov100_021D4104.h
@@ -5,8 +5,8 @@
 #include "sys_task_manager.h"
 
 typedef struct {
-    CellActorData *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_00;
+    ManagedSprite *unk_04;
     int unk_08;
     int unk_0C;
     s16 unk_10;
diff --git a/include/overlay101/ov101_021D7E48.h b/include/overlay101/ov101_021D7E48.h
index c8f37ba333..4d7928f027 100644
--- a/include/overlay101/ov101_021D7E48.h
+++ b/include/overlay101/ov101_021D7E48.h
@@ -6,8 +6,8 @@
 #include "overlay101/struct_ov101_021D7E48_decl.h"
 #include "overlay101/struct_ov101_021D8544.h"
 
-#include "cell_actor.h"
 #include "narc.h"
+#include "sprite.h"
 
 UnkStruct_ov101_021D7E48 *ov101_021D7E48(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, u32 param9, u32 param10);
 void ov101_021D7FB4(UnkStruct_ov101_021D7E48 *param0);
@@ -23,7 +23,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(CellActor *param0, VecFx32 *param1);
-void ov101_021D8574(CellActor *param0, VecFx32 *param1);
+void ov101_021D8560(Sprite *param0, VecFx32 *param1);
+void ov101_021D8574(Sprite *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 85773d837e..4f63d9b22a 100644
--- a/include/overlay101/struct_ov101_021D8544.h
+++ b/include/overlay101/struct_ov101_021D8544.h
@@ -3,11 +3,11 @@
 
 #include <nnsys.h>
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     int unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
     const NNSG2dImageProxy *unk_08;
 } UnkStruct_ov101_021D8544;
 
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index dd37bf39de..2ac6b01dd6 100644
--- a/include/overlay104/ov104_0222DCE0.h
+++ b/include/overlay104/ov104_0222DCE0.h
@@ -8,11 +8,11 @@
 #include "overlay104/struct_ov104_0223A348_sub1.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
-#include "cell_actor.h"
 #include "field_battle_data_transfer.h"
 #include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "string_template.h"
 #include "trainer_info.h"
 
@@ -24,8 +24,8 @@ void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 *param0, Pokemon *param1
 u16 ov104_0222E10C(u8 param0);
 void ov104_0222E134(SaveData *param0, Pokemon *param1);
 void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2);
-void ov104_0222E1D8(CellActor *param0, u8 param1);
-void ov104_0222E204(CellActor *param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(Sprite *param0, u8 param1);
+void ov104_0222E204(Sprite *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(FieldBattleDTO *param0, UnkStruct_ov104_0223A348_sub1 *param1, int param2, int param3, int param4);
diff --git a/include/overlay104/ov104_02231F74.h b/include/overlay104/ov104_02231F74.h
index 8997dd6a09..6ff2f3e570 100644
--- a/include/overlay104/ov104_02231F74.h
+++ b/include/overlay104/ov104_02231F74.h
@@ -31,12 +31,12 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
 void ov104_02232E80(UnkStruct_ov104_0223C4CC *param0, int param1);
 void ov104_02232EC0(UnkStruct_ov104_0223C4CC *param0);
 void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0);
-CellActorData *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4);
-void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1, int param2);
+ManagedSprite *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4);
+void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, ManagedSprite *param1, int param2);
 void ov104_02232FEC(UnkStruct_ov104_0223C4CC *param0);
 void ov104_0223307C(UnkStruct_ov104_0223C4CC *param0);
-CellActorData *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2);
-void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1);
+ManagedSprite *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2);
+void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, ManagedSprite *param1);
 void ov104_022330FC(UnkStruct_ov104_0222E930 *param0, u16 *param1);
 void ov104_0223310C(UnkStruct_ov104_0222E930 *param0, u16 *param1, u32 param2);
 void ov104_0223319C(SysTask *param0, void *param1);
diff --git a/include/overlay104/ov104_0223C2D4.h b/include/overlay104/ov104_0223C2D4.h
index 96afb9fa7d..d6723b5a31 100644
--- a/include/overlay104/ov104_0223C2D4.h
+++ b/include/overlay104/ov104_0223C2D4.h
@@ -23,9 +23,9 @@ void ov104_0223D200(UnkStruct_ov104_0223C4CC *param0, UnkStruct_ov63_0222BEC0 *p
 void ov104_0223D258(UnkStruct_ov104_0223C4CC *param0, u16 param1, UnkStruct_ov63_0222BEC0 **param2, UnkStruct_ov63_0222CE44 **param3);
 void ov104_0223D29C(UnkStruct_ov104_0223C4CC *param0, u16 param1);
 void ov104_0223D2CC(UnkStruct_ov104_0223C4CC *param0, u16 param1);
-CellActorData *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2);
+ManagedSprite *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2);
 void ov104_0223D348(UnkStruct_ov104_0223C4CC *param0, u16 param1);
-CellActorData *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1);
+ManagedSprite *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1);
 void ov104_0223D378(UnkStruct_ov104_0223C4CC *param0, u16 param1, int param2);
 u32 ov104_0223D3A4(UnkStruct_ov104_0223C4CC *param0, u16 param1);
 void ov104_0223D554(UnkStruct_ov104_0223C4CC *param0, s16 *param1, s16 *param2);
diff --git a/include/overlay104/ov104_0223D768.h b/include/overlay104/ov104_0223D768.h
index a0cdca9c85..fd849cd161 100644
--- a/include/overlay104/ov104_0223D768.h
+++ b/include/overlay104/ov104_0223D768.h
@@ -7,7 +7,7 @@
 
 void ov104_0223D768(SpriteSystem *param0, SpriteManager *param1, NARC *param2, PaletteData *param3, u16 param4);
 void ov104_0223D7EC(SpriteManager *param0, u16 param1);
-CellActorData *ov104_0223D828(SpriteSystem *param0, SpriteManager *param1, u16 param2);
-void ov104_0223D858(CellActorData *param0);
+ManagedSprite *ov104_0223D828(SpriteSystem *param0, SpriteManager *param1, u16 param2);
+void ov104_0223D858(ManagedSprite *param0);
 
 #endif // POKEPLATINUM_OV104_0223D768_H
diff --git a/include/overlay104/struct_ov104_0223BFFC.h b/include/overlay104/struct_ov104_0223BFFC.h
index b7043e2b26..8357f57b8f 100644
--- a/include/overlay104/struct_ov104_0223BFFC.h
+++ b/include/overlay104/struct_ov104_0223BFFC.h
@@ -32,10 +32,10 @@ typedef struct {
     int unk_28;
     u8 unk_2C[3];
     u8 unk_2F;
-    CellActorData *unk_30[4];
-    CellActorData *unk_40[4];
-    CellActorData *unk_50[4];
-    CellActorData *unk_60[4];
+    ManagedSprite *unk_30[4];
+    ManagedSprite *unk_40[4];
+    ManagedSprite *unk_50[4];
+    ManagedSprite *unk_60[4];
     Party *unk_70;
     Party *unk_74;
     u16 unk_78[14];
diff --git a/include/overlay104/struct_ov104_0223C4CC.h b/include/overlay104/struct_ov104_0223C4CC.h
index 3f19afbc51..e24d5b50c2 100644
--- a/include/overlay104/struct_ov104_0223C4CC.h
+++ b/include/overlay104/struct_ov104_0223C4CC.h
@@ -40,7 +40,7 @@ typedef struct UnkStruct_ov104_0223C4CC_t {
         SpriteManager *unk_04;
     } unk_34;
     UnkStruct_ov104_0223D3B0_1 unk_3C;
-    CellActorData *unk_80[4];
+    ManagedSprite *unk_80[4];
     void *unk_90;
     SysTask *unk_94;
     SysTask *unk_98;
diff --git a/include/overlay104/struct_ov104_0223D3B0_1.h b/include/overlay104/struct_ov104_0223D3B0_1.h
index 1155101ddb..b0d11b37f5 100644
--- a/include/overlay104/struct_ov104_0223D3B0_1.h
+++ b/include/overlay104/struct_ov104_0223D3B0_1.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00[8];
+    ManagedSprite *unk_00[8];
     u16 unk_20[8];
     u32 unk_30;
     u16 unk_34[8];
diff --git a/include/overlay105/ov105_02245AAC.h b/include/overlay105/ov105_02245AAC.h
index 1efeabb61e..37af22dd74 100644
--- a/include/overlay105/ov105_02245AAC.h
+++ b/include/overlay105/ov105_02245AAC.h
@@ -3,10 +3,10 @@
 
 #include "overlay105/struct_ov105_02245AAC.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0);
-CellActor *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+Sprite *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/ov105_02245CD0.h b/include/overlay105/ov105_02245CD0.h
index 7895a29b39..f67ff019d3 100644
--- a/include/overlay105/ov105_02245CD0.h
+++ b/include/overlay105/ov105_02245CD0.h
@@ -8,7 +8,7 @@
 
 void ov105_02245CD0(void);
 void ov105_02245D50(UnkStruct_02007768 *param0);
-Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5);
-void ov105_02245DB8(Sprite *param0, int param1);
+PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5);
+void ov105_02245DB8(PokemonSprite *param0, int param1);
 
 #endif // POKEPLATINUM_OV105_02245CD0_H
diff --git a/include/overlay105/struct_ov105_02245AAC.h b/include/overlay105/struct_ov105_02245AAC.h
index 5f0cb70245..4a326da1df 100644
--- a/include/overlay105/struct_ov105_02245AAC.h
+++ b/include/overlay105/struct_ov105_02245AAC.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV105_02245AAC_H
 #define POKEPLATINUM_STRUCT_OV105_02245AAC_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[1][4];
diff --git a/include/overlay106/ov106_02243310.h b/include/overlay106/ov106_02243310.h
index d70838b439..24cc402268 100644
--- a/include/overlay106/ov106_02243310.h
+++ b/include/overlay106/ov106_02243310.h
@@ -3,11 +3,11 @@
 
 #include "overlay106/struct_ov106_02243310.h"
 
-#include "cell_actor.h"
 #include "pokemon.h"
+#include "sprite.h"
 
 void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1);
-CellActor *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4);
+Sprite *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 53f7464d21..55a53d90a6 100644
--- a/include/overlay106/struct_ov106_02243310.h
+++ b/include/overlay106/struct_ov106_02243310.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV106_02243310_H
 #define POKEPLATINUM_STRUCT_OV106_02243310_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[2][4];
diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h
index 7cde88f1ab..2e6d98d5f2 100644
--- a/include/overlay107/ov107_02249604.h
+++ b/include/overlay107/ov107_02249604.h
@@ -3,11 +3,11 @@
 
 #include "overlay107/struct_ov107_02249954.h"
 
-#include "cell_actor.h"
 #include "party.h"
+#include "sprite.h"
 
 void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2);
-CellActor *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+Sprite *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 bccac361c6..505fa0d78a 100644
--- a/include/overlay107/struct_ov107_02249954.h
+++ b/include/overlay107/struct_ov107_02249954.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV107_02249954_H
 #define POKEPLATINUM_STRUCT_OV107_02249954_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[7][4];
diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h
index ee9f8050df..e5d0a52643 100644
--- a/include/overlay108/ov108_02243030.h
+++ b/include/overlay108/ov108_02243030.h
@@ -3,11 +3,11 @@
 
 #include "overlay108/struct_ov108_02243030.h"
 
-#include "cell_actor.h"
 #include "party.h"
+#include "sprite.h"
 
 void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3);
-CellActor *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+Sprite *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 6564397b19..45851120da 100644
--- a/include/overlay108/struct_ov108_02243030.h
+++ b/include/overlay108/struct_ov108_02243030.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV108_02243030_H
 #define POKEPLATINUM_STRUCT_OV108_02243030_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[11][4];
diff --git a/include/overlay109/struct_ov109_021D5140.h b/include/overlay109/struct_ov109_021D5140.h
index d998b0e016..17100c8797 100644
--- a/include/overlay109/struct_ov109_021D5140.h
+++ b/include/overlay109/struct_ov109_021D5140.h
@@ -11,9 +11,9 @@
 #include "overlay109/struct_ov109_021D5140_sub3.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "message.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -38,15 +38,15 @@ typedef struct UnkStruct_ov109_021D5140_t {
     Strbuf *unk_54;
     Strbuf *unk_58;
     int unk_5C;
-    CellActorCollection *unk_60;
+    SpriteList *unk_60;
     G2dRenderer unk_64;
     SpriteResourceCollection *unk_1F0[4];
     SpriteResource *unk_200[3][4];
-    CellActorResourceData unk_230;
-    CellActorResourceData unk_254;
-    CellActorResourceData unk_278;
-    CellActor *unk_29C[14];
-    CellActor *unk_2D4[14];
+    SpriteResourcesHeader unk_230;
+    SpriteResourcesHeader unk_254;
+    SpriteResourcesHeader unk_278;
+    Sprite *unk_29C[14];
+    Sprite *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 91a3ca4ee3..1041f16264 100644
--- a/include/overlay111/ov111_021D2F80.h
+++ b/include/overlay111/ov111_021D2F80.h
@@ -3,10 +3,10 @@
 
 #include "overlay111/struct_ov111_021D2F80.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0);
-CellActor *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+Sprite *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 689d982edd..7977189432 100644
--- a/include/overlay111/struct_ov111_021D2F80.h
+++ b/include/overlay111/struct_ov111_021D2F80.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV111_021D2F80_H
 #define POKEPLATINUM_STRUCT_OV111_021D2F80_H
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[5][4];
diff --git a/include/overlay114/ov114_0225C700.h b/include/overlay114/ov114_0225C700.h
index 4d5096e12c..0e561cf0ca 100644
--- a/include/overlay114/ov114_0225C700.h
+++ b/include/overlay114/ov114_0225C700.h
@@ -8,8 +8,8 @@
 #include "overlay114/struct_ov114_0225D678_decl.h"
 #include "overlay114/struct_ov114_0225E854_decl.h"
 
-#include "cell_actor.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "trainer_info.h"
 
 void ov114_0225C700(UnkStruct_ov114_0225C76C *param0, BOOL param1, SaveData *param2, BOOL param3, UnkStruct_ov66_02230DBC *param4);
@@ -35,7 +35,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(CellActorCollection *param0, u32 param1);
+UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *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/overlay116/ov116_02261870.h b/include/overlay116/ov116_02261870.h
index cf3cc1ec18..6e9d746a90 100644
--- a/include/overlay116/ov116_02261870.h
+++ b/include/overlay116/ov116_02261870.h
@@ -35,7 +35,7 @@ void ov116_022620AC(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *
 void ov116_02262264(UnkStruct_ov116_02262A8C *param0);
 void ov116_022622C8(UnkStruct_ov116_0226139C *param0);
 void ov116_022625A8(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *param1);
-CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2);
+ManagedSprite *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2);
 void ov116_02262724(UnkStruct_ov116_02262A8C *param0);
 void ov116_0226281C(UnkStruct_ov116_02262A8C *param0);
 void ov116_02262840(UnkStruct_ov116_02262A8C *param0);
diff --git a/include/overlay116/struct_ov116_02262A8C.h b/include/overlay116/struct_ov116_02262A8C.h
index 8c7e872bc2..63e8c88d66 100644
--- a/include/overlay116/struct_ov116_02262A8C.h
+++ b/include/overlay116/struct_ov116_02262A8C.h
@@ -24,14 +24,14 @@ typedef struct {
     u8 padding_10[4];
     UnkStruct_ov116_022649E4 *unk_14;
     u8 padding_18[4];
-    CellActorData *unk_1C[3];
-    CellActorData *unk_20[3];
-    CellActorData *unk_24[3];
-    CellActorData *unk_28[36];
-    CellActorData *unk_B8[4];
-    CellActorData *unk_C8[2];
-    CellActorData *unk_D0[2];
-    CellActorData *unk_D8;
+    ManagedSprite *unk_1C[3];
+    ManagedSprite *unk_20[3];
+    ManagedSprite *unk_24[3];
+    ManagedSprite *unk_28[36];
+    ManagedSprite *unk_B8[4];
+    ManagedSprite *unk_C8[2];
+    ManagedSprite *unk_D0[2];
+    ManagedSprite *unk_D8;
     u16 unk_DC[4];
     u8 padding_E4[12];
     int unk_F0;
diff --git a/include/overlay116/struct_ov116_02262CB8.h b/include/overlay116/struct_ov116_02262CB8.h
index b865eefaf6..632ea54863 100644
--- a/include/overlay116/struct_ov116_02262CB8.h
+++ b/include/overlay116/struct_ov116_02262CB8.h
@@ -10,8 +10,8 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    CellActorData *unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_0C;
+    ManagedSprite *unk_10;
     UnkStruct_ov116_0226469C unk_14;
     UnkStruct_ov116_022649E4 *unk_2C;
 } UnkStruct_ov116_02262CB8;
diff --git a/include/overlay116/struct_ov116_02262D08.h b/include/overlay116/struct_ov116_02262D08.h
index 60b9c83eba..c2b91ab222 100644
--- a/include/overlay116/struct_ov116_02262D08.h
+++ b/include/overlay116/struct_ov116_02262D08.h
@@ -11,7 +11,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     u8 padding_08[4];
-    CellActorData *unk_0C;
+    ManagedSprite *unk_0C;
     UnkStruct_ov116_0226469C unk_10;
     int unk_28;
     int *unk_2C;
diff --git a/include/overlay116/struct_ov116_022647BC.h b/include/overlay116/struct_ov116_022647BC.h
index e3fdc772cc..9697b9e755 100644
--- a/include/overlay116/struct_ov116_022647BC.h
+++ b/include/overlay116/struct_ov116_022647BC.h
@@ -9,7 +9,7 @@
 typedef struct {
     BOOL unk_00;
     int unk_04;
-    CellActorData *unk_08[3];
+    ManagedSprite *unk_08[3];
     UnkStruct_ov116_0226469C unk_14[3][2];
     UnkStruct_ov116_022649E4 *unk_A4;
 } UnkStruct_ov116_022647BC;
diff --git a/include/overlay116/struct_ov116_02265D84.h b/include/overlay116/struct_ov116_02265D84.h
index 375596d918..2d69017cb8 100644
--- a/include/overlay116/struct_ov116_02265D84.h
+++ b/include/overlay116/struct_ov116_02265D84.h
@@ -6,7 +6,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     int unk_04;
     s16 unk_08;
     u8 padding_0A[6];
diff --git a/include/overlay117/ov117_02263AF0.h b/include/overlay117/ov117_02263AF0.h
index b583da0a2b..8277a068de 100644
--- a/include/overlay117/ov117_02263AF0.h
+++ b/include/overlay117/ov117_02263AF0.h
@@ -54,12 +54,12 @@ void ov117_02265EB0(UnkStruct_ov117_02265EB0 *param0);
 void ov117_02265EC8(UnkStruct_ov117_02265EC8 *param0);
 void ov117_02265F34(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265EC8 *param1);
 void ov117_02265F98(UnkStruct_ov117_02265EC8 *param0, int param1);
-CellActorData *ov117_02266130(UnkStruct_ov117_02261280 *param0);
+ManagedSprite *ov117_02266130(UnkStruct_ov117_02261280 *param0);
 void ov117_02266150(UnkStruct_ov117_02261280 *param0);
 void ov117_02266210(UnkStruct_ov117_02261280 *param0);
-void ov117_02266238(UnkStruct_ov117_02261280 *param0, CellActorData *param1);
-CellActorData *ov117_02266244(UnkStruct_ov117_02261280 *param0);
-void ov117_02266268(UnkStruct_ov117_02261280 *param0, CellActorData *param1);
+void ov117_02266238(UnkStruct_ov117_02261280 *param0, ManagedSprite *param1);
+ManagedSprite *ov117_02266244(UnkStruct_ov117_02261280 *param0);
+void ov117_02266268(UnkStruct_ov117_02261280 *param0, ManagedSprite *param1);
 BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *param1);
 
 #endif // POKEPLATINUM_OV117_02263AF0_H
diff --git a/include/overlay117/struct_ov117_02263EF8.h b/include/overlay117/struct_ov117_02263EF8.h
index 787e9b7eb6..bacf0b1d35 100644
--- a/include/overlay117/struct_ov117_02263EF8.h
+++ b/include/overlay117/struct_ov117_02263EF8.h
@@ -13,7 +13,7 @@ typedef struct {
     s16 unk_0C;
     u8 unk_0E;
     u8 padding_0F[1];
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     const UnkStruct_ov117_02266F10 *unk_14;
 } UnkStruct_ov117_02263EF8;
 
diff --git a/include/overlay117/struct_ov117_02264508.h b/include/overlay117/struct_ov117_02264508.h
index 00013a7275..e3e4478988 100644
--- a/include/overlay117/struct_ov117_02264508.h
+++ b/include/overlay117/struct_ov117_02264508.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     fx32 unk_04;
     fx32 unk_08;
     fx32 unk_0C;
diff --git a/include/overlay117/struct_ov117_02264930.h b/include/overlay117/struct_ov117_02264930.h
index ed131606e7..ab423e19e7 100644
--- a/include/overlay117/struct_ov117_02264930.h
+++ b/include/overlay117/struct_ov117_02264930.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     u8 unk_04;
     u8 unk_05;
     u8 unk_06;
diff --git a/include/overlay117/struct_ov117_0226504C.h b/include/overlay117/struct_ov117_0226504C.h
index 3686a91ce9..ad2bce3471 100644
--- a/include/overlay117/struct_ov117_0226504C.h
+++ b/include/overlay117/struct_ov117_0226504C.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00[4];
+    ManagedSprite *unk_00[4];
 } UnkStruct_ov117_0226504C;
 
 #endif // POKEPLATINUM_STRUCT_OV117_0226504C_H
diff --git a/include/overlay117/struct_ov117_02265428.h b/include/overlay117/struct_ov117_02265428.h
index 195762fc69..81ebeecc9d 100644
--- a/include/overlay117/struct_ov117_02265428.h
+++ b/include/overlay117/struct_ov117_02265428.h
@@ -6,9 +6,9 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
-    CellActorData *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_00;
+    ManagedSprite *unk_04;
+    ManagedSprite *unk_08;
     fx32 unk_0C;
     u8 unk_10;
     u8 unk_11;
diff --git a/include/overlay117/struct_ov117_02265C1C.h b/include/overlay117/struct_ov117_02265C1C.h
index 7eeb3c6502..c512bddf4e 100644
--- a/include/overlay117/struct_ov117_02265C1C.h
+++ b/include/overlay117/struct_ov117_02265C1C.h
@@ -4,8 +4,8 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_00;
+    ManagedSprite *unk_04;
     fx32 unk_08;
     fx32 unk_0C;
     s16 unk_10;
diff --git a/include/overlay117/struct_ov117_02265EC8.h b/include/overlay117/struct_ov117_02265EC8.h
index eacb3ad822..55f8a736ab 100644
--- a/include/overlay117/struct_ov117_02265EC8.h
+++ b/include/overlay117/struct_ov117_02265EC8.h
@@ -6,7 +6,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov117_02265EB0 unk_04[6][2];
     UnkStruct_ov117_02265EB0 unk_F4;
     UnkStruct_ov117_02265EB0 unk_108[6];
diff --git a/include/overlay117/struct_ov117_02266274.h b/include/overlay117/struct_ov117_02266274.h
index 978a7cacf4..b3cd8a015e 100644
--- a/include/overlay117/struct_ov117_02266274.h
+++ b/include/overlay117/struct_ov117_02266274.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     s16 unk_04;
     s16 unk_06;
     s16 unk_08;
diff --git a/include/overlay117/struct_ov117_02266344.h b/include/overlay117/struct_ov117_02266344.h
index 032f4d84b4..02f098a044 100644
--- a/include/overlay117/struct_ov117_02266344.h
+++ b/include/overlay117/struct_ov117_02266344.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00[2];
+    ManagedSprite *unk_00[2];
     fx32 unk_08[2];
     fx32 unk_10[2];
     u8 unk_18;
diff --git a/include/overlay119/struct_ov119_021D0FD0.h b/include/overlay119/struct_ov119_021D0FD0.h
index 901d06cc79..f5314ac406 100644
--- a/include/overlay119/struct_ov119_021D0FD0.h
+++ b/include/overlay119/struct_ov119_021D0FD0.h
@@ -7,7 +7,7 @@
 #include "overlay119/struct_ov119_021D16C0.h"
 #include "overlay119/struct_ov119_021D17B8.h"
 
-#include "sprite_system.h"
+#include "sprite.h"
 
 typedef struct {
     UnkStruct_0209843C *unk_00;
@@ -17,10 +17,10 @@ typedef struct {
     int unk_64;
     int unk_68;
     u8 unk_6C;
-    Sprite *unk_70;
-    CellActorData *unk_74;
-    CellActorData *unk_78;
-    CellActorData *unk_7C;
+    PokemonSprite *unk_70;
+    ManagedSprite *unk_74;
+    ManagedSprite *unk_78;
+    ManagedSprite *unk_7C;
     UnkStruct_ov119_021D16C0 unk_80;
 } UnkStruct_ov119_021D0FD0;
 
diff --git a/include/pokemon.h b/include/pokemon.h
index 2a2dd03465..bef1ffded3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -482,7 +482,7 @@ u8 BoxPokemon_SpriteYOffset(BoxPokemon *boxMon, u8 face, BOOL preferDP);
  */
 u8 LoadPokemonSpriteYOffset(u16 species, u8 gender, u8 face, u8 form, u32 personality);
 void sub_0207697C(ArchivedSprite *param0, u16 param1);
-CellActorData *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
+ManagedSprite *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID);
 void sub_02076AAC(int param0, int param1, UnkStruct_ov5_021DE5D0 *param2);
 
 /**
@@ -850,7 +850,7 @@ void PokeSprite_LoadAnimationFrames(NARC *narc, SpriteAnimationFrame *frames, u1
  * @param reverse       If TRUE, reverse the sprite + animation
  * @param frame         Which frame of the animation to initialize
  */
-void PokeSprite_LoadAnimation(NARC *narc, PokemonAnimationSys *animationSys, Sprite *sprite, u16 species, int face, int reverse, int frame);
+void PokeSprite_LoadAnimation(NARC *narc, PokemonAnimationSys *animationSys, PokemonSprite *sprite, u16 species, int face, int reverse, int frame);
 
 /**
  * @brief Load the cry delay for a given species and a client type.
diff --git a/include/sprite.h b/include/sprite.h
new file mode 100644
index 0000000000..35ce4db1be
--- /dev/null
+++ b/include/sprite.h
@@ -0,0 +1,204 @@
+#ifndef POKEPLATINUM_SPRITE_H
+#define POKEPLATINUM_SPRITE_H
+
+#include <nitro/fx/fx.h>
+#include <nitro/gx.h>
+#include <nnsys.h>
+
+#include "constants/heap.h"
+
+#define SPRITE_FLIP_NONE 0
+#define SPRITE_FLIP_H    1
+#define SPRITE_FLIP_V    2
+
+#define SPRITE_ANIM_SIZE 29
+#define MAX_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,
+    AFFINE_OVERWRITE_MODE_NORMAL,
+    AFFINE_OVERWRITE_MODE_DOUBLE, // Extends the cell sprite's drawable area by 2x, use when the cell sprite is scaled up
+};
+
+typedef struct SpriteList SpriteList;
+
+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 Sprite {
+    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;
+    SpriteList *list; // The collection this sprite 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[SPRITE_ANIM_SIZE];
+    NNSG2dImageProxy imageProxy;
+    NNSG2dImagePaletteProxy paletteProxy;
+    u32 type;
+    u16 activeAnimID;
+    u8 explicitPriority;
+    u16 priority;
+    enum NNS_G2D_VRAM_TYPE vramType;
+    struct Sprite *prev;
+    struct Sprite *next;
+} Sprite;
+
+struct SpriteList {
+    Sprite *sprites;
+    int capacity;
+    Sprite **freeSprites; // Stack of currently unused sprites
+    int freeSpriteHead;
+    Sprite sentinelData;
+    NNSG2dRendererInstance *renderer;
+    void *rawAnimData;
+    NNSG2dCellAnimBankData *defaultAnimBank;
+    BOOL active;
+};
+
+typedef struct SpriteListParams {
+    int maxElements;
+    NNSG2dRendererInstance *renderer;
+    enum HeapId heapID;
+} SpriteListParams;
+
+typedef struct SpriteResourcesHeader {
+    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];
+} SpriteResourcesHeader;
+
+typedef struct SpriteResourcesHeaderList {
+    SpriteResourcesHeader *headers;
+    int length;
+} SpriteResourcesHeaderList;
+
+typedef struct ManagedSprite {
+    Sprite *sprite;
+    SpriteResourcesHeader *resourceHeader;
+    SpriteResourcesHeaderList *resourceHeaderList;
+    BOOL vramTransfer;
+} ManagedSprite;
+
+typedef struct SpriteListTemplate {
+    SpriteList *list;
+    const SpriteResourcesHeader *resourceData;
+    VecFx32 position;
+    u32 priority;
+    enum NNS_G2D_VRAM_TYPE vramType;
+    enum HeapId heapID;
+} SpriteListTemplate;
+
+typedef struct AffineSpriteListTemplate {
+    SpriteList *list;
+    const SpriteResourcesHeader *resourceData;
+    VecFx32 position;
+    VecFx32 affineScale;
+    u16 affineZRotation;
+    u32 priority;
+    enum NNS_G2D_VRAM_TYPE vramType;
+    enum HeapId heapID;
+} AffineSpriteListTemplate;
+
+SpriteList *SpriteList_New(const SpriteListParams *params);
+BOOL SpriteList_Delete(SpriteList *collection);
+BOOL SpriteList_SetActive(SpriteList *collection, u8 active);
+BOOL SpriteList_DeleteAll(SpriteList *collection);
+void SpriteList_Update(const SpriteList *collection);
+void Sprite_Reset(Sprite *sprite);
+Sprite *SpriteList_AddEx(const AffineSpriteListTemplate *params);
+Sprite *SpriteList_Add(const SpriteListTemplate *params);
+void Sprite_Delete(Sprite *gfxElem);
+void Sprite_SetPosition(Sprite *sprite, const VecFx32 *position);
+void Sprite_SetAffineTranslation(Sprite *sprite, const VecFx32 *translation);
+void Sprite_SetAffineScale(Sprite *sprite, const VecFx32 *scale);
+void Sprite_SetAffineScaleEx(Sprite *sprite, const VecFx32 *scale, enum AffineOverwriteMode mode);
+void Sprite_SetAffineZRotation(Sprite *sprite, u16 angle);
+void Sprite_SetAffineZRotationEx(Sprite *sprite, u16 angle, enum AffineOverwriteMode mode);
+void Sprite_SetDrawFlag(Sprite *sprite, BOOL draw);
+void Sprite_SetAnimateFlag(Sprite *sprite, BOOL animate);
+void Sprite_SetAnimSpeed(Sprite *sprite, fx32 speed);
+void Sprite_SetAffineOverwriteMode(Sprite *sprite, enum AffineOverwriteMode mode);
+void Sprite_SetFlipMode(Sprite *sprite, u32 mode);
+const VecFx32 *Sprite_GetPosition(const Sprite *sprite);
+const VecFx32 *Sprite_GetAffineScale(const Sprite *sprite);
+u16 Sprite_GetAffineZRotation(const Sprite *sprite);
+BOOL Sprite_GetDrawFlag(const Sprite *sprite);
+BOOL Sprite_GetAnimateFlag(const Sprite *sprite);
+u32 Sprite_GetAnimCount(const Sprite *sprite);
+void Sprite_SetAnim(Sprite *sprite, u32 animID);
+void Sprite_SetAnimNoRestart(Sprite *sprite, u32 animID);
+void Sprite_RestartAnim(Sprite *sprite);
+u32 Sprite_GetActiveAnim(const Sprite *sprite);
+void Sprite_UpdateAnim(Sprite *sprite, fx32 frames);
+void Sprite_SetAnimFrame(Sprite *sprite, u16 frame);
+u16 Sprite_GetAnimFrame(const Sprite *sprite);
+void Sprite_SetExplicitPriority(Sprite *sprite, u8 priority);
+u8 Sprite_GetExplicitPriority(const Sprite *sprite);
+void Sprite_SetExplicitPalette(Sprite *sprite, u32 palette);
+void Sprite_SetExplicitPaletteWithOffset(Sprite *sprite, u32 palette);
+u32 Sprite_GetExplicitPalette(const Sprite *sprite);
+void Sprite_SetExplicitPaletteOffset(Sprite *sprite, u32 paletteOffset);
+void Sprite_SetExplicitPaletteOffsetAutoAdjust(Sprite *sprite, u32 paletteOffset);
+u32 Sprite_GetExplicitPaletteOffset(const Sprite *sprite);
+void Sprite_SetPriority(Sprite *sprite, u32 priority);
+u32 Sprite_GetPriority(const Sprite *sprite);
+void Sprite_SetImageProxy(Sprite *sprite, const NNSG2dImageProxy *imageProxy);
+NNSG2dImageProxy *Sprite_GetImageProxy(Sprite *sprite);
+NNSG2dImagePaletteProxy *Sprite_GetPaletteProxy(Sprite *paletteProxy);
+void Sprite_SetPixelated(Sprite *sprite, BOOL pixelated);
+enum NNS_G2D_VRAM_TYPE Sprite_GetVRamType(const Sprite *sprite);
+BOOL Sprite_IsAnimated(Sprite *sprite);
+void Sprite_SetExplicitOAMMode(Sprite *sprite, GXOamMode mode);
+void Utility_Clear2DMainOAM(enum HeapId heapID);
+void Utility_Clear2DSubOAM(enum HeapId heapID);
+u32 Sprite_GetUserAttrForAnimFrame(const Sprite *sprite, u32 animID, u32 frame);
+u32 Sprite_GetUserAttrForCurrentAnimFrame(const Sprite *sprite);
+
+#endif // POKEPLATINUM_SPRITE_H
diff --git a/include/sprite_resource.h b/include/sprite_resource.h
index 855b50d5fb..35d6fce96d 100644
--- a/include/sprite_resource.h
+++ b/include/sprite_resource.h
@@ -9,12 +9,12 @@
 #include "resource_collection.h"
 
 enum SpriteResourceType {
-    SPRITE_RESOURCE_TILES = 0,
-    SPRITE_RESOURCE_PALETTE,
-    SPRITE_RESOURCE_SPRITE,
-    SPRITE_RESOURCE_SPRITE_ANIM,
-    SPRITE_RESOURCE_MULTI_SPRITE,
-    SPRITE_RESOURCE_MULTI_SPRITE_ANIM,
+    SPRITE_RESOURCE_CHAR = 0,
+    SPRITE_RESOURCE_PLTT,
+    SPRITE_RESOURCE_CELL,
+    SPRITE_RESOURCE_ANIM,
+    SPRITE_RESOURCE_MULTI_CELL,
+    SPRITE_RESOURCE_MULTI_ANIM,
     SPRITE_RESOURCE_MAX,
 };
 
diff --git a/include/sprite_system.h b/include/sprite_system.h
index a3c9becb00..2b5d331ca6 100644
--- a/include/sprite_system.h
+++ b/include/sprite_system.h
@@ -5,11 +5,11 @@
 
 #include "constants/heap.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "narc.h"
 #include "palette.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
@@ -24,7 +24,7 @@ typedef struct SpriteSystem {
 } SpriteSystem;
 
 typedef struct SpriteManager {
-    CellActorCollection *sprites;
+    SpriteList *sprites;
     SpriteResourcesHeaderList *resourceHeaders;
     SpriteResourceTable *resourcePaths;
     SpriteResourceCollection *ownedResources[SPRITE_RESOURCE_MAX];
@@ -91,7 +91,7 @@ SpriteManager *SpriteManager_New(SpriteSystem *spriteSys);
 G2dRenderer *SpriteSystem_GetRenderer(SpriteSystem *spriteSys);
 BOOL SpriteSystem_Init(SpriteSystem *spriteSys, const RenderOamTemplate *oamTemplate, const CharTransferTemplateWithModes *transferTemplate, int plttCapacity);
 BOOL SpriteSystem_InitSprites(SpriteSystem *spriteSys, SpriteManager *spriteMan, int maxSprites);
-void SpriteSystem_DeleteSprite(CellActor *sprite);
+void Sprite_Delete2(Sprite *sprite);
 void SpriteSystem_DrawSprites(SpriteManager *spriteMan);
 void SpriteSystem_TransferOam(void);
 void SpriteSystem_UpdateTransfer(void);
@@ -103,7 +103,7 @@ void SpriteSystem_FreeSpriteManager(SpriteSystem *spriteSys, SpriteManager *spri
 void SpriteSystem_DestroySpriteManager(SpriteSystem *spriteSys, SpriteManager *spriteMan);
 void SpriteSystem_Free(SpriteSystem *spriteSys);
 BOOL SpriteSystem_LoadResourceDataFromFilepaths(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteResourceDataPaths *paths);
-CellActor *SpriteSystem_NewSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplateFromResourceHeader *template);
+Sprite *SpriteSystem_NewSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplateFromResourceHeader *template);
 BOOL SpriteSystem_InitManagerWithCapacities(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteResourceCapacities *capacities);
 BOOL SpriteSystem_LoadCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID);
 BOOL SpriteSystem_LoadCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID);
@@ -115,7 +115,7 @@ BOOL SpriteSystem_LoadCellResObj(SpriteSystem *spriteSys, SpriteManager *spriteM
 BOOL SpriteSystem_LoadCellResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID);
 BOOL SpriteSystem_LoadAnimResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int resourceID);
 BOOL SpriteSystem_LoadAnimResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID);
-CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplate *template);
+ManagedSprite *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplate *template);
 const NNSG2dImagePaletteProxy *SpriteManager_FindPlttResourceProxy(SpriteManager *spriteMan, int resourceID);
 u32 SpriteManager_FindPlttResourceOffset(SpriteManager *spriteMan, int resourceID, enum NNS_G2D_VRAM_TYPE vramType);
 BOOL SpriteManager_UnloadCharObjById(SpriteManager *spriteMan, int resourceID);
@@ -123,66 +123,66 @@ BOOL SpriteManager_UnloadPlttObjById(SpriteManager *spriteMan, int resourceID);
 BOOL SpriteManager_UnloadCellObjById(SpriteManager *spriteMan, int resourceID);
 BOOL SpriteManager_UnloadAnimObjById(SpriteManager *spriteMan, int resourceID);
 void SpriteSystem_FreeResourcesAndManager(SpriteSystem *spriteSys, SpriteManager *spriteMan);
-void Sprite_DeleteAndFreeResources(CellActorData *managedSprite);
-void Sprite_TickFrame(CellActor *sprite);
-void Sprite_TickOneFrame(CellActorData *managedSprite);
-void Sprite_TickTwoFrame(CellActorData *managedSprite);
-void Sprite_TickNFrames(CellActorData *managedSprite, fx32 frames);
-u32 Sprite_GetNumFrames(CellActorData *managedSprite);
-void Sprite_SetAnim(CellActorData *managedSprite, u32 animID);
-void Sprite_SetAnimNoRestart(CellActorData *managedSprite, u32 animID);
-u32 Sprite_GetActiveAnim(CellActorData *managedSprite);
-void Sprite_SetAnimateFlag(CellActorData *managedSprite, BOOL animate);
-void Sprite_SetAnimationSpeed(CellActorData *managedSprite, fx32 speed);
-BOOL Sprite_IsAnimated(CellActorData *managedSprite);
-void Sprite_SetAnimationFrame(CellActorData *managedSprite, u16 frame);
-u16 Sprite_GetAnimationFrame(CellActorData *managedSprite);
-void Sprite_SetDrawFlag(CellActor *sprite, BOOL draw);
-void Sprite_SetDrawFlag2(CellActorData *managedSprite, BOOL draw);
-int Sprite_GetDrawFlag(CellActor *sprite);
-int Sprite_GetDrawFlag2(CellActorData *managedSprite);
-void Sprite_SetExplicitPalette(CellActor *sprite, int palette);
-void Sprite_SetExplicitPalette2(CellActorData *managedSprite, int palette);
-void Sprite_SetExplicitPaletteOffset(CellActorData *managedSprite, int paletteOffset);
-int Sprite_GetExplicitPaletteOffset(CellActorData *managedSprite);
-int Sprite_GetExplicitPriority(CellActorData *managedSprite);
-void Sprite_SetExplicitPriority(CellActorData *managedSprite, int priority);
-void Sprite_SetPriority(CellActorData *managedSprite, int priority);
-u32 Sprite_GetPriority(CellActorData *managedSprite);
-void Sprite_SetPositionXY(CellActor *sprite, s16 x, s16 y);
-void Sprite_SetPositionXY2(CellActorData *managedSprite, s16 x, s16 y);
-void Sprite_SetPositionXYWithSubscreenOffset(CellActor *sprite, s16 x, s16 y, fx32 offset);
-void Sprite_SetPositionXYWithSubscreenOffset2(CellActorData *managedSprite, s16 x, s16 y, fx32 offset);
-void Sprite_GetPositionXY(CellActor *sprite, s16 *outX, s16 *outY);
-void Sprite_GetPositionXY2(CellActorData *managedSprite, s16 *outX, s16 *outY);
-void Sprite_GetPositionXYWithSubscreenOffset(CellActor *sprite, s16 *outX, s16 *outY, fx32 offset);
-void Sprite_GetPositionXYWithSubscreenOffset2(CellActorData *managedSprite, s16 *outX, s16 *outY, fx32 offset);
-void Sprite_OffsetPositionXY(CellActor *sprite, s16 x, s16 y);
-void Sprite_OffsetPositionXY2(CellActorData *managedSprite, s16 x, s16 y);
-void Sprite_OffsetPositionFxXY(CellActorData *managedSprite, fx32 x, fx32 y);
-void Sprite_SetPositionFxXY(CellActorData *managedSprite, fx32 x, fx32 y);
-void Sprite_GetPositionFxXY(CellActorData *managedSprite, fx32 *outX, fx32 *outY);
-void Sprite_SetPositionFxXYWithSubscreenOffset(CellActorData *managedSprite, fx32 x, fx32 y, fx32 offset);
-void Sprite_GetPositionFxXYWithSubscreenOffset(CellActorData *managedSprite, fx32 *outX, fx32 *outY, fx32 offset);
-void Sprite_SetAffineOverwriteMode(CellActorData *managedSprite, enum AffineOverwriteMode mode);
-void Sprite_SetAffineScale(CellActorData *managedSprite, f32 xScale, f32 yScale);
-void Sprite_OffsetAffineScale(CellActorData *managedSprite, f32 xScale, f32 yScale);
-void Sprite_GetAffineScale(CellActorData *managedSprite, f32 *outXScale, f32 *outYScale);
-void Sprite_SetAffineZRotation(CellActorData *managedSprite, u16 angle);
-void Sprite_OffsetAffineZRotation(CellActorData *managedSprite, s32 offset);
-void Sprite_SetFlipMode(CellActor *sprite, BOOL mode);
-void Sprite_SetFlipMode2(CellActorData *managedSprite, BOOL mode);
-void Sprite_SetAffineTranslation(CellActorData *managedSprite, s16 x, s16 y);
-void Sprite_SetPixelated(CellActorData *managedSprite, BOOL pixelated);
-void Sprite_SetExplicitOamMode(CellActor *sprite, GXOamMode mode);
-void Sprite_SetExplicitOamMode2(CellActorData *managedSprite, GXOamMode mode);
-u32 Sprite_SetUserAttrForCurrentAnimFrame(CellActorData *managedSprite);
+void Sprite_DeleteAndFreeResources(ManagedSprite *managedSprite);
+void Sprite_TickFrame(Sprite *sprite);
+void ManagedSprite_TickFrame(ManagedSprite *managedSprite);
+void ManagedSprite_TickTwoFrames(ManagedSprite *managedSprite);
+void ManagedSprite_TickNFrames(ManagedSprite *managedSprite, fx32 frames);
+u32 ManagedSprite_GetNumFrames(ManagedSprite *managedSprite);
+void ManagedSprite_SetAnim(ManagedSprite *managedSprite, u32 animID);
+void ManagedSprite_SetAnimNoRestart(ManagedSprite *managedSprite, u32 animID);
+u32 ManagedSprite_GetActiveAnim(ManagedSprite *managedSprite);
+void ManagedSprite_SetAnimateFlag(ManagedSprite *managedSprite, BOOL animate);
+void ManagedSprite_SetAnimationSpeed(ManagedSprite *managedSprite, fx32 speed);
+BOOL ManagedSprite_IsAnimated(ManagedSprite *managedSprite);
+void ManagedSprite_SetAnimationFrame(ManagedSprite *managedSprite, u16 frame);
+u16 ManagedSprite_GetAnimationFrame(ManagedSprite *managedSprite);
+void Sprite_SetDrawFlag2(Sprite *sprite, BOOL draw);
+void ManagedSprite_SetDrawFlag(ManagedSprite *managedSprite, BOOL draw);
+int Sprite_GetDrawFlag2(Sprite *sprite);
+int ManagedSprite_GetDrawFlag(ManagedSprite *managedSprite);
+void Sprite_SetExplicitPalette2(Sprite *sprite, int palette);
+void ManagedSprite_SetExplicitPalette(ManagedSprite *managedSprite, int palette);
+void ManagedSprite_SetExplicitPaletteOffset(ManagedSprite *managedSprite, int paletteOffset);
+int ManagedSprite_GetExplicitPaletteOffset(ManagedSprite *managedSprite);
+int ManagedSprite_GetExplicitPriority(ManagedSprite *managedSprite);
+void ManagedSprite_SetExplicitPriority(ManagedSprite *managedSprite, int priority);
+void ManagedSprite_SetPriority(ManagedSprite *managedSprite, int priority);
+u32 ManagedSprite_GetPriority(ManagedSprite *managedSprite);
+void Sprite_SetPositionXY(Sprite *sprite, s16 x, s16 y);
+void ManagedSprite_SetPositionXY(ManagedSprite *managedSprite, s16 x, s16 y);
+void Sprite_SetPositionXYWithSubscreenOffset(Sprite *sprite, s16 x, s16 y, fx32 offset);
+void ManagedSprite_SetPositionXYWithSubscreenOffset(ManagedSprite *managedSprite, s16 x, s16 y, fx32 offset);
+void Sprite_GetPositionXY(Sprite *sprite, s16 *outX, s16 *outY);
+void ManagedSprite_GetPositionXY(ManagedSprite *managedSprite, s16 *outX, s16 *outY);
+void ManagedSprite_GetPositionXYWithSubscreenOffset(Sprite *sprite, s16 *outX, s16 *outY, fx32 offset);
+void Sprite_GetPositionXYWithSubscreenOffset2(ManagedSprite *managedSprite, s16 *outX, s16 *outY, fx32 offset);
+void Sprite_OffsetPositionXY(Sprite *sprite, s16 x, s16 y);
+void ManagedSprite_OffsetPositionXY(ManagedSprite *managedSprite, s16 x, s16 y);
+void ManagedSprite_OffsetPositionFxXY(ManagedSprite *managedSprite, fx32 x, fx32 y);
+void ManagedSprite_SetPositionFxXY(ManagedSprite *managedSprite, fx32 x, fx32 y);
+void ManagedSprite_GetPositionFxXY(ManagedSprite *managedSprite, fx32 *outX, fx32 *outY);
+void ManagedSprite_SetPositionFxXYWithSubscreenOffset(ManagedSprite *managedSprite, fx32 x, fx32 y, fx32 offset);
+void ManagedSprite_GetPositionFxXYWithSubscreenOffset(ManagedSprite *managedSprite, fx32 *outX, fx32 *outY, fx32 offset);
+void ManagedSprite_SetAffineOverwriteMode(ManagedSprite *managedSprite, enum AffineOverwriteMode mode);
+void ManagedSprite_SetAffineScale(ManagedSprite *managedSprite, f32 xScale, f32 yScale);
+void ManagedSprite_OffsetAffineScale(ManagedSprite *managedSprite, f32 xScale, f32 yScale);
+void ManagedSprite_GetAffineScale(ManagedSprite *managedSprite, f32 *outXScale, f32 *outYScale);
+void ManagedSprite_SetAffineZRotation(ManagedSprite *managedSprite, u16 angle);
+void ManagedSprite_OffsetAffineZRotation(ManagedSprite *managedSprite, s32 offset);
+void Sprite_SetFlipMode2(Sprite *sprite, BOOL mode);
+void ManagedSprite_SetFlipMode(ManagedSprite *managedSprite, BOOL mode);
+void ManagedSprite_SetAffineTranslation(ManagedSprite *managedSprite, s16 x, s16 y);
+void ManagedSprite_SetPixelated(ManagedSprite *managedSprite, BOOL pixelated);
+void Sprite_SetExplicitOamMode2(Sprite *sprite, GXOamMode mode);
+void ManagedSprite_SetExplicitOamMode(ManagedSprite *managedSprite, GXOamMode mode);
+u32 ManagedSprite_SetUserAttrForCurrentAnimFrame(ManagedSprite *managedSprite);
 BOOL SpriteSystem_LoadCharResObjWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID);
 BOOL SpriteSystem_LoadCharResObjAtEndWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID);
 BOOL SpriteSystem_LoadCharResObjFromOpenNarcWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID);
 void SpriteSystem_ReplaceCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int resourceID);
 void SpriteSystem_ReplacePlttResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int resourceID);
-CellActorCollection *SpriteManager_GetSpriteList(SpriteManager *spriteMan);
+SpriteList *SpriteManager_GetSpriteList(SpriteManager *spriteMan);
 void SpriteSystem_ReplaceCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID);
 
 #endif // POKEPLATINUM_SPRITE_SYSTEM_H
diff --git a/include/sprite_util.h b/include/sprite_util.h
index e981294ecd..de27ce2444 100644
--- a/include/sprite_util.h
+++ b/include/sprite_util.h
@@ -3,7 +3,7 @@
 
 #include <nitro/gx.h>
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 
 typedef struct ResdatTableEntry {
@@ -23,7 +23,7 @@ typedef struct G2dRenderer {
     NNSG2dRenderSurface subScreen;
 } G2dRenderer;
 
-void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader,
+void SpriteResourcesHeader_Init(SpriteResourcesHeader *resourceHeader,
     int charResourceID,
     int plttResourceID,
     int cellResourceID,
@@ -38,7 +38,7 @@ void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader,
     SpriteResourceCollection *animResources,
     SpriteResourceCollection *mcellResources,
     SpriteResourceCollection *manimResources);
-void SpriteResourcesHeader_Clear(CellActorResourceData *resourceHeader);
+void SpriteResourcesHeader_Clear(SpriteResourcesHeader *resourceHeader);
 
 SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries,
     enum HeapId heapID,
@@ -50,7 +50,7 @@ SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatT
     SpriteResourceCollection *manimResources);
 void SpriteResourcesHeaderList_Free(SpriteResourcesHeaderList *param0);
 
-CellActorCollection *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID);
+SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID);
 void SetMainScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
 void SetSubScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y);
 void ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE vramType, GXOBJVRamModeChar vramMode);
diff --git a/include/struct_decls/sprite_decl.h b/include/struct_decls/sprite_decl.h
index 5971fc5e13..fd6f2272f7 100644
--- a/include/struct_decls/sprite_decl.h
+++ b/include/struct_decls/sprite_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_SPRITE_DECL_H
 #define POKEPLATINUM_SPRITE_DECL_H
 
-typedef struct Sprite Sprite;
+typedef struct PokemonSprite PokemonSprite;
 
 #endif // POKEPLATINUM_SPRITE_DECL_H
diff --git a/include/struct_defs/struct_02007768.h b/include/struct_defs/struct_02007768.h
index 444d7b138b..595973f32e 100644
--- a/include/struct_defs/struct_02007768.h
+++ b/include/struct_defs/struct_02007768.h
@@ -6,7 +6,7 @@
 #include "struct_defs/struct_02007C7C.h"
 
 typedef struct UnkStruct_02007768_t {
-    Sprite unk_00[4];
+    PokemonSprite unk_00[4];
     NNSG2dImageProxy unk_2B0;
     NNSG2dImagePaletteProxy unk_2D4;
     int unk_2E8;
diff --git a/include/struct_defs/struct_02007C7C.h b/include/struct_defs/struct_02007C7C.h
index c8d8348b22..9710598e20 100644
--- a/include/struct_defs/struct_02007C7C.h
+++ b/include/struct_defs/struct_02007C7C.h
@@ -8,7 +8,7 @@
 
 #include "functypes/funcptr_02007C34.h"
 
-typedef struct Sprite {
+typedef struct PokemonSprite {
     u32 unk_00_0 : 1;
     u32 unk_00_1 : 6;
     u32 unk_00_7 : 1;
@@ -27,6 +27,6 @@ typedef struct Sprite {
     UnkStruct_02007C7C_sub2 unk_6C;
     UnkStruct_02007C7C_sub2 unk_78;
     SpriteAnimationFrame unk_84[10];
-} Sprite;
+} PokemonSprite;
 
 #endif // POKEPLATINUM_STRUCT_02007C7C_H
diff --git a/include/struct_defs/struct_020127E8.h b/include/struct_defs/struct_020127E8.h
index 5f43cfdc13..81f23ae25e 100644
--- a/include/struct_defs/struct_020127E8.h
+++ b/include/struct_defs/struct_020127E8.h
@@ -6,14 +6,14 @@
 #include "struct_decls/struct_02012744_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
 typedef struct {
     const UnkStruct_02012744 *unk_00;
     const Window *unk_04;
-    CellActorCollection *unk_08;
+    SpriteList *unk_08;
     const NNSG2dImagePaletteProxy *unk_0C;
-    const CellActor *unk_10;
+    const Sprite *unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
diff --git a/include/struct_defs/struct_020298D8.h b/include/struct_defs/struct_020298D8.h
index 029ef82470..fe7609b8ef 100644
--- a/include/struct_defs/struct_020298D8.h
+++ b/include/struct_defs/struct_020298D8.h
@@ -9,7 +9,7 @@
 #include "touch_screen.h"
 
 typedef struct {
-    Sprite *unk_00;
+    PokemonSprite *unk_00;
     TouchScreenHitTable unk_04;
     UnkStruct_ov22_022596B0 unk_08;
     Pokemon *unk_0C;
diff --git a/include/struct_defs/struct_0206A844.h b/include/struct_defs/struct_0206A844.h
index eb593ce13a..92a3dfbeb4 100644
--- a/include/struct_defs/struct_0206A844.h
+++ b/include/struct_defs/struct_0206A844.h
@@ -7,7 +7,7 @@
 
 typedef struct {
     UnkStruct_ov5_021D30A8 unk_00;
-    CellActorData *unk_1C8[2];
+    ManagedSprite *unk_1C8[2];
 } UnkStruct_0206A844;
 
 #endif // POKEPLATINUM_STRUCT_0206A844_H
diff --git a/include/struct_defs/struct_020708E0.h b/include/struct_defs/struct_020708E0.h
index 6443f7f609..16fa267c58 100644
--- a/include/struct_defs/struct_020708E0.h
+++ b/include/struct_defs/struct_020708E0.h
@@ -22,7 +22,7 @@ typedef struct {
     u32 unk_2C;
     u8 unk_30[7];
     UnkStruct_ov5_021D30A8 unk_38;
-    CellActorData *unk_200[8];
+    ManagedSprite *unk_200[8];
     u32 unk_220;
     u32 unk_224;
     u32 unk_228;
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index 291665e4e6..4f46cd1bac 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -32,7 +32,7 @@ struct UnkStruct_0207AE68_t {
     Strbuf *unk_10;
     PaletteData *unk_14;
     UnkStruct_02007768 *unk_18;
-    Sprite *unk_1C[2];
+    PokemonSprite *unk_1C[2];
     Party *unk_24;
     Pokemon *unk_28;
     Options *unk_2C;
diff --git a/include/struct_defs/struct_0207F248.h b/include/struct_defs/struct_0207F248.h
index 8a1e681b16..786fc35dfe 100644
--- a/include/struct_defs/struct_0207F248.h
+++ b/include/struct_defs/struct_0207F248.h
@@ -14,9 +14,9 @@
 #include "overlay118/struct_ov118_021D0FDC_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "message.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -33,8 +33,8 @@ typedef struct {
     PartyManagementData *unk_5A4;
     SpriteSystem *unk_5A8;
     SpriteManager *unk_5AC;
-    CellActor *unk_5B0[29];
-    CellActorData *unk_624[29];
+    Sprite *unk_5B0[29];
+    ManagedSprite *unk_624[29];
     UnkStruct_0200C440 *unk_698;
     MessageLoader *unk_69C;
     StringTemplate *unk_6A0;
diff --git a/include/struct_defs/struct_020831B4.h b/include/struct_defs/struct_020831B4.h
index cba33fb194..f297cb509e 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 "cell_actor.h"
+#include "sprite.h"
 #include "strbuf.h"
 
 typedef struct {
@@ -26,7 +26,7 @@ typedef struct {
     s16 unk_1C;
     s16 unk_1E;
     s16 unk_20;
-    CellActor *unk_24;
+    Sprite *unk_24;
     u8 unk_28;
     u8 unk_29;
 } StrBufWrapper;
diff --git a/include/struct_defs/struct_0208AF44.h b/include/struct_defs/struct_0208AF44.h
index d5952aac7b..748b8e2a99 100644
--- a/include/struct_defs/struct_0208AF44.h
+++ b/include/struct_defs/struct_0208AF44.h
@@ -10,7 +10,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     BOOL unk_08;
-    CellActorData *unk_0C;
+    ManagedSprite *unk_0C;
     TouchScreenRect *unk_10;
     UnkStruct_0208AF44_sub1 unk_14;
 } UnkStruct_0208AF44;
diff --git a/include/struct_defs/struct_0208B878_sub2.h b/include/struct_defs/struct_0208B878_sub2.h
index 05796a768f..fc9406d8cc 100644
--- a/include/struct_defs/struct_0208B878_sub2.h
+++ b/include/struct_defs/struct_0208B878_sub2.h
@@ -4,7 +4,7 @@
 #include "sprite_system.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     s16 unk_04;
     s16 unk_06;
     int unk_08;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index 8135966444..31967312f5 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -18,13 +18,13 @@
 #include "overlay088/struct_ov88_0223C8AC.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "list_menu.h"
 #include "menu.h"
 #include "message.h"
 #include "overlay_manager.h"
 #include "party.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -69,18 +69,18 @@ struct UnkStruct_02095E80_t {
     Strbuf *unk_188;
     Strbuf *unk_18C;
     Strbuf *unk_190;
-    CellActorCollection *unk_194;
+    SpriteList *unk_194;
     G2dRenderer unk_198;
     SpriteResourceCollection *unk_324[4];
     SpriteResource *unk_334[2][4];
-    CellActorResourceData unk_354;
-    CellActorResourceData unk_378;
-    CellActor *unk_39C[14];
-    CellActor *unk_3D4[12];
-    CellActor *unk_404[12];
-    CellActor *unk_434[12];
-    CellActor *unk_464[6];
-    CellActor *unk_47C;
+    SpriteResourcesHeader unk_354;
+    SpriteResourcesHeader unk_378;
+    Sprite *unk_39C[14];
+    Sprite *unk_3D4[12];
+    Sprite *unk_404[12];
+    Sprite *unk_434[12];
+    Sprite *unk_464[6];
+    Sprite *unk_47C;
     SysTask *unk_480[7];
     Window unk_49C[34];
     Menu *unk_6BC;
diff --git a/include/struct_defs/struct_02095EAC_t.h b/include/struct_defs/struct_02095EAC_t.h
index 76c0485382..eb915700db 100644
--- a/include/struct_defs/struct_02095EAC_t.h
+++ b/include/struct_defs/struct_02095EAC_t.h
@@ -9,8 +9,8 @@
 #include "overlay058/struct_ov58_021D2820.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "message.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -27,15 +27,15 @@ struct UnkStruct_02095EAC_t {
     Strbuf *unk_28;
     Strbuf *unk_2C;
     int unk_30;
-    CellActorCollection *unk_34;
+    SpriteList *unk_34;
     G2dRenderer unk_38;
     SpriteResourceCollection *unk_1C4[4];
     SpriteResource *unk_1D4[2][4];
-    CellActorResourceData unk_1F4;
-    CellActorResourceData unk_218;
-    CellActor *unk_23C[14];
-    CellActor *unk_274[14];
-    CellActor *unk_2AC[12];
+    SpriteResourcesHeader unk_1F4;
+    SpriteResourcesHeader unk_218;
+    Sprite *unk_23C[14];
+    Sprite *unk_274[14];
+    Sprite *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 23b1dbacee..d9d7355fde 100644
--- a/include/struct_defs/struct_020961E8_t.h
+++ b/include/struct_defs/struct_020961E8_t.h
@@ -10,10 +10,10 @@
 #include "overlay059/struct_ov59_021D30E0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "menu.h"
 #include "message.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -34,15 +34,15 @@ struct UnkStruct_020961E8_t {
     Strbuf *unk_44;
     Strbuf *unk_48;
     int unk_4C;
-    CellActorCollection *unk_50;
+    SpriteList *unk_50;
     G2dRenderer unk_54;
     SpriteResourceCollection *unk_1E0[4];
     SpriteResource *unk_1F0[3][4];
-    CellActorResourceData unk_220;
-    CellActorResourceData unk_244;
-    CellActorResourceData unk_268;
-    CellActor *unk_28C[14];
-    CellActor *unk_2C4[14];
+    SpriteResourcesHeader unk_220;
+    SpriteResourcesHeader unk_244;
+    SpriteResourcesHeader unk_268;
+    Sprite *unk_28C[14];
+    Sprite *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 aecdcbf3e7..23ddea00a2 100644
--- a/include/struct_defs/struct_0209903C.h
+++ b/include/struct_defs/struct_0209903C.h
@@ -3,7 +3,7 @@
 
 #include "struct_defs/struct_0209903C_sub1.h"
 
-#include "cell_actor.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 
@@ -14,7 +14,7 @@ typedef struct {
     u16 unk_0A;
     u16 unk_0C;
     u16 unk_0E;
-    CellActorCollection *unk_10;
+    SpriteList *unk_10;
     G2dRenderer unk_14;
     SpriteResourcesHeaderList *unk_1A0;
     SpriteResourceCollection *unk_1A4[4];
diff --git a/include/struct_defs/struct_0209916C.h b/include/struct_defs/struct_0209916C.h
index 9aa89d7304..2f61e5367b 100644
--- a/include/struct_defs/struct_0209916C.h
+++ b/include/struct_defs/struct_0209916C.h
@@ -5,7 +5,7 @@
 
 typedef struct {
     u16 unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
 } UnkStruct_0209916C;
 
 #endif // POKEPLATINUM_STRUCT_0209916C_H
diff --git a/include/unk_0200762C.h b/include/unk_0200762C.h
index 0928b230a2..3a3823972e 100644
--- a/include/unk_0200762C.h
+++ b/include/unk_0200762C.h
@@ -12,33 +12,33 @@
 void *sub_0200762C(int param0);
 void sub_02007768(UnkStruct_02007768 *param0);
 void sub_02007B6C(UnkStruct_02007768 *param0);
-void sub_02007B98(Sprite *param0, int param1);
-void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1);
-BOOL sub_02007C24(Sprite *param0);
-Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7);
-Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8);
-void sub_02007DC8(Sprite *param0);
+void sub_02007B98(PokemonSprite *param0, int param1);
+void sub_02007C10(PokemonSprite *param0, SpriteAnimationFrame *param1);
+BOOL sub_02007C24(PokemonSprite *param0);
+PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7);
+PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8);
+void sub_02007DC8(PokemonSprite *param0);
 void sub_02007DD4(UnkStruct_02007768 *param0);
-void sub_02007DEC(Sprite *param0, int param1, int param2);
-int sub_020080C0(Sprite *param0, int param1);
-void sub_02008274(Sprite *param0, int param1, int param2);
-void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4);
-void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4);
+void sub_02007DEC(PokemonSprite *param0, int param1, int param2);
+int sub_020080C0(PokemonSprite *param0, int param1);
+void sub_02008274(PokemonSprite *param0, int param1, int param2);
+void sub_020086D4(PokemonSprite *param0, int param1, int param2, int param3, int param4);
+void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param4);
 void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4);
-void sub_02008780(Sprite *param0);
-BOOL sub_020087B4(Sprite *param0);
-void sub_020087C8(Sprite *param0, int param1);
+void sub_02008780(PokemonSprite *param0);
+BOOL sub_020087B4(PokemonSprite *param0);
+void sub_020087C8(PokemonSprite *param0, int param1);
 void sub_020088E0(UnkStruct_02008900 *param0, const SpriteAnimationFrame *param1);
 int sub_02008900(UnkStruct_02008900 *param0);
-void sub_020089A0(Sprite *param0);
-void sub_020089B0(Sprite *param0);
-void sub_02008A0C(Sprite *param0);
+void sub_020089A0(PokemonSprite *param0);
+void sub_020089B0(PokemonSprite *param0);
+void sub_02008A0C(PokemonSprite *param0);
 void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2);
 void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2);
-ArchivedSprite *sub_02008A90(Sprite *param0);
+ArchivedSprite *sub_02008A90(PokemonSprite *param0);
 void sub_02008A94(UnkStruct_02007768 *param0);
 void sub_02008B2C(UnkStruct_02007768 *param0, int param1);
-BOOL sub_02008B38(Sprite *param0);
+BOOL sub_02008B38(PokemonSprite *param0);
 void sub_02008B54(UnkStruct_02007768 *param0, u32 param1);
 void sub_02008B60(UnkStruct_02007768 *param0, u32 param1);
 void sub_020091D8(u8 *param0, u32 param1, BOOL param2);
diff --git a/include/unk_02012744.h b/include/unk_02012744.h
index 4ee5d41e11..b5d154cd1b 100644
--- a/include/unk_02012744.h
+++ b/include/unk_02012744.h
@@ -9,7 +9,7 @@
 #include "struct_defs/struct_020127E8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 
 UnkStruct_02012744 *sub_02012744(int param0, int param1);
 void sub_020127BC(UnkStruct_02012744 *param0);
@@ -33,6 +33,6 @@ FontOAM *sub_02012B60(const UnkStruct_020127E8 *param0, const UnkStruct_02012B20
 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 CellActor *param1);
+void sub_020131E0(FontOAM *param0, const Sprite *param1);
 
 #endif // POKEPLATINUM_UNK_02012744_H
diff --git a/include/unk_02015F84.h b/include/unk_02015F84.h
index 8e64eb96c1..e1c6bf8544 100644
--- a/include/unk_02015F84.h
+++ b/include/unk_02015F84.h
@@ -7,7 +7,7 @@
 
 PokemonAnimationSys *sub_02015F84(const int param0, const int param1, const u8 param2);
 void sub_02015FB8(PokemonAnimationSys *param0);
-void PokeAnimation_Init(PokemonAnimationSys *param0, Sprite *param1, const PokeAnimationSettings *param2, const u8 param3);
+void PokeAnimation_Init(PokemonAnimationSys *param0, PokemonSprite *param1, const PokeAnimationSettings *param2, const u8 param3);
 BOOL sub_020160F4(PokemonAnimationSys *param0, const u8 param1);
 void sub_02016114(PokemonAnimationSys *param0, const u8 param1);
 
diff --git a/include/unk_0207C908.h b/include/unk_0207C908.h
index df0add072d..80ff2e11d6 100644
--- a/include/unk_0207C908.h
+++ b/include/unk_0207C908.h
@@ -19,13 +19,13 @@ void sub_0207C9EC(SpriteSystem *param0, SpriteManager *param1, u32 param2, u32 p
 void sub_0207CA34(SpriteManager *param0, u32 param1);
 void sub_0207CA3C(SpriteManager *param0, u32 param1);
 void sub_0207CA44(SpriteManager *param0, u32 param1, u32 param2);
-CellActorData *sub_0207CA58(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3);
-void sub_0207CA88(CellActorData *param0);
+ManagedSprite *sub_0207CA58(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3);
+void sub_0207CA88(ManagedSprite *param0);
 u32 sub_0207CA90(int param0);
 u8 sub_0207CAA8(int param0);
 u32 sub_0207CAC0(void);
 void sub_0207CAC4(SpriteSystem *param0, SpriteManager *param1, NNS_G2D_VRAM_TYPE param2, int param3, u32 param4);
 void sub_0207CAF8(SpriteManager *param0, u32 param1);
-void sub_0207CB00(CellActorData *param0);
+void sub_0207CB00(ManagedSprite *param0);
 
 #endif // POKEPLATINUM_UNK_0207C908_H
diff --git a/include/unk_02094EDC.h b/include/unk_02094EDC.h
index b2e1118e27..951c8d66b8 100644
--- a/include/unk_02094EDC.h
+++ b/include/unk_02094EDC.h
@@ -15,7 +15,7 @@ void sub_02094F04(UnkStruct_02095C48 *param0, int param1, int param2, int param3
 void sub_020951B0(UnkStruct_02095C48 *param0, int param1);
 void sub_02095338(UnkStruct_02095C48 *param0);
 void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int param2);
-Sprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8);
+PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8);
 void sub_020954F0(UnkStruct_02095C48 *param0, int param1, int param2, int param3, int param4);
 s8 sub_02095734(int param0);
 void sub_02095750(int param0, u32 *param1, u32 *param2);
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index ae4530beda..c58766939f 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -88,7 +88,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_cell_actor.c.o
+	Object main.nef.p/src_sprite.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/applications/pokemon_summary_screen/3d_anim.c b/src/applications/pokemon_summary_screen/3d_anim.c
index c37bee81bf..7555b50117 100644
--- a/src/applications/pokemon_summary_screen/3d_anim.c
+++ b/src/applications/pokemon_summary_screen/3d_anim.c
@@ -8,7 +8,7 @@
 #include "struct_defs/archived_sprite.h"
 
 #include "applications/pokemon_summary_screen/main.h"
-#include "applications/pokemon_summary_screen/sprite.h"
+#include "applications/pokemon_summary_screen/sprites.h"
 #include "overlay115/camera_angle.h"
 
 #include "camera.h"
diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c
index 1b52a7c9ed..33356f407a 100644
--- a/src/applications/pokemon_summary_screen/main.c
+++ b/src/applications/pokemon_summary_screen/main.c
@@ -15,12 +15,11 @@
 
 #include "applications/pokemon_summary_screen/3d_anim.h"
 #include "applications/pokemon_summary_screen/main.h"
-#include "applications/pokemon_summary_screen/sprite.h"
+#include "applications/pokemon_summary_screen/sprites.h"
 #include "applications/pokemon_summary_screen/subscreen.h"
 #include "applications/pokemon_summary_screen/window.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -37,6 +36,7 @@
 #include "render_window.h"
 #include "ribbon.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -756,7 +756,7 @@ static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen)
     }
 
     if (JOY_NEW(PAD_BUTTON_A)) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
 
         if (summaryScreen->cursor != LEARNED_MOVES_MAX && summaryScreen->cursor != summaryScreen->cursorTmp) {
             Sound_PlayEffect(SEQ_SE_DP_DECIDE);
@@ -773,7 +773,7 @@ static int HandleInput_MoveSwap(PokemonSummaryScreen *summaryScreen)
 
     if (JOY_NEW(PAD_BUTTON_B)) {
         Sound_PlayEffect(SEQ_SE_DP_DECIDE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
         return SUMMARY_STATE_MOVE_SELECT;
     }
 
@@ -815,7 +815,7 @@ static int HandleInput_LearnMove(PokemonSummaryScreen *summaryScreen)
 
         if (summaryScreen->cursor != LEARNED_MOVES_MAX) {
             if (Item_IsHMMove(summaryScreen->monData.moves[summaryScreen->cursor]) == TRUE && summaryScreen->data->move != MOVE_NONE) {
-                Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
+                Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
                 DrawEmptyHearts(summaryScreen);
                 PokemonSummaryScreen_PrintHMMovesCantBeForgotten(summaryScreen);
                 return SUMMARY_STATE_WAIT_HM_MSG_INPUT;
@@ -1666,14 +1666,14 @@ static u8 SetupBattleMoveInfo(PokemonSummaryScreen *summaryScreen)
         }
 
         UpdateMoveAttributes(summaryScreen);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
         PokemonSummaryScreen_ShowMonIcon(summaryScreen);
 
         if (summaryScreen->monData.type1 != summaryScreen->monData.type2) {
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
         }
 
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
         return TRUE;
     }
 
@@ -1684,11 +1684,11 @@ static u8 HideBattleMoveInfo(PokemonSummaryScreen *summaryScreen)
 {
     switch (summaryScreen->pageState) {
     case PAGE_STATE_INITIAL:
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], FALSE);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], FALSE);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
         Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]);
         PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL);
         PokemonSummaryScreen_HideMoveCancelText(summaryScreen);
@@ -1775,11 +1775,11 @@ static void UpdateBattleMoveAttributes(PokemonSummaryScreen *summaryScreen, u32
 {
     if (move == SUMMARY_MOVE_NONE) {
         PokemonSummaryScreen_ClearBattleAttributeWindows(summaryScreen);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], FALSE);
     } else {
         PokemonSummaryScreen_PrintBattleMoveAttributes(summaryScreen, move);
         PokemonSummaryScreen_UpdateMoveCategoryIcon(summaryScreen, move);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], TRUE);
     }
 }
 
@@ -1828,14 +1828,14 @@ static void SetupMoveInfoNoTransition(PokemonSummaryScreen *summaryScreen)
     PokemonSummaryScreen_ShowMove5OrCancel(summaryScreen);
     UpdateMoveAttributes(summaryScreen);
 
-    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
+    Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
     PokemonSummaryScreen_ShowMonIcon(summaryScreen);
 
     if (summaryScreen->monData.type1 != summaryScreen->monData.type2) {
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
     }
 
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
 }
 
 static u8 SetupContestMoveInfo(PokemonSummaryScreen *summaryScreen)
@@ -1875,7 +1875,7 @@ static u8 SetupContestMoveInfo(PokemonSummaryScreen *summaryScreen)
         UpdateMoveAttributes(summaryScreen);
         PokemonSummaryScreen_ShowMonIcon(summaryScreen);
         PokemonSummaryScreen_DrawContestStatDots(summaryScreen);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], TRUE);
 
         return TRUE;
     }
@@ -1888,9 +1888,9 @@ static u8 HideContestMoveInfo(PokemonSummaryScreen *summaryScreen)
     switch (summaryScreen->pageState) {
     case PAGE_STATE_INITIAL:
         PokemonSummaryScreen_HideContestStatDots(summaryScreen);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], FALSE);
         UpdateAppealHearts(summaryScreen, SUMMARY_MOVE_NONE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
         Window_ClearAndScheduleCopyToVRAM(&summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]);
         PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, NULL);
         PokemonSummaryScreen_HideMoveCancelText(summaryScreen);
@@ -1976,10 +1976,10 @@ static void SetupMoveInfoFromSubscreenButton(PokemonSummaryScreen *summaryScreen
 
     if (summaryScreen->page == SUMMARY_PAGE_BATTLE_MOVES) {
         PokemonSummaryScreen_HideContestStatDots(summaryScreen);
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
 
         if (summaryScreen->monData.type1 != summaryScreen->monData.type2) {
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
         }
 
         Bg_ScheduleScroll(summaryScreen->bgConfig, BG_LAYER_MAIN_2, 3, 0);
@@ -2021,12 +2021,12 @@ static u8 SetupRibbonInfo(PokemonSummaryScreen *summaryScreen)
     case PAGE_STATE_SCROLL_FINISHED:
         PokemonSummaryScreen_ClearAndPrintButtonPrompt(summaryScreen, 181);
         PokemonSummaryScreen_UpdateAButtonSprite(summaryScreen, &summaryScreen->staticWindows[SUMMARY_WINDOW_BUTTON_PROMPT]);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_CURSOR], TRUE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], TRUE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_9], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_10], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_11], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_12], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_CURSOR], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_9], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_10], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_11], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_12], FALSE);
         ChangeSelectedRibbon(summaryScreen, 0);
 
         return TRUE;
@@ -2136,15 +2136,15 @@ static void ChangeSelectedRibbon(PokemonSummaryScreen *summaryScreen, s8 delta)
     PokemonSummaryScreen_PrintRibbonIndexAndMax(summaryScreen);
 
     if (summaryScreen->ribbonRow != 0) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], TRUE);
     } else {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FALSE);
     }
 
     if ((summaryScreen->ribbonRow * RIBBONS_PER_ROW + RIBBONS_PER_ROW * 2) < summaryScreen->ribbonMax) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], TRUE);
     } else {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FALSE);
     }
 }
 
diff --git a/src/applications/pokemon_summary_screen/sprite.c b/src/applications/pokemon_summary_screen/sprite.c
index 5f4d5cacfb..a5c6b40a0f 100644
--- a/src/applications/pokemon_summary_screen/sprite.c
+++ b/src/applications/pokemon_summary_screen/sprite.c
@@ -1,4 +1,4 @@
-#include "applications/pokemon_summary_screen/sprite.h"
+#include "sprite.h"
 
 #include <nitro.h>
 #include <string.h>
@@ -8,11 +8,11 @@
 #include "generated/items.h"
 
 #include "applications/pokemon_summary_screen/main.h"
+#include "applications/pokemon_summary_screen/sprites.h"
 #include "applications/pokemon_summary_screen/subscreen.h"
 #include "graphics/pokemon_summary_screen/pl_pst_gra.naix"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "gx_layers.h"
 #include "move_table.h"
 #include "pokemon.h"
@@ -24,7 +24,7 @@
 
 static void SetTypeIcon(PokemonSummaryScreen *summaryScreen, u8 spriteIndex, u8 param2, u8 type);
 static void SetMonAndTypeIcons(PokemonSummaryScreen *summaryScreen);
-static void DrawConditionFlash(CellActor *sprite, u32 statValue, u32 highestValue, const s16 *bounds);
+static void DrawConditionFlash(Sprite *sprite, u32 statValue, u32 highestValue, const s16 *bounds);
 
 // the summary screen refers to the contest stats in the order they appear in the condition
 // screen clock-wise, not the order used elsewhere
@@ -264,11 +264,11 @@ void PokemonSummaryScreen_FreeSpriteResources(PokemonSummaryScreen *summaryScree
 
 void PokemonSummaryScreen_UpdateArrowAndTapAnims(PokemonSummaryScreen *summaryScreen)
 {
-    CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], FX32_ONE);
-    CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], FX32_ONE);
-    CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FX32_ONE);
-    CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FX32_ONE);
-    CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FX32_ONE);
+    Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], FX32_ONE);
+    Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], FX32_ONE);
+    Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FX32_ONE);
+    Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_UP], FX32_ONE);
+    Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_ARROW_DOWN], FX32_ONE);
 }
 
 void PokemonSummaryScreen_SetDefaultSpriteStates(PokemonSummaryScreen *summaryScreen)
@@ -279,26 +279,26 @@ void PokemonSummaryScreen_SetDefaultSpriteStates(PokemonSummaryScreen *summarySc
 
     SetMonAndTypeIcons(summaryScreen);
 
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_COOL], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_BEAUTY], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_CUTE], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_SMART], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_TOUGH], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_COOL], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_CUTE], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_SMART], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_TOUGH], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_COOL], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_BEAUTY], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_CUTE], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_SMART], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_ARROW_TOUGH], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_COOL], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_BEAUTY], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_CUTE], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_SMART], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONDITION_FLASH_TOUGH], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
 }
 
 static u8 CalcPageTabsBaseXPos(PokemonSummaryScreen *summaryScreen)
@@ -321,24 +321,24 @@ void PokemonSummaryScreen_UpdatePageTabSprites(PokemonSummaryScreen *summaryScre
     u8 page;
 
     s16 baseXPos = CalcPageTabsBaseXPos(summaryScreen);
-    CellActor **sprites = &summaryScreen->sprites[0];
+    Sprite **sprites = &summaryScreen->sprites[0];
     u8 visiblePageCount = 0;
 
     for (page = 0; page < SUMMARY_PAGE_MAX; page++) {
         if (PokemonSummaryScreen_PageIsVisble(summaryScreen, page) == FALSE) {
-            CellActor_SetDrawFlag(sprites[page], FALSE);
+            Sprite_SetDrawFlag(sprites[page], FALSE);
             continue;
         }
 
-        activeAnim = CellActor_GetActiveAnim(sprites[page]);
+        activeAnim = Sprite_GetActiveAnim(sprites[page]);
 
         if (summaryScreen->page == page) {
             if (activeAnim < 8) {
-                CellActor_SetAnim(sprites[page], activeAnim + 8);
+                Sprite_SetAnim(sprites[page], activeAnim + 8);
             }
         } else {
             if (activeAnim >= 8) {
-                CellActor_SetAnim(sprites[page], activeAnim - 8);
+                Sprite_SetAnim(sprites[page], activeAnim - 8);
             }
         }
 
@@ -351,7 +351,7 @@ void PokemonSummaryScreen_UpdatePageTabSprites(PokemonSummaryScreen *summaryScre
         }
 
         Sprite_SetPositionXY(summaryScreen->sprites[page], x, y);
-        CellActor_SetDrawFlag(sprites[page], TRUE);
+        Sprite_SetDrawFlag(sprites[page], TRUE);
 
         visiblePageCount++;
     }
@@ -375,8 +375,8 @@ void PokemonSummaryScreen_UpdatePageArrows(PokemonSummaryScreen *summaryScreen,
         showArrows = FALSE;
     }
 
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], showArrows);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], showArrows);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_LEFT], showArrows);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_PAGE_ARROW_RIGHT], showArrows);
 }
 
 void PokemonSummaryScreen_SetCaughtBallGfx(PokemonSummaryScreen *summaryScreen)
@@ -396,15 +396,15 @@ void PokemonSummaryScreen_SetCaughtBallGfx(PokemonSummaryScreen *summaryScreen)
 void PokemonSummaryScreen_UpdateStatusIcon(PokemonSummaryScreen *summaryScreen)
 {
     if (summaryScreen->monData.status == 7) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
     } else if (summaryScreen->monData.status != 0) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], TRUE);
-        CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], summaryScreen->monData.status);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], TRUE);
+        Sprite_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], summaryScreen->monData.status);
     } else {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], TRUE);
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_ICON], TRUE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_STATUS_ICON], FALSE);
     }
 }
 
@@ -427,18 +427,18 @@ void PokemonSummaryScreen_UpdateTypeIcons(PokemonSummaryScreen *summaryScreen)
 {
     u16 i;
     for (i = SUMMARY_SPRITE_MON_TYPE_ICON_1; i <= SUMMARY_SPRITE_MON_ICON; i++) {
-        Sprite_SetDrawFlag(summaryScreen->sprites[i], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[i], FALSE);
     }
 
     switch (summaryScreen->page) {
     case SUMMARY_PAGE_INFO:
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], TRUE);
 
         if (summaryScreen->monData.type1 == summaryScreen->monData.type2) {
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], INFO_SOLO_MON_TYPE_ICON_X, INFO_MON_TYPE_ICON_Y);
         } else {
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_1], INFO_MON_TYPE_ICON_1_X, INFO_MON_TYPE_ICON_Y);
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], TRUE);
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_TYPE_ICON_2], INFO_MON_TYPE_ICON_2_X, INFO_MON_TYPE_ICON_Y);
         }
         break;
@@ -449,13 +449,13 @@ void PokemonSummaryScreen_UpdateTypeIcons(PokemonSummaryScreen *summaryScreen)
             }
 
             SetTypeIcon(summaryScreen, SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_TYPE));
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], TRUE);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], TRUE);
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES);
         }
 
         if (summaryScreen->data->move != MOVE_NONE) {
             SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_TYPE));
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], TRUE);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], TRUE);
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES);
         }
 
@@ -470,13 +470,13 @@ void PokemonSummaryScreen_UpdateTypeIcons(PokemonSummaryScreen *summaryScreen)
             }
 
             SetTypeIcon(summaryScreen, SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i, 5 + i, MoveTable_LoadParam(summaryScreen->monData.moves[i], MOVEATTRIBUTE_CONTEST_TYPE) + 18);
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], 1);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], 1);
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_MOVE_TYPE_ICON_SPRITE_START + i], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + i * PIXELS_BETWEEN_MOVES);
         }
 
         if (summaryScreen->data->move != MOVE_NONE) {
             SetTypeIcon(summaryScreen, SUMMARY_SPRITE_MOVE_TYPE_ICON_5, 5 + 4, MoveTable_LoadParam(summaryScreen->data->move, MOVEATTRIBUTE_CONTEST_TYPE) + 18);
-            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], 1);
+            Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], 1);
             Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_TYPE_ICON_5], MOVE_TYPE_ICON_X, MOVE_TYPE_ICON_BASE_Y + LEARNED_MOVES_MAX * PIXELS_BETWEEN_MOVES);
         }
 
@@ -496,7 +496,7 @@ void PokemonSummaryScreen_SetMonTypeIcons(PokemonSummaryScreen *summaryScreen)
 static void SetTypeIcon(PokemonSummaryScreen *summaryScreen, u8 spriteIndex, u8 param2, u8 type)
 {
     SpriteSystem_ReplaceCharResObj(summaryScreen->renderer, summaryScreen->gfxHandler, sub_0207C944(), sub_0207C908(type), 1, param2);
-    Sprite_SetExplicitPalette(summaryScreen->sprites[spriteIndex], sub_0207C92C(type) + 3);
+    Sprite_SetExplicitPalette2(summaryScreen->sprites[spriteIndex], sub_0207C92C(type) + 3);
 }
 
 static void GetMoveTypeIconPos(PokemonSummaryScreen *summaryScreen, u8 *moveIndex, s16 *outX, s16 *outY)
@@ -529,7 +529,7 @@ void PokemonSummaryScreen_UpdateMoveCategoryIcon(PokemonSummaryScreen *summarySc
     u32 category = MoveTable_LoadParam(move, MOVEATTRIBUTE_CLASS);
 
     SpriteSystem_ReplaceCharResObj(summaryScreen->renderer, summaryScreen->gfxHandler, sub_0207CAC0(), sub_0207CA90(category), 1, 10);
-    Sprite_SetExplicitPalette(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], sub_0207CAA8(category) + 3);
+    Sprite_SetExplicitPalette2(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_CATEGORY_ICON], sub_0207CAA8(category) + 3);
 }
 
 void PokemonSummaryScreen_UpdateMoveSelectorPos(PokemonSummaryScreen *summaryScreen)
@@ -542,7 +542,7 @@ void PokemonSummaryScreen_SetMoveSelector2Pos(PokemonSummaryScreen *summaryScree
     s16 x, y;
     Sprite_GetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_1], &x, &y);
     Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], x, y);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MOVE_SELECTOR_2], TRUE);
 }
 
 void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen)
@@ -560,8 +560,8 @@ void PokemonSummaryScreen_InitSheenSprites(PokemonSummaryScreen *summaryScreen)
     }
 
     for (u32 spriteIndex = SUMMARY_SHEEN_SPRITES_START; spriteIndex <= SUMMARY_SHEEN_SPRITES_END; spriteIndex++) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[spriteIndex], FALSE);
-        SpriteActor_SetAnimFrame(summaryScreen->sprites[spriteIndex], 0);
+        Sprite_SetDrawFlag(summaryScreen->sprites[spriteIndex], FALSE);
+        Sprite_SetAnimFrame(summaryScreen->sprites[spriteIndex], 0);
     }
 }
 
@@ -589,9 +589,9 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen)
         break;
     case 1:
         if (summaryScreen->sheenCount == 0) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], TRUE);
-            SpriteActor_SetAnimFrame(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE);
-            CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], TRUE);
+            Sprite_SetAnimFrame(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE);
+            Sprite_SetAnim(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenPos], FALSE);
 
             summaryScreen->sheenPos++;
 
@@ -604,7 +604,7 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen)
         summaryScreen->sheenCount = (summaryScreen->sheenCount + 1) % 10;
         break;
     case 2:
-        if (CellActor_GetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax - 1]) == FALSE) {
+        if (Sprite_GetDrawFlag(summaryScreen->sprites[SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax - 1]) == FALSE) {
             summaryScreen->sheenCount = 0;
             summaryScreen->sheenState = 3;
             break;
@@ -615,9 +615,9 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen)
 
         if (summaryScreen->sheenCount == 32) {
             for (i = SUMMARY_SHEEN_SPRITES_START; i < SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) {
-                CellActor_SetDrawFlag(summaryScreen->sprites[i], TRUE);
-                SpriteActor_SetAnimFrame(summaryScreen->sprites[i], FALSE);
-                CellActor_SetAnim(summaryScreen->sprites[i], FALSE);
+                Sprite_SetDrawFlag(summaryScreen->sprites[i], TRUE);
+                Sprite_SetAnimFrame(summaryScreen->sprites[i], FALSE);
+                Sprite_SetAnim(summaryScreen->sprites[i], FALSE);
             }
 
             summaryScreen->sheenCount = 0;
@@ -636,14 +636,14 @@ void PokemonSummaryScreen_DrawSheenSprites(PokemonSummaryScreen *summaryScreen)
     }
 
     for (i = SUMMARY_SHEEN_SPRITES_START; i < SUMMARY_SHEEN_SPRITES_START + summaryScreen->sheenMax; i++) {
-        if (CellActor_GetDrawFlag(summaryScreen->sprites[i]) == FALSE) {
+        if (Sprite_GetDrawFlag(summaryScreen->sprites[i]) == FALSE) {
             continue;
         }
 
-        CellActor_UpdateAnim(summaryScreen->sprites[i], FX32_ONE);
+        Sprite_UpdateAnim(summaryScreen->sprites[i], FX32_ONE);
 
-        if (CellActor_GetAnimFrame(summaryScreen->sprites[i]) == 6) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[i], FALSE);
+        if (Sprite_GetAnimFrame(summaryScreen->sprites[i]) == 6) {
+            Sprite_SetDrawFlag(summaryScreen->sprites[i], FALSE);
         }
     }
 }
@@ -652,30 +652,30 @@ void PokemonSummaryScreen_UpdateMiscMonDataSprites(PokemonSummaryScreen *summary
 {
     for (u32 marking = 0; marking < MAX_POKEMON_MARKINGS; marking++) {
         if (summaryScreen->monData.markings & (1 << marking)) {
-            CellActor_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], TRUE);
+            Sprite_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], TRUE);
         } else {
-            CellActor_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], FALSE);
+            Sprite_SetAnim(summaryScreen->sprites[SUMMARY_MARKING_SPRITES_START + marking], FALSE);
         }
     }
 
     if (summaryScreen->monData.isShiny == TRUE && summaryScreen->monData.isEgg == FALSE) {
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], TRUE);
     } else {
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_SHINY_ICON], FALSE);
     }
 
     if (summaryScreen->monData.pokerus == SUMMARY_POKERUS_CURED) {
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], TRUE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], TRUE);
     } else {
-        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], FALSE);
+        Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_POKERUS_CURED_ICON], FALSE);
     }
 }
 
 void PokemonSummaryScreen_ButtonTapAnim(PokemonSummaryScreen *summaryScreen)
 {
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], TRUE);
-    SpriteActor_SetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0);
-    CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], TRUE);
+    Sprite_SetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0);
+    Sprite_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], 0);
 
     s16 x, y;
     PokemonSummaryScreen_CalcSubscreenButtonTapAnimPos(summaryScreen, &x, &y);
@@ -689,8 +689,8 @@ void PokemonSummaryScreen_ButtonTapAnim(PokemonSummaryScreen *summaryScreen)
 
 void PokemonSummaryScreen_HideButtonTapCircle(PokemonSummaryScreen *summaryScreen)
 {
-    if (CellActor_GetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE]) == 2) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE);
+    if (Sprite_GetAnimFrame(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE]) == 2) {
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_BUTTON_TAP_CIRCLE], FALSE);
     }
 }
 
@@ -698,7 +698,7 @@ void PokemonSummaryScreen_UpdateConditionArrowSprites(PokemonSummaryScreen *summ
 {
     for (u8 i = 0; i < MAX_CONDITION_ARROW_SPRITES; i++) {
         if (summaryScreen->pageState & (1 << i)) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_ARROW_SPRITES_START + i], TRUE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_ARROW_SPRITES_START + i], TRUE);
         }
     }
 }
@@ -706,12 +706,12 @@ void PokemonSummaryScreen_UpdateConditionArrowSprites(PokemonSummaryScreen *summ
 void PokemonSummaryScreen_UpdateAButtonSprite(PokemonSummaryScreen *summaryScreen, Window *window)
 {
     if (window == NULL) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], FALSE);
         return;
     }
 
     Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], Window_GetXPos(window) * 8 - 10, 8);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_A_BUTTON], TRUE);
 }
 
 void PokemonSummaryScreen_SetMonIcon(PokemonSummaryScreen *summaryScreen)
@@ -726,8 +726,8 @@ void PokemonSummaryScreen_SetMonIcon(PokemonSummaryScreen *summaryScreen)
     }
 
     SpriteSystem_ReplaceCharResObj(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, iconIndex, 0, 11);
-    Sprite_SetExplicitPalette(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], PokeIconPaletteIndex(summaryScreen->monData.species, summaryScreen->monData.form, summaryScreen->monData.isEgg) + 7);
-    CellActor_SetFlipMode(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], (SpeciesData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1));
+    Sprite_SetExplicitPalette2(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], PokeIconPaletteIndex(summaryScreen->monData.species, summaryScreen->monData.form, summaryScreen->monData.isEgg) + 7);
+    Sprite_SetFlipMode(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], (SpeciesData_GetFormValue(summaryScreen->monData.species, summaryScreen->monData.form, 28) ^ 1));
 }
 
 void PokemonSummaryScreen_ShowMonIcon(PokemonSummaryScreen *summaryScreen)
@@ -740,7 +740,7 @@ void PokemonSummaryScreen_ShowMonIcon(PokemonSummaryScreen *summaryScreen)
         Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], 32, 68);
     }
 
-    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], TRUE);
+    Sprite_SetDrawFlag2(summaryScreen->sprites[SUMMARY_SPRITE_MON_ICON], TRUE);
 }
 
 static s16 CalcContestStatDotPos(u32 statValue, s16 max, s16 min)
@@ -770,33 +770,33 @@ void PokemonSummaryScreen_DrawContestStatDots(PokemonSummaryScreen *summaryScree
     Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_X, SMART_MIN_X), CalcContestStatDotPos(summaryScreen->monData.smart, SMART_MAX_Y, SMART_MIN_Y));
     Sprite_SetPositionXY(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_X, TOUGH_MIN_X), CalcContestStatDotPos(summaryScreen->monData.tough, TOUGH_MAX_Y, TOUGH_MIN_Y));
 
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], TRUE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], TRUE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], TRUE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], TRUE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], TRUE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], TRUE);
 }
 
 void PokemonSummaryScreen_HideContestStatDots(PokemonSummaryScreen *summaryScreen)
 {
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE);
-    CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_COOL], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_BEAUTY], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_CUTE], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_SMART], FALSE);
+    Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_CONTEST_STAT_DOT_TOUGH], FALSE);
 }
 
 static void SetRibbonSpriteGfx(PokemonSummaryScreen *summaryScreen, u8 ribbonNum, u8 ribbonIndex)
 {
     SpriteSystem_ReplaceCharResObj(summaryScreen->renderer, summaryScreen->gfxHandler, NARC_INDEX_GRAPHIC__PL_PST_GRA, Ribbon_GetData(ribbonNum, RIBBON_DATA_SPRITE_ID), 0, 26 + ribbonIndex);
-    Sprite_SetExplicitPalette(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_1 + ribbonIndex], Ribbon_GetData(ribbonNum, RIBBON_DATA_PALETTE_NUM) + 7);
+    Sprite_SetExplicitPalette2(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_1 + ribbonIndex], Ribbon_GetData(ribbonNum, RIBBON_DATA_PALETTE_NUM) + 7);
 }
 
 void PokemonSummaryScreen_UpdateRibbonSprites(PokemonSummaryScreen *summaryScreen)
 {
     u16 i;
     for (i = SUMMARY_RIBBON_SPRITES_START; i <= SUMMARY_SPRITE_RIBBON_FLASH; i++) {
-        CellActor_SetDrawFlag(summaryScreen->sprites[i], FALSE);
+        Sprite_SetDrawFlag(summaryScreen->sprites[i], FALSE);
     }
 
     if (summaryScreen->page != SUMMARY_PAGE_RIBBONS) {
@@ -807,22 +807,22 @@ void PokemonSummaryScreen_UpdateRibbonSprites(PokemonSummaryScreen *summaryScree
 
     for (i = 0; i < RIBBONS_PER_PAGE; i++) {
         if (i < summaryScreen->ribbonMax) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE);
             SetRibbonSpriteGfx(summaryScreen, PokemonSummaryScreen_RibbonNumAt(summaryScreen, i), i);
         }
     }
 
-    CellActor_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], 0);
+    Sprite_SetAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], 0);
 }
 
 void PokemonSummaryScreen_UpdateShownRibbonRows(PokemonSummaryScreen *summaryScreen)
 {
     for (u16 i = 0; i < RIBBONS_PER_ROW * 2; i++) {
         if ((summaryScreen->ribbonRow * RIBBONS_PER_ROW + i) < summaryScreen->ribbonMax) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], TRUE);
             SetRibbonSpriteGfx(summaryScreen, PokemonSummaryScreen_RibbonNumAt(summaryScreen, i), i);
         } else {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], FALSE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_RIBBON_SPRITES_START + i], FALSE);
         }
     }
 }
@@ -834,8 +834,8 @@ void PokemonSummaryScreen_UpdateRibbonCursorPos(PokemonSummaryScreen *summaryScr
 
 void PokemonSummaryScreen_UpdateRibbonFlashAnim(PokemonSummaryScreen *summaryScreen)
 {
-    if (CellActor_GetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH]) == TRUE) {
-        CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], FX32_ONE);
+    if (Sprite_GetDrawFlag(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH]) == TRUE) {
+        Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_SPRITE_RIBBON_FLASH], FX32_ONE);
     }
 }
 
@@ -851,7 +851,7 @@ void PokemonSummaryScreen_UpdateConditionFlashSprites(PokemonSummaryScreen *summ
 {
     if (showFlashes == FALSE) {
         for (u16 i = 0; i < MAX_CONDITION_FLASH_SPRITES; i++) {
-            CellActor_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FALSE);
+            Sprite_SetDrawFlag(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FALSE);
         }
     } else {
         u16 highestValue = summaryScreen->monData.cool;
@@ -880,14 +880,14 @@ void PokemonSummaryScreen_UpdateConditionFlashSprites(PokemonSummaryScreen *summ
     }
 }
 
-static void DrawConditionFlash(CellActor *sprite, u32 statValue, u32 highestValue, const s16 *bounds)
+static void DrawConditionFlash(Sprite *sprite, u32 statValue, u32 highestValue, const s16 *bounds)
 {
     if (statValue == 0 || statValue != highestValue) {
-        CellActor_SetDrawFlag(sprite, FALSE);
+        Sprite_SetDrawFlag(sprite, FALSE);
         return;
     }
 
-    CellActor_SetDrawFlag(sprite, TRUE);
+    Sprite_SetDrawFlag(sprite, TRUE);
 
     s32 x, y;
 
@@ -904,13 +904,13 @@ static void DrawConditionFlash(CellActor *sprite, u32 statValue, u32 highestValu
     }
 
     Sprite_SetPositionXY(sprite, x, y);
-    SpriteActor_SetAnimFrame(sprite, 0);
-    CellActor_SetAnim(sprite, 0);
+    Sprite_SetAnimFrame(sprite, 0);
+    Sprite_SetAnim(sprite, 0);
 }
 
 void PokemonSummaryScreen_UpdateConditionFlashAnim(PokemonSummaryScreen *summaryScreen)
 {
     for (u32 i = 0; i < MAX_CONDITION_FLASH_SPRITES; i++) {
-        CellActor_UpdateAnim(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FX32_ONE);
+        Sprite_UpdateAnim(summaryScreen->sprites[SUMMARY_CONDITION_FLASH_SPRITES_START + i], FX32_ONE);
     }
 }
diff --git a/src/applications/pokemon_summary_screen/subscreen.c b/src/applications/pokemon_summary_screen/subscreen.c
index 0780176ea0..b7ec21d1ea 100644
--- a/src/applications/pokemon_summary_screen/subscreen.c
+++ b/src/applications/pokemon_summary_screen/subscreen.c
@@ -6,7 +6,7 @@
 #include "generated/sdat.h"
 
 #include "applications/pokemon_summary_screen/main.h"
-#include "applications/pokemon_summary_screen/sprite.h"
+#include "applications/pokemon_summary_screen/sprites.h"
 
 #include "bg_window.h"
 #include "system.h"
diff --git a/src/applications/pokemon_summary_screen/window.c b/src/applications/pokemon_summary_screen/window.c
index 3e54201fd2..8790a46632 100644
--- a/src/applications/pokemon_summary_screen/window.c
+++ b/src/applications/pokemon_summary_screen/window.c
@@ -10,7 +10,7 @@
 #include "struct_defs/struct_02090800.h"
 
 #include "applications/pokemon_summary_screen/main.h"
-#include "applications/pokemon_summary_screen/sprite.h"
+#include "applications/pokemon_summary_screen/sprites.h"
 
 #include "bg_window.h"
 #include "font.h"
diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c
index 34bb57f286..6e54f41e8d 100644
--- a/src/battle/battle_display.c
+++ b/src/battle/battle_display.c
@@ -197,7 +197,7 @@ static void ShowPartyGaugeTask(SysTask *param0, void *param1);
 static void HidePartyGaugeTask(SysTask *param0, void *param1);
 static void ov16_02263688(SysTask *param0, void *param1);
 static void ov16_022636D4(SysTask *param0, void *param1);
-static Sprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12);
+static PokemonSprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12);
 static void ov16_02263C1C(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3F8 *param2, BattleMessage *param3);
 static void ov16_02263CF0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C40C *param2, BattleMessage *param3);
 static void ov16_02263DD0(BattleSystem *param0, BattlerData *param1, BattleMessage *param2);
@@ -205,11 +205,11 @@ static void ov16_02263E7C(BattleSystem *param0, BattlerData *param1, UnkStruct_o
 static void ov16_022641B4(BattleSystem *param0, BattlerData *param1, BattleMessage *param2);
 static void ov16_02264270(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C9F0 *param2, BattleMessage *param3);
 static void ov16_02264360(BattleSystem *param0, BattlerData *param1, BattleMessage *param2);
-static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5);
+static ManagedSprite *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5);
 static void ov16_02264408(BattleSystem *param0, BattlerData *param1, UnkStruct_ov12_0221FCDC *param2, UnkStruct_ov16_02265BBC *param3);
 static void ov16_02264530(BattleSystem *param0, UnkStruct_ov16_02265BBC *param1, UnkStruct_ov12_022380DC *param2, int param3);
 static void ov16_022645B8(u8 *param0, u8 *param1, int param2, int param3, u16 param4);
-static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, CellActorData *param1);
+static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, ManagedSprite *param1);
 static void ov16_022646C8(SysTask *param0, void *param1);
 static void ov16_02264730(BattleSystem *param0);
 static void ov16_0226474C(BattleSystem *param0);
@@ -270,11 +270,11 @@ void ov16_0225CBDC(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
     if (param1->battlerType & 0x1) {
         v4->unk_13 = 2;
         v4->unk_0C = ov16_0223E020(param0, 1);
-        Sprite_SetPositionXY2(v4->unk_0C->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (8 * 11));
+        ManagedSprite_SetPositionXY(v4->unk_0C->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (8 * 11));
     } else {
         v4->unk_13 = 0;
         v4->unk_0C = ov16_0223E020(param0, 0);
-        Sprite_SetPositionXY2(v4->unk_0C->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (128 + 8));
+        ManagedSprite_SetPositionXY(v4->unk_0C->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (128 + 8));
     }
 
     if (param2->unk_01_2) {
@@ -501,11 +501,11 @@ void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
     if (param1->battlerType & 0x1) {
         v1->unk_0F = 2;
         v1->unk_04 = ov16_0223E020(param0, 1);
-        Sprite_SetPositionXY2(v1->unk_04->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (8 * 11));
+        ManagedSprite_SetPositionXY(v1->unk_04->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (8 * 11));
     } else {
         v1->unk_0F = 0;
         v1->unk_04 = ov16_0223E020(param0, 0);
-        Sprite_SetPositionXY2(v1->unk_04->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (128 + 8));
+        ManagedSprite_SetPositionXY(v1->unk_04->unk_00, Unk_ov12_0223B0B8[param1->battlerType & 1][0], (128 + 8));
     }
 
     if ((BattleSystem_BattleType(param0) & 0x8) || ((BattleSystem_BattleType(param0) & 0x10) && (param1->battlerType & 0x1))) {
@@ -919,7 +919,7 @@ void ov16_0225DA74(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
 {
     Healthbar *v0;
 
-    GF_ASSERT(param1->healthbar.mainActor != NULL);
+    GF_ASSERT(param1->healthbar.mainSprite != NULL);
 
     v0 = &param1->healthbar;
     MI_CpuClear8(&v0->state, sizeof(u8));
@@ -945,7 +945,7 @@ void ov16_0225DB00(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
 {
     Healthbar *v0;
 
-    GF_ASSERT(param1->healthbar.mainActor != NULL);
+    GF_ASSERT(param1->healthbar.mainSprite != NULL);
 
     v0 = &param1->healthbar;
 
@@ -1059,7 +1059,7 @@ void ov16_0225DCB0(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
 
 void ov16_0225DD44(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_0225C3D0 *param2)
 {
-    GF_ASSERT(param1->healthbar.mainActor != NULL);
+    GF_ASSERT(param1->healthbar.mainSprite != NULL);
 
     param1->healthbar.status = param2->unk_01;
 
@@ -1512,17 +1512,17 @@ static void ov16_0225E4E8(SysTask *param0, void *param1)
         v0->unk_12++;
     case 2:
         if (v0->unk_13 == 2) {
-            Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+            ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
 
             if ((v0->unk_1C == 1) || (v0->unk_1C == 3)) {
                 if (v2 < (24 * 8)) {
-                    Sprite_OffsetPositionXY2(v0->unk_0C->unk_00, 8, 0);
+                    ManagedSprite_OffsetPositionXY(v0->unk_0C->unk_00, 8, 0);
                 } else {
-                    Sprite_SetPositionXY2(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
+                    ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
                 }
             }
 
-            Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+            ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
 
             if (v0->unk_1C == 1) {
                 sub_02007DEC(v0->unk_08, 0, v2);
@@ -1552,24 +1552,24 @@ static void ov16_0225E4E8(SysTask *param0, void *param1)
                 }
 
                 if ((v0->unk_1C == 1) || (v0->unk_1C == 3)) {
-                    Sprite_SetPositionXY2(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
+                    ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
                 }
 
                 sub_020086FC(v0->unk_08, 8, 0, 0, 0x0);
                 v0->unk_12++;
             }
         } else {
-            Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+            ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
 
             if ((v0->unk_1C == 0) || (v0->unk_1C == 2)) {
                 if (v2 > 64) {
-                    Sprite_OffsetPositionXY2(v0->unk_0C->unk_00, -8, 0);
+                    ManagedSprite_OffsetPositionXY(v0->unk_0C->unk_00, -8, 0);
                 } else {
-                    Sprite_SetPositionXY2(v0->unk_0C->unk_00, 64, (128 + 8));
+                    ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, 64, (128 + 8));
                 }
             }
 
-            Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+            ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
 
             if (v0->unk_1C == 0) {
                 sub_02007DEC(v0->unk_08, 0, v2);
@@ -1595,7 +1595,7 @@ static void ov16_0225E4E8(SysTask *param0, void *param1)
                 }
 
                 if ((v0->unk_1C == 0) || (v0->unk_1C == 2)) {
-                    Sprite_SetPositionXY2(v0->unk_0C->unk_00, 64, (128 + 8));
+                    ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, 64, (128 + 8));
                 }
 
                 v0->unk_12++;
@@ -1651,17 +1651,17 @@ static void ov16_0225E894(SysTask *param0, void *param1)
 
         v0->unk_12++;
     case 2:
-        Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+        ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
 
         if ((v0->unk_1C == 1) || (v0->unk_1C == 3)) {
             if (v2 < (24 * 8)) {
-                Sprite_OffsetPositionXY2(v0->unk_0C->unk_00, 8, 0);
+                ManagedSprite_OffsetPositionXY(v0->unk_0C->unk_00, 8, 0);
             } else {
-                Sprite_SetPositionXY2(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
+                ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
             }
         }
 
-        Sprite_GetPositionXY2(v0->unk_0C->unk_00, &v2, &v3);
+        ManagedSprite_GetPositionXY(v0->unk_0C->unk_00, &v2, &v3);
         sub_02008274(v0->unk_08, 1, 8 / 2);
 
         if (sub_020080C0(v0->unk_08, 1) >= v0->unk_14) {
@@ -1678,7 +1678,7 @@ static void ov16_0225E894(SysTask *param0, void *param1)
                 Pokemon_PlayDelayedCry(BattleSystem_ChatotVoice(v0->unk_00, v0->unk_11), v0->unk_18, v0->unk_16, v0->unk_2C, 117, 127, NULL, 5, v4);
             }
 
-            Sprite_SetPositionXY2(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
+            ManagedSprite_SetPositionXY(v0->unk_0C->unk_00, (24 * 8), (8 * 11));
             sub_020086FC(v0->unk_08, 8, 0, 0, 0x0);
 
             v0->unk_12++;
@@ -2313,9 +2313,9 @@ static void ov16_0225FA70(SysTask *param0, void *param1)
 
     switch (v0->unk_0E) {
     case 0:
-        if (Sprite_GetNumFrames(v0->unk_08) > 2) {
-            Sprite_SetAnimationFrame(v0->unk_08, 0);
-            Sprite_SetAnim(v0->unk_08, 2);
+        if (ManagedSprite_GetNumFrames(v0->unk_08) > 2) {
+            ManagedSprite_SetAnimationFrame(v0->unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_08, 2);
         }
 
         v0->unk_18 = 28;
@@ -2327,46 +2327,46 @@ static void ov16_0225FA70(SysTask *param0, void *param1)
 
         v0->unk_0E = 2;
     case 2:
-        Sprite_GetPositionXY2(v0->unk_04->unk_00, &v1, &v2);
-        Sprite_GetPositionXY2(v0->unk_08, &v3, &v4);
+        ManagedSprite_GetPositionXY(v0->unk_04->unk_00, &v1, &v2);
+        ManagedSprite_GetPositionXY(v0->unk_08, &v3, &v4);
 
         if (v0->unk_0F == 2) {
             if ((v0->unk_14 == 1) || (v0->unk_14 == 3)) {
                 if (v1 < (24 * 8)) {
-                    Sprite_OffsetPositionXY2(v0->unk_04->unk_00, 8, 0);
+                    ManagedSprite_OffsetPositionXY(v0->unk_04->unk_00, 8, 0);
                 } else {
-                    Sprite_SetPositionXY2(v0->unk_04->unk_00, (24 * 8), (8 * 11));
+                    ManagedSprite_SetPositionXY(v0->unk_04->unk_00, (24 * 8), (8 * 11));
                 }
             }
 
-            Sprite_GetPositionXY2(v0->unk_04->unk_00, &v1, &v2);
+            ManagedSprite_GetPositionXY(v0->unk_04->unk_00, &v1, &v2);
 
             if ((v0->unk_14 == 1) || ((v0->unk_14 == 3) && ((v5 == (0x2 | 0x1)) || (v5 == ((0x2 | 0x1) | 0x80)) || (v5 == ((0x4 | 0x1) | 0x2))))) {
-                Sprite_SetPositionXY2(v0->unk_08, v1, v4);
+                ManagedSprite_SetPositionXY(v0->unk_08, v1, v4);
             } else if (v0->unk_14 == 3) {
                 v1 = v3 - v1;
                 v1 -= 24;
 
-                Sprite_OffsetPositionXY2(v0->unk_08, -v1, 0);
+                ManagedSprite_OffsetPositionXY(v0->unk_08, -v1, 0);
             } else if (v0->unk_14 == 5) {
                 v1 = v1 - v3;
                 v1 -= 16;
 
-                Sprite_OffsetPositionXY2(v0->unk_08, v1, 0);
+                ManagedSprite_OffsetPositionXY(v0->unk_08, v1, 0);
             }
 
-            Sprite_GetPositionXY2(v0->unk_08, &v3, &v4);
+            ManagedSprite_GetPositionXY(v0->unk_08, &v3, &v4);
 
             if (v3 >= v0->unk_10) {
-                Sprite_SetPositionXY2(v0->unk_08, v0->unk_10, v4);
+                ManagedSprite_SetPositionXY(v0->unk_08, v0->unk_10, v4);
 
                 if ((v0->unk_14 == 1) || (v0->unk_14 == 3)) {
-                    Sprite_SetPositionXY2(v0->unk_04->unk_00, (24 * 8), (8 * 11));
+                    ManagedSprite_SetPositionXY(v0->unk_04->unk_00, (24 * 8), (8 * 11));
                 }
 
-                if (Sprite_GetNumFrames(v0->unk_08) > 1) {
-                    Sprite_SetAnimationFrame(v0->unk_08, 0);
-                    Sprite_SetAnim(v0->unk_08, 1);
+                if (ManagedSprite_GetNumFrames(v0->unk_08) > 1) {
+                    ManagedSprite_SetAnimationFrame(v0->unk_08, 0);
+                    ManagedSprite_SetAnim(v0->unk_08, 1);
                     v0->unk_12_0 = 0;
                     v0->unk_0E = 3;
                 } else {
@@ -2376,35 +2376,35 @@ static void ov16_0225FA70(SysTask *param0, void *param1)
         } else {
             if ((v0->unk_14 == 0) || (v0->unk_14 == 2)) {
                 if (v1 > 64) {
-                    Sprite_OffsetPositionXY2(v0->unk_04->unk_00, -8, 0);
+                    ManagedSprite_OffsetPositionXY(v0->unk_04->unk_00, -8, 0);
                 } else {
-                    Sprite_SetPositionXY2(v0->unk_04->unk_00, 64, (128 + 8));
+                    ManagedSprite_SetPositionXY(v0->unk_04->unk_00, 64, (128 + 8));
                 }
             }
 
-            Sprite_GetPositionXY2(v0->unk_04->unk_00, &v1, &v2);
+            ManagedSprite_GetPositionXY(v0->unk_04->unk_00, &v1, &v2);
 
             if ((v0->unk_14 == 0) || ((v0->unk_14 == 2) && ((v5 == (0x2 | 0x1)) || (v5 == ((0x2 | 0x1) | 0x80)) || (v5 == ((0x2 | 0x1) | 0x10)) || (v5 == ((0x4 | 0x1) | 0x2))))) {
-                Sprite_SetPositionXY2(v0->unk_08, v1, v4);
+                ManagedSprite_SetPositionXY(v0->unk_08, v1, v4);
             } else if (v0->unk_14 == 2) {
                 v1 = v1 - v3;
                 v1 -= 24;
 
-                Sprite_OffsetPositionXY2(v0->unk_08, v1, 0);
+                ManagedSprite_OffsetPositionXY(v0->unk_08, v1, 0);
             } else if (v0->unk_14 == 4) {
                 v1 = v3 - v1;
                 v1 -= 16;
 
-                Sprite_OffsetPositionXY2(v0->unk_08, -v1, 0);
+                ManagedSprite_OffsetPositionXY(v0->unk_08, -v1, 0);
             }
 
-            Sprite_GetPositionXY2(v0->unk_08, &v3, &v4);
+            ManagedSprite_GetPositionXY(v0->unk_08, &v3, &v4);
 
             if (v3 <= v0->unk_10) {
-                Sprite_SetPositionXY2(v0->unk_08, v0->unk_10, v4);
+                ManagedSprite_SetPositionXY(v0->unk_08, v0->unk_10, v4);
 
                 if ((v0->unk_14 == 0) || (v0->unk_14 == 2)) {
-                    Sprite_SetPositionXY2(v0->unk_04->unk_00, 64, (128 + 8));
+                    ManagedSprite_SetPositionXY(v0->unk_04->unk_00, 64, (128 + 8));
                 }
 
                 v0->unk_0E = 4;
@@ -2412,7 +2412,7 @@ static void ov16_0225FA70(SysTask *param0, void *param1)
         }
         break;
     case 3:
-        if (Sprite_IsAnimated(v0->unk_08) == 1) {
+        if (ManagedSprite_IsAnimated(v0->unk_08) == 1) {
             if (ov16_02264650(v0, v0->unk_08) == 0) {
                 break;
             }
@@ -2563,9 +2563,9 @@ static void ov16_0225FD5C(SysTask *param0, void *param1)
                 ov12_02237E40(v0->unk_04->unk_84, 2);
                 ov12_02237E30(v0->unk_04->unk_84, 0);
 
-                Sprite_SetAnimationFrame(v0->unk_04->unk_18, 0);
-                Sprite_SetAnim(v0->unk_04->unk_18, 1);
-                Sprite_SetAnimateFlag(v0->unk_04->unk_18, 1);
+                ManagedSprite_SetAnimationFrame(v0->unk_04->unk_18, 0);
+                ManagedSprite_SetAnim(v0->unk_04->unk_18, 1);
+                ManagedSprite_SetAnimateFlag(v0->unk_04->unk_18, 1);
 
                 v0->unk_0A = 3;
             }
@@ -2573,8 +2573,8 @@ static void ov16_0225FD5C(SysTask *param0, void *param1)
         break;
     case 1:
         if (v0->unk_0B == 2) {
-            Sprite_OffsetPositionXY2(v0->unk_04->unk_18, 5, 0);
-            Sprite_GetPositionXY2(v0->unk_04->unk_18, &v1, &v2);
+            ManagedSprite_OffsetPositionXY(v0->unk_04->unk_18, 5, 0);
+            ManagedSprite_GetPositionXY(v0->unk_04->unk_18, &v1, &v2);
 
             if ((v1 >= (256 - 48) - 48) && (ov12_02237890(v0->unk_04->unk_84) != 0)) {
                 ov12_02237E0C(v0->unk_04->unk_84, 1);
@@ -2607,18 +2607,18 @@ static void ov16_0225FD5C(SysTask *param0, void *param1)
                 v0->unk_0A = 6;
             }
         } else {
-            Sprite_SetAnimationFrame(v0->unk_04->unk_18, 0);
-            Sprite_SetAnim(v0->unk_04->unk_18, 1);
-            Sprite_SetAnimateFlag(v0->unk_04->unk_18, 1);
+            ManagedSprite_SetAnimationFrame(v0->unk_04->unk_18, 0);
+            ManagedSprite_SetAnim(v0->unk_04->unk_18, 1);
+            ManagedSprite_SetAnimateFlag(v0->unk_04->unk_18, 1);
             v0->unk_0A = 2;
         }
         break;
     case 2:
-        Sprite_OffsetPositionXY2(v0->unk_04->unk_18, -5, 0);
-        Sprite_GetPositionXY2(v0->unk_04->unk_18, &v1, &v2);
+        ManagedSprite_OffsetPositionXY(v0->unk_04->unk_18, -5, 0);
+        ManagedSprite_GetPositionXY(v0->unk_04->unk_18, &v1, &v2);
 
         if (v0->unk_04->unk_84) {
-            v3 = Sprite_GetAnimationFrame(v0->unk_04->unk_18);
+            v3 = ManagedSprite_GetAnimationFrame(v0->unk_04->unk_18);
 
             if (v5[v0->unk_0C][v3][0] != 0x7fff) {
                 ov12_02237E0C(v0->unk_04->unk_84, 1);
@@ -2662,8 +2662,8 @@ static void ov16_0225FD5C(SysTask *param0, void *param1)
         }
         break;
     case 3:
-        Sprite_GetPositionXY2(v0->unk_04->unk_18, &v1, &v2);
-        v3 = Sprite_GetAnimationFrame(v0->unk_04->unk_18);
+        ManagedSprite_GetPositionXY(v0->unk_04->unk_18, &v1, &v2);
+        v3 = ManagedSprite_GetAnimationFrame(v0->unk_04->unk_18);
 
         if (v3 == 4) {
             v0->unk_14 = 8;
@@ -2720,15 +2720,15 @@ static void ov16_02260284(SysTask *param0, void *param1)
     switch (v0->unk_0A) {
     case 0:
         if (v0->unk_0B == 2) {
-            Sprite_OffsetPositionXY2(v0->unk_04->unk_18, 5, 0);
-            Sprite_GetPositionXY2(v0->unk_04->unk_18, &v1, &v2);
+            ManagedSprite_OffsetPositionXY(v0->unk_04->unk_18, 5, 0);
+            ManagedSprite_GetPositionXY(v0->unk_04->unk_18, &v1, &v2);
 
             if (v1 >= (256 + 40)) {
                 v0->unk_0A++;
             }
         } else {
-            Sprite_OffsetPositionXY2(v0->unk_04->unk_18, -5, 0);
-            Sprite_GetPositionXY2(v0->unk_04->unk_18, &v1, &v2);
+            ManagedSprite_OffsetPositionXY(v0->unk_04->unk_18, -5, 0);
+            ManagedSprite_GetPositionXY(v0->unk_04->unk_18, &v1, &v2);
 
             if (v1 <= -40) {
                 v0->unk_0A++;
@@ -2761,7 +2761,7 @@ static void ov16_02260384(SysTask *param0, void *param1)
 
     switch (v0->unk_0A) {
     case 0:
-        Sprite_GetPositionXY2(v0->unk_04, &v1, &v2);
+        ManagedSprite_GetPositionXY(v0->unk_04, &v1, &v2);
 
         if (v0->unk_0B == 0) {
             v1 += 5;
@@ -2779,7 +2779,7 @@ static void ov16_02260384(SysTask *param0, void *param1)
             }
         }
 
-        Sprite_SetPositionXY2(v0->unk_04, v1, v2);
+        ManagedSprite_SetPositionXY(v0->unk_04, v1, v2);
         break;
     case 1:
         ClearCommand(v0->unk_00, v0->unk_09, v0->unk_08);
@@ -5662,7 +5662,7 @@ u8 Battler_BootState(BattlerData *battler)
     return battler->bootState;
 }
 
-Sprite *ov16_02263AFC(BattlerData *param0)
+PokemonSprite *ov16_02263AFC(BattlerData *param0)
 {
     if (param0->unk_20) {
         return param0->unk_20;
@@ -5692,12 +5692,12 @@ void ov16_02263B20(BattlerData *param0, int param1)
         return;
     }
 
-    Sprite_SetDrawFlag2(param0->unk_18, param1);
+    ManagedSprite_SetDrawFlag(param0->unk_18, param1);
 }
 
-static Sprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12)
+static PokemonSprite *ov16_02263B30(BattleSystem *param0, UnkStruct_02007768 *param1, ArchivedSprite *param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame *param11, UnkFuncPtr_02007C34 *param12)
 {
-    Sprite *v0;
+    PokemonSprite *v0;
     u8 *v1 = ov16_0223F2B8(ov16_0223E0C8(param0), param10);
     int v2;
     int v3;
@@ -6125,12 +6125,12 @@ static void ov16_02264360(BattleSystem *param0, BattlerData *param1, BattleMessa
     BattleSystem_SetResultFlag(param0, 0x2 | 0x80 | 0x40);
 }
 
-static CellActorData *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5)
+static ManagedSprite *ov16_022643B8(BattleSystem *param0, int param1, int param2, int param3, s16 param4, s16 param5)
 {
     SpriteSystem *v0;
     SpriteManager *v1;
     PaletteData *v2;
-    CellActorData *v3;
+    ManagedSprite *v3;
     int v4;
 
     v0 = ov16_0223E010(param0);
@@ -6256,13 +6256,13 @@ static void ov16_022645B8(u8 *param0, u8 *param1, int param2, int param3, u16 pa
     }
 }
 
-static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, CellActorData *param1)
+static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, ManagedSprite *param1)
 {
     UnkStruct_ov16_02264650 *v0;
     int v1;
     BOOL v2 = 0;
 
-    v1 = Sprite_SetUserAttrForCurrentAnimFrame(param0->unk_08);
+    v1 = ManagedSprite_SetUserAttrForCurrentAnimFrame(param0->unk_08);
 
     switch (v1) {
     case 1:
@@ -6281,8 +6281,8 @@ static BOOL ov16_02264650(UnkStruct_ov16_02264650_1 *param0, CellActorData *para
         break;
     default:
         if (((v1 & 0xf00) == 0x100) && (v1 & 0xff)) {
-            Sprite_SetAnimationFrame(param0->unk_08, 0);
-            Sprite_SetAnim(param0->unk_08, (v1 & 0xff) - 1);
+            ManagedSprite_SetAnimationFrame(param0->unk_08, 0);
+            ManagedSprite_SetAnim(param0->unk_08, (v1 & 0xff) - 1);
             v2 = 1;
         }
 
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index e486db3b18..e56c61df80 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -44,7 +44,6 @@
 #include "overlay021/struct_ov21_021E8E0C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "flags.h"
 #include "heap.h"
@@ -57,6 +56,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -10794,7 +10794,7 @@ static void BattleScript_CatchMonTask(SysTask *param0, void *param1)
         }
         break;
     case 14: {
-        Sprite *v13;
+        PokemonSprite *v13;
 
         v13 = ov21_021E8E00(v2->tmpPtr[0]);
         sub_02008274(v13, 0, 4);
@@ -12220,18 +12220,18 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript
     SpriteSystem_LoadCellResObj(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 257, TRUE, 20013);
     SpriteSystem_LoadAnimResObj(v1, v2, NARC_INDEX_BATTLE__GRAPHIC__PL_BATT_OBJ, 258, TRUE, 20013);
 
-    param1->cellActorData[0] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_0226E6C4);
+    param1->sprites[0] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_0226E6C4);
 
-    Sprite_TickOneFrame(param1->cellActorData[0]);
+    ManagedSprite_TickFrame(param1->sprites[0]);
     SpriteSystem_LoadCharResObjAtEndWithHardwareMappingType(v1, v2, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, Pokemon_IconSpriteIndex(param2), FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 20022);
     SpriteSystem_LoadPaletteBuffer(v3, PLTTBUF_MAIN_OBJ, v1, v2, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, PokeIconPalettesFileIndex(), FALSE, 3, NNS_G2D_VRAM_TYPE_2DMAIN, 20017);
     SpriteSystem_LoadCellResObj(v1, v2, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, PokeIcon64KCellsFileIndex(), FALSE, 20014);
     SpriteSystem_LoadAnimResObj(v1, v2, NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, PokeIcon64KAnimationFileIndex(), FALSE, 20014);
 
-    param1->cellActorData[1] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_0226E6F8);
+    param1->sprites[1] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_0226E6F8);
 
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(param1->cellActorData[1]->sprite, Pokemon_IconPaletteIndex(param2));
-    Sprite_TickOneFrame(param1->cellActorData[1]);
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(param1->sprites[1]->sprite, Pokemon_IconPaletteIndex(param2));
+    ManagedSprite_TickFrame(param1->sprites[1]);
 
     param1->tmpPtr[0] = sub_02012744(1, 5);
 
@@ -12286,8 +12286,8 @@ static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScript
 
     v0 = ov16_0223E018(param0);
 
-    Sprite_DeleteAndFreeResources(param1->cellActorData[0]);
-    Sprite_DeleteAndFreeResources(param1->cellActorData[1]);
+    Sprite_DeleteAndFreeResources(param1->sprites[0]);
+    Sprite_DeleteAndFreeResources(param1->sprites[1]);
     sub_02012870(param1->fontOAM);
     CharTransfer_ClearRange(&param1->charTransferAllocation);
     SpriteManager_UnloadCharObjById(v0, 20021);
diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c
index 6225edc934..3aee64b2ba 100644
--- a/src/battle/healthbar.c
+++ b/src/battle/healthbar.c
@@ -11,13 +11,13 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "math.h"
 #include "message.h"
 #include "narc.h"
 #include "palette.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "strbuf.h"
@@ -515,10 +515,10 @@ void Healthbar_LoadResources(SpriteSystem *renderer, SpriteManager *gfxHandler,
 {
     const SpriteTemplate *template = Healthbar_SpriteTemplate(healthbarType);
 
-    SpriteSystem_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_TILES], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[SPRITE_RESOURCE_TILES]);
+    SpriteSystem_LoadCharResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_CHAR], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[SPRITE_RESOURCE_CHAR]);
     SpriteSystem_LoadPaletteBufferFromOpenNarc(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, 71, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID);
-    SpriteSystem_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_SPRITE], TRUE, template->resources[SPRITE_RESOURCE_SPRITE]);
-    SpriteSystem_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_SPRITE_ANIM], TRUE, template->resources[SPRITE_RESOURCE_SPRITE_ANIM]);
+    SpriteSystem_LoadCellResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_CELL], TRUE, template->resources[SPRITE_RESOURCE_CELL]);
+    SpriteSystem_LoadAnimResObjFromOpenNarc(renderer, gfxHandler, narc, template->resources[SPRITE_RESOURCE_ANIM], TRUE, template->resources[SPRITE_RESOURCE_ANIM]);
     SpriteSystem_LoadPaletteBufferFromOpenNarc(palette, PLTTBUF_MAIN_OBJ, renderer, gfxHandler, narc, 71, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_EFFECTS_PALETTE_RESID);
 
     if (healthbarType == HEALTHBAR_TYPE_SAFARI_ZONE || healthbarType == HEALTHBAR_TYPE_PAL_PARK) {
@@ -531,17 +531,17 @@ static void Healthbar_LoadMainPalette(SpriteSystem *renderer, SpriteManager *han
     const SpriteTemplate *template = ov16_02268314(type);
 
     if (template != NULL) {
-        SpriteSystem_LoadCharResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_TILES], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[SPRITE_RESOURCE_TILES]);
+        SpriteSystem_LoadCharResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_CHAR], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, template->resources[SPRITE_RESOURCE_CHAR]);
         SpriteSystem_LoadPaletteBufferFromOpenNarc(palette, PLTTBUF_MAIN_OBJ, renderer, handler, narc, 71, FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, HEALTHBAR_MAIN_PALETTE_RESID);
-        SpriteSystem_LoadCellResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_SPRITE], TRUE, template->resources[SPRITE_RESOURCE_SPRITE]);
-        SpriteSystem_LoadAnimResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_SPRITE_ANIM], TRUE, template->resources[SPRITE_RESOURCE_SPRITE_ANIM]);
+        SpriteSystem_LoadCellResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_CELL], TRUE, template->resources[SPRITE_RESOURCE_CELL]);
+        SpriteSystem_LoadAnimResObjFromOpenNarc(renderer, handler, narc, template->resources[SPRITE_RESOURCE_ANIM], TRUE, template->resources[SPRITE_RESOURCE_ANIM]);
     }
 }
 
-CellActorData *Healthbar_LoadCellActor(SpriteSystem *renderer, SpriteManager *handler, int type)
+ManagedSprite *Healthbar_LoadCellActor(SpriteSystem *renderer, SpriteManager *handler, int type)
 {
     const SpriteTemplate *template = Healthbar_SpriteTemplate(type);
-    CellActorData *data = SpriteSystem_NewSprite(renderer, handler, template);
+    ManagedSprite *data = SpriteSystem_NewSprite(renderer, handler, template);
 
     Sprite_TickFrame(data->sprite);
     return data;
@@ -551,7 +551,7 @@ void Healthbar_DrawInfo(Healthbar *healthbar, u32 hp, u32 flags)
 {
     BOOL caughtSpecies = FALSE;
 
-    GF_ASSERT(healthbar->mainActor != NULL);
+    GF_ASSERT(healthbar->mainSprite != NULL);
 
     u32 flagsCopy = flags;
 
@@ -674,22 +674,22 @@ void ov16_02267220(Healthbar *param0)
         param0->unk_50 = NULL;
     }
 
-    if (param0->mainActor == NULL) {
+    if (param0->mainSprite == NULL) {
         return;
     }
 
-    Sprite_DeleteAndFreeResources(param0->mainActor);
-    param0->mainActor = NULL;
+    Sprite_DeleteAndFreeResources(param0->mainSprite);
+    param0->mainSprite = NULL;
 }
 
 static void ov16_02267244(Healthbar *param0)
 {
-    if (param0->arrowActor == NULL) {
+    if (param0->arrowSprite == NULL) {
         return;
     }
 
-    Sprite_DeleteAndFreeResources(param0->arrowActor);
-    param0->arrowActor = NULL;
+    Sprite_DeleteAndFreeResources(param0->arrowSprite);
+    param0->arrowSprite = NULL;
 }
 
 void ov16_02267258(Healthbar *param0)
@@ -742,12 +742,12 @@ void ov16_022672C4(Healthbar *param0)
     v0 = Healthbar_SpriteTemplate(param0->type);
 
     Healthbar_LoadResources(v1, v2, v4, v3, param0->type);
-    param0->mainActor = Healthbar_LoadCellActor(v1, v2, param0->type);
+    param0->mainSprite = Healthbar_LoadCellActor(v1, v2, param0->type);
 
     Healthbar_LoadMainPalette(v1, v2, v4, v3, param0->type);
 
-    if (param0->arrowActor != NULL) {
-        Sprite_SetPositionXY(param0->arrowActor->sprite, v0->x - sArrowOffsetX[param0->type], v0->y + 0);
+    if (param0->arrowSprite != NULL) {
+        Sprite_SetPositionXY(param0->arrowSprite->sprite, v0->x - sArrowOffsetX[param0->type], v0->y + 0);
     }
 
     NARC_dtor(v4);
@@ -778,7 +778,7 @@ void ov16_0226737C(Healthbar *param0)
     param0->numberMode ^= 1;
 
     v2 = G2_GetOBJCharPtr();
-    v1 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+    v1 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
     if (param0->numberMode == 1) {
         v0 = ov16_02268250(70);
@@ -882,8 +882,8 @@ s32 ov16_02267560(Healthbar *param0)
 
 void ov16_0226757C(Healthbar *param0)
 {
-    if (param0->arrowActor != NULL) {
-        CellActor_SetAnimateFlag(param0->arrowActor->sprite, 1);
+    if (param0->arrowSprite != NULL) {
+        Sprite_SetAnimateFlag(param0->arrowSprite->sprite, 1);
         Healthbar_EnableArrow(param0, 1);
     }
 
@@ -894,9 +894,9 @@ void ov16_0226757C(Healthbar *param0)
 
 void ov16_022675AC(Healthbar *param0)
 {
-    if (param0->arrowActor != NULL) {
-        CellActor_SetAnimateFlag(param0->arrowActor->sprite, 0);
-        SpriteActor_SetAnimFrame(param0->arrowActor->sprite, 0);
+    if (param0->arrowSprite != NULL) {
+        Sprite_SetAnimateFlag(param0->arrowSprite->sprite, 0);
+        Sprite_SetAnimFrame(param0->arrowSprite->sprite, 0);
         Healthbar_EnableArrow(param0, 0);
     }
 
@@ -905,14 +905,14 @@ void ov16_022675AC(Healthbar *param0)
 
 void ov16_022675D8(Healthbar *param0, int param1)
 {
-    if (param0->mainActor == NULL) {
+    if (param0->mainSprite == NULL) {
         return;
     }
 
-    Sprite_SetExplicitPriority(param0->mainActor, param1);
+    ManagedSprite_SetExplicitPriority(param0->mainSprite, param1);
 
-    if (param0->arrowActor != NULL) {
-        Sprite_SetExplicitPriority(param0->arrowActor, param1);
+    if (param0->arrowSprite != NULL) {
+        ManagedSprite_SetExplicitPriority(param0->arrowSprite, param1);
     }
 }
 
@@ -924,7 +924,7 @@ void ov16_022675D8(Healthbar *param0, int param1)
  */
 static void Healthbar_EnableArrow(Healthbar *battleSys, BOOL enable)
 {
-    if (battleSys->arrowActor == NULL) {
+    if (battleSys->arrowSprite == NULL) {
         return;
     }
 
@@ -934,27 +934,27 @@ static void Healthbar_EnableArrow(Healthbar *battleSys, BOOL enable)
         return;
     }
 
-    Sprite_SetDrawFlag2(battleSys->arrowActor, enable);
+    ManagedSprite_SetDrawFlag(battleSys->arrowSprite, enable);
 }
 
 void Healthbar_Enable(Healthbar *battleSys, BOOL enable)
 {
-    if (battleSys->mainActor == NULL) {
+    if (battleSys->mainSprite == NULL) {
         return;
     }
 
-    Sprite_SetDrawFlag2(battleSys->mainActor, enable);
+    ManagedSprite_SetDrawFlag(battleSys->mainSprite, enable);
     Healthbar_EnableArrow(battleSys, enable);
 }
 
 void Healthbar_OffsetPositionXY(Healthbar *healthbar, int x, int y)
 {
-    GF_ASSERT(healthbar->mainActor != NULL);
+    GF_ASSERT(healthbar->mainSprite != NULL);
     const SpriteTemplate *template = Healthbar_SpriteTemplate(healthbar->type);
 
-    Sprite_SetPositionXY(healthbar->mainActor->sprite, template->x + x, template->y + y);
-    if (healthbar->arrowActor != NULL) {
-        Sprite_SetPositionXY(healthbar->arrowActor->sprite,
+    Sprite_SetPositionXY(healthbar->mainSprite->sprite, template->x + x, template->y + y);
+    if (healthbar->arrowSprite != NULL) {
+        Sprite_SetPositionXY(healthbar->arrowSprite->sprite,
             template->x + x - sArrowOffsetX[healthbar->type],
             template->y + y + 0);
     }
@@ -963,7 +963,7 @@ void Healthbar_OffsetPositionXY(Healthbar *healthbar, int x, int y)
 void Healthbar_Scroll(Healthbar *healthbar, enum HealthbarScrollDirection direction)
 {
     GF_ASSERT(healthbar != NULL);
-    GF_ASSERT(healthbar->mainActor != NULL);
+    GF_ASSERT(healthbar->mainSprite != NULL);
 
     healthbar->doneScrolling = 0;
     healthbar->scrollDirection = direction;
@@ -1004,7 +1004,7 @@ static void ScrollHealthbarTask(SysTask *task, void *data)
     const SpriteTemplate *template = Healthbar_SpriteTemplate(healthbar->type);
 
     s16 x, y;
-    Sprite_GetPositionXY2(healthbar->mainActor, &x, &y);
+    ManagedSprite_GetPositionXY(healthbar->mainSprite, &x, &y);
 
     // Determine new X and Y based on the type of healthbar
     switch (healthbar->type) {
@@ -1052,9 +1052,9 @@ static void ScrollHealthbarTask(SysTask *task, void *data)
     }
 
     // Update positions of the sprites on the screen
-    Sprite_SetPositionXY2(healthbar->mainActor, x, y);
-    if (healthbar->arrowActor != NULL) {
-        Sprite_SetPositionXY2(healthbar->arrowActor, x - sArrowOffsetX[healthbar->type], y + 0);
+    ManagedSprite_SetPositionXY(healthbar->mainSprite, x, y);
+    if (healthbar->arrowSprite != NULL) {
+        ManagedSprite_SetPositionXY(healthbar->arrowSprite, x - sArrowOffsetX[healthbar->type], y + 0);
     }
 
     // If the sprites are now in position, we're done
@@ -1101,7 +1101,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar)
     // copy the window's data into VRAM over the painted healthbar
     {
         void *vram = G2_GetOBJCharPtr();
-        imgProxy = SpriteActor_ImageProxy(healthbar->mainActor->sprite);
+        imgProxy = Sprite_GetImageProxy(healthbar->mainSprite->sprite);
         u8 *hiHalf = buf;
         u8 *loHalf = &buf[HEALTHBAR_NAME_BLOCK_COUNT_X * HEALTHBAR_WINDOW_BLOCK_SIZE];
 
@@ -1149,7 +1149,7 @@ static void Healthbar_DrawLevelText(Healthbar *param0)
         void *v5;
 
         v5 = G2_GetOBJCharPtr();
-        v0 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v0 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
         MI_CpuCopy16(v2, (void *)((u32)v5 + Unk_ov16_0226F47C[param0->type][0].pos + v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F47C[param0->type][0].size);
         MI_CpuCopy16(v1, (void *)((u32)v5 + Unk_ov16_0226F47C[param0->type][1].pos + v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F47C[param0->type][1].size);
@@ -1174,7 +1174,7 @@ static void Healthbar_DrawLevelNumber(Healthbar *param0)
         u8 *v8, *v9;
 
         v7 = G2_GetOBJCharPtr();
-        v2 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v2 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
         MI_CpuCopy16((void *)((u32)v7 + Unk_ov16_0226F3EC[param0->type][0].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), v1, Unk_ov16_0226F3EC[param0->type][0].size);
         MI_CpuCopy16((void *)((u32)v7 + Unk_ov16_0226F3EC[param0->type][1].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), &v1[v3], Unk_ov16_0226F3EC[param0->type][1].size);
@@ -1217,7 +1217,7 @@ static void Healthbar_DrawCurrentHP(Healthbar *param0, u32 param1)
         u8 *v3;
 
         v2 = G2_GetOBJCharPtr();
-        v1 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v1 = Sprite_GetImageProxy(param0->mainSprite->sprite);
         v3 = v0;
 
         MI_CpuCopy16(v3, (void *)((u32)v2 + Unk_ov16_0226F41C[param0->type][0].pos + v1->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F41C[param0->type][0].size);
@@ -1242,7 +1242,7 @@ static void Healthbar_DrawMaxHP(Healthbar *param0)
         u8 *v3;
 
         v2 = G2_GetOBJCharPtr();
-        v1 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v1 = Sprite_GetImageProxy(param0->mainSprite->sprite);
         v3 = v0;
 
         MI_CpuCopy16(v3, (void *)((u32)v2 + Unk_ov16_0226F3BC[param0->type].pos + v1->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F3BC[param0->type].size);
@@ -1266,7 +1266,7 @@ static void Healthbar_DrawCaughtIcon(Healthbar *param0)
         void *v2;
 
         v2 = G2_GetOBJCharPtr();
-        v0 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v0 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
         MI_CpuCopy16(v1, (void *)((u32)v2 + Unk_ov16_0226F38C[param0->type].pos + v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F38C[param0->type].size);
     }
@@ -1283,7 +1283,7 @@ static void Healthbar_DrawStatusIcon(Healthbar *param0, int param1)
         void *v2;
 
         v2 = G2_GetOBJCharPtr();
-        v0 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v0 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
         MI_CpuCopy16(v1, (void *)((u32)v2 + Unk_ov16_0226F35C[param0->type].pos + v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F35C[param0->type].size);
     }
@@ -1317,7 +1317,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1)
         u8 *v7, *v8;
 
         v6 = G2_GetOBJCharPtr();
-        v2 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v2 = Sprite_GetImageProxy(param0->mainSprite->sprite);
         v7 = v1;
         v8 = &v1[13 * 0x20];
 
@@ -1365,7 +1365,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1)
         u8 *v9, *v10;
 
         v8 = G2_GetOBJCharPtr();
-        v2 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+        v2 = Sprite_GetImageProxy(param0->mainSprite->sprite);
         v9 = v1;
         v10 = &v1[13 * 0x20];
 
@@ -1426,7 +1426,7 @@ static void DrawGauge(Healthbar *param0, u8 param1)
     int v9;
 
     v7 = G2_GetOBJCharPtr();
-    v8 = SpriteActor_ImageProxy(param0->mainActor->sprite);
+    v8 = Sprite_GetImageProxy(param0->mainSprite->sprite);
 
     switch (param1) {
     case 0:
@@ -1774,7 +1774,7 @@ static void ov16_02268380(SysTask *param0, void *param1)
     switch (v0->unk_08) {
     case 0:
         v2 = SpriteManager_FindPlttResourceOffset(v1, 20007, NNS_G2D_VRAM_TYPE_2DMAIN);
-        Sprite_SetExplicitPalette2(v0->unk_00->mainActor, v2);
+        ManagedSprite_SetExplicitPalette(v0->unk_00->mainSprite, v2);
         v0->unk_09 = v2;
         v0->unk_08++;
     case 1:
@@ -1799,7 +1799,7 @@ static void ov16_02268380(SysTask *param0, void *param1)
         break;
     default:
         v2 = SpriteManager_FindPlttResourceOffset(v1, 20006, NNS_G2D_VRAM_TYPE_2DMAIN);
-        Sprite_SetExplicitPalette2(v0->unk_00->mainActor, v2);
+        ManagedSprite_SetExplicitPalette(v0->unk_00->mainSprite, v2);
 
         (*(v0->unk_04)) = 1;
 
diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c
index 5c28e4bc29..58365feb30 100644
--- a/src/battle/ov16_0223DF00.c
+++ b/src/battle/ov16_0223DF00.c
@@ -40,7 +40,6 @@
 
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "field_battle_data_transfer.h"
 #include "flags.h"
@@ -56,6 +55,7 @@
 #include "pokemon.h"
 #include "poketch.h"
 #include "render_text.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -191,7 +191,7 @@ void BattleSystem_ShowStopPlaybackButton(BattleSystem *battleSystem);
 u8 BattleSystem_RecordedChatter(BattleSystem *battleSystem, int param1);
 void ov16_0223F858(BattleSystem *battleSystem, u8 *param1);
 void ov16_0223F87C(BattleSystem *battleSystem, u8 *param1);
-void ov16_0223F8AC(BattleSystem *battleSystem, Sprite **param1);
+void ov16_0223F8AC(BattleSystem *battleSystem, PokemonSprite **param1);
 void BattleSystem_SetGaugePriority(BattleSystem *battleSystem, int param1);
 u32 BattleSystem_CalcMoneyPenalty(Party *party, TrainerInfo *trainerInfo);
 void BattleSystem_DexFlagSeen(BattleSystem *battleSystem, int param1);
@@ -1134,7 +1134,7 @@ void ov16_0223EF8C(BattleSystem *battleSystem)
     MI_CpuCopy32(PaletteData_GetUnfadedBuffer(battleSystem->unk_28, 0), battleSystem->unk_220, HW_BG_PLTT_SIZE);
 
     v7 = G2_GetOBJCharPtr();
-    v0 = SpriteActor_ImageProxy(battleSystem->unk_17C[1].unk_00->sprite);
+    v0 = Sprite_GetImageProxy(battleSystem->unk_17C[1].unk_00->sprite);
     v7 += v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN];
 
     for (v2 = 20; v2 < 20 + 8; v2++) {
@@ -1165,7 +1165,7 @@ void ov16_0223EF8C(BattleSystem *battleSystem)
     }
 
     v7 = G2_GetOBJCharPtr();
-    v0 = SpriteActor_ImageProxy(battleSystem->unk_17C[0].unk_00->sprite);
+    v0 = Sprite_GetImageProxy(battleSystem->unk_17C[0].unk_00->sprite);
     v7 += v0->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN];
 
     for (v6 = 0; v6 < 0x40 * 32; v6++) {
@@ -1625,7 +1625,7 @@ void ov16_0223F87C(BattleSystem *battleSystem, u8 *param1)
     }
 }
 
-void ov16_0223F8AC(BattleSystem *battleSystem, Sprite **param1)
+void ov16_0223F8AC(BattleSystem *battleSystem, PokemonSprite **param1)
 {
     int v0;
 
diff --git a/src/battle/ov16_02268520.c b/src/battle/ov16_02268520.c
index 269f1c5d16..ec7813e89b 100644
--- a/src/battle/ov16_02268520.c
+++ b/src/battle/ov16_02268520.c
@@ -260,7 +260,7 @@ void ov16_022686BC(UnkStruct_ov16_02268520 *param0, int param1)
         return;
     }
 
-    Sprite_SetDrawFlag2(param0->unk_00, param1);
+    ManagedSprite_SetDrawFlag(param0->unk_00, param1);
 }
 
 void ov16_022686CC(UnkStruct_ov16_02268520 *param0, BattleSystem *param1, u16 param2, int param3)
diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c
index d5a463c007..6cb88ff012 100644
--- a/src/battle/ov16_0226871C.c
+++ b/src/battle/ov16_0226871C.c
@@ -25,7 +25,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "enums.h"
 #include "font.h"
@@ -42,6 +41,7 @@
 #include "pokemon_icon.h"
 #include "render_text.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -205,11 +205,11 @@ typedef struct UnkStruct_ov16_02268A14_t {
     UnkStruct_02012744 *unk_4C8;
     UnkStruct_ov16_0226A98C unk_4CC[13];
     UnkStruct_02012B20 *unk_5B8;
-    CellActorData *unk_5BC[6];
-    CellActorData *unk_5D4[6];
-    CellActorData *unk_5EC[4];
-    CellActorData *unk_5FC[4];
-    CellActorData *unk_60C[4];
+    ManagedSprite *unk_5BC[6];
+    ManagedSprite *unk_5D4[6];
+    ManagedSprite *unk_5EC[4];
+    ManagedSprite *unk_5FC[4];
+    ManagedSprite *unk_60C[4];
     SysTask *unk_61C[4];
     UnkStruct_ov16_02268FCC unk_62C[6];
     SysTask *unk_664;
@@ -325,7 +325,7 @@ static void ov16_0226AAC0(UnkStruct_ov16_02268A14 *param0);
 static void ov16_0226A698(UnkStruct_ov16_02268A14 *param0);
 static void ov16_0226A718(UnkStruct_ov16_02268A14 *param0);
 static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0);
-static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5);
+static ManagedSprite *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5);
 static void ov16_0226A928(SysTask *param0, void *param1);
 static void ov16_0226B988(SysTask *param0, void *param1);
 static void ov16_0226BA88(SysTask *param0, void *param1);
@@ -1343,7 +1343,7 @@ void ov16_02268D40(NARC *param0, UnkStruct_ov16_02268A14 *param1)
     for (i = 0; i < 6; i++) {
         param1->unk_5BC[i] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_02270414);
         Sprite_SetPositionXYWithSubscreenOffset(param1->unk_5BC[i]->sprite, 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT));
-        Sprite_SetAffineOverwriteMode(param1->unk_5BC[i], AFFINE_OVERWRITE_MODE_NORMAL);
+        ManagedSprite_SetAffineOverwriteMode(param1->unk_5BC[i], AFFINE_OVERWRITE_MODE_NORMAL);
 
         param1->unk_5D4[i] = SpriteSystem_NewSprite(v1, v2, &Unk_ov16_02270448);
         Sprite_SetPositionXYWithSubscreenOffset(param1->unk_5D4[i]->sprite, 246 + -12 * i, 9, ((192 + 80) << FX32_SHIFT));
@@ -1409,7 +1409,7 @@ static void ov16_02268FCC(SysTask *param0, void *param1)
         switch (v2->unk_03) {
         case 0:
         default:
-            if (Sprite_GetDrawFlag(v0->unk_5BC[i]->sprite) == 0) {
+            if (Sprite_GetDrawFlag2(v0->unk_5BC[i]->sprite) == 0) {
                 break;
             }
 
@@ -1434,10 +1434,10 @@ static void ov16_02268FCC(SysTask *param0, void *param1)
             break;
         case 2:
         case 4:
-            Sprite_OffsetAffineZRotation(v0->unk_5BC[i], 0x800);
+            ManagedSprite_OffsetAffineZRotation(v0->unk_5BC[i], 0x800);
             v2->unk_00 += 0x180;
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT));
             v2->unk_06++;
 
             if (v2->unk_06 >= v2->unk_07) {
@@ -1446,8 +1446,8 @@ static void ov16_02268FCC(SysTask *param0, void *param1)
                 if (v2->unk_03 == 2) {
                     v2->unk_03++;
                 } else {
-                    Sprite_SetAffineZRotation(v0->unk_5BC[i], 0);
-                    Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_5BC[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT));
+                    ManagedSprite_SetAffineZRotation(v0->unk_5BC[i], 0);
+                    ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_5BC[i], 12 + 19 * i, 13, ((192 + 80) << FX32_SHIFT));
 
                     v2->unk_00 = 0;
 
@@ -1468,10 +1468,10 @@ static void ov16_02268FCC(SysTask *param0, void *param1)
 
             break;
         case 3:
-            Sprite_OffsetAffineZRotation(v0->unk_5BC[i], -0x800);
+            ManagedSprite_OffsetAffineZRotation(v0->unk_5BC[i], -0x800);
             v2->unk_00 -= 0x180;
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_5BC[i], 12 + 19 * i + v2->unk_00 / 0x100, 13, ((192 + 80) << FX32_SHIFT));
             v2->unk_06++;
 
             if (v2->unk_06 >= v2->unk_07 * 2) {
@@ -1499,12 +1499,12 @@ void ov16_02269168(UnkStruct_ov16_02268A14 *param0, u8 param1[], u8 param2[])
     for (i = 0; i < 6; i++) {
         v1 = ov16_0226A934(param1[i]);
 
-        CellActor_SetAnim(param0->unk_5BC[i]->sprite, v1);
+        Sprite_SetAnim(param0->unk_5BC[i]->sprite, v1);
         Sprite_TickFrame(param0->unk_5BC[i]->sprite);
 
         v1 = ov16_0226A934(param2[i]);
 
-        CellActor_SetAnim(param0->unk_5D4[i]->sprite, v1);
+        Sprite_SetAnim(param0->unk_5D4[i]->sprite, v1);
         Sprite_TickFrame(param0->unk_5D4[i]->sprite);
     }
 }
@@ -1516,12 +1516,12 @@ void ov16_022691BC(UnkStruct_ov16_02268A14 *param0)
     GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL);
 
     for (i = 0; i < 6; i++) {
-        Sprite_SetDrawFlag(param0->unk_5BC[i]->sprite, 1);
+        Sprite_SetDrawFlag2(param0->unk_5BC[i]->sprite, 1);
     }
 
     if (BattleSystem_BattleType(param0->unk_00) & 0x1) {
         for (i = 0; i < 6; i++) {
-            Sprite_SetDrawFlag(param0->unk_5D4[i]->sprite, 1);
+            Sprite_SetDrawFlag2(param0->unk_5D4[i]->sprite, 1);
         }
     }
 }
@@ -1533,8 +1533,8 @@ void ov16_02269218(UnkStruct_ov16_02268A14 *param0)
     GF_ASSERT(param0->unk_5BC[0] != NULL && param0->unk_5D4[0] != NULL);
 
     for (i = 0; i < 6; i++) {
-        Sprite_SetDrawFlag(param0->unk_5BC[i]->sprite, 0);
-        Sprite_SetDrawFlag(param0->unk_5D4[i]->sprite, 0);
+        Sprite_SetDrawFlag2(param0->unk_5BC[i]->sprite, 0);
+        Sprite_SetDrawFlag2(param0->unk_5D4[i]->sprite, 0);
     }
 }
 
@@ -1783,7 +1783,7 @@ static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param
 
     if ((BattleSystem_BattleType(param0->unk_00) & (0x20 | 0x200)) == 0) {
         Pokemon *v7;
-        CellActorData *v8;
+        ManagedSprite *v8;
         int v9, v10;
 
         v7 = BattleSystem_PartyPokemon(param0->unk_00, v6->unk_01, v6->unk_02);
@@ -1798,7 +1798,7 @@ static void ov16_02269668(UnkStruct_ov16_02268A14 *param0, int param1, int param
             v9 -= 32 / 2;
         }
 
-        Sprite_SetPositionXYWithSubscreenOffset2(v8, v9, v10 - (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT), ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(v8, v9, v10 - (((192 + 80) << FX32_SHIFT) >> FX32_SHIFT), ((192 + 80) << FX32_SHIFT));
     }
 }
 
@@ -2467,13 +2467,13 @@ static void ov16_0226A768(UnkStruct_ov16_02268A14 *param0)
     }
 }
 
-static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5)
+static ManagedSprite *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *param1, int param2, int param3, int param4, int param5)
 {
     SpriteSystem *v0;
     SpriteManager *v1;
     u32 v2;
     SpriteTemplate v3;
-    CellActorData *v4;
+    ManagedSprite *v4;
     int v5;
 
     if (param2 >= 2) {
@@ -2513,8 +2513,8 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa
     v3.y = Unk_ov16_02270304[v5][1];
     v4 = SpriteSystem_NewSprite(v0, v1, &v3);
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(v4->sprite, Pokemon_IconPaletteIndex(param1));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v4, v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(v4->sprite, Pokemon_IconPaletteIndex(param1));
 
     {
         int v6 = 0;
@@ -2539,11 +2539,11 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa
                 break;
             }
 
-            Sprite_SetAnim(v4, v6);
+            ManagedSprite_SetAnim(v4, v6);
         }
     }
 
-    Sprite_TickOneFrame(v4);
+    ManagedSprite_TickFrame(v4);
 
     param0->unk_60C[v5] = v4;
     param0->unk_61C[v5] = SysTask_Start(ov16_0226A928, v4, 1300);
@@ -2553,8 +2553,8 @@ static CellActorData *ov16_0226A7A4(UnkStruct_ov16_02268A14 *param0, Pokemon *pa
 
 static void ov16_0226A928(SysTask *param0, void *param1)
 {
-    CellActorData *v0 = param1;
-    Sprite_TickOneFrame(v0);
+    ManagedSprite *v0 = param1;
+    ManagedSprite_TickFrame(v0);
 }
 
 static int ov16_0226A934(u8 param0)
@@ -2874,14 +2874,14 @@ static void ov16_0226AF0C(UnkStruct_ov16_02268A14 *param0)
 
             param0->unk_5EC[i] = sub_0207CA58(v1, v2, v5, &v3);
 
-            Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_5EC[i], v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_5EC[i], v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
 
             {
                 void *v8;
                 NNSG2dImageProxy *v9;
 
                 v8 = G2S_GetOBJCharPtr();
-                v9 = SpriteActor_ImageProxy(param0->unk_5EC[i]->sprite);
+                v9 = Sprite_GetImageProxy(param0->unk_5EC[i]->sprite);
 
                 MI_CpuCopy16(v7->unk_18[i], (void *)((u32)v8 + v9->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DSUB]), sub_0208C098(6));
             }
@@ -3225,7 +3225,7 @@ static void ov16_0226B390(SysTask *param0, void *param1)
         sub_020128C4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + -2);
 
         if ((v0->unk_67C.unk_04_val3.unk_0E != 0xff) && (v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E] != NULL)) {
-            Sprite_OffsetPositionXY2(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, -2);
+            ManagedSprite_OffsetPositionXY(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, -2);
         }
 
         v0->unk_67C.unk_00++;
@@ -3245,7 +3245,7 @@ static void ov16_0226B390(SysTask *param0, void *param1)
         sub_020128C4(v0->unk_4CC[v0->unk_67C.unk_04_val3.unk_0D].unk_00, v2, v3 + 1);
 
         if ((v0->unk_67C.unk_04_val3.unk_0E != 0xff) && (v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E] != NULL)) {
-            Sprite_OffsetPositionXY2(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, 1);
+            ManagedSprite_OffsetPositionXY(v0->unk_60C[v0->unk_67C.unk_04_val3.unk_0E], 0, 1);
         }
 
         v0->unk_67C.unk_00++;
@@ -3413,7 +3413,7 @@ static void ov16_0226B780(SysTask *param0, void *param1)
                 }
 
                 if (v0->unk_60C[i] != NULL) {
-                    Sprite_OffsetPositionXY2(v0->unk_60C[i], 0, -2);
+                    ManagedSprite_OffsetPositionXY(v0->unk_60C[i], 0, -2);
                 }
             }
         }
@@ -3442,7 +3442,7 @@ static void ov16_0226B780(SysTask *param0, void *param1)
                 }
 
                 if (v0->unk_60C[i] != NULL) {
-                    Sprite_OffsetPositionXY2(v0->unk_60C[i], 0, 1);
+                    ManagedSprite_OffsetPositionXY(v0->unk_60C[i], 0, 1);
                 }
             }
         }
diff --git a/src/battle/ov16_0226DB7C.c b/src/battle/ov16_0226DB7C.c
index 94b909376e..b1417aa459 100644
--- a/src/battle/ov16_0226DB7C.c
+++ b/src/battle/ov16_0226DB7C.c
@@ -11,7 +11,7 @@
 #include "sys_task_manager.h"
 
 typedef struct UnkStruct_ov16_0226DC24_t {
-    CellActorData *unk_00[5];
+    ManagedSprite *unk_00[5];
     SysTask *unk_14;
 } UnkStruct_ov16_0226DC24;
 
@@ -76,7 +76,7 @@ UnkStruct_ov16_0226DC24 *ov16_0226DC24(SpriteSystem *param0, SpriteManager *para
 
     for (v2 = 0; v2 < 5; v2++) {
         v0->unk_00[v2] = SpriteSystem_NewSprite(param0, param1, &v1);
-        Sprite_SetDrawFlag2(v0->unk_00[v2], 0);
+        ManagedSprite_SetDrawFlag(v0->unk_00[v2], 0);
     }
 
     v0->unk_14 = SysTask_Start(ov16_0226DE10, v0, 40000);
@@ -99,18 +99,18 @@ void ov16_0226DCCC(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int
 {
     int v0;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[0], param1, param2, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[1], param3, param4, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[2], param5, param6, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[3], param7, param8, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[0], param1, param2, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[1], param3, param4, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[2], param5, param6, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[3], param7, param8, param9);
 
-    Sprite_SetAnim(param0->unk_00[0], 0);
-    Sprite_SetAnim(param0->unk_00[1], 1);
-    Sprite_SetAnim(param0->unk_00[2], 2);
-    Sprite_SetAnim(param0->unk_00[3], 3);
+    ManagedSprite_SetAnim(param0->unk_00[0], 0);
+    ManagedSprite_SetAnim(param0->unk_00[1], 1);
+    ManagedSprite_SetAnim(param0->unk_00[2], 2);
+    ManagedSprite_SetAnim(param0->unk_00[3], 3);
 
     for (v0 = 0; v0 < 4; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_00[v0], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_00[v0], 1);
     }
 }
 
@@ -131,9 +131,9 @@ void ov16_0226DD9C(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int
 
 void ov16_0226DDC0(UnkStruct_ov16_0226DC24 *param0, int param1, int param2, int param3, fx32 param4)
 {
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[4], param1, param2, param4);
-    Sprite_SetAnim(param0->unk_00[4], param3);
-    Sprite_SetDrawFlag2(param0->unk_00[4], 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[4], param1, param2, param4);
+    ManagedSprite_SetAnim(param0->unk_00[4], param3);
+    ManagedSprite_SetDrawFlag(param0->unk_00[4], 1);
 }
 
 void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0)
@@ -141,13 +141,13 @@ void ov16_0226DDE8(UnkStruct_ov16_0226DC24 *param0)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_00[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_00[v0], 0);
     }
 }
 
 void ov16_0226DE04(UnkStruct_ov16_0226DC24 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_00[4], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_00[4], 0);
 }
 
 static void ov16_0226DE10(SysTask *param0, void *param1)
@@ -155,15 +155,15 @@ static void ov16_0226DE10(SysTask *param0, void *param1)
     UnkStruct_ov16_0226DC24 *v0 = param1;
     int v1;
 
-    if (Sprite_GetDrawFlag2(v0->unk_00[0]) == 0) {
+    if (ManagedSprite_GetDrawFlag(v0->unk_00[0]) == 0) {
         return;
     }
 
     for (v1 = 0; v1 < 4; v1++) {
-        Sprite_TickOneFrame(v0->unk_00[v1]);
+        ManagedSprite_TickFrame(v0->unk_00[v1]);
     }
 
-    if (Sprite_GetDrawFlag2(v0->unk_00[4]) == 1) {
-        Sprite_TickOneFrame(v0->unk_00[4]);
+    if (ManagedSprite_GetDrawFlag(v0->unk_00[4]) == 1) {
+        ManagedSprite_TickFrame(v0->unk_00[4]);
     }
 }
diff --git a/src/battle/ov16_0226DE44.c b/src/battle/ov16_0226DE44.c
index 204c6ea47e..3b847de6a6 100644
--- a/src/battle/ov16_0226DE44.c
+++ b/src/battle/ov16_0226DE44.c
@@ -12,7 +12,7 @@
 #include "sys_task_manager.h"
 
 typedef struct UnkStruct_ov16_0226DEEC_t {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     SysTask *unk_04;
     int unk_08;
     int unk_0C;
@@ -85,7 +85,7 @@ UnkStruct_ov16_0226DEEC *ov16_0226DEEC(SpriteSystem *param0, SpriteManager *para
     MI_CpuClear8(v0, sizeof(UnkStruct_ov16_0226DEEC));
 
     v0->unk_00 = SpriteSystem_NewSprite(param0, param1, &v1);
-    Sprite_SetDrawFlag2(v0->unk_00, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_00, 0);
 
     v0->unk_14 = (192 << FX32_SHIFT);
     v0->unk_04 = SysTask_Start(ov16_0226DFD8, v0, 999);
@@ -108,8 +108,8 @@ void ov16_0226DF80(UnkStruct_ov16_0226DEEC *param0, int param1, int param2, fx32
     param0->unk_0C = param2;
     param0->unk_14 = param3;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00, param1, param2, param3);
-    Sprite_SetDrawFlag2(param0->unk_00, 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00, param1, param2, param3);
+    ManagedSprite_SetDrawFlag(param0->unk_00, 1);
 }
 
 void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2)
@@ -119,7 +119,7 @@ void ov16_0226DFB0(UnkStruct_ov16_0226DEEC *param0, int param1, int param2)
 
 void ov16_0226DFBC(UnkStruct_ov16_0226DEEC *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_00, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_00, 0);
     ov16_0226E13C(param0);
 }
 
@@ -149,7 +149,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
         }
     }
 
-    if (Sprite_GetDrawFlag2(v0->unk_00) == 0) {
+    if (ManagedSprite_GetDrawFlag(v0->unk_00) == 0) {
         return;
     }
 
@@ -169,7 +169,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
 
         if (v0->unk_1C == 0) {
             v1 = FX_Mul(CalcSineDegrees(v0->unk_10 / 100), 14 << FX32_SHIFT) / FX32_ONE;
-            Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_00, v0->unk_08, v0->unk_0C - v1, v0->unk_14);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_00, v0->unk_08, v0->unk_0C - v1, v0->unk_14);
         }
     }
 
@@ -184,7 +184,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
             }
             break;
         case 1:
-            Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_00, v0->unk_08, v0->unk_0C + 8, v0->unk_14);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_00, v0->unk_08, v0->unk_0C + 8, v0->unk_14);
             v0->unk_1B = 1;
             v0->unk_1D++;
             break;
@@ -192,7 +192,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
             v0->unk_1E++;
 
             if (v0->unk_1E > 2) {
-                Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_00, v0->unk_08, v0->unk_0C + 2, v0->unk_14);
+                ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_00, v0->unk_08, v0->unk_0C + 2, v0->unk_14);
                 v0->unk_1E = 0;
                 v0->unk_1D++;
             }
@@ -211,7 +211,7 @@ static void ov16_0226DFD8(SysTask *param0, void *param1)
         }
     }
 
-    Sprite_TickOneFrame(v0->unk_00);
+    ManagedSprite_TickFrame(v0->unk_00);
 }
 
 static void ov16_0226E13C(UnkStruct_ov16_0226DEEC *param0)
diff --git a/src/battle/party_gauge.c b/src/battle/party_gauge.c
index 276457fed5..d794adfc60 100644
--- a/src/battle/party_gauge.c
+++ b/src/battle/party_gauge.c
@@ -11,18 +11,18 @@
 #include "battle/ov16_0223DF00.h"
 
 #include "assert.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "heap.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
 
 typedef struct {
-    CellActorData *cells;
+    ManagedSprite *cells;
     SysTask *task;
     enum HideArrowType hideType;
     enum PartyGaugeSide side;
@@ -34,7 +34,7 @@ typedef struct {
 } PartyGaugeArrow;
 
 typedef struct {
-    CellActorData *cells;
+    ManagedSprite *cells;
     SysTask *task;
     enum PartyGaugeSide side;
     enum PartyGaugePosition position;
@@ -315,11 +315,11 @@ static void ShowArrow(PartyGaugeArrow *arrow, enum PartyGaugeSide side, enum Par
     arrow->cells = SpriteSystem_NewSprite(renderer, gfxHandler, &sArrowTemplate);
 
     if (side == PARTY_GAUGE_OURS) {
-        Sprite_SetPositionXY2(arrow->cells, ARROW_X_START_OURS, sArrowYPosOurs[pos]);
-        CellActor_SetAnim(arrow->cells->sprite, PGANM_ARROW_OURS);
+        ManagedSprite_SetPositionXY(arrow->cells, ARROW_X_START_OURS, sArrowYPosOurs[pos]);
+        Sprite_SetAnim(arrow->cells->sprite, PGANM_ARROW_OURS);
     } else {
-        Sprite_SetPositionXY2(arrow->cells, ARROW_X_START_THEIRS, sArrowYPosTheirs[pos]);
-        CellActor_SetAnim(arrow->cells->sprite, PGANM_ARROW_THEIRS);
+        ManagedSprite_SetPositionXY(arrow->cells, ARROW_X_START_THEIRS, sArrowYPosTheirs[pos]);
+        Sprite_SetAnim(arrow->cells->sprite, PGANM_ARROW_THEIRS);
     }
 
     Sprite_TickFrame(arrow->cells->sprite);
@@ -340,7 +340,7 @@ static void ShowArrowTask(SysTask *task, void *data)
     case SHOW_ARROW_INIT:
         s16 x, y;
 
-        Sprite_GetPositionXY2(arrow->cells, &x, &y);
+        ManagedSprite_GetPositionXY(arrow->cells, &x, &y);
         arrow->x = x << 8;
         arrow->state++;
         // fall-through
@@ -352,7 +352,7 @@ static void ShowArrowTask(SysTask *task, void *data)
                 arrow->state++;
             }
 
-            Sprite_SetPositionXY2(arrow->cells, arrow->x >> 8, sArrowYPosOurs[arrow->position]);
+            ManagedSprite_SetPositionXY(arrow->cells, arrow->x >> 8, sArrowYPosOurs[arrow->position]);
         } else {
             arrow->x += ARROW_IN_SPEED;
             if (arrow->x >= ARROW_X_END_THEIRS << 8) {
@@ -360,7 +360,7 @@ static void ShowArrowTask(SysTask *task, void *data)
                 arrow->state++;
             }
 
-            Sprite_SetPositionXY2(arrow->cells, arrow->x >> 8, sArrowYPosTheirs[arrow->position]);
+            ManagedSprite_SetPositionXY(arrow->cells, arrow->x >> 8, sArrowYPosTheirs[arrow->position]);
         }
         break;
 
@@ -401,10 +401,10 @@ static void HideArrowTask(SysTask *task, void *data)
     case HIDE_ARROW_INIT:
         s16 x, y;
 
-        Sprite_GetPositionXY2(arrow->cells, &x, &y);
+        ManagedSprite_GetPositionXY(arrow->cells, &x, &y);
         arrow->x = x << 8;
 
-        Sprite_SetExplicitOamMode2(arrow->cells, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(arrow->cells, GX_OAM_MODE_XLU);
         arrow->alpha = 16 << 8;
 
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_NONE, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD, (arrow->alpha >> 8), 16 - (arrow->alpha >> 8));
@@ -422,10 +422,10 @@ static void HideArrowTask(SysTask *task, void *data)
         if (arrow->hideType == HIDE_ARROW_FADE_AND_SCROLL) {
             if (arrow->side == PARTY_GAUGE_OURS) {
                 arrow->x -= ARROW_OUT_SPEED;
-                Sprite_SetPositionXY2(arrow->cells, arrow->x >> 8, sArrowYPosOurs[arrow->position]);
+                ManagedSprite_SetPositionXY(arrow->cells, arrow->x >> 8, sArrowYPosOurs[arrow->position]);
             } else {
                 arrow->x += ARROW_OUT_SPEED;
-                Sprite_SetPositionXY2(arrow->cells, arrow->x >> 8, sArrowYPosTheirs[arrow->position]);
+                ManagedSprite_SetPositionXY(arrow->cells, arrow->x >> 8, sArrowYPosTheirs[arrow->position]);
             }
         }
 
@@ -433,7 +433,7 @@ static void HideArrowTask(SysTask *task, void *data)
 
         if (arrow->alpha <= 0) {
             arrow->alpha = 0;
-            Sprite_SetDrawFlag(arrow->cells->sprite, 0);
+            Sprite_SetDrawFlag2(arrow->cells->sprite, 0);
             arrow->state++;
         }
 
@@ -466,12 +466,12 @@ static void ShowPokeballs(PartyGaugePokeballs *pokeballs, s8 *numBalls, enum Par
     pokeballs->cells = SpriteSystem_NewSprite(renderer, gfxHandler, &sPokeballTemplate);
 
     if (side == PARTY_GAUGE_OURS) {
-        Sprite_SetPositionXY2(pokeballs->cells, POKEBALL_X_START_OURS, sPokeballYPosOurs[pos]);
+        ManagedSprite_SetPositionXY(pokeballs->cells, POKEBALL_X_START_OURS, sPokeballYPosOurs[pos]);
     } else {
-        Sprite_SetPositionXY2(pokeballs->cells, POKEBALL_X_START_THEIRS, sPokeballYPosTheirs[pos]);
+        ManagedSprite_SetPositionXY(pokeballs->cells, POKEBALL_X_START_THEIRS, sPokeballYPosTheirs[pos]);
     }
 
-    CellActor_SetAnim(pokeballs->cells->sprite, frame);
+    Sprite_SetAnim(pokeballs->cells->sprite, frame);
     Sprite_TickFrame(pokeballs->cells->sprite);
 
     pokeballs->side = side;
@@ -509,7 +509,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
     switch (pokeballs->state) {
     case SHOW_POKEBALLS_INIT:
         s16 x, y;
-        Sprite_GetPositionXY2(pokeballs->cells, &x, &y);
+        ManagedSprite_GetPositionXY(pokeballs->cells, &x, &y);
         pokeballs->xStart = x << 8;
 
         pokeballs->state++;
@@ -530,7 +530,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
         } else {
             pokeballs->xStart += POKEBALL_IN_SPEED;
 
@@ -539,7 +539,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
         }
 
         Sprite_TickFrame(pokeballs->cells->sprite);
@@ -556,9 +556,9 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
         }
 
         if (pokeballs->side == PARTY_GAUGE_OURS) {
-            SpriteActor_SetAnimFrame(pokeballs->cells->sprite, 1);
+            Sprite_SetAnimFrame(pokeballs->cells->sprite, 1);
         } else {
-            SpriteActor_SetAnimFrame(pokeballs->cells->sprite, 1);
+            Sprite_SetAnimFrame(pokeballs->cells->sprite, 1);
         }
 
         pokeballs->delay = 0;
@@ -571,7 +571,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
             break;
         }
 
-        CellActor_SetAnim(pokeballs->cells->sprite, pokeballs->flipAnimation);
+        Sprite_SetAnim(pokeballs->cells->sprite, pokeballs->flipAnimation);
         pokeballs->delay = 0;
         pokeballs->state++;
         // fall-through
@@ -584,7 +584,7 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
         } else {
             pokeballs->xStart -= POKEBALL_IN_SPEED_SLOW;
 
@@ -593,14 +593,14 @@ static void ShowPokeballsStartOfBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
         }
 
         Sprite_TickFrame(pokeballs->cells->sprite);
         break;
 
     default:
-        SpriteActor_SetAnimFrame(pokeballs->cells->sprite, 0);
+        Sprite_SetAnimFrame(pokeballs->cells->sprite, 0);
         SysTask_Done(task);
         pokeballs->task = NULL;
     }
@@ -613,10 +613,10 @@ static void ShowPokeballsMidBattleTask(SysTask *task, void *data)
     switch (pokeballs->state) {
     case SHOW_POKEBALLS_INIT:
         s16 x, y;
-        Sprite_GetPositionXY2(pokeballs->cells, &x, &y);
+        ManagedSprite_GetPositionXY(pokeballs->cells, &x, &y);
         pokeballs->xStart = x << 8;
 
-        SpriteActor_SetAnimFrame(pokeballs->cells->sprite, 0);
+        Sprite_SetAnimFrame(pokeballs->cells->sprite, 0);
         pokeballs->state++;
         // fall-through
     case SHOW_POKEBALLS_DELAY:
@@ -634,7 +634,7 @@ static void ShowPokeballsMidBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
         } else {
             pokeballs->xStart += POKEBALL_IN_SPEED;
 
@@ -643,7 +643,7 @@ static void ShowPokeballsMidBattleTask(SysTask *task, void *data)
                 pokeballs->state++;
             }
 
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
         }
         break;
 
@@ -693,10 +693,10 @@ static void HidePokeballsStartOfBattleTask(SysTask *task, void *data)
     case HIDE_POKEBALLS_INIT:
         s16 x, y;
 
-        Sprite_GetPositionXY2(pokeballs->cells, &x, &y);
+        ManagedSprite_GetPositionXY(pokeballs->cells, &x, &y);
         pokeballs->xStart = x << 8;
 
-        Sprite_SetExplicitOamMode2(pokeballs->cells, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(pokeballs->cells, GX_OAM_MODE_XLU);
         pokeballs->state++;
         // fall-through
     case HIDE_POKEBALLS_DELAY:
@@ -713,10 +713,10 @@ static void HidePokeballsStartOfBattleTask(SysTask *task, void *data)
     case HIDE_POKEBALLS_FADE:
         if (pokeballs->side == PARTY_GAUGE_OURS) {
             pokeballs->xStart -= POKEBALL_OUT_SPEED;
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosOurs[pokeballs->position]);
         } else {
             pokeballs->xStart += POKEBALL_OUT_SPEED;
-            Sprite_SetPositionXY2(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
+            ManagedSprite_SetPositionXY(pokeballs->cells, pokeballs->xStart >> 8, sPokeballYPosTheirs[pokeballs->position]);
         }
 
         // Need some more documentation on this one
@@ -729,7 +729,7 @@ static void HidePokeballsStartOfBattleTask(SysTask *task, void *data)
 
     case HIDE_POKEBALLS_BREAK:
     default:
-        Sprite_SetDrawFlag(pokeballs->cells->sprite, 0);
+        Sprite_SetDrawFlag2(pokeballs->cells->sprite, 0);
         SysTask_Done(task);
         pokeballs->task = NULL;
     }
@@ -745,7 +745,7 @@ static void HidePokeballsMidBattleTask(SysTask *task, void *data)
 
     switch (pokeballs->state) {
     case HIDE_POKEBALLS_INIT:
-        Sprite_SetExplicitOamMode2(pokeballs->cells, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(pokeballs->cells, GX_OAM_MODE_XLU);
         pokeballs->state++;
         // fall-through
     case HIDE_POKEBALLS_DELAY:
@@ -754,7 +754,7 @@ static void HidePokeballsMidBattleTask(SysTask *task, void *data)
 
     case HIDE_POKEBALLS_BREAK:
     default:
-        Sprite_SetDrawFlag(pokeballs->cells->sprite, 0);
+        Sprite_SetDrawFlag2(pokeballs->cells->sprite, 0);
         SysTask_Done(task);
         pokeballs->task = NULL;
     }
diff --git a/src/cell_actor.c b/src/cell_actor.c
deleted file mode 100644
index 3fe70db742..0000000000
--- a/src/cell_actor.c
+++ /dev/null
@@ -1,933 +0,0 @@
-#include "cell_actor.h"
-
-#include "nitro/gx/g2_oam.h"
-#include <nitro.h>
-#include <string.h>
-
-#include "nnsys/g2d/g2d_Image.h"
-#include "nnsys/g2d/g2d_RendererCore.h"
-
-#include "heap.h"
-#include "system.h"
-
-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 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);
-
-    CellActorCollection *collection = Heap_AllocFromHeap(params->heapID, sizeof(CellActorCollection));
-    GF_ASSERT(collection);
-
-    CellActorCollection_Reset(collection);
-
-    collection->actors = Heap_AllocFromHeap(params->heapID, sizeof(CellActor) * params->maxElements);
-    GF_ASSERT(collection->actors);
-    collection->maxActors = params->maxElements;
-
-    collection->actorStack = Heap_AllocFromHeap(params->heapID, sizeof(CellActor *) * params->maxElements);
-    GF_ASSERT(collection->actorStack);
-
-    CellActorCollection_InitActors(collection);
-    CellActor_Reset(&collection->sentinelData);
-
-    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(collection->rawAnimData, &collection->defaultAnimBank);
-    collection->active = TRUE;
-
-    return collection;
-}
-
-BOOL CellActorCollection_Delete(CellActorCollection *collection)
-{
-    if (collection == NULL) {
-        return FALSE;
-    }
-
-    if (collection->actors == NULL) {
-        return TRUE;
-    }
-
-    CellActorCollection_DeleteAll(collection);
-
-    Heap_FreeToHeap(collection->rawAnimData);
-    Heap_FreeToHeap(collection->actorStack);
-    Heap_FreeToHeap(collection->actors);
-
-    CellActorCollection_Reset(collection);
-    Heap_FreeToHeap(collection);
-
-    collection = NULL;
-
-    return TRUE;
-}
-
-BOOL CellActorCollection_SetActive(CellActorCollection *collection, u8 active)
-{
-    if (collection == NULL) {
-        return FALSE;
-    }
-
-    if (collection->actors == NULL) {
-        return FALSE;
-    }
-
-    collection->active = active;
-
-    return TRUE;
-}
-
-BOOL CellActorCollection_DeleteAll(CellActorCollection *collection)
-{
-    if (collection == NULL) {
-        return FALSE;
-    }
-
-    if (collection->actors == NULL) {
-        return TRUE;
-    }
-
-    CellActor *actor = collection->sentinelData.next;
-    while (actor != &collection->sentinelData) {
-        CellActor *next = actor->next;
-        CellActor_Delete(actor);
-        actor = next;
-    }
-
-    return TRUE;
-}
-
-void CellActorCollection_Update(const CellActorCollection *collection)
-{
-    static const CellActorDrawFunc sDrawFuncs[] = {
-        CellActorCollection_DrawActor_Stub,
-        CellActorCollection_DrawActor
-    };
-    static const CellActorAnimUpdateFunc sAnimUpdateFuncs[] = {
-        CellActor_UpdateAnimInternal_Stub,
-        CellActor_UpdateAnimInternal
-    };
-
-    GF_ASSERT(collection);
-
-    if (collection->active == FALSE) {
-        return;
-    }
-
-    CellActor *actor = collection->sentinelData.next;
-
-    while (actor != &collection->sentinelData) {
-        sDrawFuncs[actor->draw](collection, actor);
-        sAnimUpdateFuncs[actor->animate](actor);
-        actor = actor->next;
-    }
-}
-
-static void CellActorCollection_Reset(CellActorCollection *collection)
-{
-    collection->actors = NULL;
-    collection->maxActors = 0;
-    collection->actorStack = NULL;
-    collection->stackPointer = 0;
-    collection->renderer = NULL;
-
-    CellActor_Reset(&collection->sentinelData);
-    collection->active = FALSE;
-}
-
-void CellActor_Reset(CellActor *actor)
-{
-    actor->collection = NULL;
-    memset(actor, 0, sizeof(CellActor));
-
-    NNS_G2dInitImageProxy(&actor->imageProxy);
-    NNS_G2dInitImagePaletteProxy(&actor->paletteProxy);
-
-    actor->explicitOamMode = GX_OAM_MODE_NORMAL;
-}
-
-CellActor *CellActorCollection_AddEx(const CellActorInitParamsEx *params)
-{
-    CellActor *actor = CellActorCollection_AllocActor(params->collection);
-    if (actor == NULL) {
-        return NULL;
-    }
-
-    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->collection->renderer->rendererCore,
-        actor->affineOverwriteMode);
-    NNS_G2dSetRndCoreFlipMode(
-        &params->collection->renderer->rendererCore,
-        actor->flip & CELL_ACTOR_FLIP_H,
-        actor->flip & CELL_ACTOR_FLIP_V);
-
-    actor->draw = TRUE;
-    actor->animate = FALSE;
-    actor->animSpeed = (FX32_ONE * 2);
-
-    if (CellActorCollection_InitActor(params->collection, params->resourceData, actor, params->heapID) == FALSE) {
-        CellActor_Delete(actor);
-        return NULL;
-    }
-
-    actor->explicitPaletteOffset = GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
-    actor->explicitPalette = actor->explicitPaletteOffset;
-
-    CellActorCollection_Insert(params->collection, actor);
-
-    return actor;
-}
-
-CellActor *CellActorCollection_Add(const CellActorInitParams *params)
-{
-    CellActorInitParamsEx paramsEx;
-
-    paramsEx.collection = params->collection;
-    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 CellActorCollection_AddEx(&paramsEx);
-}
-
-void CellActor_Delete(CellActor *actor)
-{
-    if (actor->type == CELL_ANIM_TYPE_NONE) {
-        return;
-    }
-
-    if (actor->prev != NULL) {
-        CellActorCollection_Remove(actor);
-    }
-
-    if (actor->type == CELL_ANIM_TYPE_VRAM_CELL) {
-        VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&actor->animData;
-
-        if (NNS_G2dGetImageLocation(&actor->imageProxy, actor->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
-            NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
-        }
-    }
-
-    if (actor->type == CELL_ANIM_TYPE_MULTI_CELL) {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
-
-        if (multiCellAnim->nodes != NULL) {
-            Heap_FreeToHeap(multiCellAnim->nodes);
-        }
-
-        if (multiCellAnim->cellAnims != NULL) {
-            Heap_FreeToHeap(multiCellAnim->cellAnims);
-        }
-    }
-
-    actor->type = CELL_ANIM_TYPE_NONE;
-
-    CellActorCollection_FreeActor(actor->collection, actor);
-}
-
-void CellActor_SetPosition(CellActor *actor, const VecFx32 *position)
-{
-    actor->position = *position;
-}
-
-void CellActor_SetAffineTranslation(CellActor *actor, const VecFx32 *translation)
-{
-    actor->affineTranslation = *translation;
-}
-
-void CellActor_SetAffineScale(CellActor *actor, const VecFx32 *scale)
-{
-    actor->affineScale = *scale;
-}
-
-void CellActor_SetAffineScaleEx(CellActor *actor, const VecFx32 *scale, enum AffineOverwriteMode mode)
-{
-    CellActor_SetAffineScale(actor, scale);
-    CellActor_SetAffineOverwriteMode(actor, mode);
-}
-
-void CellActor_SetAffineZRotation(CellActor *actor, u16 angle)
-{
-    actor->affineZRotation = angle;
-}
-
-void CellActor_SetAffineZRotationEx(CellActor *actor, u16 angle, enum AffineOverwriteMode mode)
-{
-    CellActor_SetAffineZRotation(actor, angle);
-    CellActor_SetAffineOverwriteMode(actor, mode);
-}
-
-void CellActor_SetDrawFlag(CellActor *actor, BOOL draw)
-{
-    GF_ASSERT(actor);
-    GF_ASSERT(draw < 2); // This value is used as an index into an array of size 2 inside CellActorCollection_Update
-
-    actor->draw = draw;
-}
-
-void CellActor_SetAnimateFlag(CellActor *actor, BOOL animate)
-{
-    GF_ASSERT(actor);
-    GF_ASSERT(animate < 2); // This value is used as an index into an array of size 2 inside CellActorCollection_Update
-
-    actor->animate = animate;
-}
-
-void CellActor_SetAnimSpeed(CellActor *actor, fx32 speed)
-{
-    GF_ASSERT(actor);
-    actor->animSpeed = speed;
-}
-
-void CellActor_SetAffineOverwriteMode(CellActor *actor, enum AffineOverwriteMode mode)
-{
-    GF_ASSERT(actor);
-    actor->affineOverwriteMode = mode;
-}
-
-void CellActor_SetFlipMode(CellActor *actor, u32 mode)
-{
-    GF_ASSERT(actor);
-    actor->flip = mode;
-    actor->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
-}
-
-const VecFx32 *CellActor_GetPosition(const CellActor *actor)
-{
-    return &actor->position;
-}
-
-const VecFx32 *CellActor_GetAffineScale(const CellActor *actor)
-{
-    return &actor->affineScale;
-}
-
-u16 CellActor_GetAffineZRotation(const CellActor *actor)
-{
-    return actor->affineZRotation;
-}
-
-BOOL CellActor_GetDrawFlag(const CellActor *actor)
-{
-    return actor->draw;
-}
-
-BOOL CellActor_GetAnimateFlag(const CellActor *actor)
-{
-    return actor->animate;
-}
-
-u32 CellActor_GetAnimCount(const CellActor *actor)
-{
-    GF_ASSERT(actor);
-
-    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 *)&actor->animData;
-        return multiCellAnim->animBank->numSequences;
-    }
-}
-
-void CellActor_SetAnim(CellActor *actor, u32 animID)
-{
-    GF_ASSERT(CellActor_GetAnimCount(actor) > animID);
-    actor->activeAnimID = animID;
-
-    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 *)&actor->animData;
-
-        const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, animID);
-        NNS_G2dSetAnimSequenceToMCAnimation(&multiCellAnim->anim, animSequence);
-        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
-    }
-}
-
-void CellActor_SetAnimNoRestart(CellActor *actor, u32 animID)
-{
-    if (actor->activeAnimID != animID) {
-        CellActor_SetAnim(actor, animID);
-    }
-}
-
-void CellActor_RestartAnim(CellActor *actor)
-{
-    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(actor, 0);
-    } else {
-        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
-
-        NNS_G2dResetAnimCtrlState(&multiCellAnim->anim.animCtrl);
-        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
-        SpriteActor_SetAnimFrame(actor, 0);
-    }
-}
-
-u32 CellActor_GetActiveAnim(const CellActor *actor)
-{
-    return actor->activeAnimID;
-}
-
-void CellActor_UpdateAnim(CellActor *actor, fx32 frames)
-{
-    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 *)&actor->animData;
-        NNS_G2dTickMCAnimation(&multiCellAnim->anim, frames);
-    }
-}
-
-void SpriteActor_SetAnimFrame(CellActor *actor, u16 frame)
-{
-    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 *)&actor->animData;
-        NNS_G2dSetMCAnimationCurrentFrame(&multiCellAnim->anim, frame);
-    }
-}
-
-u16 CellActor_GetAnimFrame(const CellActor *actor)
-{
-    NNSG2dAnimController *controller;
-
-    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 *)&actor->animData;
-        controller = NNS_G2dGetMCAnimAnimCtrl(&multiCellAnim->anim);
-    }
-
-    return NNS_G2dGetAnimCtrlCurrentFrame(controller);
-}
-
-void CellActor_SetExplicitPriority(CellActor *actor, u8 priority)
-{
-    actor->explicitPriority = priority;
-}
-
-u8 CellActor_GetExplicitPriority(const CellActor *actor)
-{
-    return actor->explicitPriority;
-}
-
-void CellActor_SetExplicitPalette(CellActor *actor, u32 palette)
-{
-    GF_ASSERT(actor);
-
-    actor->explicitPalette = palette;
-    actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
-    actor->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
-}
-
-void CellActor_SetExplicitPaletteWithOffset(CellActor *actor, u32 palette)
-{
-    CellActor_SetExplicitPalette(actor, palette);
-    actor->explicitPalette += GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
-}
-
-u32 CellActor_GetExplicitPalette(const CellActor *actor)
-{
-    return actor->explicitPalette;
-}
-
-void CellActor_SetExplicitPaletteOffset(CellActor *actor, u32 paletteOffset)
-{
-    GF_ASSERT(actor);
-
-    actor->explicitPaletteOffset = paletteOffset;
-    actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
-    actor->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
-}
-
-void CellActor_SetExplicitPaletteOffsetAutoAdjust(CellActor *actor, u32 paletteOffset)
-{
-    CellActor_SetExplicitPaletteOffset(actor, paletteOffset);
-    actor->explicitPaletteOffset += GetPaletteIndexForProxy(&actor->paletteProxy, actor->vramType);
-}
-
-u32 CellActor_GetExplicitPaletteOffset(const CellActor *actor)
-{
-    GF_ASSERT(actor);
-    return actor->explicitPaletteOffset;
-}
-
-void CellActor_SetPriority(CellActor *actor, u32 priority)
-{
-    CellActorCollection *collection = actor->collection; // Required to match
-    actor->priority = priority;
-
-    CellActorCollection_Remove(actor);
-    CellActorCollection_Insert(collection, actor);
-}
-
-u32 CellActor_GetPriority(const CellActor *actor)
-{
-    return actor->priority;
-}
-
-void CellActor_SetImageProxy(CellActor *actor, const NNSG2dImageProxy *imageProxy)
-{
-    actor->imageProxy = *imageProxy;
-}
-
-NNSG2dImageProxy *SpriteActor_ImageProxy(CellActor *actor)
-{
-    return &actor->imageProxy;
-}
-
-NNSG2dImagePaletteProxy *CellActor_GetPaletteProxy(CellActor *paletteProxy)
-{
-    return &paletteProxy->paletteProxy;
-}
-
-void CellActor_SetPixelated(CellActor *actor, BOOL pixelated)
-{
-    actor->explicitMosaic = pixelated;
-
-    if (pixelated == TRUE) {
-        actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
-    } else {
-        actor->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
-    }
-}
-
-NNS_G2D_VRAM_TYPE CellActor_GetVRamType(const CellActor *actor)
-{
-    return actor->vramType;
-}
-
-BOOL CellActor_IsAnimated(CellActor *actor)
-{
-    GF_ASSERT(actor);
-
-    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 *)&actor->animData;
-        return NNS_G2dIsAnimCtrlActive(&multiCellAnim->anim.animCtrl);
-    }
-}
-
-void CellActor_SetExplicitOAMMode(CellActor *actor, GXOamMode mode)
-{
-    GF_ASSERT(actor);
-
-    actor->explicitOamMode = mode;
-
-    if (mode == GX_OAM_MODE_NORMAL) {
-        actor->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
-    } else {
-        actor->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
-    }
-}
-
-void Utility_Clear2DMainOAM(enum HeapId heapID)
-{
-    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
-
-    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);
-
-    Heap_FreeToHeap(oam);
-}
-
-void Utility_Clear2DSubOAM(enum HeapId heapID)
-{
-    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SIMULTANEOUS_SPRITES);
-
-    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(oam);
-}
-
-u32 CellActor_GetUserAttrForAnimFrame(const CellActor *actor, u32 animID, u32 frame)
-{
-    const NNSG2dAnimBankData *animBank;
-
-    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 *)&actor->animData;
-        animBank = multiCellAnim->animBank;
-    }
-
-    const NNSG2dUserExAnimAttrBank *animAttrBank = NNS_G2dGetUserExAnimAttrBank(animBank);
-
-    // Guard clauses don't match here so the nested if's are required
-    if (animAttrBank) {
-        const NNSG2dUserExAnimSequenceAttr *animAttr = NNS_G2dGetUserExAnimSequenceAttr(animAttrBank, animID);
-
-        if (animAttr) {
-            const NNSG2dUserExAnimFrameAttr *frameAttr = NNS_G2dGetUserExAnimFrameAttr(animAttr, frame);
-
-            if (frameAttr) {
-                return NNS_G2dGetUserExAnimFrmAttrValue(frameAttr);
-            }
-        }
-    }
-
-    return 0;
-}
-
-u32 CellActor_GetUserAttrForCurrentAnimFrame(const CellActor *actor)
-{
-    u32 animID = CellActor_GetActiveAnim(actor);
-    u32 frame = CellActor_GetAnimFrame(actor);
-
-    return CellActor_GetUserAttrForAnimFrame(actor, animID, frame);
-}
-
-static BOOL CellActorCollection_InitActor(const CellActorCollection *collection,
-    const CellActorResourceData *resourceData,
-    CellActor *actor,
-    enum HeapId heapID)
-{
-    actor->type = CellActorResourceData_GetCellType(resourceData);
-    actor->imageProxy = *resourceData->imageProxy;
-    actor->paletteProxy = *resourceData->paletteProxy;
-
-    CellActor_SetCellBank(resourceData->cellBank, actor);
-
-    if (resourceData->cellAnimBank) {
-        CellActor_SetCellAnimBank(resourceData->cellAnimBank, actor);
-    } else {
-        CellActor_SetCellAnimBank(collection->defaultAnimBank, actor);
-    }
-
-    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 {
-        CellActor_CreateCellAnim(actor, heapID);
-    }
-
-    actor->explicitPriority = resourceData->priority;
-
-    return TRUE;
-}
-
-static enum CellAnimType CellActorResourceData_GetCellType(const CellActorResourceData *resourceData)
-{
-    if (resourceData->multiCellBank != NULL) {
-        return CELL_ANIM_TYPE_MULTI_CELL;
-    }
-
-    if (resourceData->isVRamTransfer == TRUE) {
-        return CELL_ANIM_TYPE_VRAM_CELL;
-    }
-
-    return CELL_ANIM_TYPE_CELL;
-}
-
-static void CellActor_SetCellBank(const NNSG2dCellDataBank *cellBank, CellActor *actor)
-{
-    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
-    cellAnim->cellBank = cellBank;
-}
-
-static void CellActor_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, CellActor *actor)
-{
-    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
-    cellAnim->animBank = cellAnimBank;
-}
-
-static void CellActor_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, CellActor *actor)
-{
-    MultiCellAnimationData *multiCell = (MultiCellAnimationData *)&actor->animData;
-    multiCell->cellBank = multiCellBank;
-}
-
-static void CellActor_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, CellActor *actor)
-{
-    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&actor->animData;
-    multiCellAnim->animBank = multiCellAnimBank;
-}
-
-static void CellActor_CreateCellAnim(CellActor *actor, enum HeapId heapID)
-{
-    CellAnimationData *cellAnim = (CellAnimationData *)&actor->animData;
-    NNS_G2dInitCellAnimation(
-        &cellAnim->anim,
-        NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, 0),
-        cellAnim->cellBank);
-}
-
-static void CellActor_CreateVRamCellAnim(const CellActorResourceData *resourceData, CellActor *actor, enum HeapId heapID)
-{
-    VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&actor->animData;
-    vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
-    const NNSG2dCharacterData *charData = resourceData->charData;
-
-    NNS_G2dInitCellAnimationVramTransfered(
-        &vramCellAnim->anim,
-        NNS_G2dGetAnimSequenceByIdx(vramCellAnim->animBank, 0),
-        vramCellAnim->cellBank,
-        vramCellAnim->transferHandle,
-        NNS_G2D_VRAM_ADDR_NONE,
-        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 CellActor_CreateMultiCellAnim(CellActor *actor, enum HeapId heapID)
-{
-    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);
-    multiCellAnim->cellAnims = Heap_AllocFromHeap(heapID, sizeof(NNSG2dCellAnimation) * maxNodes);
-
-    NNS_G2dInitMCAnimation(
-        &multiCellAnim->anim,
-        multiCellAnim->nodes,
-        multiCellAnim->cellAnims,
-        maxNodes,
-        multiCellAnim->individualAnimBank,
-        multiCellAnim->individualCellBank,
-        multiCellAnim->cellBank);
-
-    NNS_G2dSetAnimSequenceToMCAnimation(
-        &multiCellAnim->anim,
-        animSequence);
-}
-
-static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType)
-{
-    u32 paletteSize;
-
-    if (paletteProxy->bExtendedPlt) {
-        paletteSize = 32 * 16;
-    } else {
-        if (paletteProxy->fmt == GX_TEXFMT_PLTT256) {
-            paletteSize = 0;
-        } else {
-            paletteSize = 32;
-        }
-    }
-
-    return paletteSize != 0
-        ? NNS_G2dGetImagePaletteLocation(paletteProxy, vramType) / paletteSize
-        : 0;
-}
-
-static void CellActorCollection_DrawActor(const CellActorCollection *collection, CellActor *actor)
-{
-    VecFx32 pos = actor->position;
-
-    NNS_G2dSetRendererImageProxy(collection->renderer, &actor->imageProxy, &actor->paletteProxy);
-    NNS_G2dBeginRendering(collection->renderer);
-    NNS_G2dPushMtx();
-
-    NNS_G2dSetRndCoreAffineOverwriteMode(&collection->renderer->rendererCore, actor->affineOverwriteMode);
-
-    if (actor->affineOverwriteMode == NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
-        NNS_G2dSetRndCoreFlipMode(
-            &collection->renderer->rendererCore,
-            actor->flip & CELL_ACTOR_FLIP_H,
-            actor->flip & CELL_ACTOR_FLIP_V);
-    } else {
-        NNS_G2dSetRndCoreFlipMode(&collection->renderer->rendererCore, FALSE, FALSE);
-    }
-
-    NNS_G2dTranslate(pos.x, pos.y, pos.z);
-
-    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(-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(collection->renderer, actor->overwriteFlags);
-    NNS_G2dSetRendererOverwriteDisable(collection->renderer, ~actor->overwriteFlags);
-
-    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 (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 *)&actor->animData;
-        NNS_G2dDrawMultiCellAnimation(&multiCellAnim->anim);
-    }
-
-    NNS_G2dPopMtx();
-    NNS_G2dEndRendering();
-}
-
-static void CellActorCollection_DrawActor_Stub(const CellActorCollection *collection, CellActor *actor)
-{
-    return;
-}
-
-static void CellActor_UpdateAnimInternal(CellActor *actor)
-{
-    CellActor_UpdateAnim(actor, actor->animSpeed);
-}
-
-static void CellActor_UpdateAnimInternal_Stub(CellActor *actor)
-{
-    return;
-}
-
-static void CellActorCollection_Insert(CellActorCollection *collection, CellActor *actor)
-{
-    // 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 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 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;
-        }
-
-        cur = cur->next;
-    }
-}
-
-static void CellActorCollection_Remove(CellActor *actor)
-{
-    actor->prev->next = actor->next;
-    actor->next->prev = actor->prev;
-}
-
-static void CellActorCollection_InitActors(CellActorCollection *collection)
-{
-    for (int i = 0; i < collection->maxActors; i++) {
-        CellActor_Reset(&collection->actors[i]);
-        collection->actorStack[i] = collection->actors + i;
-    }
-
-    collection->stackPointer = 0;
-}
-
-static CellActor *CellActorCollection_AllocActor(CellActorCollection *collection)
-{
-    if (collection->stackPointer >= collection->maxActors) {
-        return NULL;
-    }
-
-    CellActor *actor = collection->actorStack[collection->stackPointer];
-    collection->stackPointer++;
-
-    return actor;
-}
-
-static BOOL CellActorCollection_FreeActor(CellActorCollection *collection, CellActor *actor)
-{
-    if (collection->stackPointer <= 0) {
-        return FALSE;
-    }
-
-    CellActor_Reset(actor);
-
-    collection->stackPointer--;
-    collection->actorStack[collection->stackPointer] = actor;
-
-    return TRUE;
-}
diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c
index 0e75a6ef4c..9328cb38a9 100644
--- a/src/choose_starter/choose_starter_app.c
+++ b/src/choose_starter/choose_starter_app.c
@@ -26,7 +26,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "easy3d.h"
 #include "font.h"
@@ -42,6 +41,7 @@
 #include "render_oam.h"
 #include "render_text.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -156,7 +156,7 @@ typedef struct ChooseStarterRotation {
 } ChooseStarterRotation;
 
 typedef struct ChooseStarterCursor {
-    CellActor *unk_00;
+    Sprite *unk_00;
     SpriteResource *unk_04[6];
     VecFx32 unk_1C;
     SysTask *unk_28;
@@ -184,7 +184,7 @@ typedef struct StarterPreviewWindow {
 } StarterPreviewWindow;
 
 typedef struct StarterPreviewGraphics {
-    Sprite *unk_00;
+    PokemonSprite *unk_00;
     StarterPreviewAnimation unk_04;
     SysTask *unk_3C;
 } StarterPreviewGraphics;
@@ -206,10 +206,10 @@ typedef struct ChooseStarterApp {
     WindowTemplate unk_B0;
     Menu *unk_B8;
     G2dRenderer unk_BC;
-    CellActorCollection *unk_248;
+    SpriteList *unk_248;
     SpriteResourceCollection *unk_24C[6];
     UnkStruct_02007768 *spriteManager;
-    Sprite *sprites[NUM_STARTER_OPTIONS];
+    PokemonSprite *sprites[NUM_STARTER_OPTIONS];
     StarterPreviewGraphics unk_274;
     NNSFndAllocator unk_2B4;
     ChooseStarter3DGraphics unk_2C4[6];
@@ -275,7 +275,7 @@ static void ov78_021D1CA8(ChooseStarterApp *param0, int param1);
 static void ov78_021D1DF0(ChooseStarterApp *param0);
 static void ov78_021D1E28(ChooseStarterApp *param0);
 static void ov78_021D1E44(ChooseStarterApp *param0, int param1);
-static void MakePokemonSprite(Sprite **sprite, ChooseStarterApp *app, int species);
+static void MakePokemonSprite(PokemonSprite **sprite, ChooseStarterApp *app, int species);
 static void ov78_021D15CC(ChooseStarter3DGraphics *param0, int param1, int param2, int param3, NNSFndAllocator *param4);
 static void ov78_021D1604(ChooseStarter3DGraphics *param0, int param1, int param2);
 static void ov78_021D16D8(ChooseStarter3DGraphics *param0, NNSFndAllocator *param1);
@@ -299,7 +299,7 @@ static BOOL ov78_021D2608(StarterPreviewWindow *param0);
 static void ov78_021D2618(ChooseStarterApp *param0);
 static void ov78_021D2688(ChooseStarterApp *param0);
 static BOOL ov78_021D26A4(ChooseStarterApp *param0);
-static void ov78_021D26B4(StarterPreviewGraphics *param0, Sprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8);
+static void ov78_021D26B4(StarterPreviewGraphics *param0, PokemonSprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8);
 static void ov78_021D270C(StarterPreviewGraphics *param0);
 static void ov78_021D2740(SysTask *param0, void *param1);
 static void ov78_021D1C58(ChooseStarterApp *param0);
@@ -695,7 +695,7 @@ static void MakeSprite(ChooseStarterApp *app, enum HeapId heapID)
     }
 }
 
-static void MakePokemonSprite(Sprite **sprite, ChooseStarterApp *app, int species)
+static void MakePokemonSprite(PokemonSprite **sprite, ChooseStarterApp *app, int species)
 {
     int gender = Pokemon_GetGenderOf(species, 0);
 
@@ -754,7 +754,7 @@ static void MakeCellActors(ChooseStarterApp *param0, int param1)
 
 static void ov78_021D1594(ChooseStarterApp *param0)
 {
-    CellActorCollection_Delete(param0->unk_248);
+    SpriteList_Delete(param0->unk_248);
     SpriteResourceCollection_Delete(param0->unk_24C[0]);
     SpriteResourceCollection_Delete(param0->unk_24C[1]);
     SpriteResourceCollection_Delete(param0->unk_24C[2]);
@@ -1037,7 +1037,7 @@ static void DrawScene(ChooseStarterApp *param0)
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    CellActorCollection_Update(param0->unk_248);
+    SpriteList_Update(param0->unk_248);
 }
 
 static void MakeCamera(ChooseStarterApp *param0, int param1)
@@ -1449,12 +1449,12 @@ static void ov78_021D2290(ChooseStarterApp *param0, ChooseStarterCursor *param1)
 
 static void AttachCursorCellActor(ChooseStarterApp *param0, ChooseStarterCursor *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
 
     SpriteResourcesHeader_Init(&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.collection = param0->unk_248;
+    v1.list = param0->unk_248;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -1463,8 +1463,8 @@ static void AttachCursorCellActor(ChooseStarterApp *param0, ChooseStarterCursor
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param1->unk_00 = CellActorCollection_Add(&v1);
-    CellActor_SetDrawFlag(param1->unk_00, 0);
+    param1->unk_00 = SpriteList_Add(&v1);
+    Sprite_SetDrawFlag(param1->unk_00, 0);
 
     param1->unk_1C.x = 0;
     param1->unk_1C.y = 0;
@@ -1472,7 +1472,7 @@ static void AttachCursorCellActor(ChooseStarterApp *param0, ChooseStarterCursor
 
 static void ov78_021D2350(ChooseStarterCursor *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
 }
 
 static void ov78_021D235C(ChooseStarterRotation *param0, fx32 param1, int param2)
@@ -1514,7 +1514,7 @@ static void ov78_021D23E8(SysTask *param0, void *param1)
     v1 = v0->unk_1C;
     v1.y += v0->unk_2C.unk_00;
 
-    CellActor_SetPosition(v0->unk_00, &v1);
+    Sprite_SetPosition(v0->unk_00, &v1);
 }
 
 static void ov78_021D241C(ChooseStarterCursor *param0)
@@ -1527,7 +1527,7 @@ static void ov78_021D241C(ChooseStarterCursor *param0)
 
 static void ov78_021D2430(ChooseStarterCursor *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_00, param1);
+    Sprite_SetDrawFlag(param0->unk_00, param1);
 }
 
 static void ov78_021D243C(ChooseStarterCursor *param0, int param1, int param2)
@@ -1668,7 +1668,7 @@ static BOOL ov78_021D26A4(ChooseStarterApp *param0)
     return ov78_021D2608(&param0->unk_6A8);
 }
 
-static void ov78_021D26B4(StarterPreviewGraphics *param0, Sprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8)
+static void ov78_021D26B4(StarterPreviewGraphics *param0, PokemonSprite *param1, fx32 param2, fx32 param3, fx32 param4, fx32 param5, fx32 param6, fx32 param7, int param8)
 {
     GF_ASSERT(param0->unk_3C == NULL);
 
diff --git a/src/field_menu.c b/src/field_menu.c
index dd1ad88e64..1dbf69c940 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -31,7 +31,6 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "catching_show.h"
-#include "cell_actor.h"
 #include "field_overworld_state.h"
 #include "field_system.h"
 #include "field_task.h"
@@ -55,6 +54,7 @@
 #include "save_player.h"
 #include "savedata.h"
 #include "script_manager.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -141,10 +141,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(CellActor *graphicElement, u32 param1);
-static void sub_0203B588(CellActor *graphicElement, u16 param1, u16 param2);
+static void sub_0203B558(Sprite *graphicElement, u32 param1);
+static void sub_0203B588(Sprite *graphicElement, u16 param1, u16 param2);
 static void sub_0203B5B4(FieldMenu *menu, u16 param1, u16 param2);
-static void sub_0203B5E8(CellActor *graphicElement);
+static void sub_0203B5E8(Sprite *graphicElement);
 static BOOL sub_0203AC44(FieldTask *taskMan);
 static void sub_0203ADFC(FieldTask *taskMan);
 static BOOL FieldMenu_Select(FieldTask *taskMan);
@@ -503,7 +503,7 @@ static BOOL sub_0203AC44(FieldTask *taskMan)
 
     if (menu->unk_20 != NULL) {
         sub_0203B520(menu);
-        CellActorCollection_Update(menu->unk_38.unk_00);
+        SpriteList_Update(menu->unk_38.unk_00);
     }
 
     return FALSE;
@@ -811,7 +811,7 @@ static void sub_0203B318(FieldMenu *menu, u8 *param1, u32 param2, u8 param3)
 
         {
             VecFx32 v4 = { FX32_ONE, FX32_ONE, FX32_ONE };
-            CellActor_SetAffineScaleEx(menu->unk_200[1 + i]->sprite, &v4, 1);
+            Sprite_SetAffineScaleEx(menu->unk_200[1 + i]->sprite, &v4, 1);
         }
     }
 
@@ -839,26 +839,26 @@ static void sub_0203B520(FieldMenu *menu)
     u16 v0;
 
     for (v0 = 0; v0 < menu->unk_220; v0++) {
-        CellActor_UpdateAnim(menu->unk_200[v0]->sprite, FX32_ONE);
+        Sprite_UpdateAnim(menu->unk_200[v0]->sprite, FX32_ONE);
     }
 }
 
-static void sub_0203B558(CellActor *graphicElement, u32 param1)
+static void sub_0203B558(Sprite *graphicElement, u32 param1)
 {
     VecFx32 vec;
 
-    vec = *(CellActor_GetPosition(graphicElement));
+    vec = *(Sprite_GetPosition(graphicElement));
     vec.y = (20 + 24 * param1) * FX32_ONE;
 
-    CellActor_SetPosition(graphicElement, &vec);
+    Sprite_SetPosition(graphicElement, &vec);
 }
 
-static void sub_0203B588(CellActor *graphicElement, u16 param1, u16 param2)
+static void sub_0203B588(Sprite *graphicElement, u16 param1, u16 param2)
 {
-    u32 v0 = CellActor_GetActiveAnim(graphicElement);
+    u32 v0 = Sprite_GetActiveAnim(graphicElement);
 
-    CellActor_SetAnim(graphicElement, (v0 / 3) * 3 + param1);
-    CellActor_SetExplicitPaletteWithOffset(graphicElement, param2);
+    Sprite_SetAnim(graphicElement, (v0 / 3) * 3 + param1);
+    Sprite_SetExplicitPaletteWithOffset(graphicElement, param2);
 }
 
 static void sub_0203B5B4(FieldMenu *menu, u16 param1, u16 param2)
@@ -867,13 +867,13 @@ static void sub_0203B5B4(FieldMenu *menu, u16 param1, u16 param2)
     sub_0203B588(menu->unk_200[1 + param2]->sprite, 1, 1);
 }
 
-static void sub_0203B5E8(CellActor *graphicElement)
+static void sub_0203B5E8(Sprite *graphicElement)
 {
-    if ((CellActor_GetActiveAnim(graphicElement) % 3) != 1) {
+    if ((Sprite_GetActiveAnim(graphicElement) % 3) != 1) {
         return;
     }
 
-    if (CellActor_IsAnimated(graphicElement) == 0) {
+    if (Sprite_IsAnimated(graphicElement) == 0) {
         sub_0203B588(graphicElement, 2, 1);
     }
 }
diff --git a/src/meson.build b/src/meson.build
index f187e31894..13fb649550 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -82,7 +82,7 @@ pokeplatinum_c = files(
     'pltt_transfer.c',
     'camera.c',
     'unk_02020AEC.c',
-    'cell_actor.c',
+    'sprite.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 7c4da1dbaa..48dd9a2ff2 100644
--- a/src/overlay005/encounter_effect.c
+++ b/src/overlay005/encounter_effect.c
@@ -26,7 +26,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "enc_effects.h"
 #include "field_battle_data_transfer.h"
 #include "graphics.h"
@@ -35,6 +34,7 @@
 #include "narc.h"
 #include "palette.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -102,7 +102,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(CellActor *param0, void *param1, u32 param2);
+static void ov5_021DE67C(Sprite *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);
@@ -740,7 +740,7 @@ void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
@@ -772,7 +772,7 @@ void ov5_021DE5A4(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1
     }
 }
 
-void ov5_021DE5D0(CellActor *param0, u32 param1, u32 param2, u8 param3, u16 param4)
+void ov5_021DE5D0(Sprite *param0, u32 param1, u32 param2, u8 param3, u16 param4)
 {
     UnkStruct_ov5_021DE5D0 v0;
     NNSG2dPaletteData *v1;
@@ -790,12 +790,12 @@ void ov5_021DE5D0(CellActor *param0, u32 param1, u32 param2, u8 param3, u16 para
     Heap_FreeToHeap(v2);
 }
 
-CellActor *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5)
+Sprite *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *param1, fx32 param2, fx32 param3, fx32 param4, int param5)
 {
-    CellActorInitParams v0;
-    CellActor *v1;
+    SpriteListTemplate v0;
+    Sprite *v1;
 
-    v0.collection = param0->unk_00;
+    v0.list = param0->unk_00;
     v0.resourceData = &param1->unk_10;
     v0.position.x = param2;
     v0.position.y = param3;
@@ -804,7 +804,7 @@ CellActor *ov5_021DE62C(UnkStruct_ov5_021DE47C *param0, UnkStruct_ov5_021DE5A4 *
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = 4;
 
-    v1 = CellActorCollection_Add(&v0);
+    v1 = SpriteList_Add(&v0);
     GF_ASSERT(v1);
     return v1;
 }
@@ -814,11 +814,11 @@ VecFx32 VecFx32_FromXYZ(fx32 x, fx32 y, fx32 z)
     return (VecFx32) { x, y, z };
 }
 
-static void ov5_021DE67C(CellActor *param0, void *param1, u32 param2)
+static void ov5_021DE67C(Sprite *param0, void *param1, u32 param2)
 {
     NNSG2dImagePaletteProxy *v0;
 
-    v0 = CellActor_GetPaletteProxy(param0);
+    v0 = Sprite_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 3cb823568e..0126631927 100644
--- a/src/overlay005/encounter_effect_core.c
+++ b/src/overlay005/encounter_effect_core.c
@@ -23,13 +23,13 @@
 #include "bg_window.h"
 #include "brightness_controller.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "message.h"
 #include "save_player.h"
 #include "screen_scroll_manager.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "sys_task.h"
@@ -583,7 +583,7 @@ typedef struct TrainerGrassEncounterEffect {
     ScreenSliceEffect *screenSliceEfx;
     UnkStruct_ov5_021DE47C unk_48;
     UnkStruct_ov5_021DE5A4 unk_1E8;
-    CellActor *pokeballSprites[2];
+    Sprite *pokeballSprites[2];
     Camera *camera;
     QuadraticInterpolationTaskFX32 unk_228;
     s32 unk_240;
@@ -595,7 +595,7 @@ typedef struct {
     ScreenSplitEffect *unk_28;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    CellActor *unk_200[2];
+    Sprite *unk_200[2];
     Camera *camera;
     QuadraticInterpolationTaskFX32 unk_20C;
     s32 unk_224;
@@ -609,7 +609,7 @@ typedef struct {
     BOOL unk_4C;
     UnkStruct_ov5_021DE47C unk_50;
     UnkStruct_ov5_021DE5A4 unk_1F0;
-    CellActor *unk_224[2];
+    Sprite *unk_224[2];
     Camera *camera;
     QuadraticInterpolationTaskFX32 unk_230;
     s32 unk_248;
@@ -618,7 +618,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    CellActor *unk_1D4[3];
+    Sprite *unk_1D4[3];
     LinearInterpolationTaskS32 unk_1E0[3];
     LinearInterpolationTaskS32 unk_21C[3];
     UnkStruct_ov5_021DE6BC *unk_258[3];
@@ -638,7 +638,7 @@ typedef struct {
     LinearInterpolationTaskS32 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC;
-    CellActor *unk_230;
+    Sprite *unk_230;
     Camera *camera;
     QuadraticInterpolationTaskFX32 unk_238;
     s32 unk_250;
@@ -647,7 +647,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    CellActor *unk_1D4[3];
+    Sprite *unk_1D4[3];
     LinearInterpolationTaskS32 unk_1E0[3];
     LinearInterpolationTaskS32 unk_21C[3];
     BOOL unk_258[3];
@@ -685,8 +685,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);
-            CellActor_SetDrawFlag(trainerEffect->pokeballSprites[i], 0);
-            CellActor_SetPriority(trainerEffect->pokeballSprites[i], i * 2);
+            Sprite_SetDrawFlag(trainerEffect->pokeballSprites[i], 0);
+            Sprite_SetPriority(trainerEffect->pokeballSprites[i], i * 2);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -715,11 +715,11 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             trainerEffect->pokeballScale.currentValue);
 
         for (i = 0; i < 2; i++) {
-            CellActor_SetDrawFlag(
+            Sprite_SetDrawFlag(
                 trainerEffect->pokeballSprites[i], 1);
-            CellActor_SetAffineOverwriteMode(
+            Sprite_SetAffineOverwriteMode(
                 trainerEffect->pokeballSprites[i], 2);
-            CellActor_SetAffineScale(
+            Sprite_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
@@ -736,14 +736,14 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
         LinearInterpolationTaskS32_Update(&trainerEffect->pokeballRotation);
 
         for (i = 0; i < 2; i++) {
-            CellActor_SetAffineScale(
+            Sprite_SetAffineScale(
                 trainerEffect->pokeballSprites[i], &v5);
         }
 
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & trainerEffect->pokeballRotation.currentValue);
 
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & (trainerEffect->pokeballRotation.currentValue - 0x100));
 
         if (done == TRUE) {
@@ -756,9 +756,9 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
 
         EncounterEffect_ScreenSlice(encEffect, trainerEffect->screenSliceEfx, 96, 6, 0, (255 * FX32_ONE), (FX32_ONE * 10));
 
-        CellActor_SetAnim(
+        Sprite_SetAnim(
             trainerEffect->pokeballSprites[0], 1);
-        CellActor_SetAnim(
+        Sprite_SetAnim(
             trainerEffect->pokeballSprites[1], 2);
 
         QuadraticInterpolationTaskFX32_Init(&trainerEffect->unk_2C, 0, (255 * FX32_ONE), (FX32_ONE * 10), 6);
@@ -766,9 +766,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);
 
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             trainerEffect->pokeballSprites[0], 0xffff & 0);
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             trainerEffect->pokeballSprites[1], 0xffff & 0);
 
         encEffect->state++;
@@ -781,9 +781,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);
 
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 trainerEffect->pokeballSprites[0], &v7);
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 trainerEffect->pokeballSprites[1], &v8);
         }
 
@@ -807,7 +807,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                CellActor_Delete(trainerEffect->pokeballSprites[v9]);
+                Sprite_Delete(trainerEffect->pokeballSprites[v9]);
             }
         }
         ov5_021DE5A4(&trainerEffect->unk_48, &trainerEffect->unk_1E8);
@@ -818,7 +818,7 @@ void EncounterEffect_Trainer_Grass_LowerLevel(SysTask *task, void *param)
     }
 
     if (encEffect->state != 7) {
-        CellActorCollection_Update(trainerEffect->unk_48.unk_00);
+        SpriteList_Update(trainerEffect->unk_48.unk_00);
     }
 }
 
@@ -850,8 +850,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);
-                CellActor_SetDrawFlag(v1->unk_200[v4], 0);
-                CellActor_SetAffineOverwriteMode(v1->unk_200[v4], 2);
+                Sprite_SetDrawFlag(v1->unk_200[v4], 0);
+                Sprite_SetAffineOverwriteMode(v1->unk_200[v4], 2);
             }
         }
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -874,18 +874,18 @@ void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1)
 
     case 3:
         LinearInterpolationTaskFX32_Init(&v1->unk_00, (-192 * FX32_ONE), (192 * FX32_ONE), 8);
-        CellActor_SetDrawFlag(
+        Sprite_SetDrawFlag(
             v1->unk_200[0], 1);
-        CellActor_SetDrawFlag(
+        Sprite_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);
 
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 v1->unk_200[0], &v5);
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 v1->unk_200[1], &v6);
         }
 
@@ -901,16 +901,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);
 
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 v1->unk_200[0], &v7);
-            CellActor_SetPosition(
+            Sprite_SetPosition(
                 v1->unk_200[1], &v8);
         }
 
         LinearInterpolationTaskS32_Update(&v1->unk_14);
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             v1->unk_200[0], v1->unk_14.currentValue);
-        CellActor_SetAffineZRotation(
+        Sprite_SetAffineZRotation(
             v1->unk_200[1], -v1->unk_14.currentValue);
 
         if (v2 == 1) {
@@ -951,7 +951,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1)
             int v9;
 
             for (v9 = 0; v9 < 2; v9++) {
-                CellActor_Delete(v1->unk_200[v9]);
+                Sprite_Delete(v1->unk_200[v9]);
             }
         }
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
@@ -962,7 +962,7 @@ void EncounterEffect_Trainer_Grass_HigherLevel(SysTask *param0, void *param1)
     }
 
     if (encEffect->state != 7) {
-        CellActorCollection_Update(v1->unk_2C.unk_00);
+        SpriteList_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -995,8 +995,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);
-            CellActor_SetDrawFlag(v1->unk_224[v5], 0);
-            CellActor_SetPriority(v1->unk_224[v5], v5);
+            Sprite_SetDrawFlag(v1->unk_224[v5], 0);
+            Sprite_SetPriority(v1->unk_224[v5], v5);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1029,12 +1029,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++) {
-            CellActor_SetDrawFlag(
+            Sprite_SetDrawFlag(
                 v1->unk_224[v5], 1);
 
-            CellActor_SetAffineOverwriteMode(
+            Sprite_SetAffineOverwriteMode(
                 v1->unk_224[v5], 2);
-            CellActor_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_XLU);
+            Sprite_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_XLU);
         }
 
         LinearInterpolationTaskS32_Init(&v1->unk_2C, 0, 0xffff, 8);
@@ -1050,18 +1050,18 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
         v3 = LinearInterpolationTaskS32_Update(&v1->unk_2C);
 
         if (v3 == 0) {
-            CellActor_SetAffineZRotation(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
-            CellActor_SetAffineZRotation(v1->unk_224[1], 0xffff & v6);
+            Sprite_SetAffineZRotation(v1->unk_224[0], 0xffff & v1->unk_2C.currentValue);
+            Sprite_SetAffineZRotation(v1->unk_224[1], 0xffff & v6);
         } else {
-            CellActor_SetAffineZRotation(v1->unk_224[0], 0);
-            CellActor_SetAffineZRotation(v1->unk_224[1], 0);
+            Sprite_SetAffineZRotation(v1->unk_224[0], 0);
+            Sprite_SetAffineZRotation(v1->unk_224[1], 0);
         }
 
         if (v2 == 1) {
             G2_BlendNone();
 
             for (v5 = 0; v5 < 2; v5++) {
-                CellActor_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
+                Sprite_SetExplicitOAMMode(v1->unk_224[v5], GX_OAM_MODE_NORMAL);
             }
 
             v0->state++;
@@ -1077,7 +1077,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++) {
-                CellActor_SetAffineScale(
+                Sprite_SetAffineScale(
                     v1->unk_224[v5], &v7);
             }
         }
@@ -1095,7 +1095,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++) {
-                CellActor_SetAffineScale(
+                Sprite_SetAffineScale(
                     v1->unk_224[v5], &v8);
             }
         }
@@ -1120,7 +1120,7 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
         v1->unk_4C = 0;
 
         for (v5 = 0; v5 < 2; v5++) {
-            CellActor_Delete(v1->unk_224[v5]);
+            Sprite_Delete(v1->unk_224[v5]);
         }
 
         ov5_021DE5A4(&v1->unk_50, &v1->unk_1F0);
@@ -1134,7 +1134,7 @@ void EncounterEffect_Trainer_Water_LowerLevel(SysTask *param0, void *param1)
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_50.unk_00);
+        SpriteList_Update(v1->unk_50.unk_00);
     }
 }
 
@@ -1166,8 +1166,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);
-            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
-            CellActor_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
+            Sprite_SetDrawFlag(v1->unk_1D4[v3], 0);
+            Sprite_SetAffineOverwriteMode(v1->unk_1D4[v3], 2);
 
             v1->unk_258[v3] = ov5_021DE6A4(4);
         }
@@ -1228,8 +1228,8 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
 
         v4 = VecFx32_FromXYZ(
             43 * FX32_ONE, 231 * FX32_ONE, 0);
-        CellActor_SetPosition(v1->unk_1D4[0], &v4);
-        CellActor_SetDrawFlag(v1->unk_1D4[0], 1);
+        Sprite_SetPosition(v1->unk_1D4[0], &v4);
+        Sprite_SetDrawFlag(v1->unk_1D4[0], 1);
         v1->unk_264[0] = 1;
         v0->state++;
         v1->unk_2A0 = 4;
@@ -1249,8 +1249,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);
-        CellActor_SetPosition(v1->unk_1D4[1], &v4);
-        CellActor_SetDrawFlag(v1->unk_1D4[1], 1);
+        Sprite_SetPosition(v1->unk_1D4[1], &v4);
+        Sprite_SetDrawFlag(v1->unk_1D4[1], 1);
         v1->unk_264[1] = 1;
         v0->state++;
         v1->unk_2A0 = 2;
@@ -1270,8 +1270,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);
-        CellActor_SetPosition(v1->unk_1D4[2], &v4);
-        CellActor_SetDrawFlag(v1->unk_1D4[2], 1);
+        Sprite_SetPosition(v1->unk_1D4[2], &v4);
+        Sprite_SetDrawFlag(v1->unk_1D4[2], 1);
         v1->unk_264[2] = 1;
 
         v0->state++;
@@ -1299,7 +1299,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
         v1->unk_280 = 0;
 
         for (v3 = 0; v3 < 3; v3++) {
-            CellActor_Delete(v1->unk_1D4[v3]);
+            Sprite_Delete(v1->unk_1D4[v3]);
             ov5_021DE6BC(v1->unk_258[v3]);
         }
 
@@ -1335,19 +1335,19 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
             LinearInterpolationTaskS32_Update(&v1->unk_1E0[v3]);
             LinearInterpolationTaskS32_Update(&v1->unk_21C[v3]);
 
-            CellActor_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
+            Sprite_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_21C[v3].currentValue);
 
-            v7 = CellActor_GetPosition(v1->unk_1D4[v3]);
+            v7 = Sprite_GetPosition(v1->unk_1D4[v3]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v3].currentValue * FX32_ONE;
-            CellActor_SetPosition(v1->unk_1D4[v3], &v8);
+            Sprite_SetPosition(v1->unk_1D4[v3], &v8);
         }
     }
 
     Window_ScheduleCopyToVRAM(v1->unk_270);
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_00.unk_00);
+        SpriteList_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1374,7 +1374,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);
-        CellActor_SetDrawFlag(v1->unk_230, 0);
+        Sprite_SetDrawFlag(v1->unk_230, 0);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1395,7 +1395,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);
-        CellActor_SetDrawFlag(
+        Sprite_SetDrawFlag(
             v1->unk_230, 1);
 
         QuadraticInterpolationTaskFX32_Init(&v1->unk_18, (FX32_CONST(0.10f)), (FX32_CONST(2.0f)), (FX32_CONST(0.0f)), 12);
@@ -1403,7 +1403,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);
-        CellActor_SetAffineScaleEx(v1->unk_230, &v4, 2);
+        Sprite_SetAffineScaleEx(v1->unk_230, &v4, 2);
 
         LinearInterpolationTaskS32_Init(&v1->unk_48, 0, (0xffff * 1), 12);
         v0->state++;
@@ -1414,19 +1414,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);
 
-            CellActor_SetPosition(
+            Sprite_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);
-        CellActor_SetAffineScale(v1->unk_230, &v4);
+        Sprite_SetAffineScale(v1->unk_230, &v4);
 
         LinearInterpolationTaskS32_Update(&v1->unk_48);
-        CellActor_SetAffineZRotation(v1->unk_230, v1->unk_48.currentValue);
+        Sprite_SetAffineZRotation(v1->unk_230, v1->unk_48.currentValue);
 
         if (v2 == 1) {
-            CellActor_SetDrawFlag(
+            Sprite_SetDrawFlag(
                 v1->unk_230, 0);
             v0->state++;
         }
@@ -1464,7 +1464,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
             *(v0->done) = 1;
         }
 
-        CellActor_Delete(v1->unk_230);
+        Sprite_Delete(v1->unk_230);
         ov5_021DE5A4(&v1->unk_5C, &v1->unk_1FC);
         ov5_021DE4AC(&v1->unk_5C);
         EncounterEffect_Finish(v0, param0);
@@ -1472,7 +1472,7 @@ void EncounterEffect_Trainer_Cave_LowerLevel(SysTask *param0, void *param1)
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_5C.unk_00);
+        SpriteList_Update(v1->unk_5C.unk_00);
     }
 }
 
@@ -1501,7 +1501,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);
-            CellActor_SetDrawFlag(v1->unk_1D4[v4], 0);
+            Sprite_SetDrawFlag(v1->unk_1D4[v4], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1547,12 +1547,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);
-        CellActor_SetPosition(v1->unk_1D4[0], &v2);
-        CellActor_SetDrawFlag(
+        Sprite_SetPosition(v1->unk_1D4[0], &v2);
+        Sprite_SetDrawFlag(
             v1->unk_1D4[0], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[0], 0, (0xffff * 1), 5);
-        CellActor_SetAffineOverwriteMode(v1->unk_1D4[0], 2);
+        Sprite_SetAffineOverwriteMode(v1->unk_1D4[0], 2);
 
         v1->unk_258[0] = 1;
         v0->state++;
@@ -1569,13 +1569,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);
-        CellActor_SetPosition(v1->unk_1D4[1], &v2);
-        CellActor_SetDrawFlag(
+        Sprite_SetPosition(v1->unk_1D4[1], &v2);
+        Sprite_SetDrawFlag(
             v1->unk_1D4[1], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[1], 0, (0xffff * -1), 5);
 
-        CellActor_SetAffineOverwriteMode(v1->unk_1D4[1], 2);
+        Sprite_SetAffineOverwriteMode(v1->unk_1D4[1], 2);
         v1->unk_258[1] = 1;
         v0->state++;
         v1->unk_288 = 3;
@@ -1591,12 +1591,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);
-        CellActor_SetPosition(v1->unk_1D4[2], &v2);
-        CellActor_SetDrawFlag(
+        Sprite_SetPosition(v1->unk_1D4[2], &v2);
+        Sprite_SetDrawFlag(
             v1->unk_1D4[2], 1);
 
         LinearInterpolationTaskS32_Init(&v1->unk_21C[2], 0, (0xffff * 1), 5);
-        CellActor_SetAffineOverwriteMode(v1->unk_1D4[2], 2);
+        Sprite_SetAffineOverwriteMode(v1->unk_1D4[2], 2);
 
         v1->unk_258[2] = 1;
         v0->state++;
@@ -1606,7 +1606,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++) {
-                CellActor_SetDrawFlag(
+                Sprite_SetDrawFlag(
                     v1->unk_1D4[v4], 0);
             }
 
@@ -1645,7 +1645,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
         }
 
         for (v4 = 0; v4 < 3; v4++) {
-            CellActor_Delete(v1->unk_1D4[v4]);
+            Sprite_Delete(v1->unk_1D4[v4]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -1676,16 +1676,16 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
                 v1->unk_258[v4] = 0;
             }
 
-            v7 = CellActor_GetPosition(v1->unk_1D4[v4]);
+            v7 = Sprite_GetPosition(v1->unk_1D4[v4]);
             v8 = *v7;
             v8.y = v1->unk_1E0[v4].currentValue * FX32_ONE;
-            CellActor_SetPosition(v1->unk_1D4[v4], &v8);
-            CellActor_SetAffineZRotation(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
+            Sprite_SetPosition(v1->unk_1D4[v4], &v8);
+            Sprite_SetAffineZRotation(v1->unk_1D4[v4], (0xffff & v1->unk_21C[v4].currentValue));
         }
     }
 
     if (v0->state != 9) {
-        CellActorCollection_Update(v1->unk_00.unk_00);
+        SpriteList_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1694,14 +1694,14 @@ typedef struct {
     QuadraticInterpolationTaskFX32 unk_14;
     UnkStruct_ov5_021DE47C unk_2C;
     UnkStruct_ov5_021DE5A4 unk_1CC;
-    CellActor *unk_200;
+    Sprite *unk_200;
     s32 unk_204;
 } UnkStruct_ov5_021E4260;
 
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    CellActor *unk_1D4[4];
+    Sprite *unk_1D4[4];
     QuadraticInterpolationTaskFX32 unk_1E4[2];
 } UnkStruct_ov5_021E44C0;
 
@@ -1724,8 +1724,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);
-        CellActor_SetDrawFlag(v1->unk_200, 0);
-        CellActor_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_XLU);
+        Sprite_SetDrawFlag(v1->unk_200, 0);
+        Sprite_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_XLU);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v0->state++;
@@ -1748,7 +1748,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);
 
-        CellActor_SetDrawFlag(
+        Sprite_SetDrawFlag(
             v1->unk_200, 1);
         v0->state++;
         break;
@@ -1759,7 +1759,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            CellActor_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(v1->unk_200, GX_OAM_MODE_NORMAL);
             v0->state++;
         }
 
@@ -1768,12 +1768,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);
 
-        CellActor_SetAffineOverwriteMode(
+        Sprite_SetAffineOverwriteMode(
             v1->unk_200, 2);
         {
             VecFx32 v3 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            CellActor_SetAffineScale(
+            Sprite_SetAffineScale(
                 v1->unk_200, &v3);
         }
 
@@ -1787,7 +1787,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
         {
             VecFx32 v4 = VecFx32_FromXYZ(v1->unk_14.currentValue, v1->unk_14.currentValue, v1->unk_14.currentValue);
 
-            CellActor_SetAffineScale(
+            Sprite_SetAffineScale(
                 v1->unk_200, &v4);
         }
 
@@ -1806,7 +1806,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
             *(v0->done) = 1;
         }
 
-        CellActor_Delete(v1->unk_200);
+        Sprite_Delete(v1->unk_200);
         ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
         ov5_021DE4AC(&v1->unk_2C);
         EncounterEffect_Finish(v0, param0);
@@ -1814,7 +1814,7 @@ void EncounterEffect_Frontier(SysTask *param0, void *param1)
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_2C.unk_00);
+        SpriteList_Update(v1->unk_2C.unk_00);
     }
 }
 
@@ -1840,7 +1840,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);
-            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
+            Sprite_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -1866,7 +1866,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++) {
-            CellActor_SetDrawFlag(v1->unk_1D4[v3], 1);
+            Sprite_SetDrawFlag(v1->unk_1D4[v3], 1);
         }
 
         v0->state++;
@@ -1879,19 +1879,19 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) - v1->unk_1E4[0].currentValue, 0);
-        CellActor_SetPosition(v1->unk_1D4[0], &v4);
+        Sprite_SetPosition(v1->unk_1D4[0], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE), (96 * FX32_ONE) + v1->unk_1E4[0].currentValue, 0);
-        CellActor_SetPosition(v1->unk_1D4[1], &v4);
+        Sprite_SetPosition(v1->unk_1D4[1], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) - v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        CellActor_SetPosition(v1->unk_1D4[2], &v4);
+        Sprite_SetPosition(v1->unk_1D4[2], &v4);
 
         v4 = VecFx32_FromXYZ(
             (128 * FX32_ONE) + v1->unk_1E4[1].currentValue, (96 * FX32_ONE), 0);
-        CellActor_SetPosition(v1->unk_1D4[3], &v4);
+        Sprite_SetPosition(v1->unk_1D4[3], &v4);
 
         if (v2 == 1) {
             v0->state++;
@@ -1923,7 +1923,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
         }
 
         for (v3 = 0; v3 < 4; v3++) {
-            CellActor_Delete(v1->unk_1D4[v3]);
+            Sprite_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -1933,7 +1933,7 @@ void EncounterEffect_Double(SysTask *param0, void *param1)
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_00.unk_00);
+        SpriteList_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -1949,7 +1949,7 @@ static const s32 Unk_ov5_021F9E94[6][8] = {
 typedef struct {
     UnkStruct_ov5_021DE47C unk_00;
     UnkStruct_ov5_021DE5A4 unk_1A0;
-    CellActor *unk_1D4[6];
+    Sprite *unk_1D4[6];
     QuadraticInterpolationTaskFX32 unk_1EC[6];
     QuadraticInterpolationTaskFX32 unk_27C[6];
     QuadraticInterpolationTaskFX32 unk_30C[6];
@@ -1964,7 +1964,7 @@ typedef struct {
     UnkStruct_ov5_021DEC18 *unk_04;
     UnkStruct_ov5_021DE47C unk_08;
     UnkStruct_ov5_021DE5A4 unk_1A8;
-    CellActor *unk_1DC;
+    Sprite *unk_1DC;
     LinearInterpolationTaskS32 unk_1E0;
     LinearInterpolationTaskS32 unk_1F4;
     LinearInterpolationTaskS32 unk_208;
@@ -1994,7 +1994,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);
-            CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
+            Sprite_SetDrawFlag(v1->unk_1D4[v3], 0);
         }
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -2029,13 +2029,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);
 
-            CellActor_SetDrawFlag(v1->unk_1D4[v1->unk_42C], 1);
+            Sprite_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);
-            CellActor_SetPosition(v1->unk_1D4[v1->unk_42C], &v4);
+            Sprite_SetPosition(v1->unk_1D4[v1->unk_42C], &v4);
             v5 = VecFx32_FromXYZ(
                 (FX32_CONST(2.0f)), (FX32_CONST(2.0f)), 0);
-            CellActor_SetAffineScaleEx(v1->unk_1D4[v1->unk_42C], &v5, 2);
+            Sprite_SetAffineScaleEx(v1->unk_1D4[v1->unk_42C], &v5, 2);
 
             v1->unk_414[v1->unk_42C] = 1;
 
@@ -2083,7 +2083,7 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
         }
 
         for (v3 = 0; v3 < 6; v3++) {
-            CellActor_Delete(v1->unk_1D4[v3]);
+            Sprite_Delete(v1->unk_1D4[v3]);
         }
 
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
@@ -2102,21 +2102,21 @@ void EncounterEffect_GalacticGrunt(SysTask *param0, void *param1)
 
             if (v2) {
                 v1->unk_414[v3] = 0;
-                CellActor_SetDrawFlag(v1->unk_1D4[v3], 0);
+                Sprite_SetDrawFlag(v1->unk_1D4[v3], 0);
             }
 
             v4 = VecFx32_FromXYZ(
                 v1->unk_27C[v3].currentValue, v1->unk_30C[v3].currentValue, 0);
-            CellActor_SetPosition(v1->unk_1D4[v3], &v4);
+            Sprite_SetPosition(v1->unk_1D4[v3], &v4);
             v5 = VecFx32_FromXYZ(
                 v1->unk_1EC[v3].currentValue, v1->unk_1EC[v3].currentValue, 0);
-            CellActor_SetAffineScale(v1->unk_1D4[v3], &v5);
-            CellActor_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
+            Sprite_SetAffineScale(v1->unk_1D4[v3], &v5);
+            Sprite_SetAffineZRotation(v1->unk_1D4[v3], v1->unk_39C[v3].currentValue);
         }
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_00.unk_00);
+        SpriteList_Update(v1->unk_00.unk_00);
     }
 }
 
@@ -2139,9 +2139,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);
-        CellActor_SetDrawFlag(v1->unk_1DC, 0);
-        CellActor_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_XLU);
-        CellActor_SetExplicitPriority(v1->unk_1DC, 1);
+        Sprite_SetDrawFlag(v1->unk_1DC, 0);
+        Sprite_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_XLU);
+        Sprite_SetExplicitPriority(v1->unk_1DC, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
         v1->unk_04 = ov5_021DEBEC(4);
@@ -2176,7 +2176,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
 
     case 3:
         LinearInterpolationTaskS32_Init(&v1->unk_1F4, 0, 16, 15);
-        CellActor_SetDrawFlag(v1->unk_1DC, 1);
+        Sprite_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;
@@ -2187,7 +2187,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
 
         if (v2 == 1) {
             G2_BlendNone();
-            CellActor_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(v1->unk_1DC, GX_OAM_MODE_NORMAL);
             v0->state++;
             v1->unk_21C = 16;
         }
@@ -2226,7 +2226,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
             *(v0->done) = 1;
         }
 
-        CellActor_Delete(v1->unk_1DC);
+        Sprite_Delete(v1->unk_1DC);
         ov5_021DE5A4(&v1->unk_08, &v1->unk_1A8);
         ov5_021DE4AC(&v1->unk_08);
 
@@ -2244,7 +2244,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
     }
 
     if (v0->state != 7) {
-        CellActorCollection_Update(v1->unk_08.unk_00);
+        SpriteList_Update(v1->unk_08.unk_00);
     }
 }
 
@@ -2756,7 +2756,7 @@ static const EliterFourChampionEncounterParam sEliteFourChampionEncounterParams[
 typedef struct {
     s16 unk_00;
     s16 unk_02;
-    CellActor *unk_04[4];
+    Sprite *unk_04[4];
     LinearInterpolationTaskFX32 unk_14[4];
 } UnkStruct_ov5_021E5128;
 
@@ -2767,7 +2767,7 @@ typedef struct {
     UnkStruct_ov5_021DED04 *unk_40;
     UnkStruct_ov5_021DE47C unk_44;
     UnkStruct_ov5_021DE5A4 unk_1E4[2];
-    CellActor *unk_24C;
+    Sprite *unk_24C;
     UnkStruct_ov5_021E5128 unk_250;
     UnkStruct_ov5_021E52A8_sub1 unk_2B4;
     UnkStruct_ov5_021E52A8_sub2 unk_2BC;
@@ -2784,7 +2784,7 @@ typedef struct {
     LinearInterpolationTaskS32 unk_48;
     UnkStruct_ov5_021DE47C unk_5C;
     UnkStruct_ov5_021DE5A4 unk_1FC[4];
-    CellActor *unk_2CC[4];
+    Sprite *unk_2CC[4];
     VecFx32 unk_2DC;
     VecFx32 unk_2E8;
     UnkStruct_ov5_021E5128 unk_2F4;
@@ -2804,11 +2804,11 @@ static void ov5_021E5128(UnkStruct_ov5_021E5128 *param0, UnkStruct_ov5_021DE47C
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov5_021DE62C(
             param1, param2, param3, param4, 0, 0);
-        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
+        Sprite_SetDrawFlag(param0->unk_04[v0], 0);
 
         if (v0 != 3) {
-            CellActor_SetAffineOverwriteMode(param0->unk_04[v0], 2);
-            CellActor_SetAnim(param0->unk_04[v0], 1);
+            Sprite_SetAffineOverwriteMode(param0->unk_04[v0], 2);
+            Sprite_SetAnim(param0->unk_04[v0], 1);
 
             LinearInterpolationTaskFX32_Init(&param0->unk_14[v0], FX32_CONST(2), FX32_CONST(1), 6);
         } else {
@@ -2822,7 +2822,7 @@ static void ov5_021E519C(UnkStruct_ov5_021E5128 *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(param0->unk_04[v0]);
+        Sprite_Delete(param0->unk_04[v0]);
     }
 }
 
@@ -2848,8 +2848,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);
-        CellActor_SetAffineScale(param0->unk_04[v0], &v3);
-        CellActor_SetDrawFlag(param0->unk_04[v0], 1);
+        Sprite_SetAffineScale(param0->unk_04[v0], &v3);
+        Sprite_SetDrawFlag(param0->unk_04[v0], 1);
 
         if (v1 == 0) {
             v2 = 0;
@@ -2916,7 +2916,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);
-        CellActor_SetDrawFlag(v0->unk_24C, 0);
+        Sprite_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)));
@@ -2985,12 +2985,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);
-        CellActor_SetDrawFlag(v0->unk_24C, 1);
-        CellActor_SetExplicitPriority(v0->unk_24C, 0);
+        Sprite_SetDrawFlag(v0->unk_24C, 1);
+        Sprite_SetExplicitPriority(v0->unk_24C, 0);
 
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (66 * FX32_ONE), 0);
-        CellActor_SetPosition(v0->unk_24C, &v3);
+        Sprite_SetPosition(v0->unk_24C, &v3);
 
         encEffect->state++;
         break;
@@ -3000,7 +3000,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);
-        CellActor_SetPosition(v0->unk_24C, &v3);
+        Sprite_SetPosition(v0->unk_24C, &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3083,7 +3083,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
             *(encEffect->done) = 1;
         }
 
-        CellActor_Delete(v0->unk_24C);
+        Sprite_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]);
@@ -3107,7 +3107,7 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
     }
 
     if (encEffect->state != 15) {
-        CellActorCollection_Update(v0->unk_44.unk_00);
+        SpriteList_Update(v0->unk_44.unk_00);
     }
 
     return 0;
@@ -3256,9 +3256,9 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             v0->unk_2CC[v5] = ov5_021DE62C(
                 &v0->unk_5C, v7, 0, 0, 0, 0);
-            CellActor_SetDrawFlag(v0->unk_2CC[v5], 0);
-            CellActor_SetAnim(v0->unk_2CC[v5], v8);
-            CellActor_SetExplicitPriority(v0->unk_2CC[v5], 1);
+            Sprite_SetDrawFlag(v0->unk_2CC[v5], 0);
+            Sprite_SetAnim(v0->unk_2CC[v5], v8);
+            Sprite_SetExplicitPriority(v0->unk_2CC[v5], 1);
         }
 
         if (v0->unk_368) {
@@ -3312,22 +3312,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);
-        CellActor_SetPosition(v0->unk_2CC[0], &v3);
+        Sprite_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[2], &v3);
-        CellActor_SetDrawFlag(v0->unk_2CC[0], 1);
-        CellActor_SetDrawFlag(v0->unk_2CC[2], 1);
+        Sprite_SetPosition(v0->unk_2CC[2], &v3);
+        Sprite_SetDrawFlag(v0->unk_2CC[0], 1);
+        Sprite_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);
-        CellActor_SetPosition(v0->unk_2CC[1], &v3);
+        Sprite_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[3], &v3);
-        CellActor_SetDrawFlag(v0->unk_2CC[1], 1);
-        CellActor_SetDrawFlag(v0->unk_2CC[3], 1);
+        Sprite_SetPosition(v0->unk_2CC[3], &v3);
+        Sprite_SetDrawFlag(v0->unk_2CC[1], 1);
+        Sprite_SetDrawFlag(v0->unk_2CC[3], 1);
 
         {
             Strbuf *v9;
@@ -3366,19 +3366,19 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         v3 = VecFx32_FromXYZ(
             v0->unk_00.currentValue, (92 * FX32_ONE), 0);
         v0->unk_2DC = v3;
-        CellActor_SetPosition(v0->unk_2CC[0], &v3);
+        Sprite_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[2], &v3);
+        Sprite_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;
-        CellActor_SetPosition(v0->unk_2CC[1], &v3);
+        Sprite_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[3], &v3);
+        Sprite_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1 == 1) {
             encEffect->state++;
@@ -3410,10 +3410,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
             ov5_021DE5D0(v0->unk_2CC[1], heapID, param->trainerClass, 0, (GX_RGB(0, 0, 0)));
 
-            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);
+            Sprite_SetAnimateFlag(v0->unk_2CC[2], 1);
+            Sprite_SetAnimSpeed(v0->unk_2CC[2], FX32_ONE * 2);
+            Sprite_SetAnimateFlag(v0->unk_2CC[3], 1);
+            Sprite_SetAnimSpeed(v0->unk_2CC[3], FX32_ONE * 2);
 
             ov5_021DF0CC(encEffect->narc, 108);
 
@@ -3477,10 +3477,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2DC = v3;
         }
 
-        CellActor_SetPosition(v0->unk_2CC[0], &v3);
+        Sprite_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[2], &v3);
+        Sprite_SetPosition(v0->unk_2CC[2], &v3);
 
         if (((encEffect->effectComplete / 2) % 2) == 0) {
             v3 = VecFx32_FromXYZ(
@@ -3494,10 +3494,10 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             v0->unk_2E8 = v3;
         }
 
-        CellActor_SetPosition(v0->unk_2CC[1], &v3);
+        Sprite_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[3], &v3);
+        Sprite_SetPosition(v0->unk_2CC[3], &v3);
 
         if (v1) {
             encEffect->state++;
@@ -3518,17 +3518,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);
-        CellActor_SetPosition(v0->unk_2CC[0], &v3);
+        Sprite_SetPosition(v0->unk_2CC[0], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[2], &v3);
+        Sprite_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);
-        CellActor_SetPosition(v0->unk_2CC[1], &v3);
+        Sprite_SetPosition(v0->unk_2CC[1], &v3);
         v3.y += (4 * FX32_ONE);
         v3.x += (-16 * FX32_ONE);
-        CellActor_SetPosition(v0->unk_2CC[3], &v3);
+        Sprite_SetPosition(v0->unk_2CC[3], &v3);
 
         if (IsScreenTransitionDone()) {
             encEffect->state++;
@@ -3548,7 +3548,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         Window_Remove(&v0->unk_358);
 
         for (v5 = 0; v5 < 4; v5++) {
-            CellActor_Delete(v0->unk_2CC[v5]);
+            Sprite_Delete(v0->unk_2CC[v5]);
         }
 
         for (v5 = 0; v5 < 4; v5++) {
@@ -3567,7 +3567,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
     }
 
     if (encEffect->state != 14) {
-        CellActorCollection_Update(v0->unk_5C.unk_00);
+        SpriteList_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 4c5d15c99c..3ca98d79d3 100644
--- a/src/overlay005/ov5_021D2F14.c
+++ b/src/overlay005/ov5_021D2F14.c
@@ -5,9 +5,9 @@
 
 #include "overlay005/struct_ov5_021D30A8.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "sprite_transfer.h"
@@ -77,7 +77,7 @@ void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0)
 {
     u32 v0;
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     SpriteResourcesHeaderList_Free(param0->unk_190);
     SpriteTransfer_ResetCharTransferList(param0->unk_1AC[0]);
     SpriteTransfer_ResetPlttTransferList(param0->unk_1AC[1]);
@@ -88,10 +88,10 @@ void ov5_021D30A8(UnkStruct_ov5_021D30A8 *param0)
     }
 }
 
-CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1)
+Sprite *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFromResourceHeader *param1)
 {
-    CellActorInitParamsEx v0;
-    CellActor *v1;
+    AffineSpriteListTemplate v0;
+    Sprite *v1;
     VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE };
     VecFx32 v3;
 
@@ -99,7 +99,7 @@ CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFrom
     v3.y = param1->y * FX32_ONE;
     v3.z = param1->z * FX32_ONE;
 
-    v0.collection = param0->unk_00;
+    v0.list = param0->unk_00;
     v0.resourceData = &param0->unk_190->headers[param1->resourceHeaderID];
     v0.position = v3;
     v0.affineScale = v2;
@@ -108,11 +108,11 @@ CellActor *ov5_021D3104(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplateFrom
     v0.vramType = param1->vramType;
     v0.heapID = param0->unk_1C6;
 
-    v1 = CellActorCollection_AddEx(&v0);
+    v1 = SpriteList_AddEx(&v0);
     GF_ASSERT(v1);
 
-    CellActor_SetAnim(v1, param1->animIdx);
-    CellActor_SetExplicitPaletteWithOffset(v1, param1->plttIdx);
+    Sprite_SetAnim(v1, param1->animIdx);
+    Sprite_SetExplicitPaletteWithOffset(v1, param1->plttIdx);
 
     return v1;
 }
@@ -323,18 +323,18 @@ static void ov5_021D3518(UnkStruct_ov5_021D30A8 *param0, NARC *param1, int param
     GF_ASSERT(0);
 }
 
-CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1)
+ManagedSprite *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate *param1)
 {
     int v0;
     int v1;
-    CellActorData *v2 = NULL;
-    CellActorInitParamsEx v3;
+    ManagedSprite *v2 = NULL;
+    AffineSpriteListTemplate v3;
     int v4[6];
 
-    v2 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(CellActorData));
+    v2 = Heap_AllocFromHeap(param0->unk_1C6, sizeof(ManagedSprite));
 
     v2->resourceHeaderList = Heap_AllocFromHeap(param0->unk_1C6, sizeof(SpriteResourcesHeaderList));
-    v2->resourceHeaderList->headers = Heap_AllocFromHeap(param0->unk_1C6, sizeof(CellActorResourceData));
+    v2->resourceHeaderList->headers = Heap_AllocFromHeap(param0->unk_1C6, sizeof(SpriteResourcesHeader));
     v2->resourceHeader = v2->resourceHeaderList->headers;
 
     for (v0 = 0; v0 < 6; v0++) {
@@ -356,7 +356,7 @@ CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate
 
     SpriteResourcesHeader_Init(v2->resourceHeader, v4[0], v4[1], v4[2], v4[3], v4[4], v4[5], param1->vramTransfer, 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.collection = param0->unk_00;
+    v3.list = param0->unk_00;
     v3.resourceData = v2->resourceHeader;
     v3.position.x = FX32_CONST(param1->x);
     v3.position.y = FX32_CONST(param1->y);
@@ -374,12 +374,12 @@ CellActorData *ov5_021D3584(UnkStruct_ov5_021D30A8 *param0, const SpriteTemplate
     v3.vramType = param1->vramType;
     v3.heapID = param0->unk_1C6;
 
-    v2->sprite = CellActorCollection_AddEx(&v3);
+    v2->sprite = SpriteList_AddEx(&v3);
 
     if (v2->sprite != NULL) {
-        v1 = CellActor_GetExplicitPalette(v2->sprite);
-        CellActor_SetAnim(v2->sprite, param1->animIdx);
-        CellActor_SetExplicitPalette(v2->sprite, v1 + param1->plttIdx);
+        v1 = Sprite_GetExplicitPalette(v2->sprite);
+        Sprite_SetAnim(v2->sprite, param1->animIdx);
+        Sprite_SetExplicitPalette(v2->sprite, v1 + param1->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -391,7 +391,7 @@ void ov5_021D375C(UnkStruct_ov5_021D30A8 *param0)
 {
     u32 v0;
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     SpriteTransfer_ResetCharTransferList(param0->unk_1AC[0]);
     SpriteTransfer_ResetPlttTransferList(param0->unk_1AC[1]);
 
diff --git a/src/overlay005/ov5_021D5EB8.c b/src/overlay005/ov5_021D5EB8.c
index 96efff880f..a501fa198c 100644
--- a/src/overlay005/ov5_021D5EB8.c
+++ b/src/overlay005/ov5_021D5EB8.c
@@ -12,7 +12,6 @@
 #include "bg_window.h"
 #include "buffer_manager.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "fx_util.h"
 #include "graphics.h"
@@ -22,6 +21,7 @@
 #include "narc.h"
 #include "render_oam.h"
 #include "render_view.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -46,8 +46,8 @@ typedef struct {
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorInitParamsEx unk_10;
-    CellActorResourceData unk_40;
+    AffineSpriteListTemplate unk_10;
+    SpriteResourcesHeader unk_40;
 } UnkStruct_ov5_021D6690;
 
 typedef struct {
@@ -61,7 +61,7 @@ typedef struct {
 
 typedef struct UnkStruct_ov5_021D6FA8_tag {
     UnkStruct_ov5_021D6594 *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
     void *unk_08;
     s32 unk_0C[10];
     struct UnkStruct_ov5_021D6FA8_tag *unk_34;
@@ -105,7 +105,7 @@ typedef struct {
     SpriteResourceTable *unk_10;
     NNSG2dRendererInstance unk_14;
     NNSG2dRenderSurface unk_C0;
-    CellActorCollection *unk_130;
+    SpriteList *unk_130;
     SysTask *unk_134;
 } UnkStruct_ov5_021D61D0;
 
@@ -245,11 +245,11 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0);
 static void ov5_021D6290(SpriteResourceTable *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(CellActor *param0, VecFx32 *param1);
+static void ov5_021D630C(Sprite *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(CellActorResourceData *param0, UnkStruct_ov5_021D6594 *param1, UnkStruct_ov5_021D6690 *param2, int param3, int param4);
+static void ov5_021D6F4C(SpriteResourcesHeader *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);
@@ -790,13 +790,13 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0)
     ov5_021D6290(param0->unk_10, 3, 62);
 
     {
-        CellActorCollectionParams v3;
+        SpriteListParams v3;
 
         v3.maxElements = 96;
         v3.renderer = &param0->unk_14;
         v3.heapID = 4;
 
-        param0->unk_130 = CellActorCollection_New(&v3);
+        param0->unk_130 = SpriteList_New(&v3);
         param0->unk_134 = SysTask_Start(ov5_021D6284, param0, 10);
     }
 }
@@ -804,7 +804,7 @@ static void ov5_021D61D0(UnkStruct_ov5_021D61D0 *param0)
 static void ov5_021D6284(SysTask *param0, void *param1)
 {
     UnkStruct_ov5_021D61D0 *v0 = param1;
-    CellActorCollection_Update(v0->unk_130);
+    SpriteList_Update(v0->unk_130);
 }
 
 static void ov5_021D6290(SpriteResourceTable *param0, int param1, int param2)
@@ -834,14 +834,14 @@ static void ov5_021D62BC(UnkStruct_ov5_021D61D0 *param0)
     Heap_FreeToHeap(param0->unk_10);
     param0->unk_10 = NULL;
 
-    CellActorCollection_Delete(param0->unk_130);
+    SpriteList_Delete(param0->unk_130);
     param0->unk_130 = NULL;
 
     SysTask_Done(param0->unk_134);
     param0->unk_134 = NULL;
 }
 
-static void ov5_021D630C(CellActor *param0, VecFx32 *param1)
+static void ov5_021D630C(Sprite *param0, VecFx32 *param1)
 {
     if (param1->x > ((255 << FX32_SHIFT) + 64 * FX32_ONE)) {
         param1->x %= ((255 << FX32_SHIFT) + 64 * FX32_ONE);
@@ -859,7 +859,7 @@ static void ov5_021D630C(CellActor *param0, VecFx32 *param1)
         }
     }
 
-    CellActor_SetPosition(param0, param1);
+    Sprite_SetPosition(param0, param1);
 }
 
 UnkStruct_ov5_021D6594 *ov5_021D6364(FieldSystem *fieldSystem)
@@ -1452,8 +1452,8 @@ static void ov5_021D6CDC(UnkStruct_ov5_021D6594 *param0, UnkStruct_ov5_021D69B8
 {
     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.collection = param0->unk_08.unk_130;
+        memset(&param1->unk_0C->unk_10, 0, sizeof(AffineSpriteListTemplate));
+        param1->unk_0C->unk_10.list = 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;
@@ -1467,8 +1467,8 @@ static void ov5_021D6D34(UnkStruct_ov5_021DB4B8 *param0)
     int v0;
 
     for (v0 = 0; v0 < 48; v0++) {
-        param0->unk_48[v0].unk_04 = CellActorCollection_AddEx(&param0->unk_08->unk_10);
-        CellActor_SetDrawFlag(param0->unk_48[v0].unk_04, 0);
+        param0->unk_48[v0].unk_04 = SpriteList_AddEx(&param0->unk_08->unk_10);
+        Sprite_SetDrawFlag(param0->unk_48[v0].unk_04, 0);
         GF_ASSERT(param0->unk_48[v0].unk_04);
     }
 }
@@ -1479,7 +1479,7 @@ static void ov5_021D6D64(UnkStruct_ov5_021DB4B8 *param0)
 
     for (v0 = 0; v0 < 48; v0++) {
         if (param0->unk_48[v0].unk_04) {
-            CellActor_Delete(param0->unk_48[v0].unk_04);
+            Sprite_Delete(param0->unk_48[v0].unk_04);
             param0->unk_48[v0].unk_04 = NULL;
         }
     }
@@ -1579,12 +1579,12 @@ static UnkStruct_ov5_021D6FA8 *ov5_021D6F00(UnkStruct_ov5_021DB4B8 *param0, int
     }
 
     GF_ASSERT(v0->unk_04);
-    CellActor_SetDrawFlag(v0->unk_04, 1);
+    Sprite_SetDrawFlag(v0->unk_04, 1);
 
     return v0;
 }
 
-static void ov5_021D6F4C(CellActorResourceData *param0, UnkStruct_ov5_021D6594 *param1, UnkStruct_ov5_021D6690 *param2, int param3, int param4)
+static void ov5_021D6F4C(SpriteResourcesHeader *param0, UnkStruct_ov5_021D6594 *param1, UnkStruct_ov5_021D6690 *param2, int param3, int param4)
 {
     int v0[4];
     int v1;
@@ -1598,12 +1598,12 @@ static void ov5_021D6F4C(CellActorResourceData *param0, UnkStruct_ov5_021D6594 *
 
 static void ov5_021D6FA8(UnkStruct_ov5_021D6FA8 *param0)
 {
-    CellActor *v0;
+    Sprite *v0;
 
     param0->unk_38->unk_34 = param0->unk_34;
     param0->unk_34->unk_38 = param0->unk_38;
 
-    CellActor_SetDrawFlag(param0->unk_04, 0);
+    Sprite_SetDrawFlag(param0->unk_04, 0);
     ov5_021D6EF0(param0);
 
     v0 = param0->unk_04;
@@ -1649,7 +1649,7 @@ static void ov5_021D700C(UnkStruct_ov5_021DB4B8 *param0)
 
 static VecFx32 ov5_021D7010(UnkStruct_ov5_021D6FA8 *param0)
 {
-    const VecFx32 *v0 = CellActor_GetPosition(param0->unk_04);
+    const VecFx32 *v0 = Sprite_GetPosition(param0->unk_04);
     return *v0;
 }
 
@@ -2230,7 +2230,7 @@ static void ov5_021D78A4(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v3[0] = 0;
         v4 = v6 % 3;
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v4);
+        Sprite_SetAnimFrame(v1->unk_04, v4);
 
         v2 = (v6 % 20);
         v3[2] = 10 * (v4 + 1) + v2;
@@ -2279,7 +2279,7 @@ static void ov5_021D7960(UnkStruct_ov5_021D6FA8 *param0)
             } else {
                 v2[3] = 1;
                 v2[0] = 4;
-                SpriteActor_SetAnimFrame(v1->unk_04, 3);
+                Sprite_SetAnimFrame(v1->unk_04, 3);
             }
         }
 
@@ -2429,7 +2429,7 @@ static void ov5_021D7C40(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v4 = (s32 *)v2->unk_08;
         v5 = MTRNG_Next() % 4;
 
-        SpriteActor_SetAnimFrame(v2->unk_04, v5);
+        Sprite_SetAnimFrame(v2->unk_04, v5);
 
         v4[4] = 10;
         v4[5] = 0;
@@ -2670,7 +2670,7 @@ static void ov5_021D8098(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v4[1] = 4 + (MTRNG_Next() % (46 - 4));
 
         v7 = (v4[1] - 4) / (((46 - 4) / 3) + 1);
-        SpriteActor_SetAnimFrame(v1->unk_04, v7);
+        Sprite_SetAnimFrame(v1->unk_04, v7);
 
         v4[4] = -1 * (v7 + 1);
         v4[2] = v6[v2] * (v7 + 1);
@@ -3215,7 +3215,7 @@ static void ov5_021D8B88(UnkStruct_ov5_021DB4B8 *param0, int param1)
             v5[2] += v5[2] / 2;
         }
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v6);
+        Sprite_SetAnimFrame(v1->unk_04, v6);
 
         {
             VecFx32 v9;
@@ -3533,7 +3533,7 @@ static void ov5_021D92C4(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v4[1] = 18 + (MTRNG_Next() % (24 - 18));
         v5 = MTRNG_Next() % 4;
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v5);
+        Sprite_SetAnimFrame(v1->unk_04, v5);
 
         v4[4] = Unk_ov5_021F8CDC[v2] * ((v5) + 1);
         v4[2] = Unk_ov5_021F8CEC[v2] * ((v5) + 1);
@@ -3753,7 +3753,7 @@ static void ov5_021D9690(UnkStruct_ov5_021DB4B8 *param0, int param1)
             v5 = MTRNG_Next() % 4;
         }
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v5);
+        Sprite_SetAnimFrame(v1->unk_04, v5);
     }
 }
 
@@ -4271,7 +4271,7 @@ static void ov5_021DA0A8(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v3[0] = 0;
         v6 = v8 % 3;
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v6);
+        Sprite_SetAnimFrame(v1->unk_04, v6);
 
         v3[4] = -24 * (v6 + 1);
         v3[2] = 24 * (v6 + 1);
@@ -4314,7 +4314,7 @@ static void ov5_021DA1A8(UnkStruct_ov5_021D6FA8 *param0)
             } else {
                 v2[3] = 1;
                 v2[0] = 4;
-                SpriteActor_SetAnimFrame(v1->unk_04, 3);
+                Sprite_SetAnimFrame(v1->unk_04, 3);
             }
         }
 
@@ -4507,7 +4507,7 @@ static void ov5_021DA5A0(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v5 = (s32 *)v2->unk_08;
         v4 = MTRNG_Next() % 4;
 
-        SpriteActor_SetAnimFrame(v2->unk_04, v4);
+        Sprite_SetAnimFrame(v2->unk_04, v4);
 
         v5[4] = 10;
         v5[5] = 0;
@@ -4749,7 +4749,7 @@ static void ov5_021DA9DC(UnkStruct_ov5_021DB4B8 *param0, int param1)
         v2 = (s32 *)v1->unk_08;
         v4 = MTRNG_Next() % 0xe;
 
-        SpriteActor_SetAnimFrame(v1->unk_04, v4);
+        Sprite_SetAnimFrame(v1->unk_04, v4);
 
         v3 = v4 / 4;
         v3++;
diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c
index 43b3208545..f67b47d818 100644
--- a/src/overlay006/ov6_022426AC.c
+++ b/src/overlay006/ov6_022426AC.c
@@ -8,11 +8,11 @@
 
 #include "struct_defs/archived_sprite.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -120,7 +120,7 @@ void ov6_02242828(GreatMarshLookout_SpriteResources *param0)
         SpriteResourceCollection_Delete(param0->unk_00[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_38);
+    SpriteList_Delete(param0->unk_38);
     Heap_FreeToHeap(param0->unk_20);
     Heap_FreeToHeap(param0->unk_24);
 }
@@ -130,7 +130,7 @@ static void ov6_02242860(SysTask *param0, void *param1)
     GreatMarshLookout_SpriteResources *v0 = param1;
 
     if (v0->unk_1CC) {
-        CellActorCollection_Update(v0->unk_38);
+        SpriteList_Update(v0->unk_38);
     } else {
         v0->unk_1D0 = 1;
         SysTask_Done(param0);
@@ -170,14 +170,14 @@ static void ov6_02242880(SpriteResourceCollection *param0, SpriteResourceCollect
 static void ov6_022428F8(GreatMarshLookout_SpriteResources *param0)
 {
     int v0;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
 
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v2;
+        AffineSpriteListTemplate v2;
 
-        v2.collection = param0->unk_38;
+        v2.list = param0->unk_38;
         v2.resourceData = &v1;
         v2.position.x = 0;
         v2.position.y = 0;
@@ -192,9 +192,9 @@ static void ov6_022428F8(GreatMarshLookout_SpriteResources *param0)
         v2.position.x = FX32_ONE * (256 / 2);
         v2.position.y = FX32_ONE * (192 / 2);
 
-        param0->unk_1C8 = CellActorCollection_AddEx(&v2);
+        param0->unk_1C8 = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_1C8, 0);
-        CellActor_SetAnim(param0->unk_1C8, 0);
+        Sprite_SetAnimateFlag(param0->unk_1C8, 0);
+        Sprite_SetAnim(param0->unk_1C8, 0);
     }
 }
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 0d338badf3..28d8d1c086 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -13,7 +13,6 @@
 #include "overlay101/struct_ov101_021D86B0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "field_message.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -22,6 +21,7 @@
 #include "narc.h"
 #include "player_avatar.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -62,7 +62,7 @@ typedef struct {
     NNSG2dScreenData *unk_64;
     NNSG2dCharacterData *unk_68;
     NNSG2dPaletteData *unk_6C;
-    CellActorCollection *unk_70;
+    SpriteList *unk_70;
     G2dRenderer unk_74;
     SpriteResourceCollection *unk_200;
     SpriteResourceCollection *unk_204;
@@ -73,8 +73,8 @@ typedef struct {
     SpriteResource *unk_22C[4];
     SpriteResource *unk_23C[2];
     UnkStruct_020711EC *unk_244;
-    CellActor *unk_248;
-    CellActor *unk_24C;
+    Sprite *unk_248;
+    Sprite *unk_24C;
     UnkStruct_ov101_021D5D90 *unk_250;
     UnkStruct_ov101_021D5D90 *unk_254;
     ArchivedSprite unk_258;
@@ -113,7 +113,7 @@ typedef struct {
     fx32 unk_4C;
     fx32 unk_50;
     fx32 unk_54;
-    CellActor *unk_58;
+    Sprite *unk_58;
     UnkStruct_ov6_0224543C unk_5C;
     UnkStruct_ov101_021D5D90 *unk_60;
     SysTask *unk_64;
@@ -121,7 +121,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov6_02243FFC *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
 } UnkStruct_ov6_02245B4C;
 
 typedef struct {
@@ -131,7 +131,7 @@ typedef struct {
     int unk_0C;
     VecFx32 unk_10;
     UnkStruct_ov6_02243FFC *unk_1C;
-    CellActor *unk_20;
+    Sprite *unk_20;
 } UnkStruct_ov6_02245B74;
 
 typedef struct {
@@ -149,7 +149,7 @@ typedef struct {
     s8 unk_05;
     s8 unk_06;
     s8 unk_07;
-    CellActorCollection *unk_08;
+    SpriteList *unk_08;
     G2dRenderer unk_0C;
     SpriteResourceCollection *unk_198;
     SpriteResourceCollection *unk_19C;
@@ -169,7 +169,7 @@ typedef struct {
     int unk_10;
     FieldSystem *fieldSystem;
     UnkStruct_ov6_02243258 unk_18;
-    CellActor *unk_1D0;
+    Sprite *unk_1D0;
     UnkStruct_020711EC *unk_1D4;
     UnkStruct_ov101_021D5D90 *unk_1D8;
     SysTask *unk_1DC;
@@ -178,7 +178,7 @@ typedef struct {
 typedef struct {
     UnkStruct_020711EC *unk_00;
     FieldSystem *fieldSystem;
-    CellActor *unk_08;
+    Sprite *unk_08;
     UnkStruct_ov6_02243258 *unk_0C;
 } UnkStruct_ov6_02243888;
 
@@ -201,7 +201,7 @@ typedef struct {
     fx32 unk_50;
     fx32 unk_54;
     UnkStruct_ov6_02243888 unk_58;
-    CellActor *unk_68;
+    Sprite *unk_68;
     UnkStruct_ov101_021D5D90 *unk_6C;
     SysTask *unk_70;
 } UnkStruct_ov6_02249110;
@@ -216,7 +216,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    CellActor *unk_08;
+    Sprite *unk_08;
     UnkStruct_ov6_02245328 unk_0C;
 } UnkStruct_ov6_02245364;
 
@@ -241,7 +241,7 @@ typedef struct {
 } UnkStruct_ov100_021D4890;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     UnkStruct_ov6_02243FFC *unk_04;
 } UnkStruct_ov6_02245F80;
 
@@ -262,11 +262,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 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 Sprite *ov6_02244C20(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static Sprite *ov6_02244CD4(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3);
+static Sprite *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1);
+static void ov6_02244D34(Sprite *param0);
+static Sprite *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(BgConfig *param0, NARC *param1, u32 param2, NNSG2dCharacterData **param3);
@@ -289,7 +289,7 @@ static void ov6_02245118(UnkStruct_ov6_02243FFC *param0, void *param1);
 static SpriteResource *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 CellActor *ov6_0224529C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1);
+static Sprite *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);
@@ -298,7 +298,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, CellActor *param1);
+static UnkStruct_ov101_021D5D90 *ov6_02245B4C(UnkStruct_020711EC *param0, Sprite *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);
@@ -402,8 +402,8 @@ static void ov6_0224339C(UnkStruct_ov6_02243258 *param0)
     Heap_FreeToHeap(param0->unk_1AC);
     Heap_FreeToHeap(param0->unk_1B0);
     Heap_FreeToHeap(param0->unk_1B4);
-    CellActorCollection_DeleteAll(param0->unk_08);
-    CellActorCollection_Delete(param0->unk_08);
+    SpriteList_DeleteAll(param0->unk_08);
+    SpriteList_Delete(param0->unk_08);
 }
 
 static void ov6_022434B0(UnkStruct_ov6_02243258 *param0, NARC *param1, int param2, int param3)
@@ -529,11 +529,11 @@ static void ov6_022436D0(UnkStruct_ov6_02243258 *param0, NARC *param1, int param
     GF_ASSERT(FALSE);
 }
 
-static CellActor *ov6_02243740(UnkStruct_ov6_02243258 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static Sprite *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;
-    CellActor *v2;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
+    Sprite *v2;
 
     if (param5 == param0->unk_07) {
         param5 = 0xffffffff;
@@ -542,45 +542,45 @@ static CellActor *ov6_02243740(UnkStruct_ov6_02243258 *param0, const VecFx32 *pa
     SpriteResourcesHeader_Init(
         &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_198, param0->unk_19C, param0->unk_1A0, param0->unk_1A4, NULL, NULL);
 
-    v1.collection = param0->unk_08;
+    v1.list = param0->unk_08;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
-    v2 = CellActorCollection_Add(&v1);
+    v2 = SpriteList_Add(&v1);
 
     GF_ASSERT(v2 != NULL);
     return v2;
 }
 
-static void ov6_022437C8(CellActor *param0, VecFx32 *param1)
+static void ov6_022437C8(Sprite *param0, VecFx32 *param1)
 {
-    const VecFx32 *v0 = CellActor_GetPosition(param0);
+    const VecFx32 *v0 = Sprite_GetPosition(param0);
     *param1 = *v0;
 }
 
-static CellActor *ov6_022437DC(UnkStruct_ov6_02243258 *param0)
+static Sprite *ov6_022437DC(UnkStruct_ov6_02243258 *param0)
 {
-    CellActor *v0;
+    Sprite *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);
 
-    CellActor_SetAffineOverwriteMode(v0, 2);
-    CellActor_SetAffineTranslation(v0, &v2);
-    CellActor_SetAffineScale(v0, &v3);
-    CellActor_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
+    Sprite_SetAffineOverwriteMode(v0, 2);
+    Sprite_SetAffineTranslation(v0, &v2);
+    Sprite_SetAffineScale(v0, &v3);
+    Sprite_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
 
     return v0;
 }
 
-static CellActor *ov6_02243848(UnkStruct_ov6_02243258 *param0, int param1)
+static Sprite *ov6_02243848(UnkStruct_ov6_02243258 *param0, int param1)
 {
     VecFx32 v0 = { 0, 0, 0 };
-    CellActor *v1;
+    Sprite *v1;
     u32 v2 = 0;
 
     if (param1 == 1) {
@@ -589,8 +589,8 @@ static CellActor *ov6_02243848(UnkStruct_ov6_02243258 *param0, int param1)
 
     v1 = ov6_02243740(param0, &v0, 2, v2, 2, 1, 0, 131);
 
-    CellActor_SetDrawFlag(v1, 0);
-    CellActor_SetAnim(v1, 6);
+    Sprite_SetDrawFlag(v1, 0);
+    Sprite_SetAnim(v1, 6);
 
     return v1;
 }
@@ -598,7 +598,7 @@ static CellActor *ov6_02243848(UnkStruct_ov6_02243258 *param0, int param1)
 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, CellActor *param3)
+static UnkStruct_ov101_021D5D90 *ov6_02243888(FieldSystem *fieldSystem, UnkStruct_020711EC *param1, UnkStruct_ov6_02243258 *param2, Sprite *param3)
 {
     UnkStruct_ov101_021D5D90 *v0;
     VecFx32 v1 = { 0, 0, 0 };
@@ -649,7 +649,7 @@ static void ov6_022438EC(UnkStruct_ov101_021D5D90 *param0)
 static void ov6_02243914(UnkStruct_ov101_021D5D90 *param0, void *param1)
 {
     UnkStruct_ov6_02249110 *v0 = param1;
-    CellActor_Delete(v0->unk_68);
+    Sprite_Delete(v0->unk_68);
 }
 
 static void ov6_02243920(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -675,7 +675,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov6_0224925C = {
 static int ov6_02243940(UnkStruct_ov6_02249110 *param0)
 {
     param0->unk_02 = 0;
-    CellActor_SetDrawFlag(param0->unk_68, 0);
+    Sprite_SetDrawFlag(param0->unk_68, 0);
     return 0;
 }
 
@@ -709,11 +709,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;
 
-    CellActor_SetPosition(v2->unk_68, &v0);
-    CellActor_SetAffineScale(v2->unk_68, &v1);
-    CellActor_SetAffineZRotation(v2->unk_68, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
-    CellActor_SetPriority(v2->unk_68, 132);
-    CellActor_SetDrawFlag(v2->unk_68, 1);
+    Sprite_SetPosition(v2->unk_68, &v0);
+    Sprite_SetAffineScale(v2->unk_68, &v1);
+    Sprite_SetAffineZRotation(v2->unk_68, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
+    Sprite_SetPriority(v2->unk_68, 132);
+    Sprite_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);
@@ -721,17 +721,17 @@ static void ov6_02243950(UnkStruct_ov101_021D5D90 *param0)
     ov5_021F0F10(v2->unk_70, 1, -(FX32_ONE * 120), 12);
 
     {
-        CellActor *v3;
+        Sprite *v3;
         VecFx32 v4 = { 0, 0, 0 };
         VecFx32 v5 = { 0x2000, 0x2000, 0 };
 
         v3 = v2->unk_58.unk_08;
 
-        CellActor_SetAffineOverwriteMode(v3, 2);
-        CellActor_SetAffineTranslation(v3, &v4);
-        CellActor_SetAffineScale(v3, &v5);
-        CellActor_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
-        CellActor_SetAnim(v3, 2);
+        Sprite_SetAffineOverwriteMode(v3, 2);
+        Sprite_SetAffineTranslation(v3, &v4);
+        Sprite_SetAffineScale(v3, &v5);
+        Sprite_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
+        Sprite_SetAnim(v3, 2);
     }
 
     ov6_02243F2C();
@@ -740,8 +740,8 @@ static void ov6_02243950(UnkStruct_ov101_021D5D90 *param0)
 static int ov6_02243AB8(UnkStruct_ov6_02249110 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_68;
-    CellActor *v2 = param0->unk_58.unk_08;
+    Sprite *v1 = param0->unk_68;
+    Sprite *v2 = param0->unk_58.unk_08;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -776,15 +776,15 @@ static int ov6_02243AB8(UnkStruct_ov6_02249110 *param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
-    CellActor_SetAffineScale(v2, &param0->unk_2C);
+    Sprite_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
     v0.y -= (FX32_ONE * 18);
-    CellActor_SetPosition(v2, &v0);
+    Sprite_SetPosition(v2, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -813,7 +813,7 @@ static int ov6_02243BB8(UnkStruct_ov6_02249110 *param0)
 static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_68;
+    Sprite *v1 = param0->unk_68;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -830,7 +830,7 @@ static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0)
     }
 
     param0->unk_38 += 0x2000;
-    CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
+    Sprite_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
     param0->unk_2C.x += param0->unk_50;
 
     if (param0->unk_2C.x > 0x1000) {
@@ -843,12 +843,12 @@ static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 
     if (((v0.y) / FX32_ONE) <= -16) {
         param0->unk_01++;
@@ -859,8 +859,8 @@ static int ov6_02243BEC(UnkStruct_ov6_02249110 *param0)
 
 static int ov6_02243CD8(UnkStruct_ov6_02249110 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_68, 0);
-    CellActor_SetAnim(param0->unk_58.unk_08, 1);
+    Sprite_SetDrawFlag(param0->unk_68, 0);
+    Sprite_SetAnim(param0->unk_58.unk_08, 1);
 
     param0->unk_04 = 0;
     param0->unk_01++;
@@ -892,12 +892,12 @@ static int ov6_02243CFC(UnkStruct_ov6_02249110 *param0)
         param0->unk_48 = (FX32_ONE * 128);
         param0->unk_4C = 0x2000;
 
-        CellActor_SetPosition(param0->unk_68, &v0);
-        CellActor_SetAffineScale(param0->unk_68, &v1);
-        CellActor_SetAffineZRotation(param0->unk_68, CalcAngleRotationIdx_Wraparound((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);
+        Sprite_SetPosition(param0->unk_68, &v0);
+        Sprite_SetAffineScale(param0->unk_68, &v1);
+        Sprite_SetAffineZRotation(param0->unk_68, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
+        Sprite_SetDrawFlag(param0->unk_68, 1);
+        Sprite_SetAnim(param0->unk_58.unk_08, 6);
+        Sprite_SetAnimateFlag(param0->unk_58.unk_08, 1);
     }
 
     param0->unk_01++;
@@ -907,7 +907,7 @@ static int ov6_02243CFC(UnkStruct_ov6_02249110 *param0)
 static int ov6_02243DC0(UnkStruct_ov6_02249110 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_68;
+    Sprite *v1 = param0->unk_68;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -938,22 +938,22 @@ static int ov6_02243DC0(UnkStruct_ov6_02249110 *param0)
         param0->unk_2C.y = 0x400;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) > 60) {
         param0->unk_38 = (FX32_ONE * 60);
     }
 
-    CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
+    Sprite_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 
     if (param0->unk_48 <= 0) {
-        CellActor_SetDrawFlag(v1, 0);
+        Sprite_SetDrawFlag(v1, 0);
         param0->unk_01++;
     }
 
@@ -965,12 +965,12 @@ static int ov6_02243ECC(UnkStruct_ov6_02249110 *param0)
     param0->unk_04++;
 
     if (param0->unk_04 == 8) {
-        CellActor_SetAnim(param0->unk_58.unk_08, 1);
+        Sprite_SetAnim(param0->unk_58.unk_08, 1);
         ov6_02243F74(param0->unk_58.fieldSystem, 0);
     }
 
     if (param0->unk_04 == 10) {
-        CellActor_SetDrawFlag(param0->unk_58.unk_08, 0);
+        Sprite_SetDrawFlag(param0->unk_58.unk_08, 0);
     }
 
     if ((param0->unk_04 > 15) && (ov5_021F0EF0(param0->unk_70) == 1)) {
@@ -1202,7 +1202,7 @@ static int ov6_022441DC(UnkStruct_ov6_02243FFC *param0)
     const VecFx32 *v0;
     VecFx32 v1;
 
-    v0 = CellActor_GetPosition(param0->unk_24C);
+    v0 = Sprite_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
@@ -1211,7 +1211,7 @@ static int ov6_022441DC(UnkStruct_ov6_02243FFC *param0)
         param0->unk_00++;
     }
 
-    CellActor_SetPosition(param0->unk_24C, &v1);
+    Sprite_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1231,11 +1231,11 @@ static int ov6_02244228(UnkStruct_ov6_02243FFC *param0)
         }
     }
 
-    v0 = CellActor_GetPosition(param0->unk_24C);
+    v0 = Sprite_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    CellActor_SetPosition(param0->unk_24C, &v1);
+    Sprite_SetPosition(param0->unk_24C, &v1);
     return 0;
 }
 
@@ -1263,11 +1263,11 @@ static int ov6_022442A4(UnkStruct_ov6_02243FFC *param0)
         param0->unk_58 = (FX32_ONE * -64);
     }
 
-    v0 = CellActor_GetPosition(param0->unk_24C);
+    v0 = Sprite_GetPosition(param0->unk_24C);
     v1 = *v0;
     v1.x += param0->unk_58;
 
-    CellActor_SetPosition(param0->unk_24C, &v1);
+    Sprite_SetPosition(param0->unk_24C, &v1);
 
     if (v1.x <= (FX32_ONE * -40)) {
         param0->unk_54 = 0x1000;
@@ -1429,7 +1429,7 @@ static int ov6_022444D0(UnkStruct_ov6_02243FFC *param0)
         return 0;
     }
 
-    CellActor_SetAnim(param0->unk_248, 1);
+    Sprite_SetAnim(param0->unk_248, 1);
     param0->unk_00++;
 
     return 0;
@@ -1823,22 +1823,22 @@ static void ov6_02244B6C(UnkStruct_ov6_02243FFC *param0)
     SpriteResourceCollection_Delete(param0->unk_204);
     SpriteResourceCollection_Delete(param0->unk_208);
     SpriteResourceCollection_Delete(param0->unk_20C);
-    CellActorCollection_DeleteAll(param0->unk_70);
-    CellActorCollection_Delete(param0->unk_70);
+    SpriteList_DeleteAll(param0->unk_70);
+    SpriteList_Delete(param0->unk_70);
 }
 
 static void ov6_02244C10(UnkStruct_ov6_02243FFC *param0)
 {
     if (param0->unk_70 != NULL) {
-        CellActorCollection_Update(param0->unk_70);
+        SpriteList_Update(param0->unk_70);
     }
 }
 
-static CellActor *ov6_02244C20(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static Sprite *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;
-    CellActor *v2;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
+    Sprite *v2;
 
     if (param5 == 4) {
         SpriteResourcesHeader_Init(
@@ -1848,32 +1848,32 @@ static CellActor *ov6_02244C20(UnkStruct_ov6_02243FFC *param0, const VecFx32 *pa
             &v0, param2, param3, param4, param5, 0xffffffff, 0xffffffff, 0, param6, param0->unk_200, param0->unk_204, param0->unk_208, param0->unk_20C, NULL, NULL);
     }
 
-    v1.collection = param0->unk_70;
+    v1.list = param0->unk_70;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = CellActorCollection_Add(&v1);
+    v2 = SpriteList_Add(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
 }
 
-static CellActor *ov6_02244CD4(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3)
+static Sprite *ov6_02244CD4(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3)
 {
-    CellActor *v0;
+    Sprite *v0;
 
     v0 = ov6_02244C20(param0, param1, 1, 0, 1, 0, 0, param2);
-    CellActor_SetAnim(v0, param3);
+    Sprite_SetAnim(v0, param3);
 
     return v0;
 }
 
-static CellActor *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1)
+static Sprite *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1)
 {
-    CellActor *v0;
+    Sprite *v0;
     u32 v1 = 0;
 
     if (param0->unk_0C == 1) {
@@ -1882,30 +1882,30 @@ static CellActor *ov6_02244CFC(UnkStruct_ov6_02243FFC *param0, const VecFx32 *pa
 
     v0 = ov6_02244C20(param0, param1, 2, v1, 2, 1, 0, 131);
 
-    CellActor_SetDrawFlag(v0, 0);
-    CellActor_SetAnim(v0, 6);
+    Sprite_SetDrawFlag(v0, 0);
+    Sprite_SetAnim(v0, 6);
 
     return v0;
 }
 
-static void ov6_02244D34(CellActor *param0)
+static void ov6_02244D34(Sprite *param0)
 {
-    CellActor_SetAnimateFlag(param0, 1);
-    CellActor_SetAnimSpeed(param0, FX32_ONE);
+    Sprite_SetAnimateFlag(param0, 1);
+    Sprite_SetAnimSpeed(param0, FX32_ONE);
 }
 
-static CellActor *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3)
+static Sprite *ov6_02244D4C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1, int param2, int param3)
 {
-    CellActor *v0;
+    Sprite *v0;
     VecFx32 v1 = { 0, 0, 0 };
     VecFx32 v2 = { 0x1000, 0x1000, 0 };
 
     v0 = ov6_02244C20(param0, param1, 0, 0, 0, 0xffffffff, 0, param2);
 
-    CellActor_SetAffineOverwriteMode(v0, 2);
-    CellActor_SetAffineTranslation(v0, &v1);
-    CellActor_SetAffineScale(v0, &v2);
-    CellActor_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
+    Sprite_SetAffineOverwriteMode(v0, 2);
+    Sprite_SetAffineTranslation(v0, &v1);
+    Sprite_SetAffineScale(v0, &v2);
+    Sprite_SetAffineZRotation(v0, CalcAngleRotationIdx_Wraparound(0));
 
     return v0;
 }
@@ -2168,9 +2168,9 @@ static void ov6_022451B8(UnkStruct_ov6_02243FFC *param0)
     GF_ASSERT(v0 < 4);
 }
 
-static CellActor *ov6_0224529C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1)
+static Sprite *ov6_0224529C(UnkStruct_ov6_02243FFC *param0, const VecFx32 *param1)
 {
-    CellActor *v0;
+    Sprite *v0;
 
     v0 = ov6_02244C20(param0, param1, 3, 2, 3, 0xffffffff, 0, 129);
     return v0;
@@ -2242,7 +2242,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);
-    CellActor_SetDrawFlag(v1->unk_08, 0);
+    Sprite_SetDrawFlag(v1->unk_08, 0);
 
     return 1;
 }
@@ -2250,7 +2250,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;
-    CellActor_Delete(v0->unk_08);
+    Sprite_Delete(v0->unk_08);
 }
 
 static void ov6_022453B8(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -2264,7 +2264,7 @@ static void ov6_022453B8(UnkStruct_ov101_021D5D90 *param0, void *param1)
     v0.x %= (FX32_ONE * 512);
 
     sub_020715D4(param0, &v0);
-    CellActor_SetPosition(v1->unk_08, &v0);
+    Sprite_SetPosition(v1->unk_08, &v0);
 
     if (v1->unk_0C.unk_04 == 1) {
         UnkStruct_ov6_02243FFC *v2 = v1->unk_0C.unk_08;
@@ -2277,9 +2277,9 @@ static void ov6_022453B8(UnkStruct_ov101_021D5D90 *param0, void *param1)
                 v3 = 1;
             }
 
-            CellActor_SetDrawFlag(v1->unk_08, v3);
+            Sprite_SetDrawFlag(v1->unk_08, v3);
         } else if (v2->unk_14 == 1) {
-            CellActor_SetDrawFlag(v1->unk_08, 0);
+            Sprite_SetDrawFlag(v1->unk_08, 0);
         }
     }
 }
@@ -2343,7 +2343,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;
-    CellActor_Delete(v0->unk_58);
+    Sprite_Delete(v0->unk_58);
 }
 
 static void ov6_022454E8(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -2380,7 +2380,7 @@ static int (*const *const Unk_ov6_02249198[])(UnkStruct_ov6_02249198 *) = {
 static int ov6_0224550C(UnkStruct_ov6_02249198 *param0)
 {
     param0->unk_02 = 0;
-    CellActor_SetDrawFlag(param0->unk_58, 0);
+    Sprite_SetDrawFlag(param0->unk_58, 0);
     return 0;
 }
 
@@ -2408,16 +2408,16 @@ static void ov6_0224551C(UnkStruct_ov6_02243FFC *param0)
     v2->unk_48 = 0;
     v2->unk_4C = 0x2000;
 
-    CellActor_SetPosition(v2->unk_58, &v0);
-    CellActor_SetAffineScale(v2->unk_58, &v1);
-    CellActor_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
-    CellActor_SetDrawFlag(v2->unk_58, 1);
+    Sprite_SetPosition(v2->unk_58, &v0);
+    Sprite_SetAffineScale(v2->unk_58, &v1);
+    Sprite_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
+    Sprite_SetDrawFlag(v2->unk_58, 1);
 }
 
 static int ov6_022455C4(UnkStruct_ov6_02249198 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_58;
+    Sprite *v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
 
@@ -2444,22 +2444,22 @@ static int ov6_022455C4(UnkStruct_ov6_02249198 *param0)
         param0->unk_2C.y = 0x1000;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 -= 0x6000;
 
     if (((param0->unk_38) / FX32_ONE) < 0) {
         param0->unk_38 = 0;
     }
 
-    CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
+    Sprite_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 
     if (v0.y < (FX32_ONE * -64)) {
-        CellActor_SetDrawFlag(v1, 0);
+        Sprite_SetDrawFlag(v1, 0);
         param0->unk_02 = 2;
         param0->unk_01++;
     }
@@ -2503,10 +2503,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;
 
-    CellActor_SetPosition(v2->unk_58, &v0);
-    CellActor_SetAffineScale(v2->unk_58, &v1);
-    CellActor_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
-    CellActor_SetDrawFlag(v2->unk_58, 1);
+    Sprite_SetPosition(v2->unk_58, &v0);
+    Sprite_SetAffineScale(v2->unk_58, &v1);
+    Sprite_SetAffineZRotation(v2->unk_58, CalcAngleRotationIdx_Wraparound((v2->unk_38) / FX32_ONE));
+    Sprite_SetDrawFlag(v2->unk_58, 1);
 
     v2->unk_60 = ov6_02245B4C(param0->unk_244, param0->unk_248);
     param0->unk_1C = 1;
@@ -2515,23 +2515,23 @@ static void ov6_022456D4(UnkStruct_ov6_02243FFC *param0)
     ov5_021F0F10(v2->unk_64, 1, -(FX32_ONE * 120), 12);
 
     {
-        CellActor *v3;
+        Sprite *v3;
         VecFx32 v4 = { 0, 0, 0 };
         VecFx32 v5 = { 0x1000, 0x1000, 0 };
 
         v3 = v2->unk_5C.unk_00->unk_248;
 
-        CellActor_SetAffineOverwriteMode(v3, 2);
-        CellActor_SetAffineTranslation(v3, &v4);
-        CellActor_SetAffineScale(v3, &v5);
-        CellActor_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
+        Sprite_SetAffineOverwriteMode(v3, 2);
+        Sprite_SetAffineTranslation(v3, &v4);
+        Sprite_SetAffineScale(v3, &v5);
+        Sprite_SetAffineZRotation(v3, CalcAngleRotationIdx_Wraparound(0));
     }
 }
 
 static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_58;
+    Sprite *v1 = param0->unk_58;
 
     param0->unk_48 -= param0->unk_4C;
 
@@ -2566,19 +2566,19 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
         param0->unk_2C.y = 0x1800;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_SetAffineScale(v1, &param0->unk_2C);
     param0->unk_38 += 0x8000;
 
     if (((param0->unk_38) / FX32_ONE) > 360) {
         param0->unk_38 = (FX32_ONE * 360);
     }
 
-    CellActor_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((param0->unk_38) / FX32_ONE));
+    Sprite_SetAffineZRotation(v1, CalcAngleRotationIdx_Wraparound((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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 
     if (param0->unk_48 == 0) {
         param0->unk_04 = 0;
@@ -2592,8 +2592,8 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
     }
 
     {
-        CellActor *v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 *v3 = CellActor_GetAffineScale(v2);
+        Sprite *v2 = param0->unk_5C.unk_00->unk_248;
+        const VecFx32 *v3 = Sprite_GetAffineScale(v2);
         VecFx32 v4 = *v3;
 
         v4.x += 0x80;
@@ -2608,7 +2608,7 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
             v4.y = 0x1400;
         }
 
-        CellActor_SetAffineScale(v2, &v4);
+        Sprite_SetAffineScale(v2, &v4);
     }
 
     return 0;
@@ -2616,16 +2616,16 @@ static int ov6_02245840(UnkStruct_ov6_02249198 *param0)
 
 static int ov6_022459B0(UnkStruct_ov6_02249198 *param0)
 {
-    CellActor *v0 = param0->unk_5C.unk_00->unk_248;
+    Sprite *v0 = param0->unk_5C.unk_00->unk_248;
 
-    CellActor_SetAnim(v0, 3);
+    Sprite_SetAnim(v0, 3);
 
     {
         fx32 v1, v2;
-        const VecFx32 *v3 = CellActor_GetPosition(v0);
+        const VecFx32 *v3 = Sprite_GetPosition(v0);
 
         v1 = v3->y;
-        v3 = CellActor_GetPosition(param0->unk_58);
+        v3 = Sprite_GetPosition(param0->unk_58);
         v2 = v3->y;
 
         param0->unk_54 = v1 - v2;
@@ -2647,7 +2647,7 @@ static int ov6_022459B0(UnkStruct_ov6_02249198 *param0)
 static int ov6_02245A0C(UnkStruct_ov6_02249198 *param0)
 {
     VecFx32 v0;
-    CellActor *v1 = param0->unk_58;
+    Sprite *v1 = param0->unk_58;
 
     param0->unk_48 += param0->unk_4C;
     param0->unk_4C += 0x1000;
@@ -2675,23 +2675,23 @@ static int ov6_02245A0C(UnkStruct_ov6_02249198 *param0)
         param0->unk_2C.y = 0x2000;
     }
 
-    CellActor_SetAffineScale(v1, &param0->unk_2C);
+    Sprite_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;
 
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 
     {
-        CellActor *v2 = param0->unk_5C.unk_00->unk_248;
-        const VecFx32 *v3 = CellActor_GetAffineScale(v2);
+        Sprite *v2 = param0->unk_5C.unk_00->unk_248;
+        const VecFx32 *v3 = Sprite_GetAffineScale(v2);
         VecFx32 v4 = v0;
         VecFx32 v5 = *v3;
 
         param0->unk_54 -= 0x1000;
 
         v4.y += param0->unk_54;
-        CellActor_SetPosition(v2, &v4);
+        Sprite_SetPosition(v2, &v4);
         v5.x += 0x100;
 
         if (v5.x > 0x2000) {
@@ -2704,7 +2704,7 @@ static int ov6_02245A0C(UnkStruct_ov6_02249198 *param0)
             v5.y = 0x2000;
         }
 
-        CellActor_SetAffineScale(v2, &v5);
+        Sprite_SetAffineScale(v2, &v5);
     }
 
     if (((v0.y) / FX32_ONE) >= 240) {
@@ -2727,7 +2727,7 @@ static int (*const Unk_ov6_022491EC[])(UnkStruct_ov6_02249198 *) = {
     ov6_02245B48
 };
 
-static UnkStruct_ov101_021D5D90 *ov6_02245B4C(UnkStruct_020711EC *param0, CellActor *param1)
+static UnkStruct_ov101_021D5D90 *ov6_02245B4C(UnkStruct_020711EC *param0, Sprite *param1)
 {
     UnkStruct_ov101_021D5D90 *v0;
     UnkStruct_ov6_02245B4C v1;
@@ -2758,11 +2758,11 @@ static void ov6_02245B80(UnkStruct_ov101_021D5D90 *param0)
     v2->unk_10.x = 0;
     v2->unk_10.y = 0;
     v2->unk_10.z = 0;
-    v1 = CellActor_GetPosition(v2->unk_20);
+    v1 = Sprite_GetPosition(v2->unk_20);
     v0 = *v1;
 
     sub_020715D4(param0, &v0);
-    CellActor_SetAnim(v2->unk_20, 5);
+    Sprite_SetAnim(v2->unk_20, 5);
 }
 
 static void ov6_02245BC8(UnkStruct_ov101_021D5D90 *param0)
@@ -2781,7 +2781,7 @@ static void ov6_02245BC8(UnkStruct_ov101_021D5D90 *param0)
     ov6_022437C8(v1->unk_20, &v0);
 
     sub_020715D4(param0, &v0);
-    CellActor_SetAnim(v1->unk_20, 4);
+    Sprite_SetAnim(v1->unk_20, 4);
 }
 
 static int ov6_02245C04(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -2826,7 +2826,7 @@ static void ov6_02245C18(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov6_02245B7
         param1->unk_10.y = Unk_ov6_022492A8[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        CellActor_SetPosition(param1->unk_20, &v0);
+        Sprite_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 12) {
@@ -2846,7 +2846,7 @@ static void ov6_02245C64(UnkStruct_ov101_021D5D90 *param0, UnkStruct_ov6_02245B7
         param1->unk_10.y = Unk_ov6_022491FC[param1->unk_0C];
         sub_020715E4(param0, &v0);
         v0.y += param1->unk_10.y;
-        CellActor_SetPosition(param1->unk_20, &v0);
+        Sprite_SetPosition(param1->unk_20, &v0);
         param1->unk_0C++;
 
         if (param1->unk_0C >= 4) {
@@ -2931,7 +2931,7 @@ static void ov6_02245D10(SysTask *param0, void *param1)
         }
 
         if (v1->unk_18.unk_08 != NULL) {
-            CellActorCollection_Update(v1->unk_18.unk_08);
+            SpriteList_Update(v1->unk_18.unk_08);
         }
     }
 }
@@ -2989,7 +2989,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);
-    CellActor_SetDrawFlag(param0->unk_1D0, 1);
+    Sprite_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);
@@ -3071,19 +3071,19 @@ static void ov6_02245F94(UnkStruct_ov101_021D5D90 *param0, void *param1)
     const VecFx32 *v3;
     UnkStruct_ov6_02245F80 *v4 = param1;
 
-    v3 = CellActor_GetPosition(v4->unk_00);
+    v3 = Sprite_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)) {
-            CellActor_SetDrawFlag(v4->unk_00, 1);
+            Sprite_SetDrawFlag(v4->unk_00, 1);
         } else {
-            CellActor_SetDrawFlag(v4->unk_00, 0);
+            Sprite_SetDrawFlag(v4->unk_00, 0);
         }
     } else {
-        CellActor_SetDrawFlag(v4->unk_00, 1);
+        Sprite_SetDrawFlag(v4->unk_00, 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c
index f73f72d6b3..b4e345b3d9 100644
--- a/src/overlay007/ov7_0224BE9C.c
+++ b/src/overlay007/ov7_0224BE9C.c
@@ -9,7 +9,6 @@
 
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "field_message.h"
 #include "font.h"
 #include "game_options.h"
@@ -21,6 +20,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -94,7 +94,7 @@ typedef struct {
     void (*unk_134)(void *, u32);
     SpriteResourceCollection *unk_138[4];
     SpriteResource *unk_148[4];
-    CellActor *unk_158[2];
+    Sprite *unk_158[2];
 } UnkStruct_ov7_0224C768;
 
 typedef void (*UnkFuncPtr_ov7_0224C768)(void *, u32);
@@ -121,7 +121,7 @@ typedef struct UnkStruct_ov7_0224BEFC_t {
     Bag *unk_10;
     BgConfig *unk_14;
     u32 unk_18;
-    CellActorCollection *unk_1C;
+    SpriteList *unk_1C;
     G2dRenderer unk_20;
     MessageLoader *unk_1AC;
     u32 unk_1B0;
@@ -147,12 +147,12 @@ static void ov7_0224C580(UnkStruct_ov7_0224C3EC *param0, MessageLoader *param1,
 static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *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, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8);
+static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, SpriteList *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);
 static void ov7_0224CA34(UnkStruct_ov7_0224C768 *param0);
-static void ov7_0224CA54(CellActorResourceData *param0, UnkStruct_ov7_0224C768 *param1, u32 param2);
+static void ov7_0224CA54(SpriteResourcesHeader *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, BgConfig *param1, u32 param2);
@@ -344,7 +344,7 @@ BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0)
         break;
     }
 
-    CellActorCollection_Update(param0->unk_1C);
+    SpriteList_Update(param0->unk_1C);
 
     return 0;
 }
@@ -379,7 +379,7 @@ static void ov7_0224C3CC(UnkStruct_ov7_0224BEFC *param0)
 
 static void ov7_0224C3E0(UnkStruct_ov7_0224BEFC *param0)
 {
-    CellActorCollection_Delete(param0->unk_1C);
+    SpriteList_Delete(param0->unk_1C);
 }
 
 static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BgConfig *param1, u32 param2, u32 param3)
@@ -550,12 +550,12 @@ static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2,
     Window_DrawStandardFrame(param0->unk_04, 0, (1 + (18 + 12)), 11);
 }
 
-static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, CellActorCollection *param8)
+static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 param2, const UnkStruct_ov7_0224F1B4 *param3, u32 param4, MessageLoader *param5, void *param6, UnkFuncPtr_ov7_0224C768 param7, SpriteList *param8)
 {
     int v0;
     Strbuf *v1;
-    CellActorResourceData v2;
-    CellActorInitParams v3;
+    SpriteResourcesHeader v2;
+    SpriteListTemplate v3;
     static const u8 v4[2] = {
         8, 136
     };
@@ -629,7 +629,7 @@ static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 p
 
     ov7_0224CA54(&v2, param0, param2);
 
-    v3.collection = param8;
+    v3.list = param8;
     v3.resourceData = &v2;
     v3.priority = 0;
     v3.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -638,10 +638,10 @@ static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 p
 
     for (v0 = 0; v0 < 2; v0++) {
         v3.position.y = v4[v0] * FX32_ONE;
-        param0->unk_158[v0] = CellActorCollection_Add(&v3);
+        param0->unk_158[v0] = SpriteList_Add(&v3);
 
-        CellActor_SetAnim(param0->unk_158[v0], v0);
-        CellActor_SetAnimateFlag(param0->unk_158[v0], 1);
+        Sprite_SetAnim(param0->unk_158[v0], v0);
+        Sprite_SetAnimateFlag(param0->unk_158[v0], 1);
     }
 }
 
@@ -654,7 +654,7 @@ static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_158[v0]);
+        Sprite_Delete(param0->unk_158[v0]);
     }
 
     ov7_0224CB40(param0);
@@ -707,11 +707,11 @@ static void ov7_0224CA0C(UnkStruct_ov7_0224C768 *param0)
 
 static void ov7_0224CA34(UnkStruct_ov7_0224C768 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_158[0], 0);
-    CellActor_SetDrawFlag(param0->unk_158[1], 0);
+    Sprite_SetDrawFlag(param0->unk_158[0], 0);
+    Sprite_SetDrawFlag(param0->unk_158[1], 0);
 }
 
-static void ov7_0224CA54(CellActorResourceData *param0, UnkStruct_ov7_0224C768 *param1, u32 param2)
+static void ov7_0224CA54(SpriteResourcesHeader *param0, UnkStruct_ov7_0224C768 *param1, u32 param2)
 {
     NARC *v0 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
 
@@ -745,15 +745,15 @@ static void ov7_0224CB70(UnkStruct_ov7_0224C768 *param0)
     ListMenu_GetListAndCursorPos(param0->unk_08, &v0, NULL);
 
     if (v0 <= 0) {
-        CellActor_SetDrawFlag(param0->unk_158[0], 0);
+        Sprite_SetDrawFlag(param0->unk_158[0], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_158[0], 1);
+        Sprite_SetDrawFlag(param0->unk_158[0], 1);
     }
 
     if (v0 >= (param0->unk_120 - 7)) {
-        CellActor_SetDrawFlag(param0->unk_158[1], 0);
+        Sprite_SetDrawFlag(param0->unk_158[1], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_158[1], 1);
+        Sprite_SetDrawFlag(param0->unk_158[1], 1);
     }
 }
 
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index 0b63d2850e..70dbb20fa2 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -13,7 +13,6 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "field_message.h"
 #include "field_task.h"
 #include "font.h"
@@ -32,6 +31,7 @@
 #include "player_avatar.h"
 #include "render_window.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "sprite_transfer.h"
@@ -294,9 +294,9 @@ BOOL ov7_0224CEAC(FieldTask *param0)
     }
 
     if ((v1->unk_297 >= 4) && (v1->unk_297 <= 11)) {
-        CellActor_UpdateAnim(v1->unk_25C[0], FX32_ONE);
-        CellActor_UpdateAnim(v1->unk_25C[1], FX32_ONE);
-        CellActorCollection_Update(v1->unk_94.unk_00);
+        Sprite_UpdateAnim(v1->unk_25C[0], FX32_ONE);
+        Sprite_UpdateAnim(v1->unk_25C[1], FX32_ONE);
+        SpriteList_Update(v1->unk_94.unk_00);
     }
 
     return 0;
@@ -694,17 +694,17 @@ static void ov7_0224D85C(ListMenu *param0, u32 param1, u8 param2)
         ListMenu_GetListAndCursorPos(param0, &v5, &v6);
 
         if (v5 == 0) {
-            CellActor_SetDrawFlag(v0->unk_25C[0], 0);
+            Sprite_SetDrawFlag(v0->unk_25C[0], 0);
         } else {
-            CellActor_SetDrawFlag(v0->unk_25C[0], 1);
+            Sprite_SetDrawFlag(v0->unk_25C[0], 1);
         }
 
         v4 = ListMenu_GetAttribute(param0, 2);
 
         if ((v4 > 7) && (v4 > v5 + 7)) {
-            CellActor_SetDrawFlag(v0->unk_25C[1], 1);
+            Sprite_SetDrawFlag(v0->unk_25C[1], 1);
         } else {
-            CellActor_SetDrawFlag(v0->unk_25C[1], 0);
+            Sprite_SetDrawFlag(v0->unk_25C[1], 0);
         }
     }
     Window_ScheduleCopyToVRAM(&v0->unk_08[1]);
@@ -840,11 +840,11 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0)
         Strbuf *v3;
         u32 v4;
 
-        param0->unk_26C[0] = (u16)CellActor_GetDrawFlag(param0->unk_25C[0]);
-        param0->unk_26C[1] = (u16)CellActor_GetDrawFlag(param0->unk_25C[1]);
+        param0->unk_26C[0] = (u16)Sprite_GetDrawFlag(param0->unk_25C[0]);
+        param0->unk_26C[1] = (u16)Sprite_GetDrawFlag(param0->unk_25C[1]);
 
-        CellActor_SetDrawFlag(param0->unk_25C[0], 0);
-        CellActor_SetDrawFlag(param0->unk_25C[1], 0);
+        Sprite_SetDrawFlag(param0->unk_25C[0], 0);
+        Sprite_SetDrawFlag(param0->unk_25C[1], 0);
 
         ov7_0224EC10(param0, 1);
 
@@ -916,8 +916,8 @@ static u8 ov7_0224DE94(UnkStruct_ov7_0224D008 *param0)
     ov7_0224DED4(param0);
     ov7_0224E28C(param0, 0);
 
-    CellActor_SetDrawFlag(param0->unk_25C[0], 1);
-    CellActor_SetDrawFlag(param0->unk_25C[1], 1);
+    Sprite_SetDrawFlag(param0->unk_25C[0], 1);
+    Sprite_SetDrawFlag(param0->unk_25C[1], 1);
 
     return 6;
 }
@@ -961,8 +961,8 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
     }
 
     if (gSystem.pressedKeys & PAD_BUTTON_A) {
-        CellActor_SetDrawFlag(param0->unk_25C[0], 0);
-        CellActor_SetDrawFlag(param0->unk_25C[1], 0);
+        Sprite_SetDrawFlag(param0->unk_25C[0], 0);
+        Sprite_SetDrawFlag(param0->unk_25C[1], 0);
         Window_EraseStandardFrame(&param0->unk_08[4], 1);
         Window_EraseStandardFrame(&param0->unk_08[3], 1);
         Window_FillTilemap(&param0->unk_08[5], 15);
@@ -978,8 +978,8 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
 
         ov7_0224EB38(param0, 0);
 
-        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        Sprite_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        Sprite_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
 
         ov7_0224EC10(param0, 0);
 
@@ -1158,8 +1158,8 @@ static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0)
     case 0xfffffffe:
         Window_EraseMessageBox(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        Sprite_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        Sprite_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
         return 4;
@@ -1238,8 +1238,8 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0)
 
         Window_EraseMessageBox(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        Sprite_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        Sprite_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
 
@@ -1258,8 +1258,8 @@ static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0)
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         Window_EraseMessageBox(&param0->unk_08[5], 0);
         ov7_0224EB38(param0, 0);
-        CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
-        CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
+        Sprite_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
+        Sprite_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
         Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
 
@@ -1471,7 +1471,7 @@ static void ov7_0224EB14(UnkStruct_ov7_0224D008 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(param0->unk_25C[v0]);
+        Sprite_Delete(param0->unk_25C[v0]);
     }
 
     ov5_021D30A8(&param0->unk_94);
@@ -1493,7 +1493,7 @@ static void ov7_0224EB7C(UnkStruct_ov7_0224D008 *param0, u16 param1)
     SpriteResource *v0;
 
     if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3)) {
-        CellActor_SetDrawFlag(param0->unk_25C[3], 0);
+        Sprite_SetDrawFlag(param0->unk_25C[3], 0);
         return;
     }
 
@@ -1510,7 +1510,7 @@ static void ov7_0224EB7C(UnkStruct_ov7_0224D008 *param0, u16 param1)
 
 static void ov7_0224EC10(UnkStruct_ov7_0224D008 *param0, u8 param1)
 {
-    Sprite_SetExplicitPalette(param0->unk_25C[2], param1);
+    Sprite_SetExplicitPalette2(param0->unk_25C[2], param1);
 }
 
 static void ov7_0224EC20(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 693039312d..576142bfa9 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -38,7 +38,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "field_system.h"
 #include "field_task.h"
 #include "gx_layers.h"
@@ -54,6 +53,7 @@
 #include "resource_collection.h"
 #include "savedata_misc.h"
 #include "script_manager.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -91,7 +91,7 @@ typedef struct {
 } UnkStruct_ov9_02251EC8;
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190;
     SpriteResourceCollection *unk_194;
@@ -143,7 +143,7 @@ typedef struct {
     fx32 unk_00;
     fx32 unk_04;
     UnkStruct_ov9_0224B1B4 unk_08;
-    CellActor *unk_40;
+    Sprite *unk_40;
 } UnkStruct_ov9_0224B2C0;
 
 typedef struct {
@@ -921,7 +921,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 CellActor *ov9_0224B130(UnkStruct_ov9_0224B064 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7);
+static Sprite *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);
@@ -2727,32 +2727,32 @@ static void ov9_0224B064(UnkStruct_ov9_0224B064 *param0)
     SpriteResourceCollection_Delete(param0->unk_198);
     SpriteResourceCollection_Delete(param0->unk_19C);
 
-    CellActorCollection_DeleteAll(param0->unk_00);
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_DeleteAll(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
 }
 
 static void ov9_0224B124(SysTask *param0, void *param1)
 {
     UnkStruct_ov9_0224B064 *v0 = param1;
-    CellActorCollection_Update(v0->unk_00);
+    SpriteList_Update(v0->unk_00);
 }
 
-static CellActor *ov9_0224B130(UnkStruct_ov9_0224B064 *param0, const VecFx32 *param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, int param7)
+static Sprite *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;
-    CellActor *v2;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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.collection = param0->unk_00;
+    v1.list = param0->unk_00;
     v1.resourceData = &v0;
     v1.position = *param1;
     v1.priority = param7;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v1.heapID = 4;
 
-    v2 = CellActorCollection_Add(&v1);
+    v2 = SpriteList_Add(&v1);
     GF_ASSERT(v2 != NULL);
 
     return v2;
@@ -2802,14 +2802,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);
 
-    CellActor_SetAffineScaleEx(v3->unk_40, &v3->unk_08.unk_04.unk_24, 2);
+    Sprite_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;
-    CellActor_Delete(v0->unk_40);
+    Sprite_Delete(v0->unk_40);
 }
 
 static void ov9_0224B2CC(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -2846,8 +2846,8 @@ static void ov9_0224B2CC(UnkStruct_ov101_021D5D90 *param0, void *param1)
     v3.y += (FX32_ONE * -512) + (CalcSineDegrees((v4->unk_00) / FX32_ONE) * v4->unk_08.unk_04.unk_10);
 
     sub_020715D4(param0, &v3);
-    CellActor_SetPosition(v4->unk_40, &v3);
-    CellActor_SetAffineZRotation(v4->unk_40, CalcAngleRotationIdx_Wraparound((v0) / FX32_ONE));
+    Sprite_SetPosition(v4->unk_40, &v3);
+    Sprite_SetAffineZRotation(v4->unk_40, CalcAngleRotationIdx_Wraparound((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 fa5b20d027..9e768d0f23 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -17,7 +17,6 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -37,6 +36,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -87,7 +87,7 @@ typedef struct UnkStruct_ov10_0221FB28_t {
     Window unk_10[24];
     SpriteSystem *unk_190;
     SpriteManager *unk_194;
-    CellActorData *unk_198[30];
+    ManagedSprite *unk_198[30];
     u32 unk_210;
     UnkStruct_ov10_0221FB28_sub1 unk_214[6];
     u16 unk_298[96];
@@ -156,7 +156,7 @@ static u8 ov10_0221FBFC(UnkStruct_ov10_0221FB28 *param0);
 static u8 ov10_022209E0(UnkStruct_ov10_0221FB28 *param0);
 static BOOL ov10_02220AD0(void);
 static void ov10_02220B00(UnkStruct_ov10_0221FB28 *param0, SpriteResourceCapacities *param1, int param2);
-static CellActorData *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1);
+static ManagedSprite *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1);
 static void ov10_02220BE8(UnkStruct_ov10_0221FB28 *param0);
 static void ov10_02220C2C(UnkStruct_ov10_0221FB28 *param0);
 static void ov10_02220C64(void *param0);
@@ -967,9 +967,9 @@ static u8 ov10_02220604(UnkStruct_ov10_0221FB28 *param0)
 static u8 ov10_02220698(UnkStruct_ov10_0221FB28 *param0)
 {
     Sound_PlayEffect(1818);
-    Sprite_SetDrawFlag2(param0->unk_198[12], 1);
-    Sprite_SetDrawFlag2(param0->unk_198[13], 1);
-    Sprite_SetAnim(param0->unk_198[12], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_198[12], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_198[13], 1);
+    ManagedSprite_SetAnim(param0->unk_198[12], 0);
     param0->unk_B75 = 32;
     return 1;
 }
@@ -977,7 +977,7 @@ static u8 ov10_02220698(UnkStruct_ov10_0221FB28 *param0)
 static u8 ov10_022206D8(UnkStruct_ov10_0221FB28 *param0)
 {
     Sound_PlayEffect(1818);
-    Sprite_SetDrawFlag2(param0->unk_198[12], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_198[12], 1);
     param0->unk_B75 = 64;
     return 1;
 }
@@ -1208,7 +1208,7 @@ static void ov10_02220B00(UnkStruct_ov10_0221FB28 *param0, SpriteResourceCapacit
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static CellActorData *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1)
+static ManagedSprite *ov10_02220BA0(UnkStruct_ov10_0221FB28 *param0, const u32 *param1)
 {
     SpriteTemplate v0;
 
@@ -1246,7 +1246,7 @@ static void ov10_02220C2C(UnkStruct_ov10_0221FB28 *param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_210; v0++) {
-        CellActor_UpdateAnim(param0->unk_198[v0]->sprite, FX32_ONE);
+        Sprite_UpdateAnim(param0->unk_198[v0]->sprite, FX32_ONE);
     }
 }
 
@@ -1502,7 +1502,7 @@ static void ov10_02221188(UnkStruct_ov10_0221FB28 *param0, u8 param1, s16 param2
     u8 v1[] = { 0, 3, 6, 9 };
 
     for (v0 = 0; v0 < 3; v0++) {
-        Sprite_SetPositionXY2(param0->unk_198[v1[param1] + v0], param0->unk_B58[param1] + v0 * 19 + param2, param0->unk_B5C[param1] + param3);
+        ManagedSprite_SetPositionXY(param0->unk_198[v1[param1] + v0], param0->unk_B58[param1] + v0 * 19 + param2, param0->unk_B5C[param1] + param3);
     }
 }
 
@@ -1516,7 +1516,7 @@ static void ov10_022211F0(UnkStruct_ov10_0221FB28 *param0, Party *param1, u16 pa
     v4 = 0;
 
     for (v1 = 0; v1 < param2; v1++) {
-        Sprite_SetAnim(param0->unk_198[v1 + param3], 0);
+        ManagedSprite_SetAnim(param0->unk_198[v1 + param3], 0);
 
         if (v3 > v1) {
             v0 = Party_GetPokemonBySlotIndex(param1, v1);
@@ -1528,11 +1528,11 @@ static void ov10_022211F0(UnkStruct_ov10_0221FB28 *param0, Party *param1, u16 pa
             v2 = PokemonSummaryScreen_StatusIconAnimIdx(v0);
 
             if (v2 == 6) {
-                Sprite_SetAnim(param0->unk_198[v4 + param3], 3);
+                ManagedSprite_SetAnim(param0->unk_198[v4 + param3], 3);
             } else if (v2 != 7) {
-                Sprite_SetAnim(param0->unk_198[v4 + param3], 2);
+                ManagedSprite_SetAnim(param0->unk_198[v4 + param3], 2);
             } else {
-                Sprite_SetAnim(param0->unk_198[v4 + param3], 1);
+                ManagedSprite_SetAnim(param0->unk_198[v4 + param3], 1);
             }
 
             v4++;
@@ -1700,35 +1700,35 @@ static void ov10_0222166C(UnkStruct_ov10_0221FB28 *param0)
 
 static void ov10_022216E0(UnkStruct_ov10_0221FB28 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_198[12], 0);
-    Sprite_SetDrawFlag2(param0->unk_198[13], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_198[12], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_198[13], 0);
 
     if (param0->unk_00->unk_2A == 3) {
-        Sprite_SetPositionXY2(param0->unk_198[12], 128, (96 - 24));
-        Sprite_SetAnim(param0->unk_198[12], 3 - 1);
+        ManagedSprite_SetPositionXY(param0->unk_198[12], 128, (96 - 24));
+        ManagedSprite_SetAnim(param0->unk_198[12], 3 - 1);
         return;
     }
 
     if (ov10_02220AD0() == 1) {
         if (param0->unk_00->unk_2A == 1) {
-            Sprite_SetPositionXY2(param0->unk_198[12], 48, (96 - 24));
-            Sprite_SetPositionXY2(param0->unk_198[13], 208, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[12], 48, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[13], 208, (96 - 24));
         } else {
-            Sprite_SetPositionXY2(param0->unk_198[12], 208, (96 - 24));
-            Sprite_SetPositionXY2(param0->unk_198[13], 48, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[12], 208, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[13], 48, (96 - 24));
         }
     } else {
         if (param0->unk_00->unk_2A == 1) {
-            Sprite_SetPositionXY2(param0->unk_198[12], 208, (96 - 24));
-            Sprite_SetPositionXY2(param0->unk_198[13], 48, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[12], 208, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[13], 48, (96 - 24));
         } else {
-            Sprite_SetPositionXY2(param0->unk_198[12], 48, (96 - 24));
-            Sprite_SetPositionXY2(param0->unk_198[13], 208, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[12], 48, (96 - 24));
+            ManagedSprite_SetPositionXY(param0->unk_198[13], 208, (96 - 24));
         }
     }
 
-    Sprite_SetAnim(param0->unk_198[12], 1 - 1);
-    Sprite_SetAnim(param0->unk_198[13], 2 - 1);
+    ManagedSprite_SetAnim(param0->unk_198[12], 1 - 1);
+    ManagedSprite_SetAnim(param0->unk_198[13], 2 - 1);
 }
 
 static void ov10_022217CC(UnkStruct_ov10_0221FB28 *param0)
@@ -2087,35 +2087,35 @@ static void ov10_02221EEC(UnkStruct_ov10_0221FB28 *param0, u32 param1)
 
     for (v0 = 0; v0 < 5; v0++) {
         param0->unk_198[param1 * 5 + v0] = ov10_02220BA0(param0, &Unk_ov10_02222F3C[param1 * 5 + v0][0]);
-        Sprite_SetPositionXY2(param0->unk_198[param1 * 5 + v0], Unk_ov10_02222C6C[param1][v0 * 2], Unk_ov10_02222C6C[param1][v0 * 2 + 1]);
+        ManagedSprite_SetPositionXY(param0->unk_198[param1 * 5 + v0], Unk_ov10_02222C6C[param1][v0 * 2], Unk_ov10_02222C6C[param1][v0 * 2 + 1]);
     }
 
     if (param0->unk_214[param1].unk_04 == 0) {
         for (v0 = 0; v0 < 5; v0++) {
-            Sprite_SetDrawFlag2(param0->unk_198[param1 * 5 + v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_198[param1 * 5 + v0], 0);
         }
     } else {
-        Sprite_SetExplicitPalette2(param0->unk_198[param1 * 5 + 0], PokeIconPaletteIndex(param0->unk_214[param1].unk_04, param0->unk_214[param1].unk_11, param0->unk_214[param1].unk_0F));
-        Sprite_SetAnim(param0->unk_198[param1 * 5 + 0], ov10_02221E84(param0, param1));
+        ManagedSprite_SetExplicitPalette(param0->unk_198[param1 * 5 + 0], PokeIconPaletteIndex(param0->unk_214[param1].unk_04, param0->unk_214[param1].unk_11, param0->unk_214[param1].unk_0F));
+        ManagedSprite_SetAnim(param0->unk_198[param1 * 5 + 0], ov10_02221E84(param0, param1));
 
         if (param0->unk_214[param1].unk_0A == 0) {
-            Sprite_SetDrawFlag2(param0->unk_198[param1 * 5 + 1], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_198[param1 * 5 + 1], 0);
         } else if (Item_IsMail(param0->unk_214[param1].unk_0A) == 1) {
-            Sprite_SetAnim(param0->unk_198[param1 * 5 + 1], 1);
+            ManagedSprite_SetAnim(param0->unk_198[param1 * 5 + 1], 1);
         } else {
-            Sprite_SetAnim(param0->unk_198[param1 * 5 + 1], 0);
+            ManagedSprite_SetAnim(param0->unk_198[param1 * 5 + 1], 0);
         }
 
         if (param0->unk_214[param1].unk_10 == 0) {
-            Sprite_SetDrawFlag2(param0->unk_198[param1 * 5 + 2], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_198[param1 * 5 + 2], 0);
         } else {
-            Sprite_SetAnim(param0->unk_198[param1 * 5 + 2], 2);
+            ManagedSprite_SetAnim(param0->unk_198[param1 * 5 + 2], 2);
         }
 
         if (param0->unk_214[param1].unk_14 == 7) {
-            Sprite_SetDrawFlag2(param0->unk_198[param1 * 5 + 3], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_198[param1 * 5 + 3], 0);
         } else {
-            Sprite_SetAnim(param0->unk_198[param1 * 5 + 3], param0->unk_214[v0].unk_14);
+            ManagedSprite_SetAnim(param0->unk_198[param1 * 5 + 3], param0->unk_214[v0].unk_14);
         }
     }
 }
@@ -2213,7 +2213,7 @@ static void ov10_02222340(UnkStruct_ov10_0221FB28 *param0, s16 param1)
 
     for (v0 = 0; v0 < 3; v0++) {
         for (v1 = 0; v1 < 5; v1++) {
-            Sprite_SetPositionXY2(
+            ManagedSprite_SetPositionXY(
                 param0->unk_198[(v2 + v0) * 5 + v1], Unk_ov10_02222C6C[v2 + v0][v1 * 2] + param1, Unk_ov10_02222C6C[v2 + v0][v1 * 2 + 1]);
         }
     }
diff --git a/src/overlay012/ov12_0221FC20.c b/src/overlay012/ov12_0221FC20.c
index 90b1110f92..a0f834c9a6 100644
--- a/src/overlay012/ov12_0221FC20.c
+++ b/src/overlay012/ov12_0221FC20.c
@@ -30,7 +30,6 @@
 #include "overlay017/ov17_022413D8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "inlines.h"
@@ -39,6 +38,7 @@
 #include "pltt_transfer.h"
 #include "pokemon.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "sprite_util.h"
@@ -68,7 +68,7 @@ typedef struct UnkStruct_ov12_02223178_t {
     SpriteSystem *unk_AC;
     UnkStruct_ov16_0223E0C8 *unk_B0[4];
     u8 unk_C0[4];
-    Sprite *unk_C4[4];
+    PokemonSprite *unk_C4[4];
     u32 unk_D4;
     u16 unk_D8[4];
     u8 unk_E0[4];
@@ -92,7 +92,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     SpriteManager *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
     BOOL unk_0C;
 } UnkStruct_ov12_02221810;
 
@@ -119,10 +119,10 @@ typedef struct UnkStruct_ov12_0221FCDC_t {
     BgConfig *unk_C0;
     PaletteData *unk_C4;
     SpriteManager *unk_C8[4];
-    CellActorData *unk_D8[10];
+    ManagedSprite *unk_D8[10];
     SpriteTemplate unk_100;
     SpriteManager *unk_134;
-    CellActorData *unk_138[5];
+    ManagedSprite *unk_138[5];
     BOOL unk_14C[5];
     UnkStruct_ov12_0222118C *unk_160[5];
     UnkStruct_ov12_022211D8 *unk_174;
@@ -204,12 +204,12 @@ typedef struct UnkStruct_ov12_022222D4_t {
 typedef struct {
     u8 unk_00;
     u8 unk_01;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     SysTask *unk_08;
 } UnkStruct_ov12_0222118C_sub1;
 
 typedef struct UnkStruct_ov12_0222118C_t {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov12_0222118C_sub1 unk_04;
 } UnkStruct_ov12_0222118C;
 
@@ -741,7 +741,7 @@ s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1)
     return param0->unk_90[param1];
 }
 
-CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1)
+ManagedSprite *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
     GF_ASSERT(param1 < 10);
     GF_ASSERT(param0 != NULL);
@@ -750,7 +750,7 @@ CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1)
     return param0->unk_D8[param1];
 }
 
-CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1)
+ManagedSprite *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
     GF_ASSERT(param1 < (4 + 1));
     GF_ASSERT(param0 != NULL);
@@ -1948,7 +1948,7 @@ static void ov12_0222118C(SysTask *param0, void *param1)
     v2 = sub_020080C0(v0->unk_04.unk_04, 1);
     v2 -= sub_020080C0(v0->unk_04.unk_04, 41);
 
-    Sprite_SetPositionXY2(v0->unk_00, v1, v2);
+    ManagedSprite_SetPositionXY(v0->unk_00, v1, v2);
 }
 
 static void ov12_022211D8(SysTask *param0, void *param1)
@@ -2122,16 +2122,16 @@ static void ov12_022214C4(UnkStruct_ov12_0221FCDC *param0)
     v0[4] = 0;
     v0[5] = 0;
 
-    SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v0[SPRITE_RESOURCE_PALETTE]);
-    SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, PLTTBUF_MAIN_OBJ, param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[SPRITE_RESOURCE_PALETTE]);
-    SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 77, FALSE, v0[SPRITE_RESOURCE_SPRITE]);
-    SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, FALSE, v0[SPRITE_RESOURCE_SPRITE_ANIM]);
+    SpriteSystem_LoadCharResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v0[SPRITE_RESOURCE_PLTT]);
+    SpriteSystem_LoadPaletteBufferFromOpenNarc(param0->unk_C4, PLTTBUF_MAIN_OBJ, param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v0[SPRITE_RESOURCE_PLTT]);
+    SpriteSystem_LoadCellResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 77, FALSE, v0[SPRITE_RESOURCE_CELL]);
+    SpriteSystem_LoadAnimResObjFromOpenNarc(param0->unk_BC->unk_AC, param0->unk_134, param0->unk_1A0[1], 78, FALSE, v0[SPRITE_RESOURCE_ANIM]);
 }
 
 static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
 {
     u8 *v0 = NULL;
-    CellActorData *v1 = NULL;
+    ManagedSprite *v1 = NULL;
     int v2[6];
     int v3;
     int v4;
@@ -2170,7 +2170,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
     v10 = param0->unk_BC->unk_E8[v7];
     {
         SpriteTemplate v11;
-        Sprite *v12 = ov12_022232FC(param0, v7);
+        PokemonSprite *v12 = ov12_022232FC(param0, v7);
         int v13;
         int v14;
         s16 v15;
@@ -2199,24 +2199,24 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
         v1 = SpriteSystem_NewSprite(param0->unk_BC->unk_AC, param0->unk_134, &v11);
 
         if (v12 == NULL) {
-            Sprite_SetDrawFlag2(v1, 0);
+            ManagedSprite_SetDrawFlag(v1, 0);
         } else {
             int v17 = sub_020080C0(v12, 6);
 
             if (v17 == 1) {
-                Sprite_SetDrawFlag2(v1, 0);
+                ManagedSprite_SetDrawFlag(v1, 0);
             }
         }
 
         if ((ov12_0221FDD4(param0) == 1) && (IsFormSymmetrical(ov12_022232D0(param0, v7), v10) == 1)) {
-            Sprite_SetFlipMode2(v1, 1);
+            ManagedSprite_SetFlipMode(v1, 1);
         }
     }
 
     if (ov12_022232FC(param0, v7) != NULL) {
         NNSG2dImageProxy *v18;
 
-        v18 = SpriteActor_ImageProxy(v1->sprite);
+        v18 = Sprite_GetImageProxy(v1->sprite);
         VramTransfer_Request(NNS_GFD_DST_2D_OBJ_CHAR_MAIN, v18->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], v0, (10 * 10 * ((8 / 2) * 8)));
     }
 
@@ -2224,7 +2224,7 @@ static void ov12_02221580(UnkStruct_ov12_0221FCDC *param0)
         NNSG2dImagePaletteProxy *v19;
         int v20;
 
-        v19 = CellActor_GetPaletteProxy(v1->sprite);
+        v19 = Sprite_GetPaletteProxy(v1->sprite);
         v20 = PlttTransfer_GetPlttOffset(v19, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteData_LoadBufferFromFileStart(param0->unk_C4, v8, v9, param0->unk_00, 2, 0x20, v20 * 16);
@@ -2318,7 +2318,7 @@ static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0)
     param0->unk_48[v1].unk_08 = param0->unk_138[v2];
     param0->unk_48[v1].unk_0C = 1;
 
-    Sprite_SetDrawFlag2(param0->unk_48[v1].unk_08, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_48[v1].unk_08, 0);
 
     if (ov12_02223364(param0) == 1) {
         int v3, v4;
@@ -2329,7 +2329,7 @@ static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0)
         {
             int v5;
             int v6;
-            Sprite *v7;
+            PokemonSprite *v7;
 
             v6 = ov12_022210A8(param0, v0);
             v7 = ov12_022232FC(param0, v6);
@@ -2341,58 +2341,58 @@ static void ov12_02221834(UnkStruct_ov12_0221FCDC *param0)
             }
 
             if (v5 == 1) {
-                Sprite_SetDrawFlag2(param0->unk_48[v1].unk_08, 0);
+                ManagedSprite_SetDrawFlag(param0->unk_48[v1].unk_08, 0);
             } else {
-                Sprite_SetDrawFlag2(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetDrawFlag(param0->unk_48[v1].unk_08, 1);
             }
         }
 
         switch (v0) {
         case 0:
             if ((v3 == 3) || (v3 == 4)) {
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
             } else {
-                Sprite_SetDrawFlag2(param0->unk_48[v1].unk_08, 0);
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetDrawFlag(param0->unk_48[v1].unk_08, 0);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
             }
             break;
         case 2:
             if ((v3 == 5) || (v3 == 2)) {
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
             } else {
-                Sprite_SetDrawFlag2(param0->unk_48[v1].unk_08, 0);
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetDrawFlag(param0->unk_48[v1].unk_08, 0);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
             }
             break;
         case 1:
             switch (v4) {
             case 2:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
                 break;
             case 3:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
                 break;
             case 4:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
                 break;
             case 5:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
                 break;
             }
             break;
         case 3:
             switch (v4) {
             case 2:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
                 break;
             case 3:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
                 break;
             case 4:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 255);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 255);
                 break;
             case 5:
-                Sprite_SetPriority(param0->unk_48[v1].unk_08, 1);
+                ManagedSprite_SetPriority(param0->unk_48[v1].unk_08, 1);
                 break;
             }
             break;
@@ -3655,7 +3655,7 @@ static void ov12_02222EBC(UnkStruct_ov12_0221FCDC *param0)
     int v1;
     int v2;
     int v3;
-    CellActorData *v4;
+    ManagedSprite *v4;
     UnkFuncPtr_ov12_02239E68 v5;
 
     param0->unk_18 += 1;
@@ -3713,7 +3713,7 @@ static void ov12_02222FC8(UnkStruct_ov12_0221FCDC *param0)
     int v0;
     int v1;
     int v2;
-    CellActorData *v3;
+    ManagedSprite *v3;
     UnkFuncPtr_ov12_02239E68 v4;
 
     param0->unk_18 += 1;
@@ -3782,7 +3782,7 @@ static void ov12_022230A8(UnkStruct_ov12_0221FCDC *param0)
     v1 = inline_ov12_022204C4(param0->unk_18);
     param0->unk_18 += 1;
 
-    Sprite_SetDrawFlag2(param0->unk_138[v0], v1);
+    ManagedSprite_SetDrawFlag(param0->unk_138[v0], v1);
 }
 
 static void ov12_022230CC(UnkStruct_ov12_0221FCDC *param0)
@@ -3951,7 +3951,7 @@ int ov12_022232EC(UnkStruct_ov12_0221FCDC *param0, int param1)
     return param0->unk_BC->unk_EC[param1];
 }
 
-Sprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1)
+PokemonSprite *ov12_022232FC(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
     if (param0->unk_BC->unk_C4[param1] == NULL) {
         return NULL;
@@ -4218,10 +4218,10 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par
             v3[4] = 0;
             v3[5] = 0;
 
-            SpriteSystem_LoadCharResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v3[SPRITE_RESOURCE_TILES]);
-            SpriteSystem_LoadPaletteBufferFromOpenNarc(v2->unk_08.unk_08, 2, v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v3[SPRITE_RESOURCE_PALETTE]);
-            SpriteSystem_LoadCellResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 77, FALSE, v3[SPRITE_RESOURCE_SPRITE]);
-            SpriteSystem_LoadAnimResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 78, FALSE, v3[SPRITE_RESOURCE_SPRITE_ANIM]);
+            SpriteSystem_LoadCharResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 76, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, v3[SPRITE_RESOURCE_CHAR]);
+            SpriteSystem_LoadPaletteBufferFromOpenNarc(v2->unk_08.unk_08, 2, v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 75, FALSE, NNS_G2D_VRAM_TYPE_2DMAIN, 1, v3[SPRITE_RESOURCE_PLTT]);
+            SpriteSystem_LoadCellResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 77, FALSE, v3[SPRITE_RESOURCE_CELL]);
+            SpriteSystem_LoadAnimResObjFromOpenNarc(v2->unk_08.unk_00, v2->unk_08.unk_04, v4, 78, FALSE, v3[SPRITE_RESOURCE_ANIM]);
         }
 
         NARC_dtor(v4);
@@ -4233,7 +4233,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par
         int v7;
         void *v8;
         int v9[6];
-        CellActorData *v10;
+        ManagedSprite *v10;
 
         for (v5 = 0; v5 < 4; v5++) {
             if ((v5 != v2->unk_04) && (v2->unk_04 != 0xFF)) {
@@ -4256,7 +4256,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par
             {
                 int v11;
                 SpriteTemplate v12;
-                Sprite *v13;
+                PokemonSprite *v13;
                 s16 v14, v15;
 
                 v13 = v2->unk_48[v5];
@@ -4284,25 +4284,25 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par
                 }
 
                 v10 = SpriteSystem_NewSprite(v2->unk_08.unk_00, v2->unk_08.unk_04, &v12);
-                Sprite_TickOneFrame(v10);
+                ManagedSprite_TickFrame(v10);
                 v2->unk_24[v5] = v10;
 
                 if (v13 == NULL) {
-                    Sprite_SetDrawFlag2(v10, 0);
+                    ManagedSprite_SetDrawFlag(v10, 0);
                 } else if (sub_02008B38(v13) == 0) {
-                    Sprite_SetDrawFlag2(v10, 0);
+                    ManagedSprite_SetDrawFlag(v10, 0);
                 } else {
                     int v16 = sub_020080C0(v13, 6);
 
                     if (v16 == 1) {
-                        Sprite_SetDrawFlag2(v10, 0);
+                        ManagedSprite_SetDrawFlag(v10, 0);
                     }
                 }
 
                 if (v13 != NULL) {
                     NNSG2dImageProxy *v17;
 
-                    v17 = SpriteActor_ImageProxy(v10->sprite);
+                    v17 = Sprite_GetImageProxy(v10->sprite);
                     VramTransfer_Request(NNS_GFD_DST_2D_OBJ_CHAR_MAIN, v17->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN], v8, (10 * 10 * ((8 / 2) * 8)));
                 }
 
@@ -4310,7 +4310,7 @@ UnkStruct_ov12_02223764 *ov12_022234F8(BattleSystem *param0, int param1, int par
                     NNSG2dImagePaletteProxy *v18;
                     int v19;
 
-                    v18 = CellActor_GetPaletteProxy(v10->sprite);
+                    v18 = Sprite_GetPaletteProxy(v10->sprite);
                     v19 = PlttTransfer_GetPlttOffset(v18, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                     PaletteData_LoadBufferFromFileStart(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 bed4b2a882..6ced23f5b6 100644
--- a/src/overlay012/ov12_02225864.c
+++ b/src/overlay012/ov12_02225864.c
@@ -15,12 +15,12 @@
 #include "overlay012/struct_ov12_02226454.h"
 
 #include "buffer_manager.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "inlines.h"
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "screen_scroll_manager.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -146,9 +146,9 @@ s16 ov12_022258E0(UnkStruct_ov12_0221FCDC *param0, int param1, int param2)
     return 0;
 }
 
-u8 ov12_02225950(CellActorData *param0)
+u8 ov12_02225950(ManagedSprite *param0)
 {
-    return PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(param0->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+    return PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(param0->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
 }
 
 int ov12_02225964(UnkStruct_ov12_0221FCDC *param0, int param1)
@@ -212,26 +212,26 @@ u32 ov12_022259AC(fx32 param0, fx32 param1, fx32 param2)
     return v0 >> FX32_SHIFT;
 }
 
-void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1, s16 param2, s16 param3)
+void ov12_022259DC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1, s16 param2, s16 param3)
 {
-    Sprite_SetPositionXY2(param1, param2 + param0->unk_00, param3 + param0->unk_02);
+    ManagedSprite_SetPositionXY(param1, param2 + param0->unk_00, param3 + param0->unk_02);
 }
 
-void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, CellActorData *param1)
+void ov12_022259FC(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1)
 {
     f32 v0, v1;
 
     ov12_02225FA4(param0, &v0, &v1);
-    Sprite_SetAffineScale(param1, v0, v1);
+    ManagedSprite_SetAffineScale(param1, v0, v1);
 }
 
-void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, Sprite *param1, s16 param2, s16 param3)
+void ov12_02225A18(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1, s16 param2, s16 param3)
 {
     sub_02007DEC(param1, 0, param2 + param0->unk_00);
     sub_02007DEC(param1, 1, param3 + param0->unk_02);
 }
 
-void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, Sprite *param1)
+void ov12_02225A3C(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1)
 {
     sub_02007DEC(param1, 12, param0->unk_00);
     sub_02007DEC(param1, 13, param0->unk_02);
@@ -293,7 +293,7 @@ BOOL ov12_02225AE0(UnkStruct_ov12_02225F6C *param0)
     return 0;
 }
 
-BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, CellActorData *param3)
+BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, ManagedSprite *param3)
 {
     if (ov12_02225AE0(param0)) {
         ov12_022259DC(param0, param3, param1, param2);
@@ -303,7 +303,7 @@ BOOL ov12_02225B78(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Cell
     return 0;
 }
 
-BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3)
+BOOL ov12_02225BA0(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, PokemonSprite *param3)
 {
     if (ov12_02225AE0(param0)) {
         ov12_02225A18(param0, param3, param1, param2);
@@ -343,7 +343,7 @@ BOOL ov12_02225C14(UnkStruct_ov12_02225F6C *param0)
     return 0;
 }
 
-BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, CellActorData *param1)
+BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1)
 {
     if (ov12_02225C14(param0)) {
         ov12_022259DC(param0, param1, 0, 0);
@@ -353,7 +353,7 @@ BOOL ov12_02225C50(UnkStruct_ov12_02225F6C *param0, CellActorData *param1)
     return 0;
 }
 
-BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, Sprite *param1)
+BOOL ov12_02225C74(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1)
 {
     if (ov12_02225C14(param0)) {
         ov12_02225A18(param0, param1, 0, 0);
@@ -391,7 +391,7 @@ BOOL ov12_02225CE4(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *par
     return 1;
 }
 
-BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, CellActorData *param2)
+BOOL ov12_02225D2C(UnkStruct_ov12_02225F6C *param0, UnkStruct_ov12_02225F6C *param1, ManagedSprite *param2)
 {
     if (ov12_02225CE4(param0, param1)) {
         ov12_022259DC(param0, param2, 0, 0);
@@ -586,7 +586,7 @@ s16 ov12_02225FD4(s16 param0, int param1, fx32 param2)
     return v5;
 }
 
-void ov12_02226024(Sprite *param0, s16 param1, s16 param2, fx32 param3, int param4)
+void ov12_02226024(PokemonSprite *param0, s16 param1, s16 param2, fx32 param3, int param4)
 {
     s16 v0;
     s16 v1;
@@ -602,7 +602,7 @@ void ov12_02226024(Sprite *param0, s16 param1, s16 param2, fx32 param3, int para
     sub_02007DEC(param0, 1, v1 + v0);
 }
 
-void ov12_0222605C(CellActorData *param0, s16 param1, s16 param2, fx32 param3, int param4)
+void ov12_0222605C(ManagedSprite *param0, s16 param1, s16 param2, fx32 param3, int param4)
 {
     s16 v0;
     s16 v1;
@@ -617,11 +617,11 @@ void ov12_0222605C(CellActorData *param0, s16 param1, s16 param2, fx32 param3, i
         v1 = param1 - param2;
     }
 
-    Sprite_GetPositionXY2(param0, &v2, &v3);
-    Sprite_SetPositionXY2(param0, v2, v1 + v0);
+    ManagedSprite_GetPositionXY(param0, &v2, &v3);
+    ManagedSprite_SetPositionXY(param0, v2, v1 + v0);
 }
 
-BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, CellActorData *param1)
+BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, ManagedSprite *param1)
 {
     if (ov12_02225EB8(param0)) {
         ov12_022259FC(param0, param1);
@@ -631,7 +631,7 @@ BOOL ov12_022260A8(UnkStruct_ov12_02225F6C *param0, CellActorData *param1)
     return 0;
 }
 
-BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, Sprite *param1)
+BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1)
 {
     if (ov12_02225EB8(param0)) {
         ov12_02225A3C(param0, param1);
@@ -641,7 +641,7 @@ BOOL ov12_022260C8(UnkStruct_ov12_02225F6C *param0, Sprite *param1)
     return 0;
 }
 
-BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, Sprite *param1)
+BOOL ov12_022260E8(UnkStruct_ov12_02225F6C *param0, PokemonSprite *param1)
 {
     if (ov12_02225F6C(param0)) {
         ov12_02225A3C(param0, param1);
@@ -713,7 +713,7 @@ BOOL ov12_02226138(UnkStruct_ov12_02225F6C *param0)
     return 0;
 }
 
-BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Sprite *param3)
+BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, PokemonSprite *param3)
 {
     if (ov12_02226138(param0)) {
         ov12_02225A18(param0, param3, param1, param2);
@@ -723,7 +723,7 @@ BOOL ov12_0222619C(UnkStruct_ov12_02225F6C *param0, s16 param1, s16 param2, Spri
     return 0;
 }
 
-void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, CellActorData *param8, CellActorData *param9, CellActorData *param10, CellActorData *param11)
+void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *param1, UnkFuncPtr_ov12_02226274 param2, s16 param3, s16 param4, u16 param5, u8 param6, u8 param7, ManagedSprite *param8, ManagedSprite *param9, ManagedSprite *param10, ManagedSprite *param11)
 {
     int v0;
 
@@ -746,7 +746,7 @@ void ov12_022261C4(UnkStruct_ov12_02226274 *param0, UnkStruct_ov12_02225F6C *par
     param0->unk_98[3] = param11;
 
     for (v0 = 0; v0 < param0->unk_AC; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_98[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_98[v0], 0);
     }
 }
 
@@ -761,7 +761,7 @@ BOOL ov12_02226274(UnkStruct_ov12_02226274 *param0)
     }
 
     if (param0->unk_A8 <= param0->unk_AA) {
-        Sprite_SetDrawFlag2(param0->unk_98[param0->unk_AD], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_98[param0->unk_AD], 1);
         param0->unk_AD++;
         param0->unk_AA = 0;
     }
@@ -775,13 +775,13 @@ BOOL ov12_02226274(UnkStruct_ov12_02226274 *param0)
 
         if (v1[v0]) {
             if (param0->unk_AE == 0) {
-                Sprite_SetPositionXY2(param0->unk_98[v0], param0->unk_00 + param0->unk_04[v0].unk_00, param0->unk_02 + param0->unk_04[v0].unk_02);
+                ManagedSprite_SetPositionXY(param0->unk_98[v0], param0->unk_00 + param0->unk_04[v0].unk_00, param0->unk_02 + param0->unk_04[v0].unk_02);
             } else {
                 ov12_02225FA4(&param0->unk_04[v0], &v2, &v3);
-                Sprite_SetAffineScale(param0->unk_98[v0], v2, v3);
+                ManagedSprite_SetAffineScale(param0->unk_98[v0], v2, v3);
             }
         } else {
-            Sprite_SetDrawFlag2(param0->unk_98[v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_98[v0], 0);
         }
     }
 
diff --git a/src/overlay012/ov12_022269C0.c b/src/overlay012/ov12_022269C0.c
index 7e6b2ebecb..17cd44c5f4 100644
--- a/src/overlay012/ov12_022269C0.c
+++ b/src/overlay012/ov12_022269C0.c
@@ -6,8 +6,8 @@
 #include "overlay012/ov12_0221FC20.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -32,9 +32,9 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_04;
     SpriteSystem *unk_08;
     SpriteManager *unk_0C;
-    CellActorData *unk_10;
-    CellActorData *unk_14[100];
-    CellActor *unk_1A4[10];
+    ManagedSprite *unk_10;
+    ManagedSprite *unk_14[100];
+    Sprite *unk_1A4[10];
 } UnkStruct_ov12_02226AAC;
 
 void ov12_022269C0(UnkStruct_ov12_0221FCDC *param0)
@@ -149,7 +149,7 @@ static void ov12_02226AAC(SysTask *param0, void *param1)
     }
 }
 
-void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02226B1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02226AAC *v0;
     SpriteTemplate v1;
diff --git a/src/overlay012/ov12_02226B84.c b/src/overlay012/ov12_02226B84.c
index 2d67a2d64a..6ee07850c2 100644
--- a/src/overlay012/ov12_02226B84.c
+++ b/src/overlay012/ov12_02226B84.c
@@ -21,7 +21,6 @@
 #include "overlay012/struct_ov12_02235998.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "inlines.h"
@@ -29,6 +28,7 @@
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task_manager.h"
 #include "unk_0200762C.h"
@@ -63,7 +63,7 @@ typedef struct {
 typedef struct {
     u8 unk_00;
     UnkStruct_ov12_0221FCDC *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov12_02225D50 unk_0C;
     s32 unk_20;
     int unk_24;
@@ -74,7 +74,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     UnkStruct_ov12_02225F6C unk_04;
-    Sprite *unk_28;
+    PokemonSprite *unk_28;
     s16 unk_2C;
     s16 unk_2E;
 } UnkStruct_ov12_022274E4;
@@ -85,7 +85,7 @@ typedef struct {
     SpriteManager *unk_08;
     int unk_0C;
     int unk_10;
-    CellActorData *unk_14;
+    ManagedSprite *unk_14;
     UnkStruct_ov12_02225F6C unk_18;
     int unk_3C;
     int unk_40;
@@ -102,7 +102,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
-    Sprite *unk_04;
+    PokemonSprite *unk_04;
     int unk_08;
     int unk_0C;
     int unk_10;
@@ -117,7 +117,7 @@ typedef struct {
     int unk_08;
     s16 unk_0C;
     s16 unk_0E;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     int unk_38;
     int unk_3C;
@@ -133,7 +133,7 @@ typedef struct {
     int unk_04;
     s16 unk_08;
     s16 unk_0A;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     int unk_34;
     int unk_38;
@@ -209,7 +209,7 @@ typedef struct {
     u8 unk_09;
     u8 unk_0A;
     UnkStruct_ov12_0221FCDC *unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225F6C unk_38;
 } UnkStruct_ov12_0222862C;
@@ -226,7 +226,7 @@ typedef struct {
     int unk_10;
     int unk_14;
     UnkStruct_ov12_0221FCDC *unk_18;
-    Sprite *unk_1C;
+    PokemonSprite *unk_1C;
     UnkStruct_ov12_02225F6C unk_20;
     UnkStruct_ov12_02225F6C unk_44;
 } UnkStruct_ov12_02228868;
@@ -234,8 +234,8 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_ov12_0223595C unk_04;
-    CellActorData *unk_20;
-    CellActorData *unk_24;
+    ManagedSprite *unk_20;
+    ManagedSprite *unk_24;
 } UnkStruct_ov12_02228B10;
 
 typedef struct {
@@ -323,7 +323,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
     s16 unk_20;
     int unk_24;
     int unk_28;
@@ -377,25 +377,25 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
 } UnkStruct_ov12_0222A178;
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
     UnkStruct_ov12_02225D50 unk_20;
     int unk_34;
 } UnkStruct_ov12_0222A1F478;
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
     UnkStruct_ov12_02225D50 unk_20;
 } UnkStruct_ov12_0222A3DC;
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
     u8 unk_20;
     u8 unk_21;
     UnkStruct_ov12_02225F6C unk_24[2];
@@ -403,7 +403,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C;
+    ManagedSprite *unk_1C;
     int unk_20;
     int unk_24;
     int unk_28;
@@ -416,7 +416,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C[4];
+    ManagedSprite *unk_1C[4];
     int unk_2C;
     int unk_30;
 } UnkStruct_ov12_0222AB10;
@@ -430,7 +430,7 @@ typedef struct {
 
 static int ov12_02229454(UnkStruct_ov12_0221FCDC *param0, int param1);
 
-static void ov12_02226B84(Sprite *param0)
+static void ov12_02226B84(PokemonSprite *param0)
 {
     sub_02007DEC(param0, 12, 0x100);
     sub_02007DEC(param0, 13, 0x100);
@@ -465,8 +465,8 @@ static void ov12_02226BA0(SysTask *param0, void *param1)
                         continue;
                     }
 
-                    Sprite_SetPositionXY2(v1->unk_2C[v0].unk_0C, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02);
-                    Sprite_TickOneFrame(v1->unk_2C[v0].unk_0C);
+                    ManagedSprite_SetPositionXY(v1->unk_2C[v0].unk_0C, v1->unk_2C[v0].unk_04.unk_00 + v1->unk_7C.unk_00, v1->unk_2C[v0].unk_04.unk_02 + v1->unk_7C.unk_02);
+                    ManagedSprite_TickFrame(v1->unk_2C[v0].unk_0C);
                 }
 
                 SpriteSystem_DrawSprites(v1->unk_04.unk_0C);
@@ -948,8 +948,8 @@ void ov12_02227534(UnkStruct_ov12_0221FCDC *param0)
 
 static void ov12_02227620(UnkStruct_ov12_02227620 *param0, s16 param1, s16 param2)
 {
-    Sprite_SetDrawFlag2(param0->unk_14, 1);
-    Sprite_SetPositionXY2(param0->unk_14, param1, param2);
+    ManagedSprite_SetDrawFlag(param0->unk_14, 1);
+    ManagedSprite_SetPositionXY(param0->unk_14, param1, param2);
     param0->unk_40 = 0;
     ov12_02225E68(&param0->unk_18, 10, 10, 14, 4);
 }
@@ -958,7 +958,7 @@ static BOOL ov12_02227658(UnkStruct_ov12_02227620 *param0)
 {
     if (ov12_022260A8(&param0->unk_18, param0->unk_14) == 0) {
         if (param0->unk_40) {
-            Sprite_SetDrawFlag2(param0->unk_14, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_14, 0);
             return 1;
         } else {
             param0->unk_40 = 1;
@@ -1024,10 +1024,10 @@ static void ov12_02227738(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02227620 *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227620));
 
@@ -1036,10 +1036,10 @@ void ov12_0222777C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_08 = param2;
     v0->unk_14 = param3;
 
-    Sprite_SetPriority(v0->unk_14, 100);
-    Sprite_SetExplicitPriority(v0->unk_14, 1);
-    Sprite_SetAffineOverwriteMode(v0->unk_14, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetDrawFlag2(v0->unk_14, FALSE);
+    ManagedSprite_SetPriority(v0->unk_14, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_14, 1);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_14, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetDrawFlag(v0->unk_14, FALSE);
 
     v0->unk_44 = 4;
     v0->unk_3C = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00));
@@ -1278,7 +1278,7 @@ static void ov12_02227B4C(SysTask *param0, void *param1)
             v1 = -v1;
         }
 
-        Sprite_SetAffineScale(v0->unk_10, v1, v2);
+        ManagedSprite_SetAffineScale(v0->unk_10, v1, v2);
         v0->unk_08++;
         break;
     case 1:
@@ -1289,7 +1289,7 @@ static void ov12_02227B4C(SysTask *param0, void *param1)
             v1 = -v1;
         }
 
-        Sprite_SetAffineScale(v0->unk_10, v1, v2);
+        ManagedSprite_SetAffineScale(v0->unk_10, v1, v2);
 
         if (v3) {
             ov12_0222605C(v0->unk_10, v0->unk_0C, v0->unk_0E, v0->unk_14.unk_04[4], 0);
@@ -1309,7 +1309,7 @@ static void ov12_02227B4C(SysTask *param0, void *param1)
             v1 = -v1;
         }
 
-        Sprite_SetAffineScale(v0->unk_10, v1, v2);
+        ManagedSprite_SetAffineScale(v0->unk_10, v1, v2);
 
         if (v3) {
             ov12_0222605C(v0->unk_10, v0->unk_0C, v0->unk_0E, v0->unk_14.unk_04[4], 0);
@@ -1335,7 +1335,7 @@ static void ov12_02227B4C(SysTask *param0, void *param1)
 void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0)
 {
     UnkStruct_ov12_02227B4C *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
     int v2;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02227B4C));
@@ -1361,10 +1361,10 @@ void ov12_02227CBC(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_4C = ov12_02220280(param0, 6);
     v0->unk_10 = ov12_022202C0(v0->unk_00, ov12_02220280(param0, 7));
 
-    Sprite_SetPriority(v0->unk_10, 100);
-    Sprite_SetExplicitPriority(v0->unk_10, 1);
-    Sprite_SetExplicitOamMode2(v0->unk_10, GX_OAM_MODE_XLU);
-    Sprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetPriority(v0->unk_10, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_10, 1);
+    ManagedSprite_SetExplicitOamMode(v0->unk_10, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
 
     ov12_02235780(v0->unk_00, v0->unk_38, 16 - v0->unk_38);
     ov12_022201E8(v0->unk_00, ov12_02227B4C, v0);
@@ -1581,7 +1581,7 @@ void ov12_02228168(UnkStruct_ov12_0221FCDC *param0)
     UnkStruct_ov12_0222813C *v0;
     int v1;
     int v2;
-    CellActorData *v3;
+    ManagedSprite *v3;
     int v4;
     int v5;
 
@@ -1595,7 +1595,7 @@ void ov12_02228168(UnkStruct_ov12_0221FCDC *param0)
     for (v2 = 0; v2 < 4; v2++) {
         if (v1 & (1 << v2)) {
             v3 = ov12_022202C0(v0->unk_00, v2);
-            Sprite_SetExplicitOamMode2(v3, GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v3, GX_OAM_MODE_XLU);
         }
     }
 
@@ -2039,7 +2039,7 @@ static void ov12_02228B10(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_24);
+    ManagedSprite_TickFrame(v0->unk_24);
     SpriteSystem_DrawSprites(v0->unk_04.unk_0C);
 }
 
@@ -2056,9 +2056,9 @@ void ov12_02228B40(UnkStruct_ov12_0221FCDC *param0)
 
     v1->unk_24 = ov12_022202C0(v1->unk_04.unk_04, 0);
 
-    Sprite_SetExplicitOamMode2(v1->unk_24, GX_OAM_MODE_OBJWND);
-    Sprite_SetAffineOverwriteMode(v1->unk_24, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetAffineScale(v1->unk_24, 1.2f, 1.2f);
+    ManagedSprite_SetExplicitOamMode(v1->unk_24, GX_OAM_MODE_OBJWND);
+    ManagedSprite_SetAffineOverwriteMode(v1->unk_24, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAffineScale(v1->unk_24, 1.2f, 1.2f);
 
     GX_SetVisibleWnd(GX_WNDMASK_OW);
     G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0);
@@ -2392,7 +2392,7 @@ void ov12_022291AC(UnkStruct_ov12_0221FCDC *param0)
 
         ov12_02235D74(param0, v3, &(v1->unk_1C), &v0);
 
-        v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v1->unk_1C.unk_0C->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v1->unk_1C.unk_0C->sprite), 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);
     }
 
@@ -2772,7 +2772,7 @@ static void ov12_0222988C(SysTask *param0, void *param1)
         }
     }
 
-    Sprite_TickOneFrame(v0->unk_1C);
+    ManagedSprite_TickFrame(v0->unk_1C);
     G2_SetOBJMosaicSize(v0->unk_24, v0->unk_28);
     SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 }
@@ -2791,7 +2791,7 @@ void ov12_02229908(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_28 = ov12_02220280(v0->unk_00.unk_04, 3);
     v0->unk_1C = ov12_022202C0(v0->unk_00.unk_04, ov12_02220280(v0->unk_00.unk_04, 0));
 
-    Sprite_SetDrawFlag2(v0->unk_1C, 1);
+    ManagedSprite_SetDrawFlag(v0->unk_1C, 1);
 
     if (v0->unk_20 < 0) {
         v0->unk_2C = 0;
@@ -2799,7 +2799,7 @@ void ov12_02229908(UnkStruct_ov12_0221FCDC *param0)
         v0->unk_2C = 15;
     }
 
-    Sprite_SetPixelated(v0->unk_1C, 1);
+    ManagedSprite_SetPixelated(v0->unk_1C, 1);
 
     {
         SysTask *v2;
@@ -3172,7 +3172,7 @@ static void ov12_0222A178(SysTask *param0, void *param1)
     UnkStruct_ov12_0222A178 *v1 = (UnkStruct_ov12_0222A178 *)param1;
 
     v0 = 1;
-    v0 = Sprite_IsAnimated(v1->unk_1C);
+    v0 = ManagedSprite_IsAnimated(v1->unk_1C);
 
     if (v0 == 0) {
         Sprite_DeleteAndFreeResources(v1->unk_1C);
@@ -3181,11 +3181,11 @@ static void ov12_0222A178(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v1->unk_1C);
+    ManagedSprite_TickFrame(v1->unk_1C);
     SpriteSystem_DrawSprites(v1->unk_00.unk_10);
 }
 
-void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222A178 *v0 = NULL;
 
@@ -3201,7 +3201,7 @@ void ov12_0222A1AC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
         v1 = ov12_02220280(param0, 0);
         v2 = ov12_02220280(param0, 1);
 
-        Sprite_OffsetPositionXY2(param3, v1, v2);
+        ManagedSprite_OffsetPositionXY(param3, v1, v2);
     }
 
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222A178, v0);
@@ -3268,29 +3268,29 @@ static void ov12_0222A1F4(SysTask *param0, void *param1)
             int v3;
 
             if (v1 == 0) {
-                v2 = Sprite_GetExplicitPriority(v0->unk_1C);
+                v2 = ManagedSprite_GetExplicitPriority(v0->unk_1C);
 
                 if (v2 == ov12_0222339C(v0->unk_00.unk_04)) {
                     v3 = ov12_02223428(v0->unk_00.unk_04, 2);
-                    Sprite_SetExplicitPriority(v0->unk_1C, v3);
+                    ManagedSprite_SetExplicitPriority(v0->unk_1C, v3);
                 } else {
                     v3 = ov12_0222339C(v0->unk_00.unk_04);
-                    Sprite_SetExplicitPriority(v0->unk_1C, v3);
+                    ManagedSprite_SetExplicitPriority(v0->unk_1C, v3);
                 }
             }
 
-            Sprite_OffsetPositionXY2(v0->unk_1C, v1, 0);
+            ManagedSprite_OffsetPositionXY(v0->unk_1C, v1, 0);
         } else {
-            Sprite_SetAffineOverwriteMode(v0->unk_1C, AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_1C, AFFINE_OVERWRITE_MODE_DOUBLE);
             ov12_02225D50(&v0->unk_20, 0, +((20 * 0xffff) / 360), 4);
-            Sprite_SetAffineTranslation(v0->unk_1C, -8, 16);
+            ManagedSprite_SetAffineTranslation(v0->unk_1C, -8, 16);
             v0->unk_34 = 0;
             v0->unk_00.unk_00++;
         }
     } break;
     case 1: {
         if (ov12_02225DA0(&v0->unk_20) == 1) {
-            Sprite_SetAffineZRotation(v0->unk_1C, v0->unk_20.unk_00);
+            ManagedSprite_SetAffineZRotation(v0->unk_1C, v0->unk_20.unk_00);
         } else {
             if (v0->unk_34 > 5) {
                 v0->unk_00.unk_00++;
@@ -3324,11 +3324,11 @@ static void ov12_0222A1F4(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C);
+    ManagedSprite_TickFrame(v0->unk_1C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222A1F478 *v0 = NULL;
 
@@ -3344,17 +3344,17 @@ void ov12_0222A34C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
         s16 v2 = ov12_022258E0(param0, v1, 0);
         s16 v3 = ov12_022258E0(param0, v1, 1);
 
-        Sprite_SetPositionXY2(v0->unk_1C, v2, v3);
+        ManagedSprite_SetPositionXY(v0->unk_1C, v2, v3);
     }
 
     if (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4) {
-        Sprite_SetAnim(v0->unk_1C, 1);
+        ManagedSprite_SetAnim(v0->unk_1C, 1);
     } else {
-        Sprite_SetAnim(v0->unk_1C, 0);
+        ManagedSprite_SetAnim(v0->unk_1C, 0);
     }
 
-    Sprite_SetExplicitPriority(v0->unk_1C, ov12_0222339C(v0->unk_00.unk_04));
-    Sprite_OffsetPositionXY2(v0->unk_1C, 0, +12);
+    ManagedSprite_SetExplicitPriority(v0->unk_1C, ov12_0222339C(v0->unk_00.unk_04));
+    ManagedSprite_OffsetPositionXY(v0->unk_1C, 0, +12);
 
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222A1F4, v0);
 }
@@ -3364,7 +3364,7 @@ static void ov12_0222A3DC(SysTask *param0, void *param1)
     UnkStruct_ov12_0222A3DC *v0 = param1;
     BOOL v1;
 
-    v1 = Sprite_IsAnimated(v0->unk_1C);
+    v1 = ManagedSprite_IsAnimated(v0->unk_1C);
 
     if (v1 == 0) {
         Sprite_DeleteAndFreeResources(v0->unk_1C);
@@ -3373,11 +3373,11 @@ static void ov12_0222A3DC(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C);
+    ManagedSprite_TickFrame(v0->unk_1C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222A3DC *v0;
 
@@ -3405,11 +3405,11 @@ void ov12_0222A410(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             }
         }
 
-        Sprite_SetPositionXY2(v0->unk_1C, v3, v4);
-        Sprite_SetAnim(v0->unk_1C, v1);
+        ManagedSprite_SetPositionXY(v0->unk_1C, v3, v4);
+        ManagedSprite_SetAnim(v0->unk_1C, v1);
     }
 
-    Sprite_SetExplicitPriority(v0->unk_1C, ov12_02223428(v0->unk_00.unk_04, 2));
+    ManagedSprite_SetExplicitPriority(v0->unk_1C, ov12_02223428(v0->unk_00.unk_04, 2));
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222A3DC, v0);
 }
 
@@ -3429,10 +3429,10 @@ static void ov12_0222A4A0(SysTask *param0, void *param1)
         }
         break;
     case 2: {
-        BOOL v2 = Sprite_IsAnimated(v0->unk_1C);
+        BOOL v2 = ManagedSprite_IsAnimated(v0->unk_1C);
 
         if (v2 == 0) {
-            Sprite_SetExplicitOamMode2(v0->unk_1C, GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_1C, GX_OAM_MODE_XLU);
             v0->unk_20 = 16;
             v0->unk_21 = 0;
             ov12_02235780(v0->unk_00.unk_04, v0->unk_20, v0->unk_21);
@@ -3461,11 +3461,11 @@ static void ov12_0222A4A0(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C);
+    ManagedSprite_TickFrame(v0->unk_1C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222A4A0 *v0;
 
@@ -3473,8 +3473,8 @@ void ov12_0222A5C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     ov12_0223595C(param0, &v0->unk_00);
     v0->unk_1C = param3;
 
-    Sprite_SetPositionXY2(v0->unk_1C, -30, 160);
-    Sprite_SetExplicitPriority(v0->unk_1C, ov12_02223428(v0->unk_00.unk_04, 2));
+    ManagedSprite_SetPositionXY(v0->unk_1C, -30, 160);
+    ManagedSprite_SetExplicitPriority(v0->unk_1C, ov12_02223428(v0->unk_00.unk_04, 2));
 
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222A4A0, v0);
 }
@@ -3513,14 +3513,14 @@ static void ov12_0222A624(UnkStruct_ov12_0222A624 *param0)
         if (LCRNG_Next() % 2) {
             if (param0->unk_38 == 0) {
                 param0->unk_38++;
-                Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+                ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
             }
         }
         break;
     case 7:
         if (param0->unk_38 != 1) {
             param0->unk_38++;
-            Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+            ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
         }
         break;
     case 10:
@@ -3528,14 +3528,14 @@ static void ov12_0222A624(UnkStruct_ov12_0222A624 *param0)
         if (LCRNG_Next() % 2) {
             if (param0->unk_38 == 1) {
                 param0->unk_38++;
-                Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+                ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
             }
         }
         break;
     case 12:
         if (param0->unk_38 != 2) {
             param0->unk_38++;
-            Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+            ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
         }
         break;
     case 15:
@@ -3543,14 +3543,14 @@ static void ov12_0222A624(UnkStruct_ov12_0222A624 *param0)
         if (LCRNG_Next() % 2) {
             if (param0->unk_38 == 2) {
                 param0->unk_38++;
-                Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+                ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
             }
         }
         break;
     case 17:
         if (param0->unk_38 != 3) {
             param0->unk_38++;
-            Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+            ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
         }
         break;
     case 22:
@@ -3558,34 +3558,34 @@ static void ov12_0222A624(UnkStruct_ov12_0222A624 *param0)
         if (LCRNG_Next() % 2) {
             if (param0->unk_38 == 3) {
                 param0->unk_38++;
-                Sprite_OffsetPositionXY2(param0->unk_1C, 0, +8);
+                ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +8);
             }
         }
         break;
     case 24:
         if (param0->unk_38 != 4) {
             param0->unk_38++;
-            Sprite_OffsetPositionXY2(param0->unk_1C, 0, +8);
+            ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +8);
         }
         break;
     default:
         if (param0->unk_00.unk_00 > param0->unk_3C) {
             if (param0->unk_38 < 20) {
-                Sprite_OffsetPositionXY2(param0->unk_1C, 0, +4);
+                ManagedSprite_OffsetPositionXY(param0->unk_1C, 0, +4);
 
                 {
                     s16 v0, v1;
 
-                    Sprite_GetPositionXY2(param0->unk_1C, &v0, &v1);
+                    ManagedSprite_GetPositionXY(param0->unk_1C, &v0, &v1);
 
                     if (v1 > 130) {
-                        Sprite_SetDrawFlag2(param0->unk_1C, 0);
+                        ManagedSprite_SetDrawFlag(param0->unk_1C, 0);
                     }
                 }
 
                 param0->unk_38++;
             } else {
-                Sprite_SetDrawFlag2(param0->unk_1C, 0);
+                ManagedSprite_SetDrawFlag(param0->unk_1C, 0);
             }
         }
 
@@ -3609,7 +3609,7 @@ static void ov12_0222A878(SysTask *param0, void *param1)
         G2_SetWndOutsidePlane(GX_WND_PLANEMASK_NONE, 0);
         G2_SetWnd0Position(0, 0, 0, 0);
 
-        Sprite_SetDrawFlag2(v0->unk_1C, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_1C, 0);
         SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 
         ov12_02220220(v0->unk_00.unk_04, param0);
@@ -3617,7 +3617,7 @@ static void ov12_0222A878(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C);
+    ManagedSprite_TickFrame(v0->unk_1C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 }
 
@@ -3642,17 +3642,17 @@ void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0)
 
         if (v0->unk_28 != 0xFF) {
             v1 = ov12_02223428(param0, v0->unk_28);
-            Sprite_SetExplicitPriority(v0->unk_1C, v1);
+            ManagedSprite_SetExplicitPriority(v0->unk_1C, v1);
         }
 
         if (v0->unk_2C != 0xFF) {
-            Sprite_SetPriority(v0->unk_1C, v0->unk_2C);
+            ManagedSprite_SetPriority(v0->unk_1C, v0->unk_2C);
         }
     }
 
     if (ov12_02223364(param0) != 1) {
         if ((ov12_02220280(param0, 4) == 2) || (ov12_02220280(param0, 4) == 3)) {
-            Sprite_SetDrawFlag2(v0->unk_1C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_1C, 0);
             Heap_FreeToHeap(v0);
             return;
         }
@@ -3672,64 +3672,64 @@ void ov12_0222A8F4(UnkStruct_ov12_0221FCDC *param0)
             case 0:
                 switch (v5) {
                 case 2:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 3:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 4:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 5:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 }
                 break;
             case 2:
                 switch (v5) {
                 case 2:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 3:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 4:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 5:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 }
                 break;
             case 1:
                 switch (v6) {
                 case 2:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 3:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 4:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 5:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 }
                 break;
             case 3:
                 switch (v6) {
                 case 2:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 case 3:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 4:
-                    Sprite_SetPriority(v0->unk_1C, 20);
+                    ManagedSprite_SetPriority(v0->unk_1C, 20);
                     break;
                 case 5:
-                    Sprite_SetPriority(v0->unk_1C, 10);
+                    ManagedSprite_SetPriority(v0->unk_1C, 10);
                     break;
                 }
                 break;
@@ -3758,7 +3758,7 @@ static void ov12_0222AB10(SysTask *param0, void *param1)
             continue;
         }
 
-        Sprite_TickOneFrame(v1->unk_1C[v0]);
+        ManagedSprite_TickFrame(v1->unk_1C[v0]);
     }
 
     SpriteSystem_DrawSprites(v1->unk_00.unk_0C);
@@ -3790,7 +3790,7 @@ void ov12_0222AB50(UnkStruct_ov12_0221FCDC *param0)
             v0->unk_1C[v1] = ov12_022202C0(v0->unk_00.unk_04, v1);
 
             if (v0->unk_1C[v1] != NULL) {
-                Sprite_SetPriority(v0->unk_1C[v1], v2[v1]);
+                ManagedSprite_SetPriority(v0->unk_1C[v1], v2[v1]);
             }
         }
     }
diff --git a/src/overlay012/ov12_0222AC70.c b/src/overlay012/ov12_0222AC70.c
index 050bc5fcba..4a50e8292c 100644
--- a/src/overlay012/ov12_0222AC70.c
+++ b/src/overlay012/ov12_0222AC70.c
@@ -19,10 +19,10 @@
 #include "overlay012/struct_ov12_02235998.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "palette.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task_manager.h"
 #include "unk_0200762C.h"
@@ -36,7 +36,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_08;
     SpriteSystem *unk_0C;
     SpriteManager *unk_10;
-    CellActorData *unk_14[3];
+    ManagedSprite *unk_14[3];
     UnkStruct_ov12_02225F6C unk_20;
 } UnkStruct_ov12_0222AC70;
 
@@ -47,7 +47,7 @@ typedef struct {
     int unk_04;
     u8 unk_08;
     UnkStruct_ov12_0221FCDC *unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225F6C unk_38;
 } UnkStruct_ov12_0222AFA0;
@@ -58,7 +58,7 @@ typedef struct {
     s16 unk_02;
     int unk_04;
     UnkStruct_ov12_0221FCDC *unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     UnkStruct_ov12_02225F6C unk_34;
 } UnkStruct_ov12_0222B220;
@@ -73,9 +73,9 @@ typedef struct {
     s16 unk_08;
     s16 unk_0A;
     UnkStruct_ov12_0221FCDC *unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     SpriteManager *unk_14;
-    CellActorData *unk_18[4];
+    ManagedSprite *unk_18[4];
     UnkStruct_ov12_02225F6C unk_28[4];
 } UnkStruct_ov12_0222B4C8;
 
@@ -84,7 +84,7 @@ typedef struct {
     u8 unk_01;
     u8 unk_02;
     UnkStruct_ov12_0221FCDC *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov12_02225F6C unk_0C;
 } UnkStruct_ov12_0222B914;
 
@@ -94,7 +94,7 @@ typedef struct {
     s16 unk_02;
     s16 unk_04;
     UnkStruct_ov12_0221FCDC *unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
 } UnkStruct_ov12_0222BA18;
 
@@ -105,7 +105,7 @@ typedef struct {
     s16 unk_04;
     s16 unk_06;
     UnkStruct_ov12_0221FCDC *unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
 } UnkStruct_ov12_0222BB30;
 
@@ -115,7 +115,7 @@ typedef struct {
     PaletteData *unk_04;
     UnkStruct_ov12_0221FCDC *unk_08;
     UnkStruct_ov12_022267D4 *unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
 } UnkStruct_ov12_0222BD48;
 
 typedef struct {
@@ -125,7 +125,7 @@ typedef struct {
     s16 unk_04;
     s16 unk_06;
     UnkStruct_ov12_0221FCDC *unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     UnkStruct_ov12_02225F6C unk_34;
 } UnkStruct_ov12_0222BE80;
@@ -135,14 +135,14 @@ typedef struct {
     u8 unk_01;
     UnkStruct_ov12_0221FCDC *unk_04;
     SpriteManager *unk_08;
-    CellActorData *unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_0C;
+    ManagedSprite *unk_10;
 } UnkStruct_ov12_0222BFF4;
 
 typedef struct {
     u8 unk_00;
     u8 unk_01;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     UnkStruct_ov12_02225F6C unk_08;
 } UnkStruct_ov12_0222C1A4_sub1;
 
@@ -152,7 +152,7 @@ typedef struct {
     s16 unk_02;
     int unk_04;
     s8 unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_0221FCDC *unk_10;
     SpriteManager *unk_14;
     UnkStruct_ov12_0222C1A4_sub1 unk_18[3];
@@ -181,8 +181,8 @@ typedef struct {
     BgConfig *unk_08;
     UnkStruct_ov12_0221FCDC *unk_0C;
     SpriteManager *unk_10;
-    Sprite *unk_14;
-    CellActorData *unk_18;
+    PokemonSprite *unk_14;
+    ManagedSprite *unk_18;
     UnkStruct_ov12_02225F6C unk_1C;
     UnkStruct_ov12_02225F6C unk_40;
     UnkStruct_ov12_02226454 unk_64;
@@ -191,7 +191,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     UnkStruct_ov12_0222C7E0_sub1 unk_1C;
-    Sprite *unk_28[2];
+    PokemonSprite *unk_28[2];
     s16 unk_30;
     s16 unk_32;
     s16 unk_34;
@@ -204,7 +204,7 @@ typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     UnkStruct_ov12_0222C7E0_sub1 unk_1C;
     UnkStruct_ov12_02235350 unk_28[4];
-    Sprite *unk_38[4];
+    PokemonSprite *unk_38[4];
     int unk_48;
     UnkStruct_ov12_02225F6C unk_4C;
 } UnkStruct_ov12_0222C994;
@@ -213,8 +213,8 @@ typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     UnkStruct_ov12_0222C7E0_sub1 unk_1C;
     UnkStruct_ov12_02235350 unk_28[2];
-    Sprite *unk_30[2];
-    CellActorData *unk_38[2];
+    PokemonSprite *unk_30[2];
+    ManagedSprite *unk_38[2];
     UnkStruct_ov12_02225F6C unk_40[2];
 } UnkStruct_ov12_0222CACC;
 
@@ -225,7 +225,7 @@ typedef struct {
     UnkStruct_ov12_02235350 unk_0C;
     UnkStruct_ov12_0223595C unk_10;
     UnkStruct_ov12_0222C7E0_sub1 unk_2C;
-    CellActorData *unk_38;
+    ManagedSprite *unk_38;
     UnkStruct_ov12_02235998 unk_3C[4];
     UnkStruct_ov12_02225F6C unk_8C[2];
     UnkStruct_ov12_02225D50 unk_D4;
@@ -245,15 +245,15 @@ typedef struct {
     UnkStruct_ov12_02235350 unk_14;
     UnkStruct_ov12_0223595C unk_18;
     UnkStruct_ov12_0222C7E0_sub1 unk_34;
-    CellActorData *unk_40;
-    CellActorData *unk_44[2];
+    ManagedSprite *unk_40;
+    ManagedSprite *unk_44[2];
     UnkStruct_ov12_02235998 unk_4C[4];
     UnkStruct_ov12_02225F6C unk_9C;
     UnkStruct_ov12_02225D50 unk_C0;
 } UnkStruct_ov12_0222CDF0;
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov12_02225F6C unk_04[2];
 } UnkStruct_ov12_0222D128_sub1;
 
@@ -266,7 +266,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_10;
     SpriteSystem *unk_14;
     SpriteManager *unk_18;
-    Sprite *unk_1C;
+    PokemonSprite *unk_1C;
     s16 unk_20;
     int unk_24;
     u16 unk_28;
@@ -295,7 +295,7 @@ static void ov12_0222AC70(SysTask *param0, void *param1)
         for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
             {
                 s16 v2, v3;
-                Sprite_GetPositionXY2(v1->unk_14[v0], &v2, &v3);
+                ManagedSprite_GetPositionXY(v1->unk_14[v0], &v2, &v3);
             }
 
             if (v1->unk_04 >= Unk_ov12_0223A09E[v0][0]) {
@@ -304,20 +304,20 @@ static void ov12_0222AC70(SysTask *param0, void *param1)
                 if (v1->unk_01[v0] >= Unk_ov12_0223A09E[v0][1]) {
                     v1->unk_01[v0] = 0;
 
-                    if (Sprite_GetDrawFlag2(v1->unk_14[v0]) == 1) {
-                        Sprite_SetDrawFlag2(v1->unk_14[v0], 0);
+                    if (ManagedSprite_GetDrawFlag(v1->unk_14[v0]) == 1) {
+                        ManagedSprite_SetDrawFlag(v1->unk_14[v0], 0);
                     } else {
-                        Sprite_SetDrawFlag2(v1->unk_14[v0], 1);
+                        ManagedSprite_SetDrawFlag(v1->unk_14[v0], 1);
                     }
                 }
             } else {
-                Sprite_SetDrawFlag2(v1->unk_14[v0], 0);
+                ManagedSprite_SetDrawFlag(v1->unk_14[v0], 0);
             }
         }
 
         if (v1->unk_04 >= 45) {
             for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
-                Sprite_SetDrawFlag2(v1->unk_14[v0], 1);
+                ManagedSprite_SetDrawFlag(v1->unk_14[v0], 1);
             }
 
             v1->unk_04 = 0;
@@ -334,7 +334,7 @@ static void ov12_0222AC70(SysTask *param0, void *param1)
                 f32 v4, v5;
 
                 ov12_02225FA4(&v1->unk_20, &v4, &v5);
-                Sprite_SetAffineScale(v1->unk_14[v0], v4, v5);
+                ManagedSprite_SetAffineScale(v1->unk_14[v0], v4, v5);
             }
         } else {
             if (++v1->unk_04 >= 45) {
@@ -374,7 +374,7 @@ static void ov12_0222AC70(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v1->unk_10);
 }
 
-void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     UnkStruct_ov12_0222AC70 *v1;
@@ -412,17 +412,17 @@ void ov12_0222AE68(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
 
         for (v0 = 1; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
             v1->unk_14[v0] = SpriteSystem_NewSprite(v1->unk_0C, v1->unk_10, &v2);
-            Sprite_SetPositionXY2(v1->unk_14[v0], v3.unk_00, v3.unk_02);
+            ManagedSprite_SetPositionXY(v1->unk_14[v0], v3.unk_00, v3.unk_02);
         }
 
-        Sprite_SetPositionXY2(v1->unk_14[0], v3.unk_00, v3.unk_02);
+        ManagedSprite_SetPositionXY(v1->unk_14[0], v3.unk_00, v3.unk_02);
     }
 
     for (v0 = 0; v0 < ov12_02220280(v1->unk_08, 0); v0++) {
         v1->unk_01[v0] = 0;
-        Sprite_SetAffineOverwriteMode(v1->unk_14[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_OffsetPositionXY2(v1->unk_14[v0], 0, 32 - (v0 * 4));
-        Sprite_SetExplicitOamMode2(v1->unk_14[v0], GX_OAM_MODE_XLU);
+        ManagedSprite_SetAffineOverwriteMode(v1->unk_14[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_OffsetPositionXY(v1->unk_14[v0], 0, 32 - (v0 * 4));
+        ManagedSprite_SetExplicitOamMode(v1->unk_14[v0], GX_OAM_MODE_XLU);
     }
 
     ov12_022201CC(param0, ov12_0222AC70, v1, 0x1000);
@@ -651,10 +651,10 @@ static void ov12_0222B4C8(SysTask *param0, void *param1)
             if (ov12_02225C14(&v2->unk_28[v0]) == 0) {
                 v1++;
             } else {
-                Sprite_SetPositionXY2(v2->unk_18[v0], v2->unk_28[v0].unk_00, v2->unk_28[v0].unk_02);
+                ManagedSprite_SetPositionXY(v2->unk_18[v0], v2->unk_28[v0].unk_00, v2->unk_28[v0].unk_02);
             }
 
-            Sprite_TickOneFrame(v2->unk_18[v0]);
+            ManagedSprite_TickFrame(v2->unk_18[v0]);
         }
 
         if (v1 == 4) {
@@ -718,42 +718,42 @@ void ov12_0222B68C(UnkStruct_ov12_0221FCDC *param0)
 
         for (v1 = 0; v1 < 4; v1++) {
             v0->unk_18[v1] = ov12_022202C0(v0->unk_0C, v1);
-            Sprite_SetExplicitOamMode2(v0->unk_18[v1], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
         }
 
         if (ov12_0223525C(v0->unk_0C, ov12_02220240(v0->unk_0C)) == 0x3) {
-            Sprite_SetPriority(v0->unk_18[0], 10);
-            Sprite_SetPriority(v0->unk_18[1], 10);
-            Sprite_SetPriority(v0->unk_18[2], 20);
-            Sprite_SetPriority(v0->unk_18[3], 20);
-            Sprite_SetExplicitPriority(v0->unk_18[0], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[1], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[2], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[3], v4);
+            ManagedSprite_SetPriority(v0->unk_18[0], 10);
+            ManagedSprite_SetPriority(v0->unk_18[1], 10);
+            ManagedSprite_SetPriority(v0->unk_18[2], 20);
+            ManagedSprite_SetPriority(v0->unk_18[3], 20);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[0], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[1], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[2], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[3], v4);
 
-            v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_18[0]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_18[0]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
             PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
 
-            v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_18[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_18[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
             PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
         } else {
-            Sprite_SetPriority(v0->unk_18[0], 20);
-            Sprite_SetPriority(v0->unk_18[1], 20);
-            Sprite_SetPriority(v0->unk_18[2], 10);
-            Sprite_SetPriority(v0->unk_18[3], 10);
-            Sprite_SetExplicitPriority(v0->unk_18[0], v4 + 1);
-            Sprite_SetExplicitPriority(v0->unk_18[1], v4 + 1);
-            Sprite_SetExplicitPriority(v0->unk_18[2], v4 + 1);
-            Sprite_SetExplicitPriority(v0->unk_18[3], v4 + 1);
-            Sprite_SetExplicitPriority(v0->unk_18[0], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[1], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[2], v4);
-            Sprite_SetExplicitPriority(v0->unk_18[3], v4);
+            ManagedSprite_SetPriority(v0->unk_18[0], 20);
+            ManagedSprite_SetPriority(v0->unk_18[1], 20);
+            ManagedSprite_SetPriority(v0->unk_18[2], 10);
+            ManagedSprite_SetPriority(v0->unk_18[3], 10);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[0], v4 + 1);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[1], v4 + 1);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[2], v4 + 1);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[3], v4 + 1);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[0], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[1], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[2], v4);
+            ManagedSprite_SetExplicitPriority(v0->unk_18[3], v4);
 
-            v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_18[0]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_18[0]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
             PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 196, 196, 196);
 
-            v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_18[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_18[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
             PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_0C), v5, v3, ov12_0221FDE4(param0), 2, 0x20, v2 * 16, 128, 128, 128);
         }
     }
@@ -1087,17 +1087,17 @@ static void ov12_0222BFF4(SysTask *param0, void *param1)
         }
         break;
     case 1:
-        Sprite_SetDrawFlag2(v0->unk_0C, 1);
-        Sprite_SetDrawFlag2(v0->unk_10, 1);
-        Sprite_SetExplicitOamMode2(v0->unk_10, GX_OAM_MODE_OBJWND);
+        ManagedSprite_SetDrawFlag(v0->unk_0C, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_10, 1);
+        ManagedSprite_SetExplicitOamMode(v0->unk_10, GX_OAM_MODE_OBJWND);
         v0->unk_00++;
         break;
     case 2:
         if ((++v0->unk_01) >= 10) {
             G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0);
             G2_SetWndOBJInsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0);
-            Sprite_SetDrawFlag2(v0->unk_0C, 0);
-            Sprite_SetDrawFlag2(v0->unk_10, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_0C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_10, 0);
             v0->unk_01 = 0;
             v0->unk_00++;
         }
@@ -1109,8 +1109,8 @@ static void ov12_0222BFF4(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_0C);
-    Sprite_TickOneFrame(v0->unk_10);
+    ManagedSprite_TickFrame(v0->unk_0C);
+    ManagedSprite_TickFrame(v0->unk_10);
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
@@ -1134,12 +1134,12 @@ 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 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_0C->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v1 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_0C->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
         PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_04), v3, v2, ov12_0221FDE4(param0), 2, 0x20, v1 * 16, 256, 256, 256);
     }
 
-    Sprite_SetDrawFlag2(v0->unk_0C, 0);
-    Sprite_SetDrawFlag2(v0->unk_10, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_0C, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_10, 0);
     ov12_022201E8(v0->unk_04, ov12_0222BFF4, v0);
 }
 
@@ -1179,7 +1179,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1)
                     f32 v3, v4;
 
                     ov12_02225FA4(&v2->unk_18[v0].unk_08, &v3, &v4);
-                    Sprite_SetAffineScale(v2->unk_18[v0].unk_04, v3 * v2->unk_08, v4);
+                    ManagedSprite_SetAffineScale(v2->unk_18[v0].unk_04, v3 * v2->unk_08, v4);
                     ov12_0222605C(v2->unk_18[v0].unk_04, v2->unk_02, v2->unk_04, v2->unk_18[v0].unk_08.unk_04[4], 0);
                 }
                 break;
@@ -1188,7 +1188,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1)
                 break;
             }
 
-            Sprite_TickOneFrame(v2->unk_18[v0].unk_04);
+            ManagedSprite_TickFrame(v2->unk_18[v0].unk_04);
         }
 
         if (v1 >= 3) {
@@ -1200,9 +1200,9 @@ static void ov12_0222C1A4(SysTask *param0, void *param1)
                         s16 v5;
                         s16 v6;
 
-                        Sprite_GetPositionXY2(v2->unk_18[v0].unk_04, &v5, &v6);
-                        Sprite_SetPositionXY2(v2->unk_18[v0].unk_04, v5, v2->unk_02);
-                        Sprite_SetAffineScale(v2->unk_18[v0].unk_04, 1.0f * v2->unk_08, 1.0f);
+                        ManagedSprite_GetPositionXY(v2->unk_18[v0].unk_04, &v5, &v6);
+                        ManagedSprite_SetPositionXY(v2->unk_18[v0].unk_04, v5, v2->unk_02);
+                        ManagedSprite_SetAffineScale(v2->unk_18[v0].unk_04, 1.0f * v2->unk_08, 1.0f);
                     }
                     v2->unk_18[v0].unk_00 = 0;
                     v2->unk_18[v0].unk_01 = 0;
@@ -1216,7 +1216,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1)
         break;
     case 2:
         for (v0 = 0; v0 < 3; v0++) {
-            Sprite_SetExplicitOamMode2(v2->unk_18[v0].unk_04, GX_OAM_MODE_NORMAL);
+            ManagedSprite_SetExplicitOamMode(v2->unk_18[v0].unk_04, GX_OAM_MODE_NORMAL);
             ov12_02225EF0(&v2->unk_18[v0].unk_08, 5, 100, 5, 100, 100, 5);
         }
 
@@ -1232,7 +1232,7 @@ static void ov12_0222C1A4(SysTask *param0, void *param1)
                 f32 v7, v8;
 
                 ov12_02225FA4(&v2->unk_18[v0].unk_08, &v7, &v8);
-                Sprite_SetAffineScale(v2->unk_18[v0].unk_04, v7 * v2->unk_08, v8);
+                ManagedSprite_SetAffineScale(v2->unk_18[v0].unk_04, v7 * v2->unk_08, v8);
                 ov12_0222605C(v2->unk_18[v0].unk_04, v2->unk_02, v2->unk_04, v2->unk_18[v0].unk_08.unk_04[4], 0);
             }
         }
@@ -1277,9 +1277,9 @@ void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0)
             v0->unk_18[v1].unk_01 = 0;
             v0->unk_18[v1].unk_04 = ov12_022202C0(v0->unk_10, v1);
 
-            Sprite_SetAffineOverwriteMode(v0->unk_18[v1].unk_04, AFFINE_OVERWRITE_MODE_DOUBLE);
-            Sprite_SetExplicitOamMode2(v0->unk_18[v1].unk_04, GX_OAM_MODE_XLU);
-            Sprite_SetPriority(v0->unk_18[v1].unk_04, v1 + 1);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_18[v1].unk_04, AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetExplicitOamMode(v0->unk_18[v1].unk_04, GX_OAM_MODE_XLU);
+            ManagedSprite_SetPriority(v0->unk_18[v1].unk_04, v1 + 1);
         }
     }
 
@@ -1293,7 +1293,7 @@ void ov12_0222C3C0(UnkStruct_ov12_0221FCDC *param0)
         int v2;
 
         for (v2 = 0; v2 < 3; v2++) {
-            Sprite_SetAffineScale(v0->unk_18[v2].unk_04, 1.0f * v0->unk_08, 1.0f);
+            ManagedSprite_SetAffineScale(v0->unk_18[v2].unk_04, 1.0f * v0->unk_08, 1.0f);
         }
     }
 
@@ -1423,8 +1423,8 @@ static void ov12_0222C678(SysTask *param0, void *param1)
         ov12_02226138(&v0->unk_1C);
         ov12_02226454(&v0->unk_64);
 
-        Sprite_SetPositionXY2(v0->unk_18, v0->unk_40.unk_00, v0->unk_40.unk_02);
-        Sprite_TickOneFrame(v0->unk_18);
+        ManagedSprite_SetPositionXY(v0->unk_18, v0->unk_40.unk_00, v0->unk_40.unk_02);
+        ManagedSprite_TickFrame(v0->unk_18);
         SpriteSystem_DrawSprites(v0->unk_10);
         break;
     default:
@@ -1468,7 +1468,7 @@ void ov12_0222C6D4(UnkStruct_ov12_0221FCDC *param0)
     ov12_022357BC(v0->unk_0C, (1 << ov12_022233EC(param0, 2)) | GX_BLEND_PLANEMASK_BD | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0, 0xffffffff, 0xffffffff);
     ov12_02226424(&v0->unk_64, 31, 0, 0, 31, (20 - 5));
 
-    Sprite_SetExplicitOamMode2(v0->unk_18, GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(v0->unk_18, GX_OAM_MODE_XLU);
     ov12_022201E8(v0->unk_0C, ov12_0222C678, v0);
 }
 
@@ -1674,10 +1674,10 @@ static void ov12_0222CACC(SysTask *param0, void *param1)
         if (ov12_02226138(&v1->unk_40[0]) == 0) {
             v1->unk_00.unk_00++;
         } else {
-            Sprite_SetPositionXY2(v1->unk_38[0], +v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
-            Sprite_SetPositionXY2(v1->unk_38[1], -v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
-            Sprite_TickOneFrame(v1->unk_38[0]);
-            Sprite_TickOneFrame(v1->unk_38[1]);
+            ManagedSprite_SetPositionXY(v1->unk_38[0], +v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
+            ManagedSprite_SetPositionXY(v1->unk_38[1], -v1->unk_28[1].unk_00 + v1->unk_40[0].unk_00, v1->unk_28[1].unk_02 + v1->unk_40[0].unk_02);
+            ManagedSprite_TickFrame(v1->unk_38[0]);
+            ManagedSprite_TickFrame(v1->unk_38[1]);
         }
 
         SpriteSystem_DrawSprites(v1->unk_00.unk_0C);
@@ -1720,14 +1720,14 @@ static void ov12_0222CBFC(SysTask *param0, void *param1)
     }
 
     if (ov12_02225DA0(&v1->unk_D4) == 1) {
-        Sprite_SetAffineZRotation(v1->unk_38, v1->unk_D4.unk_00);
+        ManagedSprite_SetAffineZRotation(v1->unk_38, v1->unk_D4.unk_00);
     }
 
-    Sprite_TickOneFrame(v1->unk_38);
+    ManagedSprite_TickFrame(v1->unk_38);
     SpriteSystem_DrawSprites(v1->unk_10.unk_10);
 }
 
-void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     int v1;
@@ -1744,7 +1744,7 @@ void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v1 = ov12_02225964(param0, ov12_02220240(param0));
     v2->unk_38 = param3;
 
-    Sprite_SetAffineOverwriteMode(v2->unk_38, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAffineOverwriteMode(v2->unk_38, AFFINE_OVERWRITE_MODE_DOUBLE);
 
     v2->unk_3C[0].unk_08 = ov12_022232FC(param0, ov12_02220240(param0));
     v2->unk_3C[1].unk_08 = ov12_022232FC(param0, ov12_02220248(param0));
@@ -1767,10 +1767,10 @@ void ov12_0222CC54(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
         ov12_02225D50(&v2->unk_D4, ((90 * 0xffff) / 360) * v1, ((130 * 0xffff) / 360) * v1, 10);
     }
 
-    Sprite_SetAffineZRotation(v2->unk_38, v2->unk_D4.unk_00);
+    ManagedSprite_SetAffineZRotation(v2->unk_38, v2->unk_D4.unk_00);
     ov12_02225D2C(&v2->unk_8C[0], &v2->unk_8C[1], v2->unk_38);
 
-    Sprite_TickOneFrame(v2->unk_38);
+    ManagedSprite_TickFrame(v2->unk_38);
     ov12_022201E8(v2->unk_10.unk_04, ov12_0222CBFC, v2);
 }
 
@@ -1792,9 +1792,9 @@ static void ov12_0222CDF0(SysTask *param0, void *param1)
             s16 v3;
 
             ov12_02225FA4(&v0->unk_9C, &v1, &v2);
-            Sprite_SetAffineScale(v0->unk_40, v1, v2);
+            ManagedSprite_SetAffineScale(v0->unk_40, v1, v2);
             v3 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
-            Sprite_SetPositionXY2(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
+            ManagedSprite_SetPositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
 
             if (v0->unk_0C < v0->unk_10) {
                 v0->unk_0C++;
@@ -1820,9 +1820,9 @@ static void ov12_0222CDF0(SysTask *param0, void *param1)
             s16 v6;
 
             ov12_02225FA4(&v0->unk_9C, &v4, &v5);
-            Sprite_SetAffineScale(v0->unk_40, v4, v5);
+            ManagedSprite_SetAffineScale(v0->unk_40, v4, v5);
             v6 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
-            Sprite_SetPositionXY2(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v6);
+            ManagedSprite_SetPositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v6);
 
             if (v0->unk_0C > v0->unk_0E) {
                 v0->unk_0C--;
@@ -1844,7 +1844,7 @@ static void ov12_0222CDF0(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_40);
+    ManagedSprite_TickFrame(v0->unk_40);
     SpriteSystem_DrawSprites(v0->unk_18.unk_10);
 }
 
@@ -1877,34 +1877,34 @@ void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0)
 
     if (ov12_0221FDD4(param0) == 1) {
         v0->unk_40 = v0->unk_44[0];
-        Sprite_SetDrawFlag2(v0->unk_44[1], 0);
-        Sprite_SetAnim(v0->unk_40, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_44[1], 0);
+        ManagedSprite_SetAnim(v0->unk_40, 0);
         v0->unk_14.unk_00 = 255 - 76;
         v0->unk_14.unk_02 = 120;
-        Sprite_SetExplicitPriority(v0->unk_40, ov12_0222339C(param0) + 1);
+        ManagedSprite_SetExplicitPriority(v0->unk_40, ov12_0222339C(param0) + 1);
         v0->unk_12 = -1;
     } else {
         if (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4) {
             v0->unk_40 = v0->unk_44[1];
-            Sprite_SetDrawFlag2(v0->unk_44[0], 0);
-            Sprite_SetAnim(v0->unk_40, 1);
+            ManagedSprite_SetDrawFlag(v0->unk_44[0], 0);
+            ManagedSprite_SetAnim(v0->unk_40, 1);
             v0->unk_14.unk_00 = 144;
             v0->unk_14.unk_02 = 64;
         } else {
             v0->unk_40 = v0->unk_44[0];
-            Sprite_SetDrawFlag2(v0->unk_44[1], 0);
-            Sprite_SetAnim(v0->unk_40, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_44[1], 0);
+            ManagedSprite_SetAnim(v0->unk_40, 0);
             v0->unk_14.unk_00 = 76;
             v0->unk_14.unk_02 = 120;
-            Sprite_SetExplicitPriority(v0->unk_40, ov12_0222339C(param0) + 1);
+            ManagedSprite_SetExplicitPriority(v0->unk_40, ov12_0222339C(param0) + 1);
         }
 
         v0->unk_12 = +1;
     }
 
-    Sprite_SetPositionXY2(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02);
-    Sprite_SetAffineOverwriteMode(v0->unk_40, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetExplicitOamMode2(v0->unk_40, GX_OAM_MODE_XLU);
+    ManagedSprite_SetPositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_40, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetExplicitOamMode(v0->unk_40, GX_OAM_MODE_XLU);
 
     {
         f32 v1, v2;
@@ -1914,10 +1914,10 @@ void ov12_0222CFA0(UnkStruct_ov12_0221FCDC *param0)
         ov12_02225F6C(&v0->unk_9C);
 
         ov12_02225FA4(&v0->unk_9C, &v1, &v2);
-        Sprite_SetAffineScale(v0->unk_40, v1, v2);
+        ManagedSprite_SetAffineScale(v0->unk_40, v1, v2);
 
         v3 = ov12_02225FD4(v0->unk_14.unk_02, 16, v0->unk_9C.unk_04[4]);
-        Sprite_SetPositionXY2(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
+        ManagedSprite_SetPositionXY(v0->unk_40, v0->unk_14.unk_00, v0->unk_14.unk_02 + v3);
     }
 
     ov12_022201E8(v0->unk_18.unk_04, ov12_0222CDF0, v0);
@@ -1966,11 +1966,11 @@ static void ov12_0222D128(SysTask *param0, void *param1)
     case 3: {
         s16 v3, v4;
 
-        Sprite_GetPositionXY2(v1->unk_30[0].unk_00, &v3, &v4);
+        ManagedSprite_GetPositionXY(v1->unk_30[0].unk_00, &v3, &v4);
 
         if (v4 <= ((40 - 16 + 20 + 10) + 50)) {
-            Sprite_OffsetPositionXY2(v1->unk_30[0].unk_00, 0, 2);
-            Sprite_OffsetPositionXY2(v1->unk_30[1].unk_00, 0, 2);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[0].unk_00, 0, 2);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[1].unk_00, 0, 2);
         } else {
             v1->unk_00++;
         }
@@ -1978,11 +1978,11 @@ static void ov12_0222D128(SysTask *param0, void *param1)
     case 4: {
         s16 v5, v6;
 
-        Sprite_GetPositionXY2(v1->unk_30[0].unk_00, &v5, &v6);
+        ManagedSprite_GetPositionXY(v1->unk_30[0].unk_00, &v5, &v6);
 
         if (v6 <= ((40 - 16 + 20 + 10) + 50)) {
-            Sprite_OffsetPositionXY2(v1->unk_30[0].unk_00, 0, 2);
-            Sprite_OffsetPositionXY2(v1->unk_30[1].unk_00, 0, 2);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[0].unk_00, 0, 2);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[1].unk_00, 0, 2);
         } else {
             G2_ChangeBlendAlpha(16, 0);
             v1->unk_00++;
@@ -1996,11 +1996,11 @@ static void ov12_0222D128(SysTask *param0, void *param1)
         G2_ChangeBlendAlpha(v1->unk_04, v1->unk_08);
 
         if (v1->unk_01 == 10) {
-            Sprite_OffsetPositionXY2(v1->unk_30[0].unk_00, 0, 16);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[0].unk_00, 0, 16);
         }
 
         if (v1->unk_01 == 12) {
-            Sprite_OffsetPositionXY2(v1->unk_30[1].unk_00, 0, 16);
+            ManagedSprite_OffsetPositionXY(v1->unk_30[1].unk_00, 0, 16);
         }
         break;
     case 5:
@@ -2013,8 +2013,8 @@ static void ov12_0222D128(SysTask *param0, void *param1)
         {
             s16 v7, v8, v9, v10;
 
-            Sprite_GetPositionXY2(v1->unk_30[0].unk_00, &v7, &v8);
-            Sprite_GetPositionXY2(v1->unk_30[1].unk_00, &v9, &v10);
+            ManagedSprite_GetPositionXY(v1->unk_30[0].unk_00, &v7, &v8);
+            ManagedSprite_GetPositionXY(v1->unk_30[1].unk_00, &v9, &v10);
 
             ov12_02226728(v7, v8, v9, v10, &v1->unk_C8, &v1->unk_CA);
             ov12_02226744(v7, v8, v1->unk_C8, v1->unk_CA, &v1->unk_2C);
@@ -2035,8 +2035,8 @@ static void ov12_0222D128(SysTask *param0, void *param1)
             { +1, -1 },
         };
 
-        Sprite_GetPositionXY2(v1->unk_30[0].unk_00, &v11, &v12);
-        Sprite_GetPositionXY2(v1->unk_30[1].unk_00, &v13, &v14);
+        ManagedSprite_GetPositionXY(v1->unk_30[0].unk_00, &v11, &v12);
+        ManagedSprite_GetPositionXY(v1->unk_30[1].unk_00, &v13, &v14);
 
         ov12_02225C98(&v1->unk_30[0].unk_04[0], &v1->unk_30[0].unk_04[1], v11, v13, v12, v14, 10, v1->unk_2C * v15[v1->unk_0C][0]);
         ov12_02225C98(&v1->unk_30[1].unk_04[0], &v1->unk_30[1].unk_04[1], v13, v11, v14, v12, 10, v1->unk_2C * v15[v1->unk_0C][1]);
@@ -2094,15 +2094,15 @@ static void ov12_0222D128(SysTask *param0, void *param1)
         s16 v18, v19;
 
         for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
-            Sprite_GetPositionXY2(v1->unk_30[v0].unk_00, &v18, &v19);
+            ManagedSprite_GetPositionXY(v1->unk_30[v0].unk_00, &v18, &v19);
 
             if (v19 < 80) {
-                Sprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10));
+                ManagedSprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10));
             } else {
                 if (v18 > 128) {
-                    Sprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10));
+                    ManagedSprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10));
                 } else {
-                    Sprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10) + 1);
+                    ManagedSprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10) + 1);
                 }
             }
         }
@@ -2113,13 +2113,13 @@ static void ov12_0222D128(SysTask *param0, void *param1)
     }
 
     for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
-        Sprite_TickOneFrame(v1->unk_30[v0].unk_00);
+        ManagedSprite_TickFrame(v1->unk_30[v0].unk_00);
     }
 
     SpriteSystem_DrawSprites(v1->unk_18);
 }
 
-void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     UnkStruct_ov12_0222D128 *v1;
@@ -2151,16 +2151,16 @@ void ov12_0222D56C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     }
 
     for (v0 = 0; v0 < ov12_02220280(v1->unk_10, 0); v0++) {
-        Sprite_SetExplicitOamMode2(v1->unk_30[v0].unk_00, GX_OAM_MODE_XLU);
-        Sprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10) + 1);
+        ManagedSprite_SetExplicitOamMode(v1->unk_30[v0].unk_00, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitPriority(v1->unk_30[v0].unk_00, ov12_0222339C(v1->unk_10) + 1);
     }
 
     if (ov12_0221FDD4(param0) == 1) {
-        Sprite_SetPositionXY2(v1->unk_30[0].unk_00, 180 - 20, (40 - 16 + 20 + 10));
-        Sprite_SetPositionXY2(v1->unk_30[1].unk_00, 100 - 20, (25 - 16 + 20 + 10));
+        ManagedSprite_SetPositionXY(v1->unk_30[0].unk_00, 180 - 20, (40 - 16 + 20 + 10));
+        ManagedSprite_SetPositionXY(v1->unk_30[1].unk_00, 100 - 20, (25 - 16 + 20 + 10));
     } else {
-        Sprite_SetPositionXY2(v1->unk_30[0].unk_00, 100, (40 - 16 + 20 + 10));
-        Sprite_SetPositionXY2(v1->unk_30[1].unk_00, 180, (25 - 16 + 20 + 10));
+        ManagedSprite_SetPositionXY(v1->unk_30[0].unk_00, 100, (40 - 16 + 20 + 10));
+        ManagedSprite_SetPositionXY(v1->unk_30[1].unk_00, 180, (25 - 16 + 20 + 10));
     }
 
     ov12_022201E8(v1->unk_10, ov12_0222D128, v1);
diff --git a/src/overlay012/ov12_0222D6B0.c b/src/overlay012/ov12_0222D6B0.c
index 70a7e1cc29..84637975bd 100644
--- a/src/overlay012/ov12_0222D6B0.c
+++ b/src/overlay012/ov12_0222D6B0.c
@@ -33,7 +33,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_08;
     SpriteSystem *unk_0C;
     SpriteManager *unk_10;
-    CellActorData *unk_14[3];
+    ManagedSprite *unk_14[3];
     UnkStruct_ov12_02225F6C unk_20;
 } UnkStruct_ov12_0222D6B0;
 
@@ -47,10 +47,10 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_0C;
     SpriteSystem *unk_10;
     SpriteManager *unk_14;
-    CellActorData *unk_18[6];
+    ManagedSprite *unk_18[6];
     int unk_30;
-    CellActorData *unk_34;
-    CellActorData *unk_38;
+    ManagedSprite *unk_34;
+    ManagedSprite *unk_38;
     UnkStruct_ov12_02225F6C unk_3C;
     UnkStruct_ov12_02225F6C unk_60;
 } UnkStruct_ov12_0222D934;
@@ -63,7 +63,7 @@ typedef struct {
     u8 unk_0D;
     u8 unk_0E;
     u8 unk_0F;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     f32 unk_38;
     int *unk_3C;
@@ -85,8 +85,8 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_ov12_0223595C unk_04;
-    CellActorData *unk_20;
-    CellActorData *unk_24;
+    ManagedSprite *unk_20;
+    ManagedSprite *unk_24;
     UnkStruct_ov12_0222660C *unk_28;
     UnkStruct_ov12_02226454 unk_2C;
 } UnkStruct_ov12_0222E080;
@@ -95,7 +95,7 @@ typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     s16 unk_1C;
     s16 unk_1E[4];
-    CellActorData *unk_28[4];
+    ManagedSprite *unk_28[4];
 } UnkStruct_ov12_0222E25C;
 
 typedef struct {
@@ -103,7 +103,7 @@ typedef struct {
     int unk_1C;
     s16 unk_20;
     s16 unk_22[4];
-    CellActorData *unk_2C[4];
+    ManagedSprite *unk_2C[4];
     UnkStruct_ov12_022267D4 *unk_3C[6];
     int unk_54;
     int unk_58;
@@ -136,7 +136,7 @@ static void ov12_0222D6B0(SysTask *param0, void *param1)
         for (v0 = 0; v0 < v1->unk_05; v0++) {
             {
                 s16 v2, v3;
-                Sprite_GetPositionXY2(v1->unk_14[v0], &v2, &v3);
+                ManagedSprite_GetPositionXY(v1->unk_14[v0], &v2, &v3);
             }
 
             if (v1->unk_04 >= Unk_ov12_0223A144[v0][0]) {
@@ -185,7 +185,7 @@ static void ov12_0222D6B0(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v1->unk_10);
 }
 
-void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     UnkStruct_ov12_0222D6B0 *v1;
@@ -219,29 +219,29 @@ void ov12_0222D7C0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
 
     if (ov12_0223525C(param0, ov12_02220248(param0)) == 0x3) {
         if ((ov12_0223525C(param0, ov12_02220248(param0)) == 0x3) && (ov12_0223525C(param0, ov12_02220240(param0)) == 0x3)) {
-            Sprite_SetAnim(v1->unk_14[0], 0);
+            ManagedSprite_SetAnim(v1->unk_14[0], 0);
         } else {
-            Sprite_SetAnim(v1->unk_14[0], 1);
+            ManagedSprite_SetAnim(v1->unk_14[0], 1);
         }
 
-        Sprite_SetPositionXY2(v1->unk_14[0], 128, 80);
+        ManagedSprite_SetPositionXY(v1->unk_14[0], 128, 80);
     } else {
         if ((ov12_0223525C(param0, ov12_02220248(param0)) == 0x4) && (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4)) {
-            Sprite_SetAnim(v1->unk_14[0], 1);
+            ManagedSprite_SetAnim(v1->unk_14[0], 1);
         } else {
-            Sprite_SetAnim(v1->unk_14[0], 0);
+            ManagedSprite_SetAnim(v1->unk_14[0], 0);
         }
 
-        Sprite_SetPositionXY2(v1->unk_14[0], 128, 80);
+        ManagedSprite_SetPositionXY(v1->unk_14[0], 128, 80);
     }
 
     for (v0 = 0; v0 < v1->unk_05; v0++) {
         v1->unk_01[v0] = 0;
-        Sprite_SetAffineOverwriteMode(v1->unk_14[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetExplicitOamMode2(v1->unk_14[v0], GX_OAM_MODE_XLU);
+        ManagedSprite_SetAffineOverwriteMode(v1->unk_14[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetExplicitOamMode(v1->unk_14[v0], GX_OAM_MODE_XLU);
 
         if (ov12_0221FDD4(v1->unk_08) == 1) {
-            Sprite_SetAffineScale(v1->unk_14[v0], -1.0f, 1.0f);
+            ManagedSprite_SetAffineScale(v1->unk_14[v0], -1.0f, 1.0f);
         }
     }
 
@@ -310,31 +310,31 @@ static void ov12_0222D934(SysTask *param0, void *param1)
         case 0:
             v2->unk_34 = v2->unk_18[0];
             v2->unk_38 = v2->unk_18[3];
-            Sprite_SetDrawFlag2(v2->unk_34, 1);
-            Sprite_SetDrawFlag2(v2->unk_38, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_34, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_38, 1);
             break;
         case 1:
             v2->unk_34 = v2->unk_18[1];
             v2->unk_38 = v2->unk_18[2];
-            Sprite_SetDrawFlag2(v2->unk_34, 1);
-            Sprite_SetDrawFlag2(v2->unk_38, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_34, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_38, 1);
             break;
         case 2:
         case 3:
             v2->unk_34 = v2->unk_18[4];
             v2->unk_38 = v2->unk_18[5];
-            Sprite_SetDrawFlag2(v2->unk_34, 1);
-            Sprite_SetDrawFlag2(v2->unk_38, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_34, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_38, 1);
             break;
         }
 
         {
             s16 v3, v4;
 
-            Sprite_GetPositionXY2(v2->unk_34, &v3, &v4);
+            ManagedSprite_GetPositionXY(v2->unk_34, &v3, &v4);
             ov12_02225BC8(&v2->unk_3C, v3, Unk_ov12_0223A17A[v2->unk_30][0].unk_00, v4, Unk_ov12_0223A17A[v2->unk_30][0].unk_02, Unk_ov12_0223A140[v2->unk_30]);
 
-            Sprite_GetPositionXY2(v2->unk_38, &v3, &v4);
+            ManagedSprite_GetPositionXY(v2->unk_38, &v3, &v4);
             ov12_02225BC8(&v2->unk_60, v3, Unk_ov12_0223A17A[v2->unk_30][1].unk_00, v4, Unk_ov12_0223A17A[v2->unk_30][1].unk_02, Unk_ov12_0223A140[v2->unk_30]);
         }
         v2->unk_30++;
@@ -358,8 +358,8 @@ static void ov12_0222D934(SysTask *param0, void *param1)
 
         if (v5 >= 2) {
             if (v2->unk_30 <= 3) {
-                Sprite_SetDrawFlag2(v2->unk_34, 0);
-                Sprite_SetDrawFlag2(v2->unk_38, 0);
+                ManagedSprite_SetDrawFlag(v2->unk_34, 0);
+                ManagedSprite_SetDrawFlag(v2->unk_38, 0);
                 v2->unk_00--;
             } else {
                 v2->unk_00++;
@@ -404,7 +404,7 @@ static void ov12_0222D934(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v2->unk_14);
 }
 
-void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     UnkStruct_ov12_0222D934 *v1;
@@ -438,25 +438,25 @@ void ov12_0222DB60(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
         }
     }
 
-    Sprite_SetAnim(v1->unk_18[0], 0);
-    Sprite_SetAnim(v1->unk_18[1], 0);
-    Sprite_SetAnim(v1->unk_18[2], 1);
-    Sprite_SetAnim(v1->unk_18[3], 1);
-    Sprite_SetAnim(v1->unk_18[4], 2);
-    Sprite_SetAnim(v1->unk_18[5], 3);
-    Sprite_SetFlipMode2(v1->unk_18[0], 1);
-    Sprite_SetFlipMode2(v1->unk_18[3], 1);
+    ManagedSprite_SetAnim(v1->unk_18[0], 0);
+    ManagedSprite_SetAnim(v1->unk_18[1], 0);
+    ManagedSprite_SetAnim(v1->unk_18[2], 1);
+    ManagedSprite_SetAnim(v1->unk_18[3], 1);
+    ManagedSprite_SetAnim(v1->unk_18[4], 2);
+    ManagedSprite_SetAnim(v1->unk_18[5], 3);
+    ManagedSprite_SetFlipMode(v1->unk_18[0], 1);
+    ManagedSprite_SetFlipMode(v1->unk_18[3], 1);
 
     for (v0 = 0; v0 < v1->unk_08; v0++) {
-        Sprite_SetAnimateFlag(v1->unk_18[v0], 1);
-        Sprite_SetPositionXY2(v1->unk_18[v0], Unk_ov12_0223A162[v0].unk_00, Unk_ov12_0223A162[v0].unk_02);
-        Sprite_SetExplicitOamMode2(v1->unk_18[v0], GX_OAM_MODE_XLU);
+        ManagedSprite_SetAnimateFlag(v1->unk_18[v0], 1);
+        ManagedSprite_SetPositionXY(v1->unk_18[v0], Unk_ov12_0223A162[v0].unk_00, Unk_ov12_0223A162[v0].unk_02);
+        ManagedSprite_SetExplicitOamMode(v1->unk_18[v0], GX_OAM_MODE_XLU);
     }
 
-    Sprite_SetDrawFlag2(v1->unk_18[1], 0);
-    Sprite_SetDrawFlag2(v1->unk_18[2], 0);
-    Sprite_SetDrawFlag2(v1->unk_18[4], 0);
-    Sprite_SetDrawFlag2(v1->unk_18[5], 0);
+    ManagedSprite_SetDrawFlag(v1->unk_18[1], 0);
+    ManagedSprite_SetDrawFlag(v1->unk_18[2], 0);
+    ManagedSprite_SetDrawFlag(v1->unk_18[4], 0);
+    ManagedSprite_SetDrawFlag(v1->unk_18[5], 0);
 
     ov12_022201CC(param0, ov12_0222D934, v1, 1100);
 }
@@ -482,7 +482,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
         break;
     case 1:
         if ((++v0->unk_0D) >= 3) {
-            Sprite_SetDrawFlag2(v0->unk_10, 1);
+            ManagedSprite_SetDrawFlag(v0->unk_10, 1);
             v0->unk_0D = 0;
             v0->unk_0C++;
         }
@@ -490,7 +490,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
     case 2:
         if ((++v0->unk_0D) <= 3) {
             v0->unk_38 += 0.1f;
-            Sprite_SetAffineScale(v0->unk_10, v0->unk_38, v0->unk_38);
+            ManagedSprite_SetAffineScale(v0->unk_10, v0->unk_38, v0->unk_38);
         } else {
             v0->unk_0D = 0;
             v0->unk_0C++;
@@ -499,7 +499,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
     case 3:
         if ((++v0->unk_0D) <= 3) {
             v0->unk_38 -= 0.1f;
-            Sprite_SetAffineScale(v0->unk_10, v0->unk_38, v0->unk_38);
+            ManagedSprite_SetAffineScale(v0->unk_10, v0->unk_38, v0->unk_38);
         } else {
             v0->unk_0D = 0;
             v0->unk_0C++;
@@ -529,7 +529,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
 
         v2 = 10 + (LCRNG_Next() % 10);
 
-        Sprite_GetPositionXY2(v0->unk_10, &v1.unk_00, &v1.unk_02);
+        ManagedSprite_GetPositionXY(v0->unk_10, &v1.unk_00, &v1.unk_02);
         ov12_02225BC8(&v0->unk_14, v1.unk_00, Unk_ov12_0223A14A[v0->unk_0F].unk_00, v1.unk_02, Unk_ov12_0223A14A[v0->unk_0F].unk_02, v2);
         v0->unk_0C++;
     } break;
@@ -539,7 +539,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
         v3 = ov12_02225C50(&v0->unk_14, v0->unk_10);
 
         if (v3 == 0) {
-            Sprite_SetDrawFlag2(v0->unk_10, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_10, 0);
             v0->unk_0C++;
         } else {
             break;
@@ -551,7 +551,7 @@ static void ov12_0222DC98(SysTask *param0, void *param1)
         break;
     }
 
-    Sprite_TickOneFrame(v0->unk_10);
+    ManagedSprite_TickFrame(v0->unk_10);
 }
 
 static void ov12_0222DE24(SysTask *param0, void *param1)
@@ -620,7 +620,7 @@ static const s16 Unk_ov12_0223A19A[][4] = {
     { 0x50, 0x92, 0x32, 0x35 }
 };
 
-void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     int v0;
     int v1;
@@ -644,7 +644,7 @@ void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
 
     {
         s16 v4, v5;
-        CellActorData *v6;
+        ManagedSprite *v6;
 
         v2->unk_14[0].unk_10 = param3;
         v0 = 0;
@@ -669,10 +669,10 @@ void ov12_0222DEFC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v4 = Unk_ov12_0223A19A[v0][1] + (LCRNG_Next() % Unk_ov12_0223A19A[v0][3]);
             v5 = Unk_ov12_0223A19A[v0][0] + (LCRNG_Next() % Unk_ov12_0223A19A[v0][2]);
 
-            Sprite_SetPositionXY2(v6, v4, v5);
-            Sprite_SetAffineOverwriteMode(v6, AFFINE_OVERWRITE_MODE_DOUBLE);
-            Sprite_SetAffineScale(v6, v2->unk_14[v1].unk_38, v2->unk_14[v1].unk_38);
-            Sprite_SetDrawFlag2(v6, FALSE);
+            ManagedSprite_SetPositionXY(v6, v4, v5);
+            ManagedSprite_SetAffineOverwriteMode(v6, AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetAffineScale(v6, v2->unk_14[v1].unk_38, v2->unk_14[v1].unk_38);
+            ManagedSprite_SetDrawFlag(v6, FALSE);
 
             ov12_022201CC(param0, ov12_0222DC98, &v2->unk_14[v1], 1100 - 1);
 
@@ -690,7 +690,7 @@ static void ov12_0222E080(SysTask *param0, void *param1)
 
     switch (v0->unk_04.unk_00) {
     case 0: {
-        Sprite *v1;
+        PokemonSprite *v1;
 
         v1 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04));
         sub_02007DEC(v1, 6, 1);
@@ -723,7 +723,7 @@ static void ov12_0222E080(SysTask *param0, void *param1)
         }
 
         {
-            Sprite *v2;
+            PokemonSprite *v2;
 
             v2 = ov12_022232FC(v0->unk_04.unk_04, ov12_02220240(v0->unk_04.unk_04));
             sub_02007DEC(v2, 6, 0);
@@ -738,8 +738,8 @@ static void ov12_0222E080(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_24);
-    Sprite_TickOneFrame(v0->unk_20);
+    ManagedSprite_TickFrame(v0->unk_24);
+    ManagedSprite_TickFrame(v0->unk_20);
     SpriteSystem_DrawSprites(v0->unk_04.unk_0C);
 }
 
@@ -751,14 +751,14 @@ void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0)
     ov12_0223595C(param0, &v0->unk_04);
 
     v0->unk_20 = ov12_022202C0(v0->unk_04.unk_04, 0);
-    Sprite_SetExplicitOamMode2(v0->unk_20, GX_OAM_MODE_OBJWND);
+    ManagedSprite_SetExplicitOamMode(v0->unk_20, GX_OAM_MODE_OBJWND);
 
     GX_SetVisibleWnd(GX_WNDMASK_OW);
     G2_SetWndOutsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ, 0);
     G2_SetWndOBJInsidePlane(GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_OBJ, 0);
 
     v0->unk_24 = ov12_022202C0(v0->unk_04.unk_04, 1);
-    Sprite_SetExplicitOamMode2(v0->unk_24, GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(v0->unk_24, GX_OAM_MODE_XLU);
 
     ov12_02226424(&v0->unk_2C, 16, 2, 2, 16, 16);
     ov12_02222590(v0->unk_04.unk_04, 2);
@@ -767,10 +767,10 @@ void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0)
     ov12_022201E8(v0->unk_04.unk_04, ov12_0222E080, v0);
 }
 
-void ov12_0222E248(CellActorData *param0)
+void ov12_0222E248(ManagedSprite *param0)
 {
-    if (Sprite_GetDrawFlag2(param0) == 1) {
-        Sprite_TickOneFrame(param0);
+    if (ManagedSprite_GetDrawFlag(param0) == 1) {
+        ManagedSprite_TickFrame(param0);
     }
 }
 
@@ -796,7 +796,7 @@ static void ov12_0222E25C(SysTask *param0, void *param1)
             v0->unk_1E[v1]++;
 
             if (v0->unk_1E[v1] >= 40) {
-                Sprite_SetDrawFlag2(v0->unk_28[v1], 0);
+                ManagedSprite_SetDrawFlag(v0->unk_28[v1], 0);
                 v2++;
             }
         }
@@ -815,7 +815,7 @@ static void ov12_0222E25C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222E25C *v0 = NULL;
 
@@ -838,17 +838,17 @@ void ov12_0222E2F8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_28[v1] = SpriteSystem_NewSprite(v0->unk_00.unk_08, v0->unk_00.unk_10, &v2);
         }
 
-        Sprite_SetFlipMode2(v0->unk_28[0], 1);
-        Sprite_SetFlipMode2(v0->unk_28[1], 1);
+        ManagedSprite_SetFlipMode(v0->unk_28[0], 1);
+        ManagedSprite_SetFlipMode(v0->unk_28[1], 1);
 
         {
             UnkStruct_ov12_02235350 v3;
         }
 
-        Sprite_OffsetPositionXY2(v0->unk_28[0], -32, 0);
-        Sprite_OffsetPositionXY2(v0->unk_28[1], -32, +32);
-        Sprite_OffsetPositionXY2(v0->unk_28[2], +32, 0);
-        Sprite_OffsetPositionXY2(v0->unk_28[3], +32, +32);
+        ManagedSprite_OffsetPositionXY(v0->unk_28[0], -32, 0);
+        ManagedSprite_OffsetPositionXY(v0->unk_28[1], -32, +32);
+        ManagedSprite_OffsetPositionXY(v0->unk_28[2], +32, 0);
+        ManagedSprite_OffsetPositionXY(v0->unk_28[3], +32, +32);
     }
 
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222E25C, v0);
@@ -874,10 +874,10 @@ static void ov12_0222E390(SysTask *param0, void *param1)
             if (v0->unk_22[0] == 110) {
                 ov12_02235780(v0->unk_00.unk_04, 0xffffffff, 0xffffffff);
 
-                Sprite_SetExplicitOamMode2(v0->unk_2C[0], GX_OAM_MODE_XLU);
-                Sprite_SetExplicitOamMode2(v0->unk_2C[1], GX_OAM_MODE_XLU);
-                Sprite_SetExplicitOamMode2(v0->unk_2C[2], GX_OAM_MODE_XLU);
-                Sprite_SetExplicitOamMode2(v0->unk_2C[3], GX_OAM_MODE_XLU);
+                ManagedSprite_SetExplicitOamMode(v0->unk_2C[0], GX_OAM_MODE_XLU);
+                ManagedSprite_SetExplicitOamMode(v0->unk_2C[1], GX_OAM_MODE_XLU);
+                ManagedSprite_SetExplicitOamMode(v0->unk_2C[2], GX_OAM_MODE_XLU);
+                ManagedSprite_SetExplicitOamMode(v0->unk_2C[3], GX_OAM_MODE_XLU);
 
                 v0->unk_54 = 15;
                 v0->unk_58 = 0;
@@ -911,10 +911,10 @@ static void ov12_0222E390(SysTask *param0, void *param1)
         if (v0->unk_22[0] == 110) {
             ov12_02235780(v0->unk_00.unk_04, 0xffffffff, 0xffffffff);
 
-            Sprite_SetExplicitOamMode2(v0->unk_2C[0], GX_OAM_MODE_XLU);
-            Sprite_SetExplicitOamMode2(v0->unk_2C[1], GX_OAM_MODE_XLU);
-            Sprite_SetExplicitOamMode2(v0->unk_2C[2], GX_OAM_MODE_XLU);
-            Sprite_SetExplicitOamMode2(v0->unk_2C[3], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_2C[0], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_2C[1], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_2C[2], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_2C[3], GX_OAM_MODE_XLU);
 
             v0->unk_54 = 15;
             v0->unk_58 = 0;
@@ -954,7 +954,7 @@ static void ov12_0222E390(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222E390 *v0 = NULL;
 
@@ -978,14 +978,14 @@ void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_2C[v1] = SpriteSystem_NewSprite(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
         }
 
-        Sprite_SetFlipMode2(v0->unk_2C[1], 1);
-        Sprite_SetFlipMode2(v0->unk_2C[2], 1);
+        ManagedSprite_SetFlipMode(v0->unk_2C[1], 1);
+        ManagedSprite_SetFlipMode(v0->unk_2C[2], 1);
 
         {
             s16 v5;
             s16 v6;
             int v7;
-            Sprite *v8;
+            PokemonSprite *v8;
 
             v7 = ov12_02220240(param0);
             v8 = ov12_022232FC(param0, v7);
@@ -1000,7 +1000,7 @@ void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             }
 
             for (v1 = 0; v1 < 4; v1++) {
-                Sprite_SetPositionXY2(v0->unk_2C[v1], v5, v6);
+                ManagedSprite_SetPositionXY(v0->unk_2C[v1], v5, v6);
             }
         }
 
@@ -1008,29 +1008,29 @@ void ov12_0222E61C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v3 = 24;
             v2 = 16;
 
-            Sprite_SetPriority(v0->unk_2C[0], 10);
-            Sprite_SetPriority(v0->unk_2C[2], 10);
-            Sprite_SetPriority(v0->unk_2C[1], 18);
-            Sprite_SetPriority(v0->unk_2C[3], 18);
+            ManagedSprite_SetPriority(v0->unk_2C[0], 10);
+            ManagedSprite_SetPriority(v0->unk_2C[2], 10);
+            ManagedSprite_SetPriority(v0->unk_2C[1], 18);
+            ManagedSprite_SetPriority(v0->unk_2C[3], 18);
         } else {
             v3 = 0;
             v2 = 8;
 
-            Sprite_SetPriority(v0->unk_2C[0], 18);
-            Sprite_SetPriority(v0->unk_2C[2], 18);
-            Sprite_SetPriority(v0->unk_2C[1], 10);
-            Sprite_SetPriority(v0->unk_2C[3], 10);
+            ManagedSprite_SetPriority(v0->unk_2C[0], 18);
+            ManagedSprite_SetPriority(v0->unk_2C[2], 18);
+            ManagedSprite_SetPriority(v0->unk_2C[1], 10);
+            ManagedSprite_SetPriority(v0->unk_2C[3], 10);
         }
 
         v2 = 4;
         v3 = 0;
 
-        Sprite_OffsetPositionXY2(v0->unk_2C[0], -32, +v3);
-        Sprite_OffsetPositionXY2(v0->unk_2C[3], -40, +v2);
-        Sprite_OffsetPositionXY2(v0->unk_2C[2], +32, +v3);
-        Sprite_OffsetPositionXY2(v0->unk_2C[1], +40, +v2);
+        ManagedSprite_OffsetPositionXY(v0->unk_2C[0], -32, +v3);
+        ManagedSprite_OffsetPositionXY(v0->unk_2C[3], -40, +v2);
+        ManagedSprite_OffsetPositionXY(v0->unk_2C[2], +32, +v3);
+        ManagedSprite_OffsetPositionXY(v0->unk_2C[1], +40, +v2);
     }
 
-    v0->unk_1C = Sprite_GetExplicitPaletteOffset(v0->unk_2C[0]);
+    v0->unk_1C = ManagedSprite_GetExplicitPaletteOffset(v0->unk_2C[0]);
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222E390, v0);
 }
diff --git a/src/overlay012/ov12_0222E784.c b/src/overlay012/ov12_0222E784.c
index fea27733aa..281b2a0fad 100644
--- a/src/overlay012/ov12_0222E784.c
+++ b/src/overlay012/ov12_0222E784.c
@@ -32,9 +32,9 @@ static void ov12_0222E784(SysTask *param0, void *param1)
     switch (v0->unk_00.unk_00) {
     case 0:
         if (ov12_02225F6C(&v0->unk_60) == 0) {
-            Sprite_SetDrawFlag2(v0->unk_1C.unk_0C, 0);
-            Sprite_SetDrawFlag2(v0->unk_30[0].unk_0C, 0);
-            Sprite_SetDrawFlag2(v0->unk_30[0].unk_0C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_1C.unk_0C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_30[0].unk_0C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_30[0].unk_0C, 0);
 
             ov12_02220220(v0->unk_00.unk_04, param0);
             ov12_02235E80(v0);
@@ -47,7 +47,7 @@ static void ov12_0222E784(SysTask *param0, void *param1)
             f32 v1, v2;
 
             ov12_02225FA4(&v0->unk_60, &v1, &v2);
-            Sprite_SetAffineScale(v0->unk_1C.unk_0C, v1, v2);
+            ManagedSprite_SetAffineScale(v0->unk_1C.unk_0C, v1, v2);
             ov12_0222605C(v0->unk_1C.unk_0C, v0->unk_58, v0->unk_5A, v0->unk_60.unk_04[4], 0);
         }
         break;
@@ -55,9 +55,9 @@ static void ov12_0222E784(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C.unk_0C);
-    Sprite_TickOneFrame(v0->unk_30[0].unk_0C);
-    Sprite_TickOneFrame(v0->unk_30[1].unk_0C);
+    ManagedSprite_TickFrame(v0->unk_1C.unk_0C);
+    ManagedSprite_TickFrame(v0->unk_30[0].unk_0C);
+    ManagedSprite_TickFrame(v0->unk_30[1].unk_0C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 }
 
@@ -75,10 +75,10 @@ void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_30[0].unk_0C = ov12_022202C0(param0, 1);
     v0->unk_30[1].unk_0C = ov12_022202C0(param0, 2);
 
-    Sprite_SetAffineOverwriteMode(v0->unk_1C.unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetExplicitPriority(v0->unk_1C.unk_0C, ov12_0222339C(param0));
-    Sprite_SetExplicitPriority(v0->unk_30[0].unk_0C, ov12_0222339C(param0));
-    Sprite_SetExplicitPriority(v0->unk_30[1].unk_0C, ov12_0222339C(param0));
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_1C.unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetExplicitPriority(v0->unk_1C.unk_0C, ov12_0222339C(param0));
+    ManagedSprite_SetExplicitPriority(v0->unk_30[0].unk_0C, ov12_0222339C(param0));
+    ManagedSprite_SetExplicitPriority(v0->unk_30[1].unk_0C, ov12_0222339C(param0));
 
     {
         int v1;
@@ -86,13 +86,13 @@ void ov12_0222E810(UnkStruct_ov12_0221FCDC *param0)
         v1 = ov12_022232B8(v0->unk_00.unk_04, ov12_02220248(v0->unk_00.unk_04));
 
         if ((v1 == 3) || (v1 == 4)) {
-            Sprite_SetPriority(v0->unk_1C.unk_0C, 30);
-            Sprite_SetPriority(v0->unk_30[0].unk_0C, 50);
-            Sprite_SetPriority(v0->unk_30[1].unk_0C, 70);
+            ManagedSprite_SetPriority(v0->unk_1C.unk_0C, 30);
+            ManagedSprite_SetPriority(v0->unk_30[0].unk_0C, 50);
+            ManagedSprite_SetPriority(v0->unk_30[1].unk_0C, 70);
         } else {
-            Sprite_SetPriority(v0->unk_1C.unk_0C, 60);
-            Sprite_SetPriority(v0->unk_30[0].unk_0C, 70);
-            Sprite_SetPriority(v0->unk_30[1].unk_0C, 50);
+            ManagedSprite_SetPriority(v0->unk_1C.unk_0C, 60);
+            ManagedSprite_SetPriority(v0->unk_30[0].unk_0C, 70);
+            ManagedSprite_SetPriority(v0->unk_30[1].unk_0C, 50);
         }
     }
 
diff --git a/src/overlay012/ov12_0222E91C.c b/src/overlay012/ov12_0222E91C.c
index 470154876d..ff83a100ac 100644
--- a/src/overlay012/ov12_0222E91C.c
+++ b/src/overlay012/ov12_0222E91C.c
@@ -19,11 +19,11 @@
 #include "overlay012/struct_ov12_022380DC.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task_manager.h"
 #include "unk_0200762C.h"
@@ -31,7 +31,7 @@
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     UnkStruct_ov12_02235998 unk_1C;
-    CellActorData *unk_30;
+    ManagedSprite *unk_30;
     UnkStruct_ov12_02225F6C unk_34;
     UnkStruct_ov12_02225F6C unk_58;
     UnkStruct_ov12_02225F6C unk_7C;
@@ -46,13 +46,13 @@ typedef struct {
     UnkStruct_ov12_0223595C unk_00;
     s16 unk_1C;
     s16 unk_1E[8];
-    CellActorData *unk_30[8];
+    ManagedSprite *unk_30[8];
     UnkStruct_ov12_02225F6C unk_50;
 } UnkStruct_ov12_0222EC18;
 
 typedef struct {
     UnkStruct_ov12_0223595C unk_00;
-    CellActorData *unk_1C[3];
+    ManagedSprite *unk_1C[3];
     int unk_28;
     f32 unk_2C;
     f32 unk_30;
@@ -84,7 +84,7 @@ typedef struct {
     int unk_10;
     int unk_14;
     int unk_18;
-    Sprite *unk_1C;
+    PokemonSprite *unk_1C;
     UnkStruct_ov12_0223595C unk_20;
     UnkStruct_ov12_02235998 unk_3C;
 } UnkStruct_ov12_0222F464;
@@ -138,7 +138,7 @@ static void ov12_0222E91C(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C.unk_0C);
+    ManagedSprite_TickFrame(v0->unk_1C.unk_0C);
     SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 }
 
@@ -163,24 +163,24 @@ void ov12_0222EAA0(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_A4 = -sub_020080C0(v0->unk_1C.unk_08, 41);
 
     {
-        CellActorData *v1;
+        ManagedSprite *v1;
         int v2;
         int v3 = ov12_02223334(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04));
         int v4 = ov12_02223344(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04));
 
         v1 = v0->unk_1C.unk_0C;
-        Sprite_SetExplicitPriority(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v1->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        ManagedSprite_SetExplicitPriority(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
+        v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v1->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
-        Sprite_SetExplicitOamMode2(v1, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(v1, GX_OAM_MODE_XLU);
 
         v1 = v0->unk_30;
-        Sprite_SetExplicitPriority(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
-        v2 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v1->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        ManagedSprite_SetExplicitPriority(v1, ov12_0222339C(v0->unk_00.unk_04) + 1);
+        v2 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v1->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteData_LoadBufferFromFileStartWithTint(ov12_0222332C(v0->unk_00.unk_04), v4, v3, ov12_0221FDE4(v0->unk_00.unk_04), 2, 0x20, v2 * 16, 196, 196, 196);
-        Sprite_SetExplicitOamMode2(v1, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(v1, GX_OAM_MODE_XLU);
     }
 
     ov12_022201E8(v0->unk_00.unk_04, ov12_0222E91C, v0);
@@ -204,7 +204,7 @@ static void ov12_0222EC18(SysTask *param0, void *param1)
             ov12_0222E248(v0->unk_30[v1]);
 
             if (v0->unk_1E[v1] >= 160) {
-                Sprite_SetDrawFlag2(v0->unk_30[v1], 0);
+                ManagedSprite_SetDrawFlag(v0->unk_30[v1], 0);
                 v2++;
             }
         }
@@ -223,7 +223,7 @@ static void ov12_0222EC18(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_00.unk_10);
 }
 
-void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222EC18 *v0 = NULL;
 
@@ -246,13 +246,13 @@ void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
                 v0->unk_30[v1] = SpriteSystem_NewSprite(v0->unk_00.unk_08, v0->unk_00.unk_10, &v4);
 
                 if (v1 % 2) {
-                    Sprite_SetFlipMode2(v0->unk_30[v1], 1);
+                    ManagedSprite_SetFlipMode(v0->unk_30[v1], 1);
                 }
             }
         }
 
         {
-            Sprite *v5;
+            PokemonSprite *v5;
             s16 v6, v7, v8, v9;
 
             v5 = ov12_022232FC(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04));
@@ -281,7 +281,7 @@ void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
                 if (v11 % 2) {
                     if (v13 == 0) {
                         if (v12 < 8) {
-                            Sprite_SetPositionXY2(v0->unk_30[v12], v0->unk_50.unk_00, v0->unk_50.unk_02);
+                            ManagedSprite_SetPositionXY(v0->unk_30[v12], v0->unk_50.unk_00, v0->unk_50.unk_02);
                             v12++;
                         }
                     } else {
@@ -303,22 +303,22 @@ void ov12_0222EC90(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
                 if (ov12_0221FDD4(v0->unk_00.unk_04) == 0) {
                     if (ov12_0223525C(v0->unk_00.unk_04, ov12_02220240(v0->unk_00.unk_04)) == 0x3) {
                         if (v1 < 4) {
-                            Sprite_SetExplicitPriority(v0->unk_30[v1], v15);
+                            ManagedSprite_SetExplicitPriority(v0->unk_30[v1], v15);
                         } else {
-                            Sprite_SetExplicitPriority(v0->unk_30[v1], v14);
+                            ManagedSprite_SetExplicitPriority(v0->unk_30[v1], v14);
                         }
                     } else {
                         if (v1 >= 4) {
-                            Sprite_SetExplicitPriority(v0->unk_30[v1], v15);
+                            ManagedSprite_SetExplicitPriority(v0->unk_30[v1], v15);
                         } else {
-                            Sprite_SetExplicitPriority(v0->unk_30[v1], v14);
+                            ManagedSprite_SetExplicitPriority(v0->unk_30[v1], v14);
                         }
                     }
 
-                    Sprite_SetPriority(v0->unk_30[v1], 8 - v1);
+                    ManagedSprite_SetPriority(v0->unk_30[v1], 8 - v1);
                 } else {
-                    Sprite_SetPriority(v0->unk_30[v1], v1);
-                    Sprite_SetExplicitPriority(v0->unk_30[v1], v15);
+                    ManagedSprite_SetPriority(v0->unk_30[v1], v1);
+                    ManagedSprite_SetExplicitPriority(v0->unk_30[v1], v15);
                 }
             }
         }
@@ -339,9 +339,9 @@ static void ov12_0222EE50(SysTask *param0, void *param1)
 
             if (v0->unk_30 <= 0.2) {
                 v0->unk_00.unk_00++;
-                Sprite_SetDrawFlag2(v0->unk_1C[0], 0);
+                ManagedSprite_SetDrawFlag(v0->unk_1C[0], 0);
             } else {
-                Sprite_SetAffineScale(v0->unk_1C[0], v0->unk_2C * v0->unk_36, v0->unk_30);
+                ManagedSprite_SetAffineScale(v0->unk_1C[0], v0->unk_2C * v0->unk_36, v0->unk_30);
             }
         } else {
             v0->unk_34++;
@@ -357,7 +357,7 @@ static void ov12_0222EE50(SysTask *param0, void *param1)
             ov12_02226858(v0->unk_38[0]);
             ov12_02226858(v0->unk_38[1]);
 
-            v1 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_1C[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+            v1 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_1C[2]->sprite), 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++;
@@ -366,7 +366,7 @@ static void ov12_0222EE50(SysTask *param0, void *param1)
     case 2:
     default:
         if (ov12_02226848(v0->unk_38[1]) == 0) {
-            Sprite_TickOneFrame(v0->unk_1C[1]);
+            ManagedSprite_TickFrame(v0->unk_1C[1]);
             ov12_02226858(v0->unk_38[1]);
             ov12_02220220(v0->unk_00.unk_04, param0);
             Heap_FreeToHeap(v0);
@@ -375,9 +375,9 @@ static void ov12_0222EE50(SysTask *param0, void *param1)
         break;
     }
 
-    Sprite_TickOneFrame(v0->unk_1C[0]);
-    Sprite_TickOneFrame(v0->unk_1C[1]);
-    Sprite_TickOneFrame(v0->unk_1C[2]);
+    ManagedSprite_TickFrame(v0->unk_1C[0]);
+    ManagedSprite_TickFrame(v0->unk_1C[1]);
+    ManagedSprite_TickFrame(v0->unk_1C[2]);
     SpriteSystem_DrawSprites(v0->unk_00.unk_0C);
 }
 
@@ -411,19 +411,19 @@ void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0)
             v0->unk_36 = +1;
         }
 
-        Sprite_GetPositionXY2(v0->unk_1C[1], &v2, &v3);
-        Sprite_SetPositionXY2(v0->unk_1C[0], v2 + v4, v3);
-        Sprite_SetAffineOverwriteMode(v0->unk_1C[0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineScale(v0->unk_1C[0], v0->unk_2C * v0->unk_36, v0->unk_30);
+        ManagedSprite_GetPositionXY(v0->unk_1C[1], &v2, &v3);
+        ManagedSprite_SetPositionXY(v0->unk_1C[0], v2 + v4, v3);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_1C[0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineScale(v0->unk_1C[0], v0->unk_2C * v0->unk_36, v0->unk_30);
     }
 
     {
         int v6;
 
-        v6 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_1C[0]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_1C[0]->sprite), 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 = PlttTransfer_GetPlttOffset(CellActor_GetPaletteProxy(v0->unk_1C[2]->sprite), NNS_G2D_VRAM_TYPE_2DMAIN);
+        v6 = PlttTransfer_GetPlttOffset(Sprite_GetPaletteProxy(v0->unk_1C[2]->sprite), 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);
     }
 
@@ -431,7 +431,7 @@ void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0)
         u8 v7;
         u8 v8;
         u8 v9;
-        Sprite *v10;
+        PokemonSprite *v10;
         UnkStruct_ov12_02235350 v11;
         UnkStruct_ov12_02235350 v12;
 
@@ -439,18 +439,18 @@ void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0)
         v9 = ov12_02235254(v0->unk_00.unk_04, v8);
 
         ov12_02235350(v9, ov12_0221FDD4(v0->unk_00.unk_04), &v11);
-        Sprite_GetPositionXY2(v0->unk_1C[0], &v12.unk_00, &v12.unk_02);
+        ManagedSprite_GetPositionXY(v0->unk_1C[0], &v12.unk_00, &v12.unk_02);
 
         {
             int v13;
 
             if (ov12_0223525C(v0->unk_00.unk_04, v8) == 0x3) {
                 v13 = 0;
-                Sprite_SetExplicitPriority(v0->unk_1C[0], 1);
-                Sprite_SetPriority(v0->unk_1C[0], 0);
+                ManagedSprite_SetExplicitPriority(v0->unk_1C[0], 1);
+                ManagedSprite_SetPriority(v0->unk_1C[0], 0);
             } else {
-                Sprite_SetExplicitPriority(v0->unk_1C[0], 2);
-                Sprite_SetPriority(v0->unk_1C[0], 0);
+                ManagedSprite_SetExplicitPriority(v0->unk_1C[0], 2);
+                ManagedSprite_SetPriority(v0->unk_1C[0], 0);
                 v13 = 2;
             }
 
@@ -458,10 +458,10 @@ void ov12_0222EFB0(UnkStruct_ov12_0221FCDC *param0)
             v7 = LoadPokemonSpriteYOffset(ov12_022232D0(v0->unk_00.unk_04, v8), ov12_022232C4(v0->unk_00.unk_04, v8), v13, ov12_022232E0(v0->unk_00.unk_04, v8), ov12_022232EC(v0->unk_00.unk_04, v8));
         }
 
-        Sprite_SetPositionXY2(v0->unk_1C[0], v12.unk_00, v11.unk_02 + v7);
+        ManagedSprite_SetPositionXY(v0->unk_1C[0], v12.unk_00, v11.unk_02 + v7);
     }
 
-    Sprite_SetDrawFlag2(v0->unk_1C[0], 1);
+    ManagedSprite_SetDrawFlag(v0->unk_1C[0], 1);
 
     v0->unk_34 = 0;
     v0->unk_35 = 15;
@@ -591,7 +591,7 @@ void ov12_0222F2F8(UnkStruct_ov12_0221FCDC *param0)
     ov12_022201E8(v1->unk_00.unk_04, ov12_0222F208, v1);
 }
 
-static void ov12_0222F44C(Sprite *param0, int param1, int param2, int param3, int param4)
+static void ov12_0222F44C(PokemonSprite *param0, int param1, int param2, int param3, int param4)
 {
     sub_020086D4(param0, param1, 80 - param3, param2, param4);
 }
diff --git a/src/overlay012/ov12_0222F700.c b/src/overlay012/ov12_0222F700.c
index a90c01d8aa..24058f9f6d 100644
--- a/src/overlay012/ov12_0222F700.c
+++ b/src/overlay012/ov12_0222F700.c
@@ -18,10 +18,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "heap.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task_manager.h"
 #include "unk_0200762C.h"
@@ -29,9 +29,9 @@
 typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     SpriteManager *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     UnkStruct_ov12_02225F6C unk_0C;
-    CellActorData *unk_30[2];
+    ManagedSprite *unk_30[2];
     UnkStruct_ov12_02226274 unk_38;
     s16 unk_E8;
     s16 unk_EA;
@@ -42,7 +42,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     int unk_04;
     s16 unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     UnkStruct_ov12_02225D50 unk_34;
     s16 unk_48;
@@ -50,7 +50,7 @@ typedef struct {
 } UnkStruct_ov12_0222F888;
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov12_02225F6C unk_04;
     UnkStruct_ov12_02225D50 unk_28;
     s16 unk_3C;
@@ -79,8 +79,8 @@ typedef struct {
     int unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     UnkStruct_ov12_02225F6C unk_34;
-    CellActorData *unk_58;
-    Sprite *unk_5C;
+    ManagedSprite *unk_58;
+    PokemonSprite *unk_5C;
     s16 unk_60;
     s16 unk_62;
     s16 unk_64;
@@ -91,7 +91,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     int unk_04;
     int unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     s16 unk_10;
     s16 unk_12;
     s16 unk_14;
@@ -106,7 +106,7 @@ typedef struct {
     SpriteManager *unk_04;
     int unk_08;
     int unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225D50 unk_38;
     BOOL unk_4C;
@@ -115,8 +115,8 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     int unk_04;
-    Sprite *unk_08;
-    CellActorData *unk_0C;
+    PokemonSprite *unk_08;
+    ManagedSprite *unk_0C;
     BOOL unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     s16 unk_38;
@@ -129,12 +129,12 @@ typedef struct {
     int unk_04;
     int unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_0222660C *unk_14;
     PaletteData *unk_18;
     UnkStruct_ov12_02226454 unk_1C;
     int unk_44;
-    CellActorData *unk_48;
+    ManagedSprite *unk_48;
 } UnkStruct_ov12_02230910;
 
 typedef struct {
@@ -142,7 +142,7 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225D50 unk_38;
     int unk_4C;
@@ -151,7 +151,7 @@ typedef struct {
 } UnkStruct_ov12_02230BE0;
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     UnkStruct_ov12_02225F6C unk_04;
     BOOL unk_28;
     int unk_2C;
@@ -166,7 +166,7 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    Sprite *unk_18;
+    PokemonSprite *unk_18;
     s16 unk_1C;
     s16 unk_1E;
     UnkStruct_ov12_02225F6C unk_20;
@@ -179,15 +179,15 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     s16 unk_14;
     s16 unk_16;
     UnkStruct_ov12_02225F6C unk_18;
     s32 unk_3C;
-    Sprite *unk_40;
+    PokemonSprite *unk_40;
     s16 unk_44;
     s16 unk_46;
-    CellActorData *unk_48;
+    ManagedSprite *unk_48;
     UnkStruct_ov12_02225F6C unk_4C;
     UnkStruct_ov12_02225F6C unk_70;
 } UnkStruct_ov12_022310D4;
@@ -197,8 +197,8 @@ typedef struct {
     SpriteManager *unk_04;
     int unk_08;
     int unk_0C;
-    Sprite *unk_10;
-    CellActorData *unk_14;
+    PokemonSprite *unk_10;
+    ManagedSprite *unk_14;
     s16 unk_18;
     s16 unk_1A;
     UnkStruct_ov12_02225F6C unk_1C;
@@ -211,10 +211,10 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     int unk_38;
-    CellActorData *unk_3C;
+    ManagedSprite *unk_3C;
     int unk_40;
     UnkStruct_ov12_02225F6C unk_44;
     UnkStruct_ov12_02225F6C unk_68;
@@ -228,8 +228,8 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
-    CellActorData *unk_14;
+    PokemonSprite *unk_10;
+    ManagedSprite *unk_14;
     UnkStruct_ov12_02225F6C unk_18;
     UnkStruct_ov12_02226454 unk_3C;
     s16 unk_64;
@@ -243,9 +243,9 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
-    Sprite *unk_14[4];
-    CellActorData *unk_24;
+    PokemonSprite *unk_10;
+    PokemonSprite *unk_14[4];
+    ManagedSprite *unk_24;
     UnkStruct_ov12_02225F6C unk_28;
     s16 unk_4C;
     s16 unk_4E;
@@ -257,7 +257,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_ov12_0221FCDC *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     s16 unk_0C;
     s16 unk_0E;
     UnkStruct_ov12_02225D50 unk_10;
@@ -272,7 +272,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     int unk_04;
     int unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     UnkStruct_ov12_02225F6C unk_10;
     int unk_34;
     int unk_38;
@@ -286,7 +286,7 @@ typedef struct {
     SpriteManager *unk_08;
     int unk_0C;
     int unk_10;
-    CellActorData *unk_14;
+    ManagedSprite *unk_14;
     UnkStruct_ov12_02225F6C unk_18;
     UnkStruct_ov12_02226454 unk_3C;
     int unk_64;
@@ -301,7 +301,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     UnkStruct_ov12_0221FCDC *unk_04;
-    Sprite *unk_08;
+    PokemonSprite *unk_08;
     s16 unk_0C;
     s16 unk_0E;
     UnkStruct_ov12_02225F6C unk_10;
@@ -312,11 +312,11 @@ typedef struct {
     int unk_00;
     UnkStruct_ov12_0221FCDC *unk_04;
     int unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     s16 unk_10;
     s16 unk_12;
     UnkStruct_ov12_02225F6C unk_14;
-    Sprite *unk_38;
+    PokemonSprite *unk_38;
     s16 unk_3C;
     s16 unk_3E;
     UnkStruct_ov12_02225F6C unk_40;
@@ -329,12 +329,12 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    Sprite *unk_18;
+    PokemonSprite *unk_18;
     UnkStruct_ov12_02225F6C unk_1C;
     int unk_40;
     s16 unk_44;
     s16 unk_46;
-    CellActorData *unk_48[6];
+    ManagedSprite *unk_48[6];
     int unk_60[6];
     int unk_78[6];
 } UnkStruct_ov12_02232720;
@@ -344,10 +344,10 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225F6C unk_38;
-    CellActorData *unk_5C;
+    ManagedSprite *unk_5C;
     UnkStruct_ov12_02225F6C unk_60;
     int unk_84;
     s16 unk_88;
@@ -361,10 +361,10 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    CellActorData *unk_18;
-    CellActorData *unk_1C;
-    CellActorData *unk_20;
-    CellActorData *unk_24;
+    ManagedSprite *unk_18;
+    ManagedSprite *unk_1C;
+    ManagedSprite *unk_20;
+    ManagedSprite *unk_24;
     UnkStruct_ov12_02225F6C unk_28;
     UnkStruct_ov12_02225F6C unk_4C;
     UnkStruct_ov12_02225F6C unk_70;
@@ -381,11 +381,11 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     s16 unk_38;
     s16 unk_3A;
-    CellActorData *unk_3C[3];
+    ManagedSprite *unk_3C[3];
     UnkStruct_ov12_02226274 unk_48;
     UnkStruct_ov12_02225F6C unk_F8;
 } UnkStruct_ov12_022332E8;
@@ -397,7 +397,7 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    CellActorData *unk_18[6];
+    ManagedSprite *unk_18[6];
     UnkStruct_ov12_02225F6C unk_30[6];
     UnkStruct_ov12_02226454 unk_108;
     s16 unk_130;
@@ -411,7 +411,7 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    CellActorData *unk_18[15];
+    ManagedSprite *unk_18[15];
     UnkStruct_ov12_02225F6C unk_54[15];
     int unk_270;
     int unk_274;
@@ -421,7 +421,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     UnkStruct_ov12_02226504 *unk_04;
     int unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     int unk_10;
     int unk_14;
     int unk_18;
@@ -445,7 +445,7 @@ typedef struct {
     SpriteSystem *unk_04;
     SpriteManager *unk_08;
     int unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02226454 unk_14;
 } UnkStruct_ov12_02233F4C;
 
@@ -455,7 +455,7 @@ typedef struct {
     s16 unk_08;
     s16 unk_0A;
     s16 unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     UnkStruct_ov12_02225F6C unk_14;
     UnkStruct_ov12_02225F6C unk_38;
     int unk_5C;
@@ -471,7 +471,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     SpriteManager *unk_04;
     UnkStruct_ov12_02225F6C unk_08;
-    CellActorData *unk_2C;
+    ManagedSprite *unk_2C;
 } UnkStruct_ov12_02234290;
 
 typedef struct {
@@ -480,7 +480,7 @@ typedef struct {
     int unk_08;
     int unk_0C;
     int unk_10;
-    Sprite *unk_14;
+    PokemonSprite *unk_14;
     s16 unk_18;
     s16 unk_1A;
     UnkStruct_ov12_02225F6C unk_1C;
@@ -492,7 +492,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     int unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     s16 unk_14;
     s16 unk_16;
     UnkStruct_ov12_02225F6C unk_18;
@@ -550,9 +550,9 @@ void ov12_0222F770(UnkStruct_ov12_0221FCDC *param0)
 
     for (v1 = 0; v1 < 2; v1++) {
         v0->unk_30[v1] = ov12_022202C0(v0->unk_00, v1);
-        Sprite_SetPriority(v0->unk_30[v1], 100);
-        Sprite_SetExplicitPriority(v0->unk_30[v1], 1);
-        Sprite_SetExplicitOamMode2(v0->unk_30[v1], GX_OAM_MODE_XLU);
+        ManagedSprite_SetPriority(v0->unk_30[v1], 100);
+        ManagedSprite_SetExplicitPriority(v0->unk_30[v1], 1);
+        ManagedSprite_SetExplicitOamMode(v0->unk_30[v1], GX_OAM_MODE_XLU);
     }
 
     ov12_022261C4(&v0->unk_38, &v3, ov12_02225AE0, v0->unk_E8, v0->unk_EA - v0->unk_EC, 2, 2, 0, v0->unk_30[0], v0->unk_30[1], NULL, NULL);
@@ -676,9 +676,9 @@ static void ov12_0222FAFC(UnkStruct_ov12_0222FAFC *param0, SpriteSystem *param1,
     param0->unk_44 = param4->unk_44;
     param0->unk_48 = 0;
 
-    Sprite_SetDrawFlag2(param0->unk_00, 0);
-    Sprite_SetPriority(param0->unk_00, 100);
-    Sprite_SetExplicitPriority(param0->unk_00, 1);
+    ManagedSprite_SetDrawFlag(param0->unk_00, 0);
+    ManagedSprite_SetPriority(param0->unk_00, 100);
+    ManagedSprite_SetExplicitPriority(param0->unk_00, 1);
 }
 
 static void ov12_0222FB6C(UnkStruct_ov12_0222FAFC *param0)
@@ -688,7 +688,7 @@ static void ov12_0222FB6C(UnkStruct_ov12_0222FAFC *param0)
 
 static void ov12_0222FB78(UnkStruct_ov12_0222FAFC *param0, BOOL param1)
 {
-    Sprite_SetDrawFlag2(param0->unk_00, param1);
+    ManagedSprite_SetDrawFlag(param0->unk_00, param1);
 }
 
 static BOOL ov12_0222FB84(UnkStruct_ov12_0222FAFC *param0)
@@ -703,7 +703,7 @@ static BOOL ov12_0222FB84(UnkStruct_ov12_0222FAFC *param0)
         if (ov12_02225AE0(&param0->unk_04)) {
             ov12_02225E0C(&param0->unk_28);
             param0->unk_04.unk_04[5] = param0->unk_3C + param0->unk_28.unk_00;
-            Sprite_SetPositionXY2(param0->unk_00, param0->unk_3E + param0->unk_04.unk_00, param0->unk_40 + param0->unk_04.unk_02);
+            ManagedSprite_SetPositionXY(param0->unk_00, param0->unk_3E + param0->unk_04.unk_00, param0->unk_40 + param0->unk_04.unk_02);
         } else {
             if (param0->unk_44 < 1) {
                 if (param0->unk_44 == 0) {
@@ -740,7 +740,7 @@ static void ov12_0222FC44(SysTask *param0, void *param1)
         G2_ChangeBlendAlpha((v0->unk_F8 / 10), 31 - (v0->unk_F8 / 10));
 
         if (v0->unk_F8 >= 310) {
-            Sprite_SetExplicitOamMode2(v0->unk_0C.unk_00, GX_OAM_MODE_NORMAL);
+            ManagedSprite_SetExplicitOamMode(v0->unk_0C.unk_00, GX_OAM_MODE_NORMAL);
 
             v0->unk_EC++;
         }
@@ -752,7 +752,7 @@ static void ov12_0222FC44(SysTask *param0, void *param1)
     case 3:
         if (v0->unk_F0 <= 0) {
             v0->unk_58[v0->unk_F4].unk_48 = 1;
-            Sprite_SetDrawFlag2(v0->unk_58[v0->unk_F4].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v0->unk_58[v0->unk_F4].unk_00, 1);
             v0->unk_F4++;
             v0->unk_F0 = 8;
         }
@@ -778,10 +778,10 @@ static void ov12_0222FC44(SysTask *param0, void *param1)
         }
         break;
     case 4:
-        Sprite_TickOneFrame(v0->unk_0C.unk_00);
+        ManagedSprite_TickFrame(v0->unk_0C.unk_00);
 
-        if (CellActor_IsAnimated(v0->unk_0C.unk_00->sprite) == 0) {
-            Sprite_SetExplicitOamMode2(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
+        if (Sprite_IsAnimated(v0->unk_0C.unk_00->sprite) == 0) {
+            ManagedSprite_SetExplicitOamMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
             v0->unk_EC++;
         }
         break;
@@ -808,7 +808,7 @@ static void ov12_0222FC44(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0222FC44 *v0;
     SpriteTemplate v1;
@@ -840,9 +840,9 @@ void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_0C.unk_3E = ov12_022258E0(param0, v3, 0);
     v0->unk_0C.unk_40 = ov12_022258E0(param0, v3, 1);
 
-    Sprite_SetPositionXY2(v0->unk_0C.unk_00, v0->unk_0C.unk_3E, v0->unk_0C.unk_40);
-    Sprite_SetPriority(v0->unk_0C.unk_00, 100);
-    Sprite_SetExplicitPriority(v0->unk_0C.unk_00, 1);
+    ManagedSprite_SetPositionXY(v0->unk_0C.unk_00, v0->unk_0C.unk_3E, v0->unk_0C.unk_40);
+    ManagedSprite_SetPriority(v0->unk_0C.unk_00, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_0C.unk_00, 1);
 
     v1 = ov12_0222329C(v0->unk_00);
     v1.x = v0->unk_0C.unk_3E;
@@ -855,10 +855,10 @@ void ov12_0222FE30(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_F8 = 0;
 
     ov12_02235780(v0->unk_00, 0, 31);
-    Sprite_SetExplicitOamMode2(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(v0->unk_0C.unk_00, GX_OAM_MODE_XLU);
 
     for (v2 = 0; v2 < 2; v2++) {
-        Sprite_SetExplicitOamMode2(v0->unk_58[v2].unk_00, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(v0->unk_58[v2].unk_00, GX_OAM_MODE_XLU);
     }
 
     ov12_022201E8(v0->unk_00, ov12_0222FC44, v0);
@@ -870,11 +870,11 @@ static void ov12_0222FF80(UnkStruct_ov12_0222FF80 *param0)
 
     sub_02007DEC(param0->unk_5C, 0, param0->unk_60 + param0->unk_10.unk_00);
     sub_02007DEC(param0->unk_5C, 1, param0->unk_62 + param0->unk_10.unk_02);
-    Sprite_SetPositionXY2(param0->unk_58, param0->unk_60 + param0->unk_10.unk_00, param0->unk_62 + param0->unk_10.unk_02 - param0->unk_66);
+    ManagedSprite_SetPositionXY(param0->unk_58, param0->unk_60 + param0->unk_10.unk_00, param0->unk_62 + param0->unk_10.unk_02 - param0->unk_66);
 
     ov12_02225FA4(&param0->unk_34, &v0, &v1);
     v0 += (f32)(param0->unk_64 * (0.10f));
-    Sprite_SetAffineScale(param0->unk_58, v0, v1);
+    ManagedSprite_SetAffineScale(param0->unk_58, v0, v1);
 
     param0->unk_64 *= -1;
 }
@@ -935,10 +935,10 @@ void ov12_022300C4(UnkStruct_ov12_0221FCDC *param0)
     ov12_02226108(&v0->unk_10, 2, 0, 1, 6);
     v0->unk_58 = ov12_022202C0(v0->unk_00, 0);
 
-    Sprite_SetExplicitOamMode2(v0->unk_58, GX_OAM_MODE_XLU);
-    Sprite_SetAffineOverwriteMode(v0->unk_58, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetPriority(v0->unk_58, 100);
-    Sprite_SetExplicitPriority(v0->unk_58, 1);
+    ManagedSprite_SetExplicitOamMode(v0->unk_58, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_58, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetPriority(v0->unk_58, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_58, 1);
 
     ov12_02225EF0(&v0->unk_34, 10, 12, 10, 15, 10, 7);
     v0->unk_64 = 1;
@@ -1122,10 +1122,10 @@ static void ov12_02230540(SysTask *param0, void *param1)
             v2 = -v2;
         }
 
-        Sprite_SetAffineScale(v0->unk_10, v2, v3);
+        ManagedSprite_SetAffineScale(v0->unk_10, v2, v3);
 
         if (v1 == 0) {
-            Sprite_SetDrawFlag2(v0->unk_10, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_10, 0);
             v0->unk_08++;
         }
         break;
@@ -1182,7 +1182,7 @@ static void ov12_02230600(SysTask *param0, void *param1)
                     sub_02007DEC(v0->unk_08, 6, 0);
                 }
 
-                Sprite_SetPositionXY2(v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C);
+                ManagedSprite_SetPositionXY(v0->unk_0C, v0->unk_38, v0->unk_3A - v0->unk_3C);
             }
 
             v0->unk_04++;
@@ -1211,18 +1211,18 @@ void ov12_02230754(UnkStruct_ov12_0221FCDC *param0)
     ov12_02225E68(&v0->unk_14, 14, 10, 10, 8);
     ov12_02225D78(&v0->unk_38, 0, 16, 8);
 
-    Sprite_SetExplicitOamMode2(v0->unk_10, GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(v0->unk_10, GX_OAM_MODE_XLU);
     ov12_02235780(v0->unk_00, 0, 31);
-    Sprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
 
     if (v0->unk_4C == 1) {
-        Sprite_SetAffineScale(v0->unk_10, -(14 / (f32)10), (14 / (f32)10));
+        ManagedSprite_SetAffineScale(v0->unk_10, -(14 / (f32)10), (14 / (f32)10));
     } else {
-        Sprite_SetAffineScale(v0->unk_10, (14 / (f32)10), (14 / (f32)10));
+        ManagedSprite_SetAffineScale(v0->unk_10, (14 / (f32)10), (14 / (f32)10));
     }
 
-    Sprite_SetPriority(v0->unk_10, 100);
-    Sprite_SetExplicitPriority(v0->unk_10, 1);
+    ManagedSprite_SetPriority(v0->unk_10, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_10, 1);
 
     ov12_022201E8(v0->unk_00, ov12_02230540, v0);
 }
@@ -1312,7 +1312,7 @@ static void ov12_02230994(SysTask *param0, void *param1)
     case 0:
         ov12_02230910(v0);
 
-        if (Sprite_GetDrawFlag2(v0->unk_48) == 1) {
+        if (ManagedSprite_GetDrawFlag(v0->unk_48) == 1) {
             if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) {
                 sub_02007DEC(v0->unk_10, 6, 1);
             }
@@ -1372,12 +1372,12 @@ void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0)
     v5 = ov12_02235254(v0->unk_00, ov12_02220248(v0->unk_00));
 
     if ((v5 == 5) || (v5 == 2)) {
-        Sprite_SetDrawFlag2(v0->unk_48, 1);
-        Sprite_SetExplicitPriority(v0->unk_48, 2);
+        ManagedSprite_SetDrawFlag(v0->unk_48, 1);
+        ManagedSprite_SetExplicitPriority(v0->unk_48, 2);
     } else {
         Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
         Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
-        Sprite_SetDrawFlag2(v0->unk_48, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_48, 0);
     }
 
     v0->unk_14 = ov12_0222662C(v3, v3 + 80, ((5 * 0xffff) / 360), (5 * FX32_ONE), 100, ov12_022233EC(param0, 1), 0, ov12_022266E8(-v2, -v3), ov12_0221FDE4(param0));
@@ -1400,7 +1400,7 @@ static void ov12_02230BE0(SysTask *param0, void *param1)
 
         if (v1 == 1) {
             ov12_02225FA4(&v0->unk_14, &v2, &v3);
-            Sprite_SetAffineScale(v0->unk_10, v2 * v0->unk_54, v3);
+            ManagedSprite_SetAffineScale(v0->unk_10, v2 * v0->unk_54, v3);
         } else {
             v0->unk_0C++;
             v0->unk_4C = 5;
@@ -1411,7 +1411,7 @@ static void ov12_02230BE0(SysTask *param0, void *param1)
         break;
     case 1:
         v1 = ov12_02225DA0(&v0->unk_38);
-        Sprite_SetAffineZRotation(v0->unk_10, v0->unk_38.unk_00);
+        ManagedSprite_SetAffineZRotation(v0->unk_10, v0->unk_38.unk_00);
 
         if (v1 == 0) {
             if (v0->unk_4C > 0) {
@@ -1432,7 +1432,7 @@ static void ov12_02230BE0(SysTask *param0, void *param1)
 
         if (v1 == 1) {
             ov12_02225FA4(&v0->unk_14, &v2, &v3);
-            Sprite_SetAffineScale(v0->unk_10, v2 * v0->unk_54, v3);
+            ManagedSprite_SetAffineScale(v0->unk_10, v2 * v0->unk_54, v3);
         } else {
             v0->unk_0C++;
         }
@@ -1447,7 +1447,7 @@ static void ov12_02230BE0(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02230BE0 *v0;
     int v1;
@@ -1475,18 +1475,18 @@ void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
 
     v0->unk_10 = param3;
 
-    Sprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetAffineScale(v0->unk_10, 1, 1);
-    Sprite_SetPositionXY2(v0->unk_10, v3, v4);
-    Sprite_OffsetPositionXY2(v0->unk_10, 40 * v1, 0);
-    Sprite_SetPriority(v0->unk_10, 100);
-    Sprite_SetExplicitPriority(v0->unk_10, 1);
-    Sprite_SetAffineTranslation(v0->unk_10, -12 * v2, 12);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_10, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAffineScale(v0->unk_10, 1, 1);
+    ManagedSprite_SetPositionXY(v0->unk_10, v3, v4);
+    ManagedSprite_OffsetPositionXY(v0->unk_10, 40 * v1, 0);
+    ManagedSprite_SetPriority(v0->unk_10, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_10, 1);
+    ManagedSprite_SetAffineTranslation(v0->unk_10, -12 * v2, 12);
 
     if (ov12_0223525C(param0, ov12_02220240(param0)) == 0x4) {
-        Sprite_SetAnim(v0->unk_10, 1);
+        ManagedSprite_SetAnim(v0->unk_10, 1);
     } else {
-        Sprite_SetAnim(v0->unk_10, 0);
+        ManagedSprite_SetAnim(v0->unk_10, 0);
     }
 
     ov12_02225E68(&v0->unk_14, 1, 10, 10, 8);
@@ -1502,7 +1502,7 @@ void ov12_02230CEC(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     ov12_022201E8(v0->unk_00, ov12_02230BE0, v0);
 }
 
-static void ov12_02230E24(UnkStruct_ov12_02230E24 *param0, CellActorData *param1, s16 param2, s16 param3, BOOL param4)
+static void ov12_02230E24(UnkStruct_ov12_02230E24 *param0, ManagedSprite *param1, s16 param2, s16 param3, BOOL param4)
 {
     param0->unk_00 = param1;
 
@@ -1513,17 +1513,17 @@ static void ov12_02230E24(UnkStruct_ov12_02230E24 *param0, CellActorData *param1
     param0->unk_34 = 10;
     param0->unk_28 = param4;
 
-    Sprite_SetPositionXY2(param0->unk_00, param2, param3);
-    Sprite_SetPositionXY2(param0->unk_00, param2, param3);
-    Sprite_SetAffineOverwriteMode(param0->unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetPriority(param0->unk_00, 100);
-    Sprite_SetExplicitPriority(param0->unk_00, 1);
+    ManagedSprite_SetPositionXY(param0->unk_00, param2, param3);
+    ManagedSprite_SetPositionXY(param0->unk_00, param2, param3);
+    ManagedSprite_SetAffineOverwriteMode(param0->unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetPriority(param0->unk_00, 100);
+    ManagedSprite_SetExplicitPriority(param0->unk_00, 1);
 
     if (param4) {
-        Sprite_SetAffineScale(param0->unk_00, -1, 1);
+        ManagedSprite_SetAffineScale(param0->unk_00, -1, 1);
     }
 
-    Sprite_SetDrawFlag2(param0->unk_00, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_00, 0);
 }
 
 static void ov12_02230E9C(UnkStruct_ov12_02230E24 *param0)
@@ -1533,8 +1533,8 @@ static void ov12_02230E9C(UnkStruct_ov12_02230E24 *param0)
 
 static void ov12_02230EA8(UnkStruct_ov12_02230E24 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_00, 1);
-    Sprite_SetAnimateFlag(param0->unk_00, 1);
+    ManagedSprite_SetDrawFlag(param0->unk_00, 1);
+    ManagedSprite_SetAnimateFlag(param0->unk_00, 1);
 }
 
 static BOOL ov12_02230EC0(UnkStruct_ov12_02230E24 *param0)
@@ -1549,9 +1549,9 @@ static BOOL ov12_02230EC0(UnkStruct_ov12_02230E24 *param0)
         ov12_02225FA4(&param0->unk_04, &v1, &v2);
 
         if (param0->unk_28) {
-            Sprite_SetAffineScale(param0->unk_00, -v1, 1);
+            ManagedSprite_SetAffineScale(param0->unk_00, -v1, 1);
         } else {
-            Sprite_SetAffineScale(param0->unk_00, v1, 1);
+            ManagedSprite_SetAffineScale(param0->unk_00, v1, 1);
         }
     } else {
         if (param0->unk_2C > 0) {
@@ -1618,7 +1618,7 @@ static void ov12_02230F3C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02231010(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02230F3C *v0;
     int v1;
@@ -1692,7 +1692,7 @@ static void ov12_022310D4(SysTask *param0, void *param1)
         break;
     case 3:
         if (ov12_02225D2C(&v0->unk_4C, &v0->unk_70, v0->unk_48) == 0) {
-            Sprite_SetDrawFlag2(v0->unk_48, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_48, 0);
             v0->unk_0C++;
         }
         break;
@@ -1724,7 +1724,7 @@ static void ov12_022310D4(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_022310D4 *v0;
 
@@ -1745,9 +1745,9 @@ void ov12_022312A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_46 = sub_020080C0(v0->unk_40, 1);
     v0->unk_48 = param3;
 
-    Sprite_SetAnimateFlag(v0->unk_48, 1);
-    Sprite_SetPriority(v0->unk_48, 100);
-    Sprite_SetExplicitPriority(v0->unk_48, 1);
+    ManagedSprite_SetAnimateFlag(v0->unk_48, 1);
+    ManagedSprite_SetPriority(v0->unk_48, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_48, 1);
 
     ov12_02225C98(&v0->unk_4C, &v0->unk_70, v0->unk_14, v0->unk_44, v0->unk_16, v0->unk_46, 10, (32 * FX32_ONE));
     ov12_022201E8(v0->unk_00, ov12_022310D4, v0);
@@ -1776,7 +1776,7 @@ static void ov12_02231390(SysTask *param0, void *param1)
         break;
     case 2:
         if (ov12_02226454(&v0->unk_40)) {
-            Sprite_SetDrawFlag2(v0->unk_14, 1);
+            ManagedSprite_SetDrawFlag(v0->unk_14, 1);
             sub_02007DEC(v0->unk_10, 6, 0);
             v0->unk_08++;
         }
@@ -1809,7 +1809,7 @@ void ov12_02231444(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_1A -= -8;
     v0->unk_14 = ov12_022202C0(v0->unk_00, 0);
 
-    Sprite_SetExplicitOamMode2(v0->unk_14, GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(v0->unk_14, GX_OAM_MODE_XLU);
     sub_02007DEC(v0->unk_10, 6, 1);
 
     ov12_022263A4(&v0->unk_1C, 2, 16);
@@ -1871,7 +1871,7 @@ static BOOL ov12_02231584(UnkStruct_ov12_02231508 *param0)
         break;
     case 1:
         if (ov12_02226454(&param0->unk_8C)) {
-            Sprite_SetDrawFlag2(param0->unk_3C, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_3C, 0);
             param0->unk_40++;
         }
         break;
@@ -1906,7 +1906,7 @@ static void ov12_02231608(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02231508 *v0;
     int v1;
@@ -1931,11 +1931,11 @@ void ov12_02231650(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     ov12_02225E68(&v0->unk_14, 10, 10, 15, 12);
     v0->unk_3C = param3;
 
-    Sprite_SetAnimateFlag(v0->unk_3C, 1);
-    Sprite_SetAffineOverwriteMode(v0->unk_3C, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetExplicitOamMode2(v0->unk_3C, GX_OAM_MODE_XLU);
-    Sprite_SetPriority(v0->unk_3C, 100);
-    Sprite_SetExplicitPriority(v0->unk_3C, 1);
+    ManagedSprite_SetAnimateFlag(v0->unk_3C, 1);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_3C, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetExplicitOamMode(v0->unk_3C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetPriority(v0->unk_3C, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_3C, 1);
 
     v0->unk_B4 = v3 + (32 * v1);
     v0->unk_B6 = v4;
@@ -2007,7 +2007,7 @@ static void ov12_0223181C(SysTask *param0, void *param1)
             } else {
                 v0->unk_0C++;
 
-                Sprite_SetExplicitOamMode2(v0->unk_14, GX_OAM_MODE_XLU);
+                ManagedSprite_SetExplicitOamMode(v0->unk_14, GX_OAM_MODE_XLU);
                 ov12_02226424(
                     &v0->unk_3C, 16, 0, 0, 16, 16);
 
@@ -2017,7 +2017,7 @@ static void ov12_0223181C(SysTask *param0, void *param1)
         break;
     case 2:
         if (ov12_02226454(&v0->unk_3C)) {
-            Sprite_SetDrawFlag2(v0->unk_14, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_14, 0);
         }
 
         if (sub_020087B4(v0->unk_10) == 0) {
@@ -2040,7 +2040,7 @@ static void ov12_0223181C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02231760 *v0;
 
@@ -2052,9 +2052,9 @@ void ov12_02231950(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_10 = ov12_022232FC(v0->unk_00, ov12_02220248(param0));
     v0->unk_14 = param3;
 
-    Sprite_SetPriority(v0->unk_14, 100);
-    Sprite_SetExplicitPriority(v0->unk_14, 1);
-    Sprite_GetPositionXY2(v0->unk_14, &v0->unk_64, &v0->unk_66);
+    ManagedSprite_SetPriority(v0->unk_14, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_14, 1);
+    ManagedSprite_GetPositionXY(v0->unk_14, &v0->unk_64, &v0->unk_66);
 
     ov12_022201E8(v0->unk_00, ov12_0223181C, v0);
 }
@@ -2109,8 +2109,8 @@ static void ov12_02231A38(SysTask *param0, void *param1)
                 v0->unk_0C++;
                 v0->unk_54 = 8;
 
-                Sprite_SetAnim(v0->unk_24, 1);
-                Sprite_SetAnimateFlag(v0->unk_24, 1);
+                ManagedSprite_SetAnim(v0->unk_24, 1);
+                ManagedSprite_SetAnimateFlag(v0->unk_24, 1);
             }
         }
         break;
@@ -2159,7 +2159,7 @@ static void ov12_02231A38(SysTask *param0, void *param1)
             if (v0->unk_50 < 0) {
                 v0->unk_0C++;
             } else {
-                Sprite_SetDrawFlag2(v0->unk_24, v0->unk_58);
+                ManagedSprite_SetDrawFlag(v0->unk_24, v0->unk_58);
                 v0->unk_58 ^= 1;
             }
         }
@@ -2174,7 +2174,7 @@ static void ov12_02231A38(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_022319AC *v0;
     int v1;
@@ -2192,15 +2192,15 @@ void ov12_02231C1C(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
 
     v0->unk_24 = param3;
 
-    Sprite_SetPriority(v0->unk_24, 100);
-    Sprite_SetExplicitPriority(v0->unk_24, 1);
-    Sprite_GetPositionXY2(v0->unk_24, &v0->unk_4C, &v0->unk_4E);
+    ManagedSprite_SetPriority(v0->unk_24, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_24, 1);
+    ManagedSprite_GetPositionXY(v0->unk_24, &v0->unk_4C, &v0->unk_4E);
 
     v0->unk_4C -= 80 / 2;
     v0->unk_4E -= 80 / 2;
 
-    Sprite_SetPositionXY2(v0->unk_24, v0->unk_4C, v0->unk_4E);
-    Sprite_SetExplicitOamMode2(v0->unk_24, GX_OAM_MODE_XLU);
+    ManagedSprite_SetPositionXY(v0->unk_24, v0->unk_4C, v0->unk_4E);
+    ManagedSprite_SetExplicitOamMode(v0->unk_24, GX_OAM_MODE_XLU);
 
     v0->unk_54 = -16;
 
@@ -2395,7 +2395,7 @@ static void ov12_02231FD8(SysTask *param0, void *param1)
 void ov12_02232024(UnkStruct_ov12_0221FCDC *param0)
 {
     UnkStruct_ov12_02231F18 *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02231F18));
 
@@ -2502,9 +2502,9 @@ static void ov12_0223223C(SysTask *param0, void *param1)
             v0->unk_0C++;
             v0->unk_10 = 30;
 
-            Sprite_SetAnim(v0->unk_14, 0);
-            Sprite_SetAnimateFlag(v0->unk_14, 1);
-            Sprite_SetAffineScale(v0->unk_14, 1, 1);
+            ManagedSprite_SetAnim(v0->unk_14, 0);
+            ManagedSprite_SetAnimateFlag(v0->unk_14, 1);
+            ManagedSprite_SetAffineScale(v0->unk_14, 1, 1);
 
             ov12_02226424(&v0->unk_3C, 0, 16, 16, 0, 4);
         }
@@ -2526,7 +2526,7 @@ static void ov12_0223223C(SysTask *param0, void *param1)
             }
         }
 
-        if (Sprite_IsAnimated(v0->unk_14) == 0) {
+        if (ManagedSprite_IsAnimated(v0->unk_14) == 0) {
             v0->unk_0C++;
         }
         break;
@@ -2539,7 +2539,7 @@ static void ov12_0223223C(SysTask *param0, void *param1)
         break;
     case 3:
         if (ov12_02226454(&v0->unk_3C)) {
-            Sprite_SetDrawFlag2(v0->unk_14, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_14, 0);
             v0->unk_0C++;
         }
         break;
@@ -2553,10 +2553,10 @@ static void ov12_0223223C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02232084 *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02232084));
 
@@ -2565,11 +2565,11 @@ void ov12_02232378(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_08 = param2;
     v0->unk_14 = param3;
 
-    Sprite_SetPriority(v0->unk_14, 100);
-    Sprite_SetExplicitPriority(v0->unk_14, 1);
-    Sprite_SetAffineOverwriteMode(v0->unk_14, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetExplicitOamMode2(v0->unk_14, GX_OAM_MODE_XLU);
-    Sprite_SetAnimationFrame(v0->unk_14, 4);
+    ManagedSprite_SetPriority(v0->unk_14, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_14, 1);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_14, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetExplicitOamMode(v0->unk_14, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnimationFrame(v0->unk_14, 4);
 
     v0->unk_6C = 3;
     v0->unk_70 = (4 * 100);
@@ -2764,27 +2764,27 @@ static BOOL ov12_02232744(UnkStruct_ov12_02232720 *param0)
     return v0;
 }
 
-static void ov12_0223283C(CellActorData *param0, int *param1, fx32 param2)
+static void ov12_0223283C(ManagedSprite *param0, int *param1, fx32 param2)
 {
     *param1 = 0;
 
-    Sprite_SetPriority(param0, 100);
-    Sprite_SetExplicitPriority(param0, 1);
-    Sprite_SetDrawFlag2(param0, 1);
-    Sprite_SetAnimateFlag(param0, 1);
-    Sprite_SetAnimationSpeed(param0, param2);
-    Sprite_SetAnim(param0, 0);
-    Sprite_SetAnimationFrame(param0, 0);
-    Sprite_TickNFrames(param0, 55 * FX32_ONE);
+    ManagedSprite_SetPriority(param0, 100);
+    ManagedSprite_SetExplicitPriority(param0, 1);
+    ManagedSprite_SetDrawFlag(param0, 1);
+    ManagedSprite_SetAnimateFlag(param0, 1);
+    ManagedSprite_SetAnimationSpeed(param0, param2);
+    ManagedSprite_SetAnim(param0, 0);
+    ManagedSprite_SetAnimationFrame(param0, 0);
+    ManagedSprite_TickNFrames(param0, 55 * FX32_ONE);
 }
 
-static BOOL ov12_02232888(CellActorData *param0, int *param1)
+static BOOL ov12_02232888(ManagedSprite *param0, int *param1)
 {
     BOOL v0 = 0;
 
     switch (*param1) {
     case 0:
-        if (Sprite_IsAnimated(param0) == 0) {
+        if (ManagedSprite_IsAnimated(param0) == 0) {
             (*param1)++;
             v0 = 1;
         }
@@ -2817,7 +2817,7 @@ static void ov12_022328B8(SysTask *param0, void *param1)
         v2 = ov12_02232888(v0->unk_48[v0->unk_10], &v0->unk_60[v0->unk_10]);
 
         if ((v1 == v2) && (v1 == 1)) {
-            Sprite_SetAnim(v0->unk_48[v0->unk_10], 1);
+            ManagedSprite_SetAnim(v0->unk_48[v0->unk_10], 1);
             v0->unk_0C++;
         }
         break;
@@ -2863,7 +2863,7 @@ static void ov12_022328B8(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02232720 *v0;
     SpriteTemplate v1;
@@ -2895,20 +2895,20 @@ void ov12_022329E0(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_48[v2] = SpriteSystem_NewSprite(param1, param2, &v1);
         }
 
-        Sprite_SetDrawFlag2(v0->unk_48[v2], 0);
+        ManagedSprite_SetDrawFlag(v0->unk_48[v2], 0);
 
         v5 = FX_Mul(FX_CosIdx((((90 * 0xffff) / 360) / (6 / 2)) * (v2 / 2)), (48 * FX32_ONE)) >> FX32_SHIFT;
         v6 = FX_Mul(FX_SinIdx((((90 * 0xffff) / 360) / (6 / 2)) * (v2 / 2)), (48 * FX32_ONE)) >> FX32_SHIFT;
 
         if ((v2 % 2) == 0) {
             v5 = v3 + v5;
-            Sprite_SetFlipMode2(v0->unk_48[v2], 1);
+            ManagedSprite_SetFlipMode(v0->unk_48[v2], 1);
         } else {
             v5 = v3 - v5;
         }
 
         v6 = v4 - v6;
-        Sprite_SetPositionXY2(v0->unk_48[v2], v5, v6);
+        ManagedSprite_SetPositionXY(v0->unk_48[v2], v5, v6);
 
         if (v2 < 2) {
             v0->unk_78[v2] = 8;
@@ -2927,12 +2927,12 @@ static void ov12_02232B40(SysTask *param0, void *param1)
 
     switch (v0->unk_0C) {
     case 0:
-        Sprite_SetAnimateFlag(v0->unk_5C, 1);
+        ManagedSprite_SetAnimateFlag(v0->unk_5C, 1);
         v0->unk_0C++;
         break;
     case 1:
-        if (Sprite_IsAnimated(v0->unk_5C) == 0) {
-            Sprite_SetAnimateFlag(v0->unk_5C, 0);
+        if (ManagedSprite_IsAnimated(v0->unk_5C) == 0) {
+            ManagedSprite_SetAnimateFlag(v0->unk_5C, 0);
             v0->unk_0C++;
             ov12_02225E68(&v0->unk_14, 10, 10, 0, 8);
             v1 = sub_020080C0(v0->unk_10, 0);
@@ -2947,22 +2947,22 @@ static void ov12_02232B40(SysTask *param0, void *param1)
             sub_02007DEC(v0->unk_10, 6, 1);
             sub_02007DEC(v0->unk_10, 12, 0x100);
             sub_02007DEC(v0->unk_10, 13, 0x100);
-            Sprite_SetAnim(v0->unk_5C, 1);
-            Sprite_SetAnimationSpeed(v0->unk_5C, FX32_ONE);
-            Sprite_SetAnimateFlag(v0->unk_5C, 1);
+            ManagedSprite_SetAnim(v0->unk_5C, 1);
+            ManagedSprite_SetAnimationSpeed(v0->unk_5C, FX32_ONE);
+            ManagedSprite_SetAnimateFlag(v0->unk_5C, 1);
             v0->unk_0C++;
         }
         break;
     case 3:
-        if (Sprite_IsAnimated(v0->unk_5C) == 0) {
-            Sprite_SetAnimateFlag(v0->unk_5C, 0);
+        if (ManagedSprite_IsAnimated(v0->unk_5C) == 0) {
+            ManagedSprite_SetAnimateFlag(v0->unk_5C, 0);
             v0->unk_0C++;
             ov12_02225BC8(&v0->unk_60, 0, 0, v0->unk_8A, 0, 8);
         }
         break;
     case 4:
         if (ov12_02225C14(&v0->unk_60)) {
-            Sprite_SetPositionXY2(v0->unk_5C, v0->unk_88, v0->unk_60.unk_02);
+            ManagedSprite_SetPositionXY(v0->unk_5C, v0->unk_88, v0->unk_60.unk_02);
         } else {
             v0->unk_0C++;
         }
@@ -2977,7 +2977,7 @@ static void ov12_02232B40(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02232B40 *v0;
     s16 v1, v2;
@@ -2994,9 +2994,9 @@ void ov12_02232CA8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_8A = ov12_022258E0(param0, ov12_02220240(param0), 1);
     v0->unk_5C = param3;
 
-    Sprite_SetPriority(v0->unk_5C, 100);
-    Sprite_SetExplicitPriority(v0->unk_5C, 1);
-    Sprite_SetPositionXY2(v0->unk_5C, v0->unk_88, v0->unk_8A);
+    ManagedSprite_SetPriority(v0->unk_5C, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_5C, 1);
+    ManagedSprite_SetPositionXY(v0->unk_5C, v0->unk_88, v0->unk_8A);
     ov12_022201E8(v0->unk_00, ov12_02232B40, v0);
 }
 
@@ -3009,7 +3009,7 @@ static const u16 Unk_ov12_0223A1CC[6] = {
     0x1
 };
 
-static void ov12_02232D38(UnkStruct_ov12_02232D38 *param0, CellActorData *param1)
+static void ov12_02232D38(UnkStruct_ov12_02232D38 *param0, ManagedSprite *param1)
 {
     int v0;
 
@@ -3030,8 +3030,8 @@ static void ov12_02232D64(UnkStruct_ov12_02232D38 *param0)
 
     v0 = ov12_02235254(param0->unk_00, ov12_02220240(param0->unk_00));
 
-    Sprite_SetDrawFlag2(param0->unk_20, Unk_ov12_0223A1CC[v0]);
-    Sprite_SetDrawFlag2(param0->unk_18, 1);
+    ManagedSprite_SetDrawFlag(param0->unk_20, Unk_ov12_0223A1CC[v0]);
+    ManagedSprite_SetDrawFlag(param0->unk_18, 1);
 
     ov12_02225FA4(&param0->unk_28, &v1, &v2);
 
@@ -3039,7 +3039,7 @@ static void ov12_02232D64(UnkStruct_ov12_02232D38 *param0)
         v1 = -v1;
     }
 
-    Sprite_SetAffineScale(param0->unk_18, v1, v2);
+    ManagedSprite_SetAffineScale(param0->unk_18, v1, v2);
     ov12_02232D38(param0, param0->unk_18);
 }
 
@@ -3057,7 +3057,7 @@ static BOOL ov12_02232E04(UnkStruct_ov12_02232D38 *param0)
             v1 = -v1;
         }
 
-        Sprite_SetAffineScale(param0->unk_18, v1, v2);
+        ManagedSprite_SetAffineScale(param0->unk_18, v1, v2);
         ov12_0222605C(param0->unk_18, param0->unk_14, param0->unk_10, param0->unk_28.unk_04[4], 0);
         param0->unk_98--;
 
@@ -3078,13 +3078,13 @@ static BOOL ov12_02232E04(UnkStruct_ov12_02232D38 *param0)
                 v1 = -v1;
             }
 
-            Sprite_SetAffineScale(param0->unk_18, v1, v2);
+            ManagedSprite_SetAffineScale(param0->unk_18, v1, v2);
             ov12_0222605C(param0->unk_18, param0->unk_14, param0->unk_10, param0->unk_28.unk_04[4], 0);
         } else {
             param0->unk_94++;
 
-            Sprite_SetDrawFlag2(param0->unk_20, 0);
-            Sprite_SetDrawFlag2(param0->unk_18, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_20, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_18, 0);
 
             v0 = 1;
         }
@@ -3103,7 +3103,7 @@ static void ov12_02232F30(UnkStruct_ov12_02232D38 *param0)
     f32 v2, v3;
     int v4;
 
-    Sprite_GetPositionXY2(param0->unk_1C, &v0, &v1);
+    ManagedSprite_GetPositionXY(param0->unk_1C, &v0, &v1);
 
     ov12_02225BC8(&param0->unk_70, v0, v0, v1 - 64, v1, 8);
     ov12_02225EF0(&param0->unk_28, 2, 10, 20, 10, 10, 8);
@@ -3113,7 +3113,7 @@ static void ov12_02232F30(UnkStruct_ov12_02232D38 *param0)
         v2 = -v2;
     }
 
-    Sprite_SetAffineScale(param0->unk_1C, v2, v3);
+    ManagedSprite_SetAffineScale(param0->unk_1C, v2, v3);
     ov12_02225C50(&param0->unk_70, param0->unk_1C);
 
     param0->unk_94 = 0;
@@ -3121,8 +3121,8 @@ static void ov12_02232F30(UnkStruct_ov12_02232D38 *param0)
 
     v4 = ov12_02235254(param0->unk_00, ov12_02220248(param0->unk_00));
 
-    Sprite_SetDrawFlag2(param0->unk_24, Unk_ov12_0223A1CC[v4]);
-    Sprite_SetDrawFlag2(param0->unk_1C, 1);
+    ManagedSprite_SetDrawFlag(param0->unk_24, Unk_ov12_0223A1CC[v4]);
+    ManagedSprite_SetDrawFlag(param0->unk_1C, 1);
 
     ov12_02232D38(param0, param0->unk_1C);
 }
@@ -3152,7 +3152,7 @@ static BOOL ov12_02232FF0(UnkStruct_ov12_02232D38 *param0)
             v0 = -v0;
         }
 
-        Sprite_SetAffineScale(param0->unk_1C, v0, v1);
+        ManagedSprite_SetAffineScale(param0->unk_1C, v0, v1);
 
         if (v3 == 0) {
             param0->unk_94++;
@@ -3220,7 +3220,7 @@ static void ov12_02233094(SysTask *param0, void *param1)
 void ov12_02233178(UnkStruct_ov12_0221FCDC *param0)
 {
     UnkStruct_ov12_02232D38 *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
     s16 v2, v3;
     s16 v4, v5;
 
@@ -3244,30 +3244,30 @@ void ov12_02233178(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_10 = ov12_02223354(v0->unk_00, ov12_02220240(v0->unk_00));
     v0->unk_18 = ov12_022202C0(v0->unk_00, 0);
 
-    Sprite_SetPriority(v0->unk_18, 100);
-    Sprite_SetExplicitPriority(v0->unk_18, 1);
-    Sprite_SetPositionXY2(v0->unk_18, v2, v3);
-    Sprite_SetDrawFlag2(v0->unk_18, FALSE);
-    Sprite_SetExplicitOamMode2(v0->unk_18, GX_OAM_MODE_XLU);
-    Sprite_SetAffineOverwriteMode(v0->unk_18, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetPriority(v0->unk_18, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_18, 1);
+    ManagedSprite_SetPositionXY(v0->unk_18, v2, v3);
+    ManagedSprite_SetDrawFlag(v0->unk_18, FALSE);
+    ManagedSprite_SetExplicitOamMode(v0->unk_18, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_18, AFFINE_OVERWRITE_MODE_DOUBLE);
 
     v0->unk_1C = ov12_022202C0(v0->unk_00, 1);
 
-    Sprite_SetPriority(v0->unk_1C, 100);
-    Sprite_SetExplicitPriority(v0->unk_1C, 1);
-    Sprite_SetPositionXY2(v0->unk_1C, v4, v5);
-    Sprite_SetDrawFlag2(v0->unk_1C, FALSE);
-    Sprite_SetExplicitOamMode2(v0->unk_1C, GX_OAM_MODE_XLU);
-    Sprite_SetAffineOverwriteMode(v0->unk_1C, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetAffineTranslation(v0->unk_1C, 0, 80 / 2);
+    ManagedSprite_SetPriority(v0->unk_1C, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_1C, 1);
+    ManagedSprite_SetPositionXY(v0->unk_1C, v4, v5);
+    ManagedSprite_SetDrawFlag(v0->unk_1C, FALSE);
+    ManagedSprite_SetExplicitOamMode(v0->unk_1C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAffineOverwriteMode(v0->unk_1C, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAffineTranslation(v0->unk_1C, 0, 80 / 2);
 
     v0->unk_C8 = ov12_022234A8(v0->unk_00, 0);
     v0->unk_CC = ov12_022234A8(v0->unk_00, 1);
     v0->unk_20 = ov12_022202C0(v0->unk_00, 2);
     v0->unk_24 = ov12_022202C0(v0->unk_00, 3);
 
-    Sprite_SetDrawFlag2(v0->unk_20, 0);
-    Sprite_SetDrawFlag2(v0->unk_24, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_20, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_24, 0);
 
     ov12_022201E8(v0->unk_00, ov12_02233094, v0);
 }
@@ -3282,7 +3282,7 @@ static void ov12_02233338(UnkStruct_ov12_022332E8 *param0)
 {
     ov12_02225E68(&param0->unk_F8, 10, 10, 25, 6);
     ov12_022261C4(&param0->unk_48, &param0->unk_F8, ov12_02225EB8, param0->unk_38, param0->unk_3A, 5, 3, 1, param0->unk_3C[0], param0->unk_3C[1], param0->unk_3C[2], NULL);
-    Sprite_SetDrawFlag2(param0->unk_3C[0], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_3C[0], 1);
 }
 
 static void ov12_02233394(SysTask *param0, void *param1)
@@ -3297,7 +3297,7 @@ static void ov12_02233394(SysTask *param0, void *param1)
         break;
     case 1:
         if (ov12_02226274(&v0->unk_48) == 0) {
-            Sprite_SetDrawFlag2(v0->unk_3C[0], 1);
+            ManagedSprite_SetDrawFlag(v0->unk_3C[0], 1);
             v0->unk_0C++;
             ov12_02226108(&v0->unk_14, 4, 0, 1, 6);
         }
@@ -3326,7 +3326,7 @@ static void ov12_02233394(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_022332E8 *v0;
     int v1;
@@ -3347,17 +3347,17 @@ void ov12_02233454(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     for (v1 = 0; v1 < 3; v1++) {
         if (v1 == 0) {
             v0->unk_3C[v1] = param3;
-            Sprite_SetAnim(v0->unk_3C[v1], 1);
+            ManagedSprite_SetAnim(v0->unk_3C[v1], 1);
         } else {
             v0->unk_3C[v1] = SpriteSystem_NewSprite(v0->unk_04, v0->unk_08, &v2);
-            Sprite_SetExplicitOamMode2(v0->unk_3C[v1], GX_OAM_MODE_XLU);
+            ManagedSprite_SetExplicitOamMode(v0->unk_3C[v1], GX_OAM_MODE_XLU);
         }
 
-        Sprite_SetPriority(v0->unk_3C[v1], 100);
-        Sprite_SetExplicitPriority(v0->unk_3C[v1], 1);
-        Sprite_SetPositionXY2(v0->unk_3C[v1], v0->unk_38, v0->unk_3A);
-        Sprite_SetDrawFlag2(v0->unk_3C[v1], FALSE);
-        Sprite_SetAffineOverwriteMode(v0->unk_3C[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetPriority(v0->unk_3C[v1], 100);
+        ManagedSprite_SetExplicitPriority(v0->unk_3C[v1], 1);
+        ManagedSprite_SetPositionXY(v0->unk_3C[v1], v0->unk_38, v0->unk_3A);
+        ManagedSprite_SetDrawFlag(v0->unk_3C[v1], FALSE);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_3C[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
     }
 
     ov12_022201E8(v0->unk_00, ov12_02233394, v0);
@@ -3389,12 +3389,12 @@ static void ov12_02233574(UnkStruct_ov12_0223351C *param0)
         v2 = param0->unk_30[v0].unk_04[1] * 5;
         v1 = FX_Mul(FX_SinIdx(v2), (FX32_ONE * 10) * param0->unk_14) >> FX32_SHIFT;
 
-        Sprite_SetPositionXY2(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132 + v1);
+        ManagedSprite_SetPositionXY(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132 + v1);
 
         if ((param0->unk_30[v0].unk_04[1] >= ((90 * 0xffff) / 360)) && (param0->unk_30[v0].unk_04[1] <= ((269 * 0xffff) / 360))) {
-            Sprite_SetExplicitPriority(param0->unk_18[v0], 1);
+            ManagedSprite_SetExplicitPriority(param0->unk_18[v0], 1);
         } else {
-            Sprite_SetExplicitPriority(param0->unk_18[v0], ov12_0222339C(param0->unk_00) + 1);
+            ManagedSprite_SetExplicitPriority(param0->unk_18[v0], ov12_0222339C(param0->unk_00) + 1);
         }
     }
 }
@@ -3449,11 +3449,11 @@ static void ov12_02233644(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_0223351C *v0;
     int v1;
-    Sprite *v2;
+    PokemonSprite *v2;
     SpriteTemplate v3;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_0223351C));
@@ -3476,25 +3476,25 @@ void ov12_02233734(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_18[v1] = SpriteSystem_NewSprite(v0->unk_04, v0->unk_08, &v3);
         }
 
-        Sprite_SetPriority(v0->unk_18[v1], 100);
-        Sprite_SetExplicitOamMode2(v0->unk_18[v1], GX_OAM_MODE_XLU);
-        Sprite_SetAnimateFlag(v0->unk_18[v1], 1);
+        ManagedSprite_SetPriority(v0->unk_18[v1], 100);
+        ManagedSprite_SetExplicitOamMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
+        ManagedSprite_SetAnimateFlag(v0->unk_18[v1], 1);
     }
 
     v0->unk_14 = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00));
     ov12_022201E8(v0->unk_00, ov12_02233644, v0);
 }
 
-static void ov12_022337E0(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, int param2, int param3)
+static void ov12_022337E0(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1, int param2, int param3)
 {
     s16 v0, v1;
 
-    Sprite_GetPositionXY2(param0, &v0, &v1);
+    ManagedSprite_GetPositionXY(param0, &v0, &v1);
     ov12_02225BC8(param1, v0 + (0 * param2), v0 + (256 * param2), v1 + (0 * param3), v1 + (-128 * param3), 59);
-    Sprite_SetDrawFlag2(param0, 1);
+    ManagedSprite_SetDrawFlag(param0, 1);
 }
 
-static BOOL ov12_02233834(CellActorData *param0, UnkStruct_ov12_02225F6C *param1)
+static BOOL ov12_02233834(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1)
 {
     s16 v0, v1;
     s16 v2;
@@ -3503,18 +3503,18 @@ static BOOL ov12_02233834(CellActorData *param0, UnkStruct_ov12_02225F6C *param1
     u16 v5;
 
     if (ov12_02225C50(param1, param0)) {
-        Sprite_GetPositionXY2(param0, &v0, &v1);
+        ManagedSprite_GetPositionXY(param0, &v0, &v1);
 
         v5 = v0 * ((2 * 0xffff) / 360);
         v2 = FX_Mul(FX_SinIdx(v5), (FX32_ONE * 14)) >> FX32_SHIFT;
 
-        Sprite_SetPositionXY2(param0, v0, v1 + v2);
+        ManagedSprite_SetPositionXY(param0, v0, v1 + v2);
 
         v3 = FX_Mul(FX_SinIdx(v5), (FX32_CONST(0.17f)));
         v3 *= -1;
         v4 = (1.0f) + FX_FX32_TO_F32(v3);
 
-        Sprite_SetAffineScale(param0, v4, v4);
+        ManagedSprite_SetAffineScale(param0, v4, v4);
         return 0;
     }
 
@@ -3567,12 +3567,12 @@ static void ov12_02233988(SysTask *param0, void *param1)
     }
 }
 
-void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02233900 *v0;
     int v1;
     s16 v2, v3;
-    Sprite *v4;
+    PokemonSprite *v4;
     SpriteTemplate v5;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02233900));
@@ -3593,12 +3593,12 @@ void ov12_022339C4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_18[v1] = SpriteSystem_NewSprite(v0->unk_04, v0->unk_08, &v5);
         }
 
-        Sprite_SetPriority(v0->unk_18[v1], 100);
-        Sprite_SetExplicitPriority(v0->unk_18[v1], 1);
-        Sprite_SetAffineOverwriteMode(v0->unk_18[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetDrawFlag2(v0->unk_18[v1], FALSE);
-        Sprite_SetPositionXY2(v0->unk_18[v1], v2, v3);
-        Sprite_SetAnim(v0->unk_18[v1], v1 % 3);
+        ManagedSprite_SetPriority(v0->unk_18[v1], 100);
+        ManagedSprite_SetExplicitPriority(v0->unk_18[v1], 1);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_18[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetDrawFlag(v0->unk_18[v1], FALSE);
+        ManagedSprite_SetPositionXY(v0->unk_18[v1], v2, v3);
+        ManagedSprite_SetAnim(v0->unk_18[v1], v1 % 3);
     }
 
     v0->unk_10 = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00));
@@ -3724,7 +3724,7 @@ static void ov12_02233BD8(SysTask *param0, void *param1)
 void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0)
 {
     UnkStruct_ov12_02233AA0 *v0;
-    Sprite *v1;
+    PokemonSprite *v1;
     s16 v2, v3;
     int v4;
 
@@ -3832,7 +3832,7 @@ static void ov12_02233F4C(SysTask *param0, void *param1)
         }
         break;
     case 2:
-        if (Sprite_IsAnimated(v0->unk_10) == 0) {
+        if (ManagedSprite_IsAnimated(v0->unk_10) == 0) {
             v0->unk_0C++;
             ov12_02226424(&v0->unk_14, 16, 0, 16 - 16, 16 - 0, 8);
         }
@@ -3852,7 +3852,7 @@ static void ov12_02233F4C(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02233F4C *v0;
 
@@ -3863,8 +3863,8 @@ void ov12_02234008(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_08 = param2;
     v0->unk_10 = param3;
 
-    Sprite_SetAnimateFlag(v0->unk_10, 1);
-    Sprite_SetExplicitOamMode2(v0->unk_10, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnimateFlag(v0->unk_10, 1);
+    ManagedSprite_SetExplicitOamMode(v0->unk_10, GX_OAM_MODE_XLU);
 
     ov12_022201E8(v0->unk_00, ov12_02233F4C, v0);
 }
@@ -3993,7 +3993,7 @@ void ov12_022342C4(UnkStruct_ov12_0221FCDC *param0)
     v4 += 64 * v2;
     v5 += -16 * v3;
 
-    Sprite_SetPositionXY2(v0->unk_2C, v4, v5);
+    ManagedSprite_SetPositionXY(v0->unk_2C, v4, v5);
 
     ov12_02225BC8(&v0->unk_08, v4, v4 + (48 * v2), v5, v5 + (-16 * v3), 6);
     ov12_022201E8(v0->unk_00, ov12_02234290, v0);
diff --git a/src/overlay012/ov12_022346A4.c b/src/overlay012/ov12_022346A4.c
index 7f33be20ab..7106b9f747 100644
--- a/src/overlay012/ov12_022346A4.c
+++ b/src/overlay012/ov12_022346A4.c
@@ -12,8 +12,8 @@
 #include "overlay012/struct_ov12_02225F6C.h"
 #include "overlay012/struct_ov12_02226454.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task_manager.h"
 #include "unk_0200762C.h"
@@ -24,7 +24,7 @@ typedef struct {
     int unk_08;
     SpriteManager *unk_0C;
     int unk_10;
-    CellActorData *unk_14[2];
+    ManagedSprite *unk_14[2];
     UnkStruct_ov12_02225F6C unk_1C[2];
     UnkStruct_ov12_02225F6C unk_64[2];
 } UnkStruct_ov12_022346A4;
@@ -34,7 +34,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     SpriteManager *unk_0C;
-    CellActorData *unk_10;
+    ManagedSprite *unk_10;
     UnkStruct_ov12_02226454 unk_14;
 } UnkStruct_ov12_022348C8;
 
@@ -42,7 +42,7 @@ typedef struct {
     UnkStruct_ov12_0221FCDC *unk_00;
     int unk_04;
     SpriteManager *unk_08;
-    CellActorData *unk_0C[6];
+    ManagedSprite *unk_0C[6];
     int unk_24[6];
     int unk_3C[6];
 } UnkStruct_ov12_02234A10;
@@ -54,7 +54,7 @@ typedef struct {
     int unk_0C;
     int unk_10;
     int unk_14;
-    CellActorData *unk_18[6];
+    ManagedSprite *unk_18[6];
     UnkStruct_ov12_02225F6C unk_30[6];
     UnkStruct_ov12_02226454 unk_108;
     s16 unk_130;
@@ -62,15 +62,15 @@ typedef struct {
 } UnkStruct_ov12_02234BD8;
 
 static void ov12_02234750(SysTask *param0, void *param1);
-static void ov12_0223483C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3);
-static BOOL ov12_0223489C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2);
+static void ov12_0223483C(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3);
+static BOOL ov12_0223489C(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2);
 static void ov12_02234918(SysTask *param0, void *param1);
 static void ov12_02234B64(SysTask *param0, void *param1);
-static BOOL ov12_02234B34(CellActorData *param0, int *param1, int *param2);
-static void ov12_02234AE0(CellActorData *param0, int *param1, int *param2, int param3, int param4);
+static BOOL ov12_02234B34(ManagedSprite *param0, int *param1, int *param2);
+static void ov12_02234AE0(ManagedSprite *param0, int *param1, int *param2, int param3, int param4);
 static void ov12_02234CA8(SysTask *param0, void *param1);
 
-void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     SpriteTemplate v0;
     UnkStruct_ov12_022346A4 *v1;
@@ -92,14 +92,14 @@ void ov12_022346A4(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     for (v2 = 0; v2 < 2; v2++) {
         if (v2 == 0) {
             v1->unk_14[v2] = param3;
-            Sprite_SetPositionXY2(v1->unk_14[v2], v0.x, v0.y);
+            ManagedSprite_SetPositionXY(v1->unk_14[v2], v0.x, v0.y);
         } else {
             v1->unk_14[v2] = SpriteSystem_NewSprite(param1, param2, &v0);
         }
 
-        Sprite_SetDrawFlag2(v1->unk_14[v2], 0);
-        Sprite_SetPriority(v1->unk_14[v2], 100);
-        Sprite_SetExplicitPriority(v1->unk_14[v2], 1);
+        ManagedSprite_SetDrawFlag(v1->unk_14[v2], 0);
+        ManagedSprite_SetPriority(v1->unk_14[v2], 100);
+        ManagedSprite_SetExplicitPriority(v1->unk_14[v2], 1);
     }
 
     ov12_022201E8(v1->unk_00, ov12_02234750, v1);
@@ -151,19 +151,19 @@ static void ov12_02234750(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_0C);
 }
 
-static void ov12_0223483C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3)
+static void ov12_0223483C(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2, int param3)
 {
     s16 v0, v1;
 
-    Sprite_SetAffineOverwriteMode(param0, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetDrawFlag2(param0, TRUE);
-    Sprite_GetPositionXY2(param0, &v0, &v1);
+    ManagedSprite_SetAffineOverwriteMode(param0, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetDrawFlag(param0, TRUE);
+    ManagedSprite_GetPositionXY(param0, &v0, &v1);
 
     ov12_02225BC8(param1, v0, v0 + (16 * param3), v1, v1 + -32, 32);
     ov12_02225E68(param2, 2, 10, 10, 32);
 }
 
-static BOOL ov12_0223489C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2)
+static BOOL ov12_0223489C(ManagedSprite *param0, UnkStruct_ov12_02225F6C *param1, UnkStruct_ov12_02225F6C *param2)
 {
     BOOL v0;
 
@@ -174,11 +174,11 @@ static BOOL ov12_0223489C(CellActorData *param0, UnkStruct_ov12_02225F6C *param1
         return 0;
     }
 
-    Sprite_SetDrawFlag2(param0, 0);
+    ManagedSprite_SetDrawFlag(param0, 0);
     return 1;
 }
 
-void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_022348C8 *v0;
     int v1;
@@ -189,12 +189,12 @@ void ov12_022348C8(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     v0->unk_0C = param2;
     v0->unk_10 = param3;
 
-    Sprite_SetDrawFlag2(v0->unk_10, 0);
-    Sprite_SetExplicitOamMode2(v0->unk_10, GX_OAM_MODE_XLU);
-    Sprite_SetPriority(v0->unk_10, 100);
-    Sprite_SetExplicitPriority(v0->unk_10, 1);
+    ManagedSprite_SetDrawFlag(v0->unk_10, 0);
+    ManagedSprite_SetExplicitOamMode(v0->unk_10, GX_OAM_MODE_XLU);
+    ManagedSprite_SetPriority(v0->unk_10, 100);
+    ManagedSprite_SetExplicitPriority(v0->unk_10, 1);
 
-    v0->unk_08 = Sprite_GetExplicitPaletteOffset(v0->unk_10);
+    v0->unk_08 = ManagedSprite_GetExplicitPaletteOffset(v0->unk_10);
 
     ov12_022201E8(v0->unk_00, ov12_02234918, v0);
 }
@@ -207,7 +207,7 @@ static void ov12_02234918(SysTask *param0, void *param1)
     switch (v0->unk_04) {
     case 0:
         ov12_02226424(&v0->unk_14, 0, 16, 20 - 0, 20 - 16, 10);
-        Sprite_SetDrawFlag2(v0->unk_10, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_10, 1);
         ov12_02235780(v0->unk_00, 0, 20 - 0);
         v0->unk_04++;
         break;
@@ -215,17 +215,17 @@ static void ov12_02234918(SysTask *param0, void *param1)
         if (ov12_02226454(&v0->unk_14)) {
             v0->unk_04++;
 
-            Sprite_SetAnimateFlag(v0->unk_10, 1);
-            Sprite_SetAnimationSpeed(v0->unk_10, FX32_ONE);
+            ManagedSprite_SetAnimateFlag(v0->unk_10, 1);
+            ManagedSprite_SetAnimationSpeed(v0->unk_10, FX32_ONE);
         }
         break;
     case 2:
-        v1 = Sprite_GetAnimationFrame(v0->unk_10);
+        v1 = ManagedSprite_GetAnimationFrame(v0->unk_10);
         v1 %= 3;
 
-        Sprite_SetExplicitPaletteOffset(v0->unk_10, v0->unk_08 + v1);
+        ManagedSprite_SetExplicitPaletteOffset(v0->unk_10, v0->unk_08 + v1);
 
-        if (Sprite_IsAnimated(v0->unk_10) == 0) {
+        if (ManagedSprite_IsAnimated(v0->unk_10) == 0) {
             v0->unk_04++;
             ov12_02226424(&v0->unk_14, 16, 0, 20 - 16, 20 - 0, 8);
         }
@@ -233,7 +233,7 @@ static void ov12_02234918(SysTask *param0, void *param1)
     case 3:
         if (ov12_02226454(&v0->unk_14)) {
             v0->unk_04++;
-            Sprite_SetDrawFlag2(v0->unk_10, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_10, 0);
         }
         break;
     case 4:
@@ -246,7 +246,7 @@ static void ov12_02234918(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_0C);
 }
 
-void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     SpriteTemplate v0;
     UnkStruct_ov12_02234A10 *v1;
@@ -269,14 +269,14 @@ void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     for (v3 = 6 - 1; v3 >= 0; v3--) {
         if (v3 == 6 - 1) {
             v1->unk_0C[v3] = param3;
-            Sprite_SetPositionXY2(param3, v0.x, v0.y);
+            ManagedSprite_SetPositionXY(param3, v0.x, v0.y);
         } else {
             v1->unk_0C[v3] = SpriteSystem_NewSprite(param1, param2, &v0);
         }
 
-        Sprite_SetPriority(v1->unk_0C[v3], 100);
-        Sprite_SetExplicitPriority(v1->unk_0C[v3], 1);
-        Sprite_SetDrawFlag2(v1->unk_0C[v3], 0);
+        ManagedSprite_SetPriority(v1->unk_0C[v3], 100);
+        ManagedSprite_SetExplicitPriority(v1->unk_0C[v3], 1);
+        ManagedSprite_SetDrawFlag(v1->unk_0C[v3], 0);
 
         ov12_02234AE0(v1->unk_0C[v3], &v1->unk_24[v3], &v1->unk_3C[v3], v3, v4);
     }
@@ -284,36 +284,36 @@ void ov12_02234A10(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
     ov12_022201E8(v1->unk_00, ov12_02234B64, v1);
 }
 
-static void ov12_02234AE0(CellActorData *param0, int *param1, int *param2, int param3, int param4)
+static void ov12_02234AE0(ManagedSprite *param0, int *param1, int *param2, int param3, int param4)
 {
     s16 v0, v1;
 
-    Sprite_SetAnim(param0, param3 / 2);
+    ManagedSprite_SetAnim(param0, param3 / 2);
 
     *param2 = param3 * 2;
     *param1 = 16;
 
-    Sprite_GetPositionXY2(param0, &v0, &v1);
+    ManagedSprite_GetPositionXY(param0, &v0, &v1);
 
     v0 += (40 + (-12 * param3)) * param4;
     v1 += 40;
 
-    Sprite_SetPositionXY2(param0, v0, v1);
+    ManagedSprite_SetPositionXY(param0, v0, v1);
 }
 
-static BOOL ov12_02234B34(CellActorData *param0, int *param1, int *param2)
+static BOOL ov12_02234B34(ManagedSprite *param0, int *param1, int *param2)
 {
     if (*param2 > 0) {
         (*param2)--;
 
         if (*param2 == 0) {
-            Sprite_SetDrawFlag2(param0, 1);
+            ManagedSprite_SetDrawFlag(param0, 1);
         }
     } else {
         if (*param1 > 0) {
             (*param1)--;
         } else {
-            Sprite_SetDrawFlag2(param0, 0);
+            ManagedSprite_SetDrawFlag(param0, 0);
             return 1;
         }
     }
@@ -372,12 +372,12 @@ static void ov12_02234C30(UnkStruct_ov12_02234BD8 *param0)
     for (v0 = 0; v0 < 6; v0++) {
         ov12_02225AE0(&param0->unk_30[v0]);
 
-        Sprite_SetPositionXY2(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132);
+        ManagedSprite_SetPositionXY(param0->unk_18[v0], param0->unk_130 + param0->unk_30[v0].unk_00, param0->unk_132);
 
         if ((param0->unk_30[v0].unk_04[1] >= ((90 * 0xffff) / 360)) && (param0->unk_30[v0].unk_04[1] <= ((269 * 0xffff) / 360))) {
-            Sprite_SetExplicitPriority(param0->unk_18[v0], 1);
+            ManagedSprite_SetExplicitPriority(param0->unk_18[v0], 1);
         } else {
-            Sprite_SetExplicitPriority(param0->unk_18[v0], ov12_0222339C(param0->unk_00) + 1);
+            ManagedSprite_SetExplicitPriority(param0->unk_18[v0], ov12_0222339C(param0->unk_00) + 1);
         }
     }
 }
@@ -433,11 +433,11 @@ static void ov12_02234CA8(SysTask *param0, void *param1)
     SpriteSystem_DrawSprites(v0->unk_08);
 }
 
-void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, CellActorData *param3)
+void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, SpriteManager *param2, ManagedSprite *param3)
 {
     UnkStruct_ov12_02234BD8 *v0;
     int v1;
-    Sprite *v2;
+    PokemonSprite *v2;
     SpriteTemplate v3;
 
     v0 = ov12_02235E50((param0), sizeof(UnkStruct_ov12_02234BD8));
@@ -460,9 +460,9 @@ void ov12_02234D98(UnkStruct_ov12_0221FCDC *param0, SpriteSystem *param1, Sprite
             v0->unk_18[v1] = SpriteSystem_NewSprite(v0->unk_04, v0->unk_08, &v3);
         }
 
-        Sprite_SetPriority(v0->unk_18[v1], 100);
-        Sprite_SetExplicitOamMode2(v0->unk_18[v1], GX_OAM_MODE_XLU);
-        Sprite_SetAnimateFlag(v0->unk_18[v1], 1);
+        ManagedSprite_SetPriority(v0->unk_18[v1], 100);
+        ManagedSprite_SetExplicitOamMode(v0->unk_18[v1], GX_OAM_MODE_XLU);
+        ManagedSprite_SetAnimateFlag(v0->unk_18[v1], 1);
     }
 
     v0->unk_14 = ov12_02225964(v0->unk_00, ov12_02220240(v0->unk_00));
diff --git a/src/overlay012/ov12_02234E44.c b/src/overlay012/ov12_02234E44.c
index 48ba131087..95959ec499 100644
--- a/src/overlay012/ov12_02234E44.c
+++ b/src/overlay012/ov12_02234E44.c
@@ -29,9 +29,9 @@ typedef struct {
 typedef struct {
     UnkStruct_ov12_02234E44 unk_00;
     UnkStruct_ov12_0223595C unk_18;
-    CellActorData *unk_34;
-    CellActorData *unk_38;
-    CellActorData *unk_3C;
+    ManagedSprite *unk_34;
+    ManagedSprite *unk_38;
+    ManagedSprite *unk_3C;
     u8 unk_40;
 } UnkStruct_ov12_02234E54;
 
@@ -100,9 +100,9 @@ static void ov12_02234EF0(SysTask *param0, void *param1)
 
         if ((v0->unk_00.unk_14 == 0) && (v0->unk_00.unk_16 == 16)) {
             Bg_ClearTilemap(v0->unk_18.unk_14, 2);
-            Sprite_SetDrawFlag2(v0->unk_34, 0);
-            Sprite_SetDrawFlag2(v0->unk_38, 0);
-            Sprite_SetDrawFlag2(v0->unk_3C, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_34, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_38, 0);
+            ManagedSprite_SetDrawFlag(v0->unk_3C, 0);
             v0->unk_18.unk_00++;
         }
 
@@ -126,9 +126,9 @@ static void ov12_02234EF0(SysTask *param0, void *param1)
     Bg_SetOffset(v0->unk_18.unk_14, 2, 0, v0->unk_00.unk_10);
     Bg_SetOffset(v0->unk_18.unk_14, 2, 3, v0->unk_00.unk_12);
 
-    Sprite_TickOneFrame(v0->unk_34);
-    Sprite_TickOneFrame(v0->unk_38);
-    Sprite_TickOneFrame(v0->unk_3C);
+    ManagedSprite_TickFrame(v0->unk_34);
+    ManagedSprite_TickFrame(v0->unk_38);
+    ManagedSprite_TickFrame(v0->unk_3C);
     SpriteSystem_DrawSprites(v0->unk_18.unk_0C);
 }
 
@@ -156,8 +156,8 @@ static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E
         v1 = ov12_02223428(v0->unk_18.unk_04, 2);
         v1 = 2;
 
-        Sprite_SetExplicitPriority(v0->unk_34, v1);
-        Sprite_SetExplicitPriority(v0->unk_38, v1);
+        ManagedSprite_SetExplicitPriority(v0->unk_34, v1);
+        ManagedSprite_SetExplicitPriority(v0->unk_38, v1);
 
         {
             int v2;
@@ -172,24 +172,24 @@ static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E
             v2 = ov12_02235254(param0, v3);
 
             if (ov12_0221FDD4(param0) == 1) {
-                Sprite_SetDrawFlag2(v0->unk_3C, 0);
+                ManagedSprite_SetDrawFlag(v0->unk_3C, 0);
                 v1 = ov12_02223428(v0->unk_18.unk_04, 2);
-                Sprite_SetExplicitPriority(v0->unk_34, v1);
-                Sprite_SetExplicitPriority(v0->unk_38, v1);
+                ManagedSprite_SetExplicitPriority(v0->unk_34, v1);
+                ManagedSprite_SetExplicitPriority(v0->unk_38, v1);
             } else {
                 if ((v2 == 0) || (v2 == 1)) {
-                    Sprite_SetDrawFlag2(v0->unk_3C, 0);
+                    ManagedSprite_SetDrawFlag(v0->unk_3C, 0);
                 } else if ((v2 == 4) || (v2 == 3)) {
                     if (v0->unk_00.unk_08 == 0) {
-                        Sprite_SetExplicitPriority(v0->unk_3C, v1 + 1);
+                        ManagedSprite_SetExplicitPriority(v0->unk_3C, v1 + 1);
                     } else {
-                        Sprite_SetExplicitPriority(v0->unk_3C, v1 + 1);
+                        ManagedSprite_SetExplicitPriority(v0->unk_3C, v1 + 1);
                     }
                 } else {
                     if (v0->unk_00.unk_08 == 0) {
-                        Sprite_SetExplicitPriority(v0->unk_3C, v1 - 1);
+                        ManagedSprite_SetExplicitPriority(v0->unk_3C, v1 - 1);
                     } else {
-                        Sprite_SetExplicitPriority(v0->unk_3C, v1 - 1);
+                        ManagedSprite_SetExplicitPriority(v0->unk_3C, v1 - 1);
                     }
                 }
             }
@@ -201,7 +201,7 @@ static void ov12_0223507C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_02234E
         G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 1);
         GX_SetVisibleWnd(GX_WNDMASK_OW);
 
-        Sprite_SetExplicitOamMode2(v0->unk_38, GX_OAM_MODE_OBJWND);
+        ManagedSprite_SetExplicitOamMode(v0->unk_38, GX_OAM_MODE_OBJWND);
     }
 
     v0->unk_00.unk_10 = 0;
diff --git a/src/overlay012/ov12_02235254.c b/src/overlay012/ov12_02235254.c
index 1ead67c95b..6befc9bc19 100644
--- a/src/overlay012/ov12_02235254.c
+++ b/src/overlay012/ov12_02235254.c
@@ -727,7 +727,7 @@ void ov12_02235838(UnkStruct_ov12_0221FCDC *param0, int param1, BOOL param2)
     G2_SetWndOutsidePlane((1 << ov12_022233EC(param0, 0)) | (1 << ov12_022233EC(param0, 1)) | GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_OBJ, 1);
 }
 
-void ov12_02235918(Sprite *param0, UnkStruct_ov12_02235350 *param1)
+void ov12_02235918(PokemonSprite *param0, UnkStruct_ov12_02235350 *param1)
 {
     if (param0 == NULL) {
         param1->unk_00 = 0;
@@ -743,9 +743,9 @@ void ov12_02235918(Sprite *param0, UnkStruct_ov12_02235350 *param1)
     param1->unk_02 = sub_020080C0(param0, 1);
 }
 
-void ov12_02235950(CellActorData *param0, UnkStruct_ov12_02235350 *param1)
+void ov12_02235950(ManagedSprite *param0, UnkStruct_ov12_02235350 *param1)
 {
-    Sprite_GetPositionXY2(param0, &(param1->unk_00), &(param1->unk_02));
+    ManagedSprite_GetPositionXY(param0, &(param1->unk_00), &(param1->unk_02));
 }
 
 void ov12_0223595C(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov12_0223595C *param1)
diff --git a/src/overlay012/ov12_02235E94.c b/src/overlay012/ov12_02235E94.c
index dde402dbdb..0c529db27c 100644
--- a/src/overlay012/ov12_02235E94.c
+++ b/src/overlay012/ov12_02235E94.c
@@ -21,13 +21,13 @@
 #include "overlay012/struct_ov12_02236690.h"
 #include "overlay012/struct_ov12_02237728.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
 #include "palette.h"
 #include "pokemon.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sprite_util.h"
 #include "sys_task.h"
@@ -98,7 +98,7 @@ typedef struct BallRotation {
     BOOL unk_24;
     BOOL unk_28;
     SpriteManager *unk_2C;
-    CellActorData *unk_30;
+    ManagedSprite *unk_30;
     UnkStruct_ov12_02225D50 unk_34;
     UnkStruct_ov12_02225F6C unk_48[2];
     BallThrow unk_90;
@@ -1120,7 +1120,7 @@ static BOOL ov12_02236918(BallRotation *param0)
 {
     switch (param0->unk_08) {
     case 0:
-        Sprite_SetAnim(param0->unk_30, 1);
+        ManagedSprite_SetAnim(param0->unk_30, 1);
         {
             UnkStruct_ov12_02236690 v0;
 
@@ -1129,7 +1129,7 @@ static BOOL ov12_02236918(BallRotation *param0)
             v0.unk_0C = 0xFF;
             v0.unk_10 = 0;
 
-            Sprite_GetPositionXY2(param0->unk_30, &v0.unk_00, &v0.unk_02);
+            ManagedSprite_GetPositionXY(param0->unk_30, &v0.unk_00, &v0.unk_02);
 
             param0->unk_D8 = ov12_02223764(param0->unk_90.battleSys, param0->unk_90.heapID);
             param0->unk_D0 = ov12_02236690(&v0);
@@ -1137,7 +1137,7 @@ static BOOL ov12_02236918(BallRotation *param0)
         param0->unk_08++;
         break;
     case 1: {
-        int v1 = Sprite_GetAnimationFrame(param0->unk_30);
+        int v1 = ManagedSprite_GetAnimationFrame(param0->unk_30);
 
         if (v1 >= 2) {
             param0->unk_24 = 0;
@@ -1151,7 +1151,7 @@ static BOOL ov12_02236918(BallRotation *param0)
         break;
     case 3: {
         if (ov12_02236764(param0->unk_D0) == 0) {
-            Sprite_SetAnimationFrame(param0->unk_30, 0);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, 0);
             ov12_02236780(param0->unk_D0);
             param0->unk_08++;
         }
@@ -1175,7 +1175,7 @@ static BOOL ov12_022369FC(BallRotation *param0)
 
     switch (param0->unk_0C) {
     case 0:
-        Sprite_GetPositionXY2(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
+        ManagedSprite_GetPositionXY(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
         param0->unk_B8.unk_04 = 60;
         param0->unk_B8.unk_06 = 180;
         param0->unk_B8.unk_08 = 10;
@@ -1219,7 +1219,7 @@ static BOOL ov12_02236A6C(BallRotation *param0)
     {
         int v0;
 
-        v0 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+        v0 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
         PaletteData_StartFade(param0->unk_90.paletteSys, 0x4, 1 << v0, -1, 0, 12, 0x37F);
 
         param0->unk_08++;
@@ -1232,7 +1232,7 @@ static BOOL ov12_02236A6C(BallRotation *param0)
         {
             int v1;
 
-            v1 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+            v1 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
             PaletteData_StartFade(param0->unk_90.paletteSys, 0x4, 1 << v1, -1, 12, 0, 0x37F);
         }
 
@@ -1267,7 +1267,7 @@ static BOOL ov12_02236B20(BallRotation *param0)
         {
             s16 v0, v1;
 
-            Sprite_GetPositionXY2(param0->unk_30, &v0, &v1);
+            ManagedSprite_GetPositionXY(param0->unk_30, &v0, &v1);
             ov12_02225BC8(&param0->unk_48[0], v0, v0, v1, v1 + 32, 32 / 3);
 
             param0->unk_08++;
@@ -1328,8 +1328,8 @@ static BOOL ov12_02236B98(BallRotation *param0)
 {
     switch (param0->unk_08) {
     case 0:
-        Sprite_SetAnim(param0->unk_30, 1);
-        Sprite_SetAnimationFrame(param0->unk_30, 0);
+        ManagedSprite_SetAnim(param0->unk_30, 1);
+        ManagedSprite_SetAnimationFrame(param0->unk_30, 0);
         param0->unk_08++;
     case 1: {
         s16 v0, v1;
@@ -1339,7 +1339,7 @@ static BOOL ov12_02236B98(BallRotation *param0)
         v1 = Unk_ov12_0223ACF0[param0->unk_0C][1];
         v2 = Unk_ov12_0223ACF0[param0->unk_0C][2];
 
-        Sprite_SetAnimationFrame(param0->unk_30, v2);
+        ManagedSprite_SetAnimationFrame(param0->unk_30, v2);
 
         param0->unk_0C++;
 
@@ -1356,7 +1356,7 @@ static BOOL ov12_02236B98(BallRotation *param0)
         if ((param0->unk_0C > 20) || (v0 == 0xFF) || (v1 == 0xFF)) {
             param0->unk_08++;
         } else {
-            Sprite_OffsetPositionXY2(param0->unk_30, v0, v1);
+            ManagedSprite_OffsetPositionXY(param0->unk_30, v0, v1);
         }
     } break;
     default:
@@ -1412,7 +1412,7 @@ static BOOL ov12_02236C64(BallRotation *param0)
         if ((param0->unk_0C > 11) || (v0 == 0xFF)) {
             param0->unk_08++;
             param0->unk_18++;
-            Sprite_SetAffineZRotation(param0->unk_30, 0);
+            ManagedSprite_SetAffineZRotation(param0->unk_30, 0);
             ov12_022368E4(param0, 18);
             return 1;
         } else {
@@ -1420,8 +1420,8 @@ static BOOL ov12_02236C64(BallRotation *param0)
                 sub_02005728(1534, 117);
             }
 
-            Sprite_OffsetPositionXY2(param0->unk_30, v0, 0);
-            Sprite_OffsetAffineZRotation(param0->unk_30, ((((v0) * 2) * 0xffff) / 360));
+            ManagedSprite_OffsetPositionXY(param0->unk_30, v0, 0);
+            ManagedSprite_OffsetAffineZRotation(param0->unk_30, ((((v0) * 2) * 0xffff) / 360));
         }
     } break;
     default:
@@ -1456,7 +1456,7 @@ static BOOL ov12_02236D18(BallRotation *param0)
     {
         int v0;
 
-        v0 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+        v0 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
         PaletteData_StartFade(param0->unk_90.paletteSys, 0x4, 1 << v0, -5, 0, 10, 0x0);
 
         param0->unk_08++;
@@ -1474,7 +1474,7 @@ static BOOL ov12_02236D18(BallRotation *param0)
             v1.unk_0C = ov12_02235FB4(v1.unk_04);
             v1.unk_10 = 0;
 
-            Sprite_GetPositionXY2(param0->unk_30, &v1.unk_00, &v1.unk_02);
+            ManagedSprite_GetPositionXY(param0->unk_30, &v1.unk_00, &v1.unk_02);
             param0->unk_D0 = ov12_02236690(&v1);
         }
         param0->unk_08++;
@@ -1485,7 +1485,7 @@ static BOOL ov12_02236D18(BallRotation *param0)
         break;
     case 3: {
         if (ov12_02236764(param0->unk_D0) == 0) {
-            Sprite_SetAnimationFrame(param0->unk_30, 0);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, 0);
             ov12_02236780(param0->unk_D0);
             param0->unk_08++;
         }
@@ -1513,7 +1513,7 @@ static BOOL ov12_02236E0C(BallRotation *param0)
     case 0: {
         int v0;
 
-        v0 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+        v0 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
         PaletteData_StartFade(param0->unk_90.paletteSys, 0x4, 1 << v0, -5, 10, 0, 0x0);
     }
         param0->unk_08++;
@@ -1543,7 +1543,7 @@ static BOOL ov12_02236E7C(BallRotation *param0)
 {
     switch (param0->unk_08) {
     case 0:
-        Sprite_SetExplicitOamMode2(param0->unk_30, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(param0->unk_30, GX_OAM_MODE_XLU);
         param0->unk_08++;
     case 1:
         if (param0->unk_20 > 0) {
@@ -1552,7 +1552,7 @@ static BOOL ov12_02236E7C(BallRotation *param0)
         } else {
             param0->unk_20 = 0;
             param0->unk_21 = 15;
-            Sprite_SetDrawFlag2(param0->unk_30, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_30, 0);
             param0->unk_08++;
         }
 
@@ -1632,23 +1632,23 @@ static BOOL ov12_02236F24(BallRotation *param0)
             if (ov12_02235EB0(param0->unk_90.type) == 1) {
                 v0 = (LCRNG_Next() % 20) + 10;
 
-                Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000 * v0);
+                ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000 * v0);
             }
         }
         break;
     case 1:
         if (ov12_02235EB0(param0->unk_90.type) == 1) {
-            Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
+            ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
 
             if (param0->unk_B8.unk_0C > ((param0->unk_B8.unk_08 / 2) + 10)) {
-                Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
+                ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
             }
 
             if (ov12_02235EF0(param0->unk_90.type) == 1) {
                 if (param0->unk_B8.unk_0C == ((param0->unk_B8.unk_08 / 2) + 10)) {
                     int v1;
 
-                    v1 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+                    v1 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
                     param0->unk_D4 = ov12_02226870(param0->unk_90.paletteSys, param0->unk_90.heapID, 2, v1 * 16, 16, -2, 2, 0, 14, 0xFFFF, 1002);
                 }
             }
@@ -1691,7 +1691,7 @@ static BOOL ov12_02236F24(BallRotation *param0)
         }
         break;
     case 3:
-        Sprite_SetAnim(param0->unk_30, 1);
+        ManagedSprite_SetAnim(param0->unk_30, 1);
         ov12_02237E30(param0, 1);
         param0->unk_B8.unk_0C = 0;
         param0->unk_08++;
@@ -1702,7 +1702,7 @@ static BOOL ov12_02236F24(BallRotation *param0)
                 int v2;
 
                 if ((param0->unk_90.type != 12) && (param0->unk_90.type != 13)) {
-                    v2 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+                    v2 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
                     param0->unk_D4 = ov12_02226870(param0->unk_90.paletteSys, param0->unk_90.heapID, 2, v2 * 16, 16, -2, 2, 0, 14, 0xFFFF, 1002);
                 }
             }
@@ -1743,23 +1743,23 @@ static BOOL ov12_022371E4(BallRotation *param0)
             if (ov12_02235EB0(param0->unk_90.type) == 1) {
                 v0 = (LCRNG_Next() % 20) + 10;
 
-                Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000 * v0);
+                ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000 * v0);
             }
         }
         break;
     case 1:
         if (ov12_02235EB0(param0->unk_90.type) == 1) {
-            Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
+            ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
 
             if (param0->unk_B8.unk_0C > ((param0->unk_B8.unk_08 / 2) + 10)) {
-                Sprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
+                ManagedSprite_OffsetAffineZRotation(param0->unk_30, 0x2000);
             }
 
             if (ov12_02235EF0(param0->unk_90.type) == 1) {
                 if (param0->unk_B8.unk_0C == ((param0->unk_B8.unk_08 / 2) + 10)) {
                     int v1;
 
-                    v1 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+                    v1 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
                     param0->unk_D4 = ov12_02226870(param0->unk_90.paletteSys, param0->unk_90.heapID, 2, v1 * 16, 16, -2, 2, 0, 14, 0xFFFF, 1002);
                 }
             }
@@ -1799,19 +1799,19 @@ static BOOL ov12_022371E4(BallRotation *param0)
         }
         break;
     case 3:
-        Sprite_SetAnim(param0->unk_30, 1);
+        ManagedSprite_SetAnim(param0->unk_30, 1);
         ov12_02237E30(param0, 0);
         param0->unk_B8.unk_0C = 0;
         param0->unk_08++;
         break;
     default:
         if (param0->unk_B8.unk_0C == 5) {
-            Sprite_SetAnimationFrame(param0->unk_30, 2);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, 2);
 
             {
                 int v2;
 
-                v2 = Sprite_GetExplicitPaletteOffset(param0->unk_30);
+                v2 = ManagedSprite_GetExplicitPaletteOffset(param0->unk_30);
                 param0->unk_D4 = ov12_02226870(param0->unk_90.paletteSys, param0->unk_90.heapID, 2, v2 * 16, 16, -2, 2, 0, 14, 0xFFFF, 1002);
             }
 
@@ -1847,11 +1847,11 @@ static BOOL ov12_02237474(BallRotation *param0)
     switch (param0->unk_08) {
     case 0:
         ov12_02237E30(param0, 0);
-        Sprite_SetAnim(param0->unk_30, 1);
+        ManagedSprite_SetAnim(param0->unk_30, 1);
         param0->unk_B8.unk_0C++;
 
         if (param0->unk_B8.unk_0C >= Unk_ov12_0223ABBC[0][1]) {
-            Sprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[0][0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[0][0]);
             param0->unk_B8.unk_0C = 0;
             param0->unk_08++;
         }
@@ -1860,7 +1860,7 @@ static BOOL ov12_02237474(BallRotation *param0)
         param0->unk_B8.unk_0C++;
 
         if (param0->unk_B8.unk_0C >= Unk_ov12_0223ABBC[1][1]) {
-            Sprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[1][0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[1][0]);
             param0->unk_B8.unk_0C = 0;
             param0->unk_08++;
         }
@@ -1873,7 +1873,7 @@ static BOOL ov12_02237474(BallRotation *param0)
         v0.unk_0C = 0xFF;
         v0.unk_10 = 1;
 
-        Sprite_GetPositionXY2(param0->unk_30, &v0.unk_00, &v0.unk_02);
+        ManagedSprite_GetPositionXY(param0->unk_30, &v0.unk_00, &v0.unk_02);
         param0->unk_D0 = ov12_02236690(&v0);
     }
         param0->unk_08++;
@@ -1886,7 +1886,7 @@ static BOOL ov12_02237474(BallRotation *param0)
         param0->unk_B8.unk_0C++;
 
         if (param0->unk_B8.unk_0C >= Unk_ov12_0223ABBC[2][1]) {
-            Sprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[2][0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[2][0]);
             param0->unk_B8.unk_0C = 0;
             param0->unk_08++;
         }
@@ -1895,7 +1895,7 @@ static BOOL ov12_02237474(BallRotation *param0)
         param0->unk_B8.unk_0C++;
 
         if (param0->unk_B8.unk_0C >= Unk_ov12_0223ABBC[3][1]) {
-            Sprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[3][0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[3][0]);
             param0->unk_B8.unk_0C = 0;
             param0->unk_08++;
         }
@@ -1904,7 +1904,7 @@ static BOOL ov12_02237474(BallRotation *param0)
         param0->unk_B8.unk_0C++;
 
         if (param0->unk_B8.unk_0C >= Unk_ov12_0223ABBC[4][1]) {
-            Sprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[4][0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_30, Unk_ov12_0223ABBC[4][0]);
             param0->unk_B8.unk_0C = 0;
             param0->unk_08++;
         }
@@ -1938,7 +1938,7 @@ static BOOL ov12_02237608(BallRotation *param0)
         param0->unk_08++;
         break;
     case 1:
-        Sprite_SetAffineZRotation(param0->unk_30, param0->unk_34.unk_00);
+        ManagedSprite_SetAffineZRotation(param0->unk_30, param0->unk_34.unk_00);
 
         if (ov12_02225DA0(&param0->unk_34) == 0) {
             if (param0->unk_0C >= 1) {
@@ -1967,7 +1967,7 @@ static BOOL ov12_02237694(BallRotation *param0)
     if (param0->unk_30 != NULL) {
         s16 v0, v1;
 
-        Sprite_GetPositionXY2(param0->unk_30, &v0, &v1);
+        ManagedSprite_GetPositionXY(param0->unk_30, &v0, &v1);
 
         param0->unk_B8.unk_00 = v0;
         param0->unk_B8.unk_02 = v1;
@@ -1998,7 +1998,7 @@ static void ov12_022376D0(SysTask *param0, void *param1)
     }
 
     if (v1->unk_24 == 1) {
-        Sprite_TickOneFrame(v1->unk_30);
+        ManagedSprite_TickFrame(v1->unk_30);
     }
 
     SpriteSystem_DrawSprites(v1->unk_2C);
@@ -2095,7 +2095,7 @@ void ov12_0223786C(BallRotation *param0, int param1)
     param0->unk_10 = 0;
     param0->unk_1C = 1;
 
-    Sprite_GetPositionXY2(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
+    ManagedSprite_GetPositionXY(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
 }
 
 int ov12_02237890(BallRotation *param0)
@@ -2107,7 +2107,7 @@ int ov12_02237890(BallRotation *param0)
 
 static void ov12_022378A0(BallRotation *param0)
 {
-    Sprite_GetPositionXY2(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
+    ManagedSprite_GetPositionXY(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
 
     switch (param0->unk_90.type) {
     case 0:
@@ -2116,7 +2116,7 @@ static void ov12_022378A0(BallRotation *param0)
     case 3:
     case 4:
     case 5:
-        Sprite_GetPositionXY2(param0->unk_30, &param0->unk_B8.unk_04, &param0->unk_B8.unk_06);
+        ManagedSprite_GetPositionXY(param0->unk_30, &param0->unk_B8.unk_04, &param0->unk_B8.unk_06);
         param0->unk_B8.unk_10 = 0;
         param0->unk_B8.unk_08 = 12;
         return;
@@ -2126,7 +2126,7 @@ static void ov12_022378A0(BallRotation *param0)
         param0->unk_B8.unk_06 += 32;
         break;
     case 7:
-        Sprite_GetPositionXY2(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
+        ManagedSprite_GetPositionXY(param0->unk_30, &param0->unk_B8.unk_00, &param0->unk_B8.unk_02);
         ov12_02225864(1, 4, &param0->unk_B8.unk_04, &param0->unk_B8.unk_06);
         param0->unk_B8.unk_10 = 48;
         param0->unk_B8.unk_06 += 32;
@@ -2331,28 +2331,28 @@ static void ov12_02237D8C(BallRotation *param0)
 
     param0->unk_30 = SpriteSystem_NewSprite(param0->unk_90.cellActorSys, param0->unk_2C, &v1);
 
-    Sprite_SetDrawFlag2(param0->unk_30, TRUE);
-    Sprite_SetAffineOverwriteMode(param0->unk_30, AFFINE_OVERWRITE_MODE_DOUBLE);
-    Sprite_SetAnimationFrame(param0->unk_30, 0);
-    Sprite_SetAnim(param0->unk_30, 0);
-    Sprite_TickOneFrame(param0->unk_30);
+    ManagedSprite_SetDrawFlag(param0->unk_30, TRUE);
+    ManagedSprite_SetAffineOverwriteMode(param0->unk_30, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetAnimationFrame(param0->unk_30, 0);
+    ManagedSprite_SetAnim(param0->unk_30, 0);
+    ManagedSprite_TickFrame(param0->unk_30);
 
     ov12_02220474();
 }
 
 void ov12_02237E0C(BallRotation *param0, int param1)
 {
-    Sprite_SetDrawFlag2(param0->unk_30, param1);
+    ManagedSprite_SetDrawFlag(param0->unk_30, param1);
 }
 
 void ov12_02237E18(BallRotation *param0, s16 param1, s16 param2)
 {
-    Sprite_SetPositionXY2(param0->unk_30, param1, param2);
+    ManagedSprite_SetPositionXY(param0->unk_30, param1, param2);
 }
 
 void ov12_02237E24(BallRotation *param0, u16 param1)
 {
-    Sprite_SetAffineZRotation(param0->unk_30, param1);
+    ManagedSprite_SetAffineZRotation(param0->unk_30, param1);
 }
 
 void ov12_02237E30(BallRotation *param0, BOOL param1)
@@ -2362,12 +2362,12 @@ void ov12_02237E30(BallRotation *param0, BOOL param1)
 
 void ov12_02237E34(BallRotation *param0, int param1)
 {
-    Sprite_SetPriority(param0->unk_30, param1);
+    ManagedSprite_SetPriority(param0->unk_30, param1);
 }
 
 void ov12_02237E40(BallRotation *param0, int param1)
 {
-    Sprite_SetExplicitPriority(param0->unk_30, param1);
+    ManagedSprite_SetExplicitPriority(param0->unk_30, param1);
 }
 
 void ov12_02237E4C(BallRotation *param0, int param1)
diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c
index 0bb060d1c4..9f4c4cba7f 100644
--- a/src/overlay013/ov13_0221FC20.c
+++ b/src/overlay013/ov13_0221FC20.c
@@ -883,7 +883,7 @@ static u8 ov13_022208A4(UnkStruct_ov13_022213F0 *param0)
             param0->unk_04[v0->unk_11].unk_17_3 = PokemonSummaryScreen_StatusIconAnimIdx(param0->unk_04[v0->unk_11].unk_00);
 
             if (param0->unk_04[v0->unk_11].unk_17_3 == 7) {
-                Sprite_SetDrawFlag2(param0->unk_1FB4[13 + v0->unk_11], 0);
+                ManagedSprite_SetDrawFlag(param0->unk_1FB4[13 + v0->unk_11], 0);
                 ov13_022234A8(param0, v0->unk_11);
             }
 
@@ -1715,7 +1715,7 @@ static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0)
 
 static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_1FB4[26], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_1FB4[26], 0);
     Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[10]);
     Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[6]);
     Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[7]);
diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c
index 5629220df7..f1c5080ddc 100644
--- a/src/overlay013/ov13_02224500.c
+++ b/src/overlay013/ov13_02224500.c
@@ -324,7 +324,7 @@ static void ov13_02224848(UnkStruct_ov13_022213F0 *param0)
     SpriteSystem_LoadCharResObj(v0, param0->unk_1FB0, NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA, 26, FALSE, NNS_G2D_VRAM_TYPE_2DSUB, 45079);
 }
 
-static CellActorData *ov13_022248D8(UnkStruct_ov13_022213F0 *param0, u32 param1)
+static ManagedSprite *ov13_022248D8(UnkStruct_ov13_022213F0 *param0, u32 param1)
 {
     SpriteTemplate v0;
     SpriteSystem *v1;
@@ -374,10 +374,10 @@ void ov13_02224970(UnkStruct_ov13_022213F0 *param0)
     SpriteSystem_FreeResourcesAndManager(v0, param0->unk_1FB0);
 }
 
-static void ov13_022249AC(CellActorData *param0, const int param1, const int param2)
+static void ov13_022249AC(ManagedSprite *param0, const int param1, const int param2)
 {
-    Sprite_SetDrawFlag2(param0, 1);
-    Sprite_SetPositionXY2(param0, param1, param2);
+    ManagedSprite_SetDrawFlag(param0, 1);
+    ManagedSprite_SetPositionXY(param0, param1, param2);
 }
 
 static void ov13_022249CC(UnkStruct_ov13_022213F0 *param0)
@@ -389,33 +389,33 @@ static void ov13_022249CC(UnkStruct_ov13_022213F0 *param0)
             continue;
         }
 
-        Sprite_SetExplicitPalette2(param0->unk_1FB4[7 + v0], PokeIconPaletteIndex(param0->unk_04[v0].unk_04, param0->unk_04[v0].unk_2E, param0->unk_04[v0].unk_17_7));
+        ManagedSprite_SetExplicitPalette(param0->unk_1FB4[7 + v0], PokeIconPaletteIndex(param0->unk_04[v0].unk_04, param0->unk_04[v0].unk_2E, param0->unk_04[v0].unk_17_7));
     }
 }
 
-static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2, u8 param3)
+static void ov13_02224A0C(UnkStruct_ov13_022213F0 *param0, ManagedSprite *param1, u32 param2, u8 param3)
 {
     SpriteSystem *v0 = ov16_0223E010(param0->unk_00->unk_08);
 
     SpriteSystem_ReplaceCharResObj(v0, param0->unk_1FB0, sub_0207C944(), sub_0207C908(param3), 1, param2);
-    Sprite_SetExplicitPalette2(param1, sub_0207C92C(param3) + 4);
+    ManagedSprite_SetExplicitPalette(param1, sub_0207C92C(param3) + 4);
 }
 
-static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, CellActorData *param1, u32 param2)
+static void ov13_02224A5C(UnkStruct_ov13_022213F0 *param0, ManagedSprite *param1, u32 param2)
 {
     SpriteSystem *v0 = ov16_0223E010(param0->unk_00->unk_08);
 
     SpriteSystem_ReplaceCharResObj(v0, param0->unk_1FB0, sub_0207CAC0(), sub_0207CA90(param2), 1, 45077);
-    Sprite_SetExplicitPalette2(param1, sub_0207CAA8(param2) + 4);
+    ManagedSprite_SetExplicitPalette(param1, sub_0207CAA8(param2) + 4);
 }
 
-static void ov13_02224AB0(u16 param0, CellActorData *param1, const int param2, const int param3)
+static void ov13_02224AB0(u16 param0, ManagedSprite *param1, const int param2, const int param3)
 {
     if (param0 == 7) {
         return;
     }
 
-    Sprite_SetAnim(param1, param0);
+    ManagedSprite_SetAnim(param1, param0);
     ov13_022249AC(param1, param2, param3);
 }
 
@@ -430,28 +430,28 @@ static void ov13_02224AD4(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_02221E
     }
 }
 
-static void ov13_02224B28(u16 param0, CellActorData *param1, const int param2, const int param3)
+static void ov13_02224B28(u16 param0, ManagedSprite *param1, const int param2, const int param3)
 {
     if (param0 == 0) {
         return;
     }
 
     if (Item_IsMail(param0) == 1) {
-        Sprite_SetAnim(param1, 1);
+        ManagedSprite_SetAnim(param1, 1);
     } else {
-        Sprite_SetAnim(param1, 0);
+        ManagedSprite_SetAnim(param1, 0);
     }
 
     ov13_022249AC(param1, param2, param3);
 }
 
-static void ov13_02224B5C(u8 param0, CellActorData *param1, const int param2, const int param3)
+static void ov13_02224B5C(u8 param0, ManagedSprite *param1, const int param2, const int param3)
 {
     if (param0 == 0) {
         return;
     }
 
-    Sprite_SetAnim(param1, 2);
+    ManagedSprite_SetAnim(param1, 2);
     ov13_022249AC(param1, param2, param3);
 }
 
@@ -460,7 +460,7 @@ void ov13_02224B7C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     u32 v0;
 
     for (v0 = 0; v0 < 38; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_1FB4[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_1FB4[v0], 0);
     }
 
     switch (param1) {
@@ -699,14 +699,14 @@ void ov13_022252E8(UnkStruct_ov13_022213F0 *param0)
     }
 }
 
-static void ov13_02225304(CellActorData *param0, u8 param1)
+static void ov13_02225304(ManagedSprite *param0, u8 param1)
 {
-    if (Sprite_GetActiveAnim(param0) == param1) {
+    if (ManagedSprite_GetActiveAnim(param0) == param1) {
         return;
     }
 
-    Sprite_SetAnimationFrame(param0, 0);
-    Sprite_SetAnim(param0, param1);
+    ManagedSprite_SetAnimationFrame(param0, 0);
+    ManagedSprite_SetAnim(param0, param1);
 }
 
 static u8 ov13_02225324(UnkStruct_ov13_02221ED0 *param0)
@@ -746,7 +746,7 @@ void ov13_0222537C(UnkStruct_ov13_022213F0 *param0)
         v1 = ov13_02225324(&param0->unk_04[v0]);
 
         ov13_02225304(param0->unk_1FB4[7 + v0], v1);
-        Sprite_TickNFrames(param0->unk_1FB4[7 + v0], FX32_ONE);
+        ManagedSprite_TickNFrames(param0->unk_1FB4[7 + v0], FX32_ONE);
     }
 }
 
diff --git a/src/overlay013/ov13_02225710.c b/src/overlay013/ov13_02225710.c
index a3391c75bc..22137b8844 100644
--- a/src/overlay013/ov13_02225710.c
+++ b/src/overlay013/ov13_02225710.c
@@ -497,32 +497,32 @@ static void ov13_02225EB8(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2)
     case 3:
     case 4:
     case 5:
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[13 + param1 - 0], 0, Unk_ov13_02229896[param2]);
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[0 + param1 - 0], 0, Unk_ov13_02229896[param2]);
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[7 + param1 - 0], 0, Unk_ov13_02229896[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[13 + param1 - 0], 0, Unk_ov13_02229896[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[0 + param1 - 0], 0, Unk_ov13_02229896[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[7 + param1 - 0], 0, Unk_ov13_02229896[param2]);
         break;
     case 7:
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[0 + param0->unk_00->unk_11], 0, Unk_ov13_02229890[param2]);
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[7 + param0->unk_00->unk_11], 0, Unk_ov13_02229890[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[0 + param0->unk_00->unk_11], 0, Unk_ov13_02229890[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[7 + param0->unk_00->unk_11], 0, Unk_ov13_02229890[param2]);
         break;
     case 14:
     case 15:
     case 16:
     case 17:
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[21 + param1 - 14], 0, Unk_ov13_02229890[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[21 + param1 - 14], 0, Unk_ov13_02229890[param2]);
         break;
     case 19:
     case 20:
     case 21:
     case 22:
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[21 + param1 - 19], 0, Unk_ov13_02229890[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[21 + param1 - 19], 0, Unk_ov13_02229890[param2]);
         break;
     case 23:
     case 24:
     case 25:
     case 26:
     case 27:
-        Sprite_OffsetPositionXY2(param0->unk_1FB4[21 + param1 - 23], 0, Unk_ov13_02229890[param2]);
+        ManagedSprite_OffsetPositionXY(param0->unk_1FB4[21 + param1 - 23], 0, Unk_ov13_02229890[param2]);
         break;
     }
 }
diff --git a/src/overlay013/ov13_02227BDC.c b/src/overlay013/ov13_02227BDC.c
index 1acaf02c00..ce80d760e9 100644
--- a/src/overlay013/ov13_02227BDC.c
+++ b/src/overlay013/ov13_02227BDC.c
@@ -113,7 +113,7 @@ static void ov13_02227D48(UnkStruct_ov13_02227244 *param0, u16 param1, u16 param
     PaletteData_LoadBufferFromFileStart(param0->unk_08, 16, Item_FileID(param1, 2), param0->unk_00->unk_0C, 3, 0x20, param2 * 16);
 }
 
-static CellActorData *ov13_02227D78(UnkStruct_ov13_02227244 *param0, u32 param1)
+static ManagedSprite *ov13_02227D78(UnkStruct_ov13_02227244 *param0, u32 param1)
 {
     SpriteTemplate v0;
     SpriteSystem *v1;
@@ -162,10 +162,10 @@ void ov13_02227E08(UnkStruct_ov13_02227244 *param0)
     SpriteSystem_FreeResourcesAndManager(v0, param0->unk_30C);
 }
 
-static void ov13_02227E48(CellActorData *param0, const int param1, const int param2)
+static void ov13_02227E48(ManagedSprite *param0, const int param1, const int param2)
 {
-    Sprite_SetDrawFlag2(param0, 1);
-    Sprite_SetPositionXY2(param0, param1, param2);
+    ManagedSprite_SetDrawFlag(param0, 1);
+    ManagedSprite_SetPositionXY(param0, param1, param2);
 }
 
 void ov13_02227E68(UnkStruct_ov13_02227244 *param0, u32 param1)
@@ -173,7 +173,7 @@ void ov13_02227E68(UnkStruct_ov13_02227244 *param0, u32 param1)
     u32 v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_310[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_310[v0], 0);
     }
 
     switch (param1) {
diff --git a/src/overlay013/ov13_02228128.c b/src/overlay013/ov13_02228128.c
index 98c61b15f1..f2465aa9ac 100644
--- a/src/overlay013/ov13_02228128.c
+++ b/src/overlay013/ov13_02228128.c
@@ -388,7 +388,7 @@ static void ov13_0222872C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2)
 
 static void ov13_022287A4(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     u8 v1;
 
     if ((param1 >= 6) && (param1 <= 11)) {
@@ -397,7 +397,7 @@ static void ov13_022287A4(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2)
         for (v1 = 0; v1 < 6; v1++) {
             v0 = param0->unk_310[v1];
 
-            if (Sprite_GetDrawFlag2(v0) != 0) {
+            if (ManagedSprite_GetDrawFlag(v0) != 0) {
                 break;
             }
         }
@@ -408,10 +408,10 @@ static void ov13_022287A4(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2)
     switch (param2) {
     case 0:
     case 2:
-        Sprite_OffsetPositionXY2(v0, 0, 2);
+        ManagedSprite_OffsetPositionXY(v0, 0, 2);
         break;
     case 1:
-        Sprite_OffsetPositionXY2(v0, 0, -4);
+        ManagedSprite_OffsetPositionXY(v0, 0, -4);
         break;
     }
 }
diff --git a/src/overlay017/ov17_0223F118.c b/src/overlay017/ov17_0223F118.c
index 206fea1e34..fc30e350a2 100644
--- a/src/overlay017/ov17_0223F118.c
+++ b/src/overlay017/ov17_0223F118.c
@@ -367,9 +367,9 @@ void ov17_0223F630(UnkStruct_ov17_0223F6E8 *param0, SpriteSystem *param1, Sprite
     for (v0 = 0; v0 < 6; v0++) {
         param0->unk_00[v0] = SpriteSystem_NewSprite(param1, param2, &v1);
 
-        Sprite_SetPositionXY2(param0->unk_00[v0], Unk_ov17_022531CC[v0].unk_00, Unk_ov17_022531CC[v0].unk_02);
-        Sprite_SetAnim(param0->unk_00[v0], Unk_ov17_022531CC[v0].unk_06);
-        Sprite_SetAffineOverwriteMode(param0->unk_00[v0], AFFINE_OVERWRITE_MODE_NORMAL);
+        ManagedSprite_SetPositionXY(param0->unk_00[v0], Unk_ov17_022531CC[v0].unk_00, Unk_ov17_022531CC[v0].unk_02);
+        ManagedSprite_SetAnim(param0->unk_00[v0], Unk_ov17_022531CC[v0].unk_06);
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v0], AFFINE_OVERWRITE_MODE_NORMAL);
         Sprite_TickFrame(param0->unk_00[v0]->sprite);
     }
 
@@ -394,7 +394,7 @@ static void ov17_0223F6E8(SysTask *param0, void *param1)
     int v1;
 
     for (v1 = 0; v1 < 6; v1++) {
-        Sprite_OffsetAffineZRotation(v0->unk_00[v1], Unk_ov17_022531CC[v1].unk_04);
+        ManagedSprite_OffsetAffineZRotation(v0->unk_00[v1], Unk_ov17_022531CC[v1].unk_04);
     }
 }
 
diff --git a/src/overlay017/ov17_0223F7E4.c b/src/overlay017/ov17_0223F7E4.c
index 95e2aef1c1..27e8ef3587 100644
--- a/src/overlay017/ov17_0223F7E4.c
+++ b/src/overlay017/ov17_0223F7E4.c
@@ -66,7 +66,7 @@ typedef struct {
     s16 unk_02;
     union {
         struct {
-            CellActorData *unk_00[3];
+            ManagedSprite *unk_00[3];
             const s16 *unk_0C;
             const UnkStruct_ov17_02253388 *unk_10;
             int unk_14;
@@ -123,9 +123,9 @@ typedef struct UnkStruct_ov17_0223F7E4_t {
     u16 *unk_34[2];
     UnkStruct_02012744 *unk_3C;
     UnkStruct_ov17_02240138 unk_40[12];
-    CellActorData *unk_118[4];
-    CellActorData *unk_128;
-    CellActorData *unk_12C[4][6];
+    ManagedSprite *unk_118[4];
+    ManagedSprite *unk_128;
+    ManagedSprite *unk_12C[4][6];
     UnkStruct_ov17_0223FF38 unk_18C;
     void *unk_2C0;
     NNSG2dCharacterData *unk_2C4;
@@ -1064,7 +1064,7 @@ static void ov17_022402E8(UnkStruct_ov17_0223F7E4 *param0, u16 param1[])
             v3.y = Unk_ov17_02253298[v0][1];
 
             param0->unk_118[v0] = ov17_0224F154(v1, v2, v4, &v3);
-            Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_118[v0], v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_118[v0], v3.x, v3.y, ((192 + 80) << FX32_SHIFT));
         }
     }
 }
diff --git a/src/overlay017/ov17_02241270.c b/src/overlay017/ov17_02241270.c
index 2afc58fb5a..48d98e143a 100644
--- a/src/overlay017/ov17_02241270.c
+++ b/src/overlay017/ov17_02241270.c
@@ -52,12 +52,12 @@ void ov17_02241270(SpriteSystem *param0, SpriteManager *param1, NARC *param2)
     SpriteSystem_LoadAnimResObjFromOpenNarc(param0, param1, param2, 44, TRUE, 33014);
 }
 
-CellActorData *ov17_022412C0(SpriteSystem *param0, SpriteManager *param1, int param2)
+ManagedSprite *ov17_022412C0(SpriteSystem *param0, SpriteManager *param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_0225364C);
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, (5 * 8) + (11 * 8) * param2, (0xc * 8) + 0 * param2, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, (5 * 8) + (11 * 8) * param2, (0xc * 8) + 0 * param2, ((192 + 80) << FX32_SHIFT));
     Sprite_TickFrame(v0->sprite);
 
     return v0;
@@ -70,7 +70,7 @@ void ov17_022412F0(SpriteManager *param0)
     SpriteManager_UnloadAnimObjById(param0, 33014);
 }
 
-void ov17_02241314(CellActorData *param0)
+void ov17_02241314(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
@@ -82,9 +82,9 @@ void ov17_0224131C(SpriteSystem *param0, SpriteManager *param1, NARC *param2)
     SpriteSystem_LoadAnimResObjFromOpenNarc(param0, param1, param2, 47, TRUE, 33013);
 }
 
-CellActorData *ov17_0224136C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3, int param4)
+ManagedSprite *ov17_0224136C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3, int param4)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     if (param4 >= 0) {
         v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_02253618);
@@ -92,13 +92,13 @@ CellActorData *ov17_0224136C(SpriteSystem *param0, SpriteManager *param1, int pa
         v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_02253680);
     }
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, param2, param3, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, param2, param3, ((192 + 80) << FX32_SHIFT));
     Sprite_TickFrame(v0->sprite);
 
     return v0;
 }
 
-void ov17_022413AC(CellActorData *param0)
+void ov17_022413AC(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c
index fb943abbb1..837434f105 100644
--- a/src/overlay017/ov17_022413D8.c
+++ b/src/overlay017/ov17_022413D8.c
@@ -22,7 +22,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "graphics.h"
 #include "heap.h"
@@ -32,6 +31,7 @@
 #include "narc.h"
 #include "palette.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -69,7 +69,7 @@ typedef struct {
 } UnkStruct_ov17_022431A0;
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     f32 unk_04;
     f32 unk_08;
     u8 unk_0C;
@@ -79,7 +79,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov17_02246F24 *unk_00;
     UnkStruct_ov17_0224145C *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_08;
     u8 *unk_0C;
     u32 unk_10;
     u32 unk_14;
@@ -122,8 +122,8 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov17_0223F88C *unk_00;
-    CellActorData *unk_04;
-    CellActorData *unk_08;
+    ManagedSprite *unk_04;
+    ManagedSprite *unk_08;
     fx32 unk_0C;
     s32 unk_10;
     s32 unk_14;
@@ -143,7 +143,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov17_02246F24 *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     u8 *unk_08;
     u16 unk_0C;
     u8 unk_0E;
@@ -165,7 +165,7 @@ void ov17_022426E8(UnkStruct_ov17_02246F24 *param0, int param1, u8 *param2);
 static void ov17_02242720(SysTask *param0, void *param1);
 static void ov17_02242884(SysTask *param0, void *param1);
 static void ov17_022431E8(SysTask *param0, void *param1);
-static void ov17_02242048(CellActorData *param0);
+static void ov17_02242048(ManagedSprite *param0);
 static void ov17_0224207C(SysTask *param0, void *param1);
 static void ov17_02241C2C(SysTask *param0, void *param1);
 static void ov17_02241CF0(SysTask *param0, void *param1);
@@ -540,9 +540,9 @@ void ov17_022416E4(UnkStruct_ov17_0223F88C *param0)
     param0->unk_98.unk_00 = NULL;
 }
 
-static CellActorData *ov17_02241720(PaletteData *param0, SpriteSystem *param1, SpriteManager *param2, const UnkStruct_020954F0 *param3, int param4, NARC *param5)
+static ManagedSprite *ov17_02241720(PaletteData *param0, SpriteSystem *param1, SpriteManager *param2, const UnkStruct_020954F0 *param3, int param4, NARC *param5)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
     u32 v2, v3, v4, v5;
 
@@ -586,7 +586,7 @@ static CellActorData *ov17_02241720(PaletteData *param0, SpriteSystem *param1, S
     return v0;
 }
 
-static void ov17_02241814(SpriteManager *param0, CellActorData *param1, int param2)
+static void ov17_02241814(SpriteManager *param0, ManagedSprite *param1, int param2)
 {
     Sprite_DeleteAndFreeResources(param1);
     SpriteManager_UnloadCharObjById(param0, 33001 + param2);
@@ -608,9 +608,9 @@ static void ov17_02241854(PaletteData *param0, SpriteSystem *param1, SpriteManag
     SpriteSystem_LoadAnimResObjFromOpenNarc(param1, param2, param3, v2, TRUE, 33004);
 }
 
-static CellActorData *ov17_022418A4(SpriteSystem *param0, SpriteManager *param1, int param2)
+static ManagedSprite *ov17_022418A4(SpriteSystem *param0, SpriteManager *param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
     const int v2[] = {
         2,
@@ -629,7 +629,7 @@ static CellActorData *ov17_022418A4(SpriteSystem *param0, SpriteManager *param1,
     return v0;
 }
 
-static void ov17_02241900(CellActorData *param0)
+static void ov17_02241900(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
@@ -687,13 +687,13 @@ void ov17_02241A00(SpriteManager *param0)
 
 void ov17_02241A24(UnkStruct_ov17_0223F88C *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = Unk_ov17_022537B8;
     v0 = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &v1);
 
-    Sprite_SetDrawFlag2(v0, 0);
+    ManagedSprite_SetDrawFlag(v0, 0);
     Sprite_TickFrame(v0->sprite);
 
     param0->unk_17C = v0;
@@ -711,9 +711,9 @@ void ov17_02241A8C(UnkStruct_ov17_0223F88C *param0, int param1, int param2)
 {
     GF_ASSERT(param0->unk_17C != NULL);
 
-    Sprite_SetPositionXY2(param0->unk_17C, Unk_ov17_022536E4[param1].unk_00, Unk_ov17_022536E4[param1].unk_02);
-    Sprite_SetAnim(param0->unk_17C, param2);
-    Sprite_SetDrawFlag2(param0->unk_17C, 1);
+    ManagedSprite_SetPositionXY(param0->unk_17C, Unk_ov17_022536E4[param1].unk_00, Unk_ov17_022536E4[param1].unk_02);
+    ManagedSprite_SetAnim(param0->unk_17C, param2);
+    ManagedSprite_SetDrawFlag(param0->unk_17C, 1);
 
     switch (param2) {
     case 0:
@@ -734,7 +734,7 @@ void ov17_02241A8C(UnkStruct_ov17_0223F88C *param0, int param1, int param2)
 void ov17_02241B1C(UnkStruct_ov17_0223F88C *param0)
 {
     GF_ASSERT(param0->unk_17C != NULL);
-    Sprite_SetDrawFlag2(param0->unk_17C, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_17C, 0);
 }
 
 void ov17_02241B3C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *param3)
@@ -750,7 +750,7 @@ void ov17_02241B3C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *
     v0->unk_00 = param0;
     v0->unk_08 = param1;
 
-    Sprite_GetPositionXY2(param0->unk_0C.unk_A8[param1], &v0->unk_0C, &v0->unk_0E);
+    ManagedSprite_GetPositionXY(param0->unk_0C.unk_A8[param1], &v0->unk_0C, &v0->unk_0E);
 
     switch (param2) {
     case 0:
@@ -825,7 +825,7 @@ static void ov17_02241C2C(SysTask *param0, void *param1)
         return;
     }
 
-    Sprite_SetPositionXY2(v0->unk_00->unk_0C.unk_A8[v0->unk_08], v0->unk_10 / 0x100, v0->unk_14 / 0x100);
+    ManagedSprite_SetPositionXY(v0->unk_00->unk_0C.unk_A8[v0->unk_08], v0->unk_10 / 0x100, v0->unk_14 / 0x100);
 }
 
 static void ov17_02241CF0(SysTask *param0, void *param1)
@@ -853,7 +853,7 @@ static void ov17_02241CF0(SysTask *param0, void *param1)
             }
         }
 
-        Sprite_SetPositionXY2(v0->unk_00->unk_0C.unk_A8[v0->unk_08], v0->unk_10 / 0x100, v0->unk_14 / 0x100);
+        ManagedSprite_SetPositionXY(v0->unk_00->unk_0C.unk_A8[v0->unk_08], v0->unk_10 / 0x100, v0->unk_14 / 0x100);
         break;
     default:
         *(v0->unk_04) = 1;
@@ -874,7 +874,7 @@ void ov17_02241D94(UnkStruct_ov17_0223F88C *param0, int param1, NARC *param2)
     param0->unk_C0 = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov17_02253854);
 
     Sprite_TickFrame(param0->unk_C0->sprite);
-    Sprite_SetPositionXY2(param0->unk_C0, (8 * 12) + (4 * 8) * param1, (7 * 8));
+    ManagedSprite_SetPositionXY(param0->unk_C0, (8 * 12) + (4 * 8) * param1, (7 * 8));
 }
 
 void ov17_02241E24(UnkStruct_ov17_0223F88C *param0)
@@ -927,14 +927,14 @@ void ov17_02241EF0(UnkStruct_ov17_0223F88C *param0)
     }
 }
 
-static CellActorData *ov17_02241F08(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
+static ManagedSprite *ov17_02241F08(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_02253888);
 
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetPositionXY2(v0, param2, param3);
+    ManagedSprite_SetPositionXY(v0, param2, param3);
 
     return v0;
 }
@@ -959,10 +959,10 @@ void ov17_02241F34(UnkStruct_ov17_0223F88C *param0, int param1, int param2, int
 
         if (param0->unk_C4[param1][v2] == NULL) {
             param0->unk_C4[param1][v2] = ov17_02241F08(param0->unk_18, param0->unk_1C, Unk_ov17_0225370C[param2][0] + v2 * 8, Unk_ov17_0225370C[param2][1]);
-            Sprite_SetAnim(param0->unk_C4[param1][v2], v3);
+            ManagedSprite_SetAnim(param0->unk_C4[param1][v2], v3);
             ov17_02242048(param0->unk_C4[param1][v2]);
-        } else if (Sprite_GetActiveAnim(param0->unk_C4[param1][v2]) < v3) {
-            Sprite_SetAnim(param0->unk_C4[param1][v2], v3);
+        } else if (ManagedSprite_GetActiveAnim(param0->unk_C4[param1][v2]) < v3) {
+            ManagedSprite_SetAnim(param0->unk_C4[param1][v2], v3);
             ov17_02242048(param0->unk_C4[param1][v2]);
         }
     }
@@ -971,7 +971,7 @@ void ov17_02241F34(UnkStruct_ov17_0223F88C *param0, int param1, int param2, int
     sub_02004F7C(1761, 0xffff, 64 * (v0 - 1));
 }
 
-static void ov17_02242048(CellActorData *param0)
+static void ov17_02242048(ManagedSprite *param0)
 {
     UnkStruct_ov17_02242048 *v0;
 
@@ -979,7 +979,7 @@ static void ov17_02242048(CellActorData *param0)
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_02242048));
     v0->unk_00 = param0;
 
-    Sprite_SetDrawFlag2(param0, 0);
+    ManagedSprite_SetDrawFlag(param0, 0);
     SysTask_Start(ov17_0224207C, v0, 40000);
 }
 
@@ -989,17 +989,17 @@ static void ov17_0224207C(SysTask *param0, void *param1)
 
     switch (v0->unk_0C) {
     case 0:
-        Sprite_SetAffineOverwriteMode(v0->unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
         v0->unk_04 = (0.1f);
         v0->unk_08 = (0.1f);
-        Sprite_SetDrawFlag2(v0->unk_00, TRUE);
+        ManagedSprite_SetDrawFlag(v0->unk_00, TRUE);
         v0->unk_0C++;
     case 1:
         v0->unk_04 += (0.3f);
         v0->unk_08 += (0.3f);
 
-        Sprite_SetAffineScale(v0->unk_00, v0->unk_04, v0->unk_08);
-        Sprite_OffsetAffineZRotation(v0->unk_00, 0);
+        ManagedSprite_SetAffineScale(v0->unk_00, v0->unk_04, v0->unk_08);
+        ManagedSprite_OffsetAffineZRotation(v0->unk_00, 0);
 
         if (v0->unk_04 >= (1.5f)) {
             v0->unk_0C++;
@@ -1009,17 +1009,17 @@ static void ov17_0224207C(SysTask *param0, void *param1)
         v0->unk_04 -= (0.3f);
         v0->unk_08 -= (0.3f);
 
-        Sprite_SetAffineScale(v0->unk_00, v0->unk_04, v0->unk_08);
-        Sprite_OffsetAffineZRotation(v0->unk_00, 0);
+        ManagedSprite_SetAffineScale(v0->unk_00, v0->unk_04, v0->unk_08);
+        ManagedSprite_OffsetAffineZRotation(v0->unk_00, 0);
 
         if (v0->unk_04 <= (1.0f)) {
-            Sprite_SetAffineScale(v0->unk_00, (1.0f), (1.0f));
-            Sprite_SetAffineZRotation(v0->unk_00, 0);
+            ManagedSprite_SetAffineScale(v0->unk_00, (1.0f), (1.0f));
+            ManagedSprite_SetAffineZRotation(v0->unk_00, 0);
             v0->unk_0C++;
         }
         break;
     default:
-        Sprite_SetAffineOverwriteMode(v0->unk_00, AFFINE_OVERWRITE_MODE_NONE);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_00, AFFINE_OVERWRITE_MODE_NONE);
         Heap_FreeToHeap(param1);
         SysTask_Done(param0);
         return;
@@ -1072,26 +1072,26 @@ void ov17_02242248(UnkStruct_ov17_0223F88C *param0)
     }
 }
 
-static CellActorData *ov17_02242260(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
+static ManagedSprite *ov17_02242260(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_022537EC);
 
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetPositionXY2(v0, param2, param3);
+    ManagedSprite_SetPositionXY(v0, param2, param3);
 
     return v0;
 }
 
-static CellActorData *ov17_0224228C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
+static ManagedSprite *ov17_0224228C(SpriteSystem *param0, SpriteManager *param1, int param2, int param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0, param1, &Unk_ov17_0225371C);
 
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetPositionXY2(v0, param2, param3);
+    ManagedSprite_SetPositionXY(v0, param2, param3);
 
     return v0;
 }
@@ -1102,7 +1102,7 @@ static void ov17_022422B8(SysTask *param0, void *param1)
 
     switch (v0->unk_2E) {
     case 0:
-        Sprite_SetAffineOverwriteMode(v0->unk_04, AFFINE_OVERWRITE_MODE_NORMAL);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_04, AFFINE_OVERWRITE_MODE_NORMAL);
 
         v0->unk_20 = v0->unk_10 + (32 << 8);
         v0->unk_24 = v0->unk_14 + (72 << 8);
@@ -1151,15 +1151,15 @@ static void ov17_022422B8(SysTask *param0, void *param1)
         break;
     default:
         Sprite_DeleteAndFreeResources(v0->unk_04);
-        Sprite_SetDrawFlag2(v0->unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_08, 1);
         Sound_PlayEffect(1760);
         Heap_FreeToHeap(param1);
         SysTask_Done(param0);
         return;
     }
 
-    Sprite_OffsetAffineZRotation(v0->unk_04, 0x2000);
-    Sprite_SetPositionXY2(v0->unk_04, v0->unk_10 / 0x100, v0->unk_14 / 0x100);
+    ManagedSprite_OffsetAffineZRotation(v0->unk_04, 0x2000);
+    ManagedSprite_SetPositionXY(v0->unk_04, v0->unk_10 / 0x100, v0->unk_14 / 0x100);
 }
 
 BOOL ov17_022424A8(UnkStruct_ov17_0223F88C *param0, int param1)
@@ -1168,7 +1168,7 @@ BOOL ov17_022424A8(UnkStruct_ov17_0223F88C *param0, int param1)
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param0->unk_124[param1][v0] != NULL) {
-            if (Sprite_GetDrawFlag2(param0->unk_124[param1][v0]) == 0) {
+            if (ManagedSprite_GetDrawFlag(param0->unk_124[param1][v0]) == 0) {
                 return 0;
             }
         }
@@ -1188,7 +1188,7 @@ void ov17_022424D4(UnkStruct_ov17_0223F88C *param0, int param1, int param2)
     for (v1 = 0; v1 < v0; v1++) {
         if (param0->unk_124[param1][v1] == NULL) {
             param0->unk_124[param1][v1] = ov17_02242260(param0->unk_18, param0->unk_1C, Unk_ov17_022536D8[param1][0] + v1 * 5, Unk_ov17_022536D8[param1][1]);
-            Sprite_SetDrawFlag2(param0->unk_124[param1][v1], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_124[param1][v1], 0);
 
             v2 = Heap_AllocFromHeap(21, sizeof(UnkStruct_ov17_022422B8));
             MI_CpuClear8(v2, sizeof(UnkStruct_ov17_022422B8));
@@ -1230,14 +1230,14 @@ static void ov17_0224262C(UnkStruct_ov17_02246F24 *param0, GXOamMode param1, int
     for (v0 = 0; v0 < 4; v0++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param0->unk_0C.unk_C4[v0][v1] != NULL) {
-                Sprite_SetExplicitOamMode2(param0->unk_0C.unk_C4[v0][v1], param1);
-                Sprite_SetDrawFlag2(param0->unk_0C.unk_C4[v0][v1], v2);
+                ManagedSprite_SetExplicitOamMode(param0->unk_0C.unk_C4[v0][v1], param1);
+                ManagedSprite_SetDrawFlag(param0->unk_0C.unk_C4[v0][v1], v2);
             }
         }
 
         if (param0->unk_0C.unk_160[v0] != NULL) {
-            Sprite_SetExplicitOamMode2(param0->unk_0C.unk_160[v0], param1);
-            Sprite_SetDrawFlag2(param0->unk_0C.unk_160[v0], v2);
+            ManagedSprite_SetExplicitOamMode(param0->unk_0C.unk_160[v0], param1);
+            ManagedSprite_SetDrawFlag(param0->unk_0C.unk_160[v0], v2);
         }
 
         sub_02012AF0(param0->unk_0C.unk_180[v0].unk_00, param1);
@@ -1642,8 +1642,8 @@ void ov17_022430AC(UnkStruct_ov17_0223F88C *param0, int param1, int param2)
         param0->unk_160[param1] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov17_02253750);
     }
 
-    Sprite_SetAnim(param0->unk_160[param1], param2);
-    Sprite_SetPositionXY2(param0->unk_160[param1], (8 * 8), (5 * 8 + 2) + param1 * (6 * 8));
+    ManagedSprite_SetAnim(param0->unk_160[param1], param2);
+    ManagedSprite_SetPositionXY(param0->unk_160[param1], (8 * 8), (5 * 8 + 2) + param1 * (6 * 8));
     Sprite_TickFrame(param0->unk_160[param1]->sprite);
 }
 
@@ -1833,7 +1833,7 @@ void ov17_0224331C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *
         }
 
         if (*param3 == 0) {
-            Sprite_GetPositionXY2(param0->unk_0C.unk_C4[param1][v7], &v3, &v4);
+            ManagedSprite_GetPositionXY(param0->unk_0C.unk_C4[param1][v7], &v3, &v4);
             v8 = sub_0208C0A4(
                      MATH_IAbs(v3 - v1), MATH_IAbs(v4 - v2))
                 * 0x100;
@@ -1862,7 +1862,7 @@ void ov17_0224331C(UnkStruct_ov17_02246F24 *param0, int param1, int param2, u8 *
         v0->unk_23 = v3;
         v0->unk_24 = v4;
 
-        Sprite_GetPositionXY2(param0->unk_0C.unk_C4[param1][v7], &v5, &v6);
+        ManagedSprite_GetPositionXY(param0->unk_0C.unk_C4[param1][v7], &v5, &v6);
 
         v0->unk_1C = (MATH_IAbs(v3 - v5) << 8) / (3 * (*param3));
         v0->unk_18 = v5 << 8;
@@ -1887,9 +1887,9 @@ static void ov17_022434E0(SysTask *param0, void *param1)
             v0->unk_20++;
         }
 
-        Sprite_GetPositionXY2(v0->unk_08, &v4, &v5);
+        ManagedSprite_GetPositionXY(v0->unk_08, &v4, &v5);
         v4 = v0->unk_18 >> 8;
-        Sprite_SetPositionXY2(v0->unk_08, v4, v5);
+        ManagedSprite_SetPositionXY(v0->unk_08, v4, v5);
         break;
     case 1:
         v0->unk_1E += v0->unk_14;
@@ -1912,10 +1912,10 @@ static void ov17_022434E0(SysTask *param0, void *param1)
         v3 = v0->unk_10 / 0x100;
         v1 = FX_Mul(CalcCosineDegrees(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
         v2 = FX_Mul(CalcSineDegrees(v0->unk_1E / 100), v3 << FX32_SHIFT) / FX32_ONE;
-        Sprite_SetPositionXY2(v0->unk_08, v0->unk_21 + v1, v0->unk_22 + v2);
+        ManagedSprite_SetPositionXY(v0->unk_08, v0->unk_21 + v1, v0->unk_22 + v2);
         break;
     default:
-        Sprite_SetDrawFlag2(v0->unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_08, 0);
         Sound_PlayEffect(1505);
         ov17_022414B0(v0->unk_04);
 
@@ -1956,7 +1956,7 @@ static void ov17_022436A4(SysTask *param0, void *param1)
             continue;
         }
 
-        Sprite_TickOneFrame(v0->unk_00->unk_0C.unk_124[v0->unk_08][v1]);
+        ManagedSprite_TickFrame(v0->unk_00->unk_0C.unk_124[v0->unk_08][v1]);
     }
 }
 
@@ -2005,7 +2005,7 @@ static void ov17_02243750(SysTask *param0, void *param1)
             break;
         }
 
-        Sprite_GetPositionXY2(v0->unk_04, &v1, &v2);
+        ManagedSprite_GetPositionXY(v0->unk_04, &v1, &v2);
 
         v2 += (6 << FX32_SHIFT) >> FX32_SHIFT;
         v0->unk_1C = v1 << 8;
@@ -2024,12 +2024,12 @@ static void ov17_02243750(SysTask *param0, void *param1)
         v4 = FX_Mul(CalcCosineDegrees(v0->unk_0C / 100), (6 << FX32_SHIFT)) / FX32_ONE;
 
         v0->unk_20 += 0x80;
-        Sprite_SetPositionXY2(v0->unk_04, (v0->unk_1C >> 8) + v3, (v0->unk_20 >> 8) + v4);
+        ManagedSprite_SetPositionXY(v0->unk_04, (v0->unk_1C >> 8) + v3, (v0->unk_20 >> 8) + v4);
         v0->unk_24++;
 
         if (v0->unk_24 > 80) {
             v0->unk_24 = 0;
-            Sprite_GetPositionXY2(v0->unk_04, &v1, &v2);
+            ManagedSprite_GetPositionXY(v0->unk_04, &v1, &v2);
             v0->unk_1C = v1 << 8;
             v0->unk_20 = v2 << 8;
             {
@@ -2058,10 +2058,10 @@ static void ov17_02243750(SysTask *param0, void *param1)
             v0->unk_0E++;
         }
 
-        Sprite_SetPositionXY2(v0->unk_04, v0->unk_1C >> 8, v0->unk_20 >> 8);
+        ManagedSprite_SetPositionXY(v0->unk_04, v0->unk_1C >> 8, v0->unk_20 >> 8);
         break;
     default:
-        Sprite_SetDrawFlag2(v0->unk_04, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_04, 0);
         Sound_PlayEffect(1505);
         (*(v0->unk_08))--;
         Heap_FreeToHeap(param1);
diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c
index f1f6b57abf..8ff1d4eb40 100644
--- a/src/overlay017/ov17_022476F8.c
+++ b/src/overlay017/ov17_022476F8.c
@@ -28,7 +28,7 @@
 
 typedef struct {
     u8 *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     s32 unk_08;
     s32 unk_0C;
     fx32 unk_10;
@@ -115,10 +115,10 @@ void ov17_022477B8(UnkStruct_ov17_02247A48 *param0, int param1, int param2, fx32
     MI_CpuClear8(v0, sizeof(UnkStruct_ov17_022477B8));
 
     v0->unk_04 = SpriteSystem_NewSprite(param0->unk_0C.unk_1C, param0->unk_0C.unk_20, &Unk_ov17_022543F8);
-    Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_04, param1, param2, (256 * FX32_ONE));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_04, param1, param2, (256 * FX32_ONE));
 
     if (param4 == 1) {
-        Sprite_SetAnim(v0->unk_04, 1);
+        ManagedSprite_SetAnim(v0->unk_04, 1);
     }
 
     Sprite_TickFrame(v0->unk_04->sprite);
@@ -143,7 +143,7 @@ static void ov17_02247840(SysTask *param0, void *param1)
         v0->unk_10 += (6 << FX32_SHIFT);
         v0->unk_0C -= 0x100;
 
-        Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_04, v0->unk_08 / 0x100 + v1, v0->unk_0C / 0x100, (256 * FX32_ONE));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_04, v0->unk_08 / 0x100 + v1, v0->unk_0C / 0x100, (256 * FX32_ONE));
 
         v0->unk_16++;
 
diff --git a/src/overlay017/ov17_022492DC.c b/src/overlay017/ov17_022492DC.c
index b959c7d9d2..f1740f7b56 100644
--- a/src/overlay017/ov17_022492DC.c
+++ b/src/overlay017/ov17_022492DC.c
@@ -59,7 +59,7 @@ typedef struct {
         struct {
             UnkStruct_ov17_02249B30 *unk_00;
             const UnkStruct_ov17_02254630 *unk_04[3];
-            CellActorData *unk_10[3];
+            ManagedSprite *unk_10[3];
             u32 unk_1C[3];
             int unk_28;
             u16 unk_2C;
diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c
index 663d58a32c..9d34134c91 100644
--- a/src/overlay017/ov17_0224A0FC.c
+++ b/src/overlay017/ov17_0224A0FC.c
@@ -32,7 +32,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "heap.h"
 #include "inlines.h"
@@ -43,6 +42,7 @@
 #include "pokemon.h"
 #include "render_window.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -92,9 +92,9 @@ static void ov17_0224BE50(SysTask *param0, void *param1);
 static void ov17_0224BE64(UnkStruct_ov17_0224BE50 *param0);
 static void ov17_0224BF58(UnkStruct_ov17_0224BE50 *param0);
 static void ov17_0224C414(SysTask *param0, void *param1);
-static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7);
-static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7);
-static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7);
+static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7);
+static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7);
+static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7);
 static void ov17_0224ABFC(SysTask *param0, void *param1);
 static int ov17_0224B06C(int param0);
 static void ov17_0224AE84(SysTask *param0, void *param1);
@@ -522,7 +522,7 @@ void ov17_0224A428(SpriteManager *param0)
 
 static int ov17_0224A46C(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, SpriteManager *param2, int param3, int param4, int param5, int param6, int param7)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     int v1;
     SpriteTemplate v2;
 
@@ -569,10 +569,10 @@ static int ov17_0224A46C(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1,
 
     v0 = SpriteSystem_NewSprite(param1, param2, &v2);
 
-    Sprite_SetAnim(v0, param3);
+    ManagedSprite_SetAnim(v0, param3);
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, param5, param6, (256 * FX32_ONE));
-    Sprite_SetAnimateFlag(v0, 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, param5, param6, (256 * FX32_ONE));
+    ManagedSprite_SetAnimateFlag(v0, 1);
 
     for (v1 = 0; v1 < (((16 * 2) / 2) * 4 + 4); v1++) {
         if (param0->unk_D8[v1] == NULL) {
@@ -613,12 +613,12 @@ void ov17_0224A5F8(SpriteManager *param0)
 
 void ov17_0224A61C(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, SpriteManager *param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     int v1;
 
     for (v1 = 0; v1 < 3; v1++) {
         param0->unk_960[v1] = SpriteSystem_NewSprite(param1, param2, &Unk_ov17_02254794);
-        Sprite_SetDrawFlag2(param0->unk_960[v1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_960[v1], 0);
     }
 }
 
@@ -670,7 +670,7 @@ void ov17_0224A7B8(UnkStruct_ov17_0224A1EC *param0)
 
 void ov17_0224A7E0(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, SpriteManager *param2, int param3, int param4, u8 param5)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     int v1, v2, v3, v4;
     UnkStruct_ov17_0224A8D4 *v5;
 
@@ -689,10 +689,10 @@ void ov17_0224A7E0(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, Sprite
 
     v5->unk_00 = param0->unk_960[v4];
 
-    Sprite_SetAnim(v5->unk_00, param3);
-    Sprite_SetPositionXYWithSubscreenOffset2(v5->unk_00, v2, v3, (256 * FX32_ONE));
+    ManagedSprite_SetAnim(v5->unk_00, param3);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v5->unk_00, v2, v3, (256 * FX32_ONE));
     Sprite_TickFrame(v5->unk_00->sprite);
-    Sprite_SetDrawFlag2(v5->unk_00, 1);
+    ManagedSprite_SetDrawFlag(v5->unk_00, 1);
 
     for (v1 = 0; v1 < 3; v1++) {
         sub_020129D0(param0->unk_96C[v1][v4].unk_00, 0);
@@ -716,7 +716,7 @@ static void ov17_0224A8D4(SysTask *param0, void *param1)
         sub_020129A4(v0->unk_04->unk_00, &v1, &v2);
         v2 += -4;
         sub_020128C4(v0->unk_04->unk_00, v1, v2);
-        Sprite_OffsetPositionXY2(v0->unk_00, 0, -4);
+        ManagedSprite_OffsetPositionXY(v0->unk_00, 0, -4);
 
         v0->unk_0C++;
 
@@ -735,7 +735,7 @@ static void ov17_0224A8D4(SysTask *param0, void *param1)
         break;
     default:
         sub_020129D0(v0->unk_04->unk_00, 0);
-        Sprite_SetDrawFlag2(v0->unk_00, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_00, 0);
         v0->unk_08 = NULL;
         SysTask_Done(param0);
         return;
@@ -770,7 +770,7 @@ void ov17_0224A9D4(SpriteManager *param0)
 
 void ov17_0224A9F8(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, SpriteManager *param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param1, param2, &Unk_ov17_022547C8);
     Sprite_TickFrame(v0->sprite);
@@ -807,7 +807,7 @@ static void ov17_0224AA68(SysTask *param0, void *param1)
     v1 = v0->unk_14.unk_04[v3].unk_04;
     v2 = v0->unk_14.unk_04[v3].unk_08;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_14.unk_1E8, v1, v2 - 8 * 5, (256 * FX32_ONE));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_14.unk_1E8, v1, v2 - 8 * 5, (256 * FX32_ONE));
 }
 
 void ov17_0224AA94(SpriteSystem *param0, SpriteManager *param1, NARC *param2)
@@ -831,7 +831,7 @@ void ov17_0224AB08(UnkStruct_ov17_0224A1EC *param0, SpriteSystem *param1, Sprite
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_200[v0].unk_04 = SpriteSystem_NewSprite(param1, param2, &Unk_ov17_02254830);
         Sprite_TickFrame(param0->unk_200[v0].unk_04->sprite);
-        Sprite_SetAffineOverwriteMode(param0->unk_200[v0].unk_04, AFFINE_OVERWRITE_MODE_NORMAL);
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_200[v0].unk_04, AFFINE_OVERWRITE_MODE_NORMAL);
         param0->unk_200[v0].unk_13 = v0;
         param0->unk_200[v0].unk_0C = &param0->unk_04[v0];
         param0->unk_200[v0].unk_14 = Pokemon_DPSpriteYOffset(param0->unk_00->unk_00[v0], 2);
@@ -858,7 +858,7 @@ void ov17_0224ABDC(UnkStruct_ov17_0224A1EC *param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_200[v0].unk_04, param1);
+        ManagedSprite_SetDrawFlag(param0->unk_200[v0].unk_04, param1);
     }
 }
 
@@ -889,8 +889,8 @@ static void ov17_0224ABFC(SysTask *param0, void *param1)
         v2 = v8;
     }
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_04, v1, v2, (256 * FX32_ONE));
-    Sprite_SetAffineScale(v0->unk_04, v5, v5);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_04, v1, v2, (256 * FX32_ONE));
+    ManagedSprite_SetAffineScale(v0->unk_04, v5, v5);
 }
 
 void ov17_0224AC78(UnkStruct_ov17_0224ABFC *param0, int param1, int param2)
@@ -939,7 +939,7 @@ void ov17_0224AD4C(SpriteManager *param0)
 
 BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 *param0, int param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     u32 v1, v2;
     UnkStruct_ov17_0224AE84 *v3;
     int v4, v5, v6;
@@ -967,9 +967,9 @@ BOOL ov17_0224AD70(UnkStruct_ov17_0224DF54 *param0, int param1, int param2)
     v5 = param0->unk_14.unk_04[param1].unk_04;
     v6 = param0->unk_14.unk_04[param1].unk_08;
 
-    Sprite_SetAnim(v0, param2);
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, v5, v6, (256 * FX32_ONE));
-    CellActor_SetAnimateFlag(v0->sprite, 1);
+    ManagedSprite_SetAnim(v0, param2);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, v5, v6, (256 * FX32_ONE));
+    Sprite_SetAnimateFlag(v0->sprite, 1);
     Sprite_TickFrame(v0->sprite);
 
     v1 = sub_02094E98(param0->unk_00);
@@ -1022,7 +1022,7 @@ static void ov17_0224AE84(SysTask *param0, void *param1)
     CP_SetDivImm32_32(v0->unk_0C, 0x100);
     v2 = CP_GetDivResult32();
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0->unk_04, v1, v2, (256 * FX32_ONE));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0->unk_04, v1, v2, (256 * FX32_ONE));
 }
 
 static void ov17_0224AF3C(UnkStruct_ov17_0224DF54 *param0, int param1, int param2, int param3)
@@ -1073,15 +1073,15 @@ void ov17_0224AFF8(SpriteManager *param0)
 
 BOOL ov17_0224B01C(UnkStruct_ov17_0224DF54 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     UnkStruct_ov17_0224B058 *v1;
 
     v1 = &param0->unk_14.unk_910;
     v0 = SpriteSystem_NewSprite(param0->unk_14.unk_58, param0->unk_14.unk_5C, &Unk_ov17_0225472C);
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, -1, (0x16 * 8), (256 * FX32_ONE));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, -1, (0x16 * 8), (256 * FX32_ONE));
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetDrawFlag2(v0, 0);
+    ManagedSprite_SetDrawFlag(v0, 0);
 
     v1->unk_04 = v0;
     return 1;
@@ -1116,7 +1116,7 @@ static int ov17_0224B06C(int param0)
     return v0;
 }
 
-void ov17_0224B09C(Sprite *param0, UnkStruct_ov17_0224B09C *param1)
+void ov17_0224B09C(PokemonSprite *param0, UnkStruct_ov17_0224B09C *param1)
 {
     s32 v0, v1;
 
@@ -1166,7 +1166,7 @@ static BOOL ov17_0224B0E8(UnkStruct_ov17_0224DF54 *param0, int param1, const Unk
             if (param0->unk_14.unk_D8[v8] != NULL) {
                 Sprite_GetPositionXYWithSubscreenOffset2(param0->unk_14.unk_D8[v8], &v6, &v7, (256 * FX32_ONE));
 
-                if ((v6 == v1) && (v7 == v2) && (Sprite_GetActiveAnim(param0->unk_14.unk_D8[v8]) != 2)) {
+                if ((v6 == v1) && (v7 == v2) && (ManagedSprite_GetActiveAnim(param0->unk_14.unk_D8[v8]) != 2)) {
                     return 0;
                 }
             }
@@ -1441,7 +1441,7 @@ static void ov17_0224B5F0(SysTask *param0, void *param1)
     }
 }
 
-static inline void inline_ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5)
+static inline void inline_ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5)
 {
     s32 v0, v1, v2, v3;
     s32 v4, v5;
@@ -1477,7 +1477,7 @@ static inline void inline_ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite
     ov22_0225B100(param2->unk_00, param2->unk_04, param2->unk_08);
 }
 
-static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7)
+static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, UnkStruct_ov17_0224ABFC *param6, u32 param7)
 {
     BOOL v0 = 0;
 
@@ -1524,7 +1524,7 @@ static BOOL ov17_0224B7BC(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkSt
     return v0;
 }
 
-static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7)
+static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7)
 {
     BOOL v0 = 0;
     s32 v1;
@@ -1592,7 +1592,7 @@ static BOOL ov17_0224B8D0(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkSt
     return v0;
 }
 
-static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, Sprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7)
+static BOOL ov17_0224BA50(UnkStruct_ov17_0224B7BC *param0, PokemonSprite *param1, UnkStruct_ov17_0224B09C *param2, int param3, int param4, int param5, int param6, u32 param7)
 {
     BOOL v0 = 0;
     s32 v1;
@@ -1989,7 +1989,7 @@ void ov17_0224C384(UnkStruct_ov17_0224DF54 *param0, SpriteSystem *param1, Sprite
     v0->unk_04 = SpriteSystem_NewSprite(param0->unk_14.unk_58, param0->unk_14.unk_5C, &Unk_ov17_022547FC);
 
     Sprite_TickFrame(v0->unk_04->sprite);
-    Sprite_SetDrawFlag2(v0->unk_04, 0);
+    ManagedSprite_SetDrawFlag(v0->unk_04, 0);
 
     v0->unk_00 = SysTask_Start(ov17_0224C414, v0, ((30000 + 10000) + 15));
 }
@@ -2029,14 +2029,14 @@ void ov17_0224C434(UnkStruct_ov17_0224B058 *param0, u32 param1, u32 param2, int
     v2 = (256 - v1) / 2;
     v0 = param1 * v1 / param2;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_04, v0 - 1 + v2, (0x16 * 8), (256 * FX32_ONE));
-    Sprite_SetDrawFlag2(param0->unk_04, 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_04, v0 - 1 + v2, (0x16 * 8), (256 * FX32_ONE));
+    ManagedSprite_SetDrawFlag(param0->unk_04, 1);
 }
 
 void ov17_0224C47C(UnkStruct_ov17_0224B058 *param0, int param1)
 {
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_04, -1, (0x16 * 8), (256 * FX32_ONE));
-    Sprite_SetDrawFlag2(param0->unk_04, param1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_04, -1, (0x16 * 8), (256 * FX32_ONE));
+    ManagedSprite_SetDrawFlag(param0->unk_04, param1);
 }
 
 void ov17_0224C49C(UnkStruct_ov17_0224C384 *param0, u32 param1, u32 param2, int param3)
@@ -2061,13 +2061,13 @@ void ov17_0224C49C(UnkStruct_ov17_0224C384 *param0, u32 param1, u32 param2, int
     v4 = (0x12 * 8);
     v4 -= CalcSineDegrees(v5) * 10 / FX32_ONE;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_04, v3, v4, (256 * FX32_ONE));
-    Sprite_SetDrawFlag2(param0->unk_04, 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_04, v3, v4, (256 * FX32_ONE));
+    ManagedSprite_SetDrawFlag(param0->unk_04, 1);
 }
 
 void ov17_0224C540(UnkStruct_ov17_0224C384 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_04, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_04, 0);
 }
 
 void ov17_0224C54C(UnkStruct_ov17_0224C384 *param0, int param1)
@@ -2077,8 +2077,8 @@ void ov17_0224C54C(UnkStruct_ov17_0224C384 *param0, int param1)
     v0 = ov17_0223F0BC(param1, 3);
     v1 = (256 - v0) / 2;
 
-    Sprite_SetDrawFlag2(param0->unk_04, 1);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_04, v1, (0x12 * 8), (256 * FX32_ONE));
+    ManagedSprite_SetDrawFlag(param0->unk_04, 1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_04, v1, (0x12 * 8), (256 * FX32_ONE));
 }
 
 int ov17_0224C57C(int param0)
diff --git a/src/overlay017/ov17_0224F080.c b/src/overlay017/ov17_0224F080.c
index 7629e65536..ea05c26946 100644
--- a/src/overlay017/ov17_0224F080.c
+++ b/src/overlay017/ov17_0224F080.c
@@ -70,9 +70,9 @@ void ov17_0224F140(SpriteManager *param0, u32 param1, u32 param2)
     SpriteManager_UnloadAnimObjById(param0, param2);
 }
 
-CellActorData *ov17_0224F154(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3)
+ManagedSprite *ov17_0224F154(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = *param3;
@@ -82,7 +82,7 @@ CellActorData *ov17_0224F154(SpriteSystem *param0, SpriteManager *param1, int pa
     return v0;
 }
 
-void ov17_0224F184(CellActorData *param0)
+void ov17_0224F184(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c
index 6f012a3b62..87203d3766 100644
--- a/src/overlay017/ov17_02250744.c
+++ b/src/overlay017/ov17_02250744.c
@@ -16,7 +16,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "graphics.h"
 #include "heap.h"
@@ -27,6 +26,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -47,7 +47,7 @@ typedef struct {
 } UnkStruct_ov17_02251598;
 
 typedef struct {
-    Sprite *unk_00;
+    PokemonSprite *unk_00;
     u8 *unk_04;
     s32 unk_08;
     s32 unk_0C;
@@ -61,7 +61,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov17_0224FCA0 *unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     s32 unk_08;
     s32 unk_0C;
     s16 unk_10;
@@ -416,14 +416,14 @@ void ov17_02250DB0(UnkStruct_ov17_0224FCA0 *param0)
         v0.resources[0] = 33002 + v2;
         param0->unk_10.unk_128[v2] = SpriteSystem_NewSprite(param0->unk_10.unk_18, param0->unk_10.unk_1C, &v0);
 
-        Sprite_SetAnim(param0->unk_10.unk_128[v2], 1);
-        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10.unk_128[v2]->sprite, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
-        Sprite_TickOneFrame(param0->unk_10.unk_128[v2]);
+        ManagedSprite_SetAnim(param0->unk_10.unk_128[v2], 1);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10.unk_128[v2]->sprite, Pokemon_IconPaletteIndex(param0->unk_00->unk_00.unk_00[v2]));
+        ManagedSprite_TickFrame(param0->unk_10.unk_128[v2]);
     }
 
     for (v2 = 0; v2 < 4; v2++) {
         v1 = param0->unk_39A.unk_30[v2];
-        Sprite_SetPositionXY2(param0->unk_10.unk_128[v1], Unk_ov17_02254BD4[v2].unk_00, Unk_ov17_02254BD4[v2].unk_02);
+        ManagedSprite_SetPositionXY(param0->unk_10.unk_128[v1], Unk_ov17_02254BD4[v2].unk_00, Unk_ov17_02254BD4[v2].unk_02);
     }
 
     param0->unk_10.unk_124 = SysTask_Start(ov17_02250F4C, param0, (50000 + 1000));
@@ -453,7 +453,7 @@ static void ov17_02250F4C(SysTask *param0, void *param1)
     int v1;
 
     for (v1 = 0; v1 < 4; v1++) {
-        Sprite_TickOneFrame(v0->unk_10.unk_128[v1]);
+        ManagedSprite_TickFrame(v0->unk_10.unk_128[v1]);
     }
 }
 
@@ -515,7 +515,7 @@ static void ov17_0225102C(SysTask *param0, void *param1)
 
 static void ov17_02251070(UnkStruct_ov17_0224FCA0 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     UnkStruct_ov17_02251070 *v1;
     s32 v2, v3;
 
@@ -531,14 +531,14 @@ static void ov17_02251070(UnkStruct_ov17_0224FCA0 *param0)
     v1->unk_08 = v2 * 0x100;
     v1->unk_0C = v3 * 0x100;
 
-    Sprite_SetPositionXY2(v1->unk_04, v2, v3);
+    ManagedSprite_SetPositionXY(v1->unk_04, v2, v3);
 
     v1->unk_14 = (sub_02094E98(param0->unk_00) % 0x200) + 0x60;
     v1->unk_18 = (sub_02094E98(param0->unk_00) % 0x300) + 0x100;
     v1->unk_12 = (sub_02094E98(param0->unk_00) % 24) + 16;
 
-    Sprite_SetAnim(v1->unk_04, sub_02094E98(param0->unk_00) % 0x9);
-    Sprite_TickOneFrame(v1->unk_04);
+    ManagedSprite_SetAnim(v1->unk_04, sub_02094E98(param0->unk_00) % 0x9);
+    ManagedSprite_TickFrame(v1->unk_04);
     SysTask_Start(ov17_02251140, v1, ((50000 + 10) + 1));
 
     param0->unk_127A++;
@@ -566,8 +566,8 @@ static void ov17_02251140(SysTask *param0, void *param1)
     v0->unk_08 -= v0->unk_14;
     v0->unk_0C += 0x280;
 
-    Sprite_SetPositionXY2(v0->unk_04, (v0->unk_08 / 0x100) + v0->unk_10, v0->unk_0C / 0x100);
-    Sprite_TickOneFrame(v0->unk_04);
+    ManagedSprite_SetPositionXY(v0->unk_04, (v0->unk_08 / 0x100) + v0->unk_10, v0->unk_0C / 0x100);
+    ManagedSprite_TickFrame(v0->unk_04);
 }
 
 void ov17_0225122C(UnkStruct_ov17_0224FCA0 *param0, NARC *param1)
@@ -581,13 +581,13 @@ void ov17_0225122C(UnkStruct_ov17_0224FCA0 *param0, NARC *param1)
 
         for (v0 = 0; v0 < 4; v0++) {
             param0->unk_10.unk_138[v0] = SpriteSystem_NewSprite(param0->unk_10.unk_18, param0->unk_10.unk_1C, &Unk_ov17_02254C90);
-            Sprite_TickOneFrame(param0->unk_10.unk_138[v0]);
-            Sprite_SetDrawFlag2(param0->unk_10.unk_138[v0], 0);
+            ManagedSprite_TickFrame(param0->unk_10.unk_138[v0]);
+            ManagedSprite_SetDrawFlag(param0->unk_10.unk_138[v0], 0);
         }
 
         for (v0 = 0; v0 < 4; v0++) {
             v1 = param0->unk_39A.unk_30[v0];
-            Sprite_SetPositionXY2(param0->unk_10.unk_138[v1], Unk_ov17_02254BE4[v0].unk_00, Unk_ov17_02254BE4[v0].unk_02);
+            ManagedSprite_SetPositionXY(param0->unk_10.unk_138[v1], Unk_ov17_02254BE4[v0].unk_00, Unk_ov17_02254BE4[v0].unk_02);
         }
     }
 }
@@ -609,8 +609,8 @@ void ov17_022512E0(UnkStruct_ov17_0224FCA0 *param0)
 
 void ov17_0225131C(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2)
 {
-    Sprite_SetAnim(param0->unk_10.unk_138[param1], param2);
-    Sprite_SetDrawFlag2(param0->unk_10.unk_138[param1], 1);
+    ManagedSprite_SetAnim(param0->unk_10.unk_138[param1], param2);
+    ManagedSprite_SetDrawFlag(param0->unk_10.unk_138[param1], 1);
     Sound_PlayEffect(1501);
 }
 
@@ -633,7 +633,7 @@ void ov17_022513C0(UnkStruct_ov17_0224FCA0 *param0)
 void ov17_022513F4(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, int param3, int param4)
 {
     int v0;
-    CellActorData **v1;
+    ManagedSprite **v1;
     int v2;
     int v3, v4, v5, v6, v7, v8;
 
@@ -677,17 +677,17 @@ void ov17_022513F4(UnkStruct_ov17_0224FCA0 *param0, int param1, int param2, int
     v7 = 0;
 
     for (v8 = param3; v8 >= 16; v8 -= 16) {
-        Sprite_SetAnim(v1[v7], v2 + 16 - 1);
+        ManagedSprite_SetAnim(v1[v7], v2 + 16 - 1);
         v7++;
     }
 
     if ((v8 > 0) && (v7 < v5)) {
-        Sprite_SetAnim(v1[v7], v2 + v8 - 1);
+        ManagedSprite_SetAnim(v1[v7], v2 + v8 - 1);
     }
 
     for (v6 = 0; v6 < v5; v6++) {
-        Sprite_SetPositionXY2(v1[v6], v3 + v6 * 16, v4);
-        Sprite_TickOneFrame(v1[v6]);
+        ManagedSprite_SetPositionXY(v1[v6], v3 + v6 * 16, v4);
+        ManagedSprite_TickFrame(v1[v6]);
     }
 }
 
diff --git a/src/overlay017/ov17_02252AB0.c b/src/overlay017/ov17_02252AB0.c
index fd1da498f1..eadc97cb2a 100644
--- a/src/overlay017/ov17_02252AB0.c
+++ b/src/overlay017/ov17_02252AB0.c
@@ -10,7 +10,7 @@
 #include "sys_task_manager.h"
 
 typedef struct UnkStruct_ov17_02252B48_t {
-    CellActorData *unk_00[5];
+    ManagedSprite *unk_00[5];
     SysTask *unk_14;
 } UnkStruct_ov17_02252B48;
 
@@ -69,7 +69,7 @@ UnkStruct_ov17_02252B48 *ov17_02252B48(SpriteSystem *param0, SpriteManager *para
 
     for (v2 = 0; v2 < 5; v2++) {
         v0->unk_00[v2] = SpriteSystem_NewSprite(param0, param1, &v1);
-        Sprite_SetDrawFlag2(v0->unk_00[v2], 0);
+        ManagedSprite_SetDrawFlag(v0->unk_00[v2], 0);
     }
 
     v0->unk_14 = SysTask_Start(ov17_02252CB8, v0, 40000);
@@ -92,18 +92,18 @@ void ov17_02252BF0(UnkStruct_ov17_02252B48 *param0, int param1, int param2, int
 {
     int v0;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[0], param1, param2, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[1], param3, param4, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[2], param5, param6, param9);
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00[3], param7, param8, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[0], param1, param2, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[1], param3, param4, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[2], param5, param6, param9);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00[3], param7, param8, param9);
 
-    Sprite_SetAnim(param0->unk_00[0], 0);
-    Sprite_SetAnim(param0->unk_00[1], 1);
-    Sprite_SetAnim(param0->unk_00[2], 2);
-    Sprite_SetAnim(param0->unk_00[3], 3);
+    ManagedSprite_SetAnim(param0->unk_00[0], 0);
+    ManagedSprite_SetAnim(param0->unk_00[1], 1);
+    ManagedSprite_SetAnim(param0->unk_00[2], 2);
+    ManagedSprite_SetAnim(param0->unk_00[3], 3);
 
     for (v0 = 0; v0 < 4; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_00[v0], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_00[v0], 1);
     }
 }
 
@@ -117,7 +117,7 @@ void ov17_02252C9C(UnkStruct_ov17_02252B48 *param0)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_00[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_00[v0], 0);
     }
 }
 
@@ -126,15 +126,15 @@ static void ov17_02252CB8(SysTask *param0, void *param1)
     UnkStruct_ov17_02252B48 *v0 = param1;
     int v1;
 
-    if (Sprite_GetDrawFlag2(v0->unk_00[0]) == 0) {
+    if (ManagedSprite_GetDrawFlag(v0->unk_00[0]) == 0) {
         return;
     }
 
     for (v1 = 0; v1 < 4; v1++) {
-        Sprite_TickOneFrame(v0->unk_00[v1]);
+        ManagedSprite_TickFrame(v0->unk_00[v1]);
     }
 
-    if (Sprite_GetDrawFlag2(v0->unk_00[4]) == 1) {
-        Sprite_TickOneFrame(v0->unk_00[4]);
+    if (ManagedSprite_GetDrawFlag(v0->unk_00[4]) == 1) {
+        ManagedSprite_TickFrame(v0->unk_00[4]);
     }
 }
diff --git a/src/overlay019/ov19_021D61B0.c b/src/overlay019/ov19_021D61B0.c
index f24526c1c5..0c7bec42b1 100644
--- a/src/overlay019/ov19_021D61B0.c
+++ b/src/overlay019/ov19_021D61B0.c
@@ -35,7 +35,6 @@
 #include "overlay019/struct_ov19_021DEC04_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "font.h"
 #include "graphics.h"
@@ -43,6 +42,7 @@
 #include "heap.h"
 #include "narc.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -55,7 +55,7 @@ struct UnkStruct_ov19_021D61B0_t {
     SysTask *unk_00;
     SysTask *unk_04;
     SysTask *unk_08[4];
-    CellActorCollection *unk_18;
+    SpriteList *unk_18;
     G2dRenderer unk_1C;
     NNSG2dImagePaletteProxy unk_1A8;
     UnkStruct_02007768 *unk_1BC;
@@ -250,7 +250,7 @@ void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0)
     ov19_021D7A74(&(param0->unk_494));
     ov19_021DA384(&(param0->unk_1C8));
 
-    CellActorCollection_Delete(param0->unk_18);
+    SpriteList_Delete(param0->unk_18);
     Bg_FreeTilemapBuffer(param0->unk_1C0, 3);
     Bg_FreeTilemapBuffer(param0->unk_1C0, 2);
     Bg_FreeTilemapBuffer(param0->unk_1C0, 1);
@@ -396,7 +396,7 @@ static void ov19_021D6664(SysTask *param0, void *param1)
 
     ov19_021DAA80(&v0->unk_6604);
 
-    CellActorCollection_Update(v0->unk_18);
+    SpriteList_Update(v0->unk_18);
     RenderOam_Transfer();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -1914,7 +1914,7 @@ int ov19_021D7820(UnkStruct_ov19_021D61B0 *param0)
     }
 }
 
-void ov19_021D783C(CellActorResourceData *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5)
+void ov19_021D783C(SpriteResourcesHeader *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, NNSG2dCellDataBank *param3, NNSG2dCellAnimBankData *param4, u32 param5)
 {
     param0->imageProxy = param1;
     param0->paletteProxy = param2;
@@ -1927,12 +1927,12 @@ void ov19_021D783C(CellActorResourceData *param0, NNSG2dImageProxy *param1, NNSG
     param0->isVRamTransfer = 0;
 }
 
-CellActor *ov19_021D785C(CellActorCollection *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5)
+Sprite *ov19_021D785C(SpriteList *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    CellActorInitParams v0;
-    CellActor *v1;
+    SpriteListTemplate v0;
+    Sprite *v1;
 
-    v0.collection = param0;
+    v0.list = param0;
     v0.resourceData = param1;
     v0.position.x = param2 * FX32_ONE;
     v0.position.y = param3 * FX32_ONE;
@@ -1944,23 +1944,23 @@ CellActor *ov19_021D785C(CellActorCollection *param0, CellActorResourceData *par
     {
         OSIntrMode v2 = OS_DisableInterrupts();
 
-        v1 = CellActorCollection_Add(&v0);
+        v1 = SpriteList_Add(&v0);
         OS_RestoreInterrupts(v2);
     }
 
     if (v1) {
-        CellActor_SetAnimateFlag(v1, 1);
-        CellActor_SetAnimSpeed(v1, (FX32_ONE * (2 / 2)));
+        Sprite_SetAnimateFlag(v1, 1);
+        Sprite_SetAnimSpeed(v1, (FX32_ONE * (2 / 2)));
     }
 
     return v1;
 }
 
-void ov19_021D78AC(CellActor *param0, u32 param1)
+void ov19_021D78AC(Sprite *param0, u32 param1)
 {
     OSIntrMode v0 = OS_DisableInterrupts();
 
-    CellActor_SetPriority(param0, param1);
+    Sprite_SetPriority(param0, param1);
     OS_RestoreInterrupts(v0);
 }
 
diff --git a/src/overlay019/ov19_021D79F8.c b/src/overlay019/ov19_021D79F8.c
index 999317ced3..3ade7480b0 100644
--- a/src/overlay019/ov19_021D79F8.c
+++ b/src/overlay019/ov19_021D79F8.c
@@ -17,12 +17,12 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "text.h"
@@ -104,7 +104,7 @@ static const u16 Unk_ov19_021E0138[] = {
     10,
 };
 
-BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4)
+BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4)
 {
     param0->unk_00 = param2->unk_40.unk_00;
     param0->unk_01 = 11;
@@ -413,7 +413,7 @@ static void ov19_021D8114(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_00 != NULL) {
-            CellActor_Delete(param1->unk_00);
+            Sprite_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
@@ -684,9 +684,9 @@ static void ov19_021D865C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(CellActor_GetPosition(param1->unk_00));
+                v0 = *(Sprite_GetPosition(param1->unk_00));
                 v0.x = param0->unk_68[param2][v1];
-                CellActor_SetPosition(param1->unk_00, &v0);
+                Sprite_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -702,9 +702,9 @@ static void ov19_021D86B4(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD
     for (v2 = 0; v2 < 5; v2++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (param1->unk_00 != NULL) {
-                v0 = *(CellActor_GetPosition(param1->unk_00));
+                v0 = *(Sprite_GetPosition(param1->unk_00));
                 v0.x = param0->unk_38[param2][v1];
-                CellActor_SetPosition(param1->unk_00, &v0);
+                Sprite_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
@@ -726,7 +726,7 @@ static void ov19_021D870C(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021DCD
             v0.x = (112 + param0->unk_585C + v1 * 24) * FX32_ONE;
 
             if (param1->unk_00 != NULL) {
-                CellActor_SetPosition(param1->unk_00, &v0);
+                Sprite_SetPosition(param1->unk_00, &v0);
             }
 
             param1++;
diff --git a/src/overlay019/ov19_021D8B54.c b/src/overlay019/ov19_021D8B54.c
index 212325bdbf..927cff1d37 100644
--- a/src/overlay019/ov19_021D8B54.c
+++ b/src/overlay019/ov19_021D8B54.c
@@ -15,16 +15,16 @@
 #include "overlay019/struct_ov19_021D8E00.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     u16 unk_04;
     u16 unk_06;
     u32 unk_08;
@@ -43,7 +43,7 @@ static void ov19_021D8EE0(const UnkStruct_ov19_021D8E00 *param0, BOOL *param1, B
 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, CellActor *param1, fx32 param2, s32 param3, u32 param4);
+static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, Sprite *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);
@@ -60,9 +60,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 CellActor *ov19_021DA224(UnkStruct_ov19_021D8E00 *param0);
+static Sprite *ov19_021DA224(UnkStruct_ov19_021D8E00 *param0);
 
-BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4)
+BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *param3, NARC *param4)
 {
     param0->unk_794 = param1;
     param0->unk_790 = param2;
@@ -92,7 +92,7 @@ BOOL ov19_021D8B54(UnkStruct_ov19_021D8E00 *param0, UnkStruct_ov19_021D61B0 *par
 
 void ov19_021D8C1C(UnkStruct_ov19_021D8E00 *param0, NARC *param1)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     u32 v1, v2;
 
     NNS_G2dInitImageProxy(&(param0->unk_24));
@@ -123,30 +123,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);
     }
 
-    CellActor_SetAnim(param0->unk_08, 5);
-    CellActor_SetExplicitPriority(param0->unk_08, 2);
+    Sprite_SetAnim(param0->unk_08, 5);
+    Sprite_SetExplicitPriority(param0->unk_08, 2);
 
     v1 = ov19_021D5E10(param0->unk_790);
 
     if (v1 != 2) {
-        CellActor_SetAnim(param0->unk_0C, 6);
-        CellActor_SetAnim(param0->unk_10, 7);
+        Sprite_SetAnim(param0->unk_0C, 6);
+        Sprite_SetAnim(param0->unk_10, 7);
     } else {
-        CellActor_SetAnim(param0->unk_0C, 8);
-        CellActor_SetAnim(param0->unk_10, 9);
+        Sprite_SetAnim(param0->unk_0C, 8);
+        Sprite_SetAnim(param0->unk_10, 9);
     }
 
     if (v1 != 0) {
-        CellActor_SetDrawFlag(param0->unk_08, 0);
+        Sprite_SetDrawFlag(param0->unk_08, 0);
     }
 
     if (v2 != 3) {
         if (ov19_021D5E38(param0->unk_790) == 1) {
-            CellActor_SetAnim(param0->unk_04, 0);
+            Sprite_SetAnim(param0->unk_04, 0);
             ov19_021DA3CC(param0->unk_48, param0->unk_4C, (5 * 6));
             param0->unk_78C = 0;
         } else {
-            CellActor_SetAnim(param0->unk_04, 2);
+            Sprite_SetAnim(param0->unk_04, 2);
             ov19_021D8E00(param0);
             param0->unk_78C = 1;
         }
@@ -154,10 +154,10 @@ void ov19_021D8C1C(UnkStruct_ov19_021D8E00 *param0, NARC *param1)
         param0->unk_78D = 0;
     } else {
         if (ov19_021D5F7C(param0->unk_790) == 0) {
-            CellActor_SetAnim(param0->unk_04, 0);
+            Sprite_SetAnim(param0->unk_04, 0);
             param0->unk_78D = 0;
         } else {
-            CellActor_SetAnim(param0->unk_04, 2);
+            Sprite_SetAnim(param0->unk_04, 2);
             param0->unk_78D = 1;
         }
 
@@ -175,12 +175,12 @@ static void ov19_021D8E00(UnkStruct_ov19_021D8E00 *param0)
     VecFx32 v0;
     s32 v1, v2;
 
-    v0 = *CellActor_GetPosition(param0->unk_04);
+    v0 = *Sprite_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, CellActor_GetExplicitPriority(param0->unk_04), 2, 1240, param0->unk_4C);
+    ov19_021DA428(param0->unk_48, ov19_021D5E9C(param0->unk_790), v1, v2, Sprite_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);
@@ -201,22 +201,22 @@ void ov19_021D8E84(UnkStruct_ov19_021D8E00 *param0)
     }
 
     if (param0->unk_04 != NULL) {
-        CellActor_Delete(param0->unk_04);
+        Sprite_Delete(param0->unk_04);
         param0->unk_04 = NULL;
     }
 
     if (param0->unk_08 != NULL) {
-        CellActor_Delete(param0->unk_08);
+        Sprite_Delete(param0->unk_08);
         param0->unk_08 = NULL;
     }
 
     if (param0->unk_0C != NULL) {
-        CellActor_Delete(param0->unk_0C);
+        Sprite_Delete(param0->unk_0C);
         param0->unk_0C = NULL;
     }
 
     if (param0->unk_10 != NULL) {
-        CellActor_Delete(param0->unk_10);
+        Sprite_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 }
@@ -260,7 +260,7 @@ void ov19_021D8F60(UnkStruct_ov19_021D8E00 *param0)
     ov19_021D8EE0(param0, &v0, &v1);
 
     if (param0->unk_786 != 0) {
-        CellActor_SetDrawFlag(param0->unk_08, 0);
+        Sprite_SetDrawFlag(param0->unk_08, 0);
     }
 
     param0->unk_774 = param0->unk_764 << FX32_SHIFT;
@@ -363,15 +363,15 @@ static void ov19_021D9088(SysTask *param0, void *param1)
     v0->unk_78B = ov19_021D5E2C(v0->unk_790);
 
     if (v0->unk_786 == 0) {
-        CellActor_SetDrawFlag(v0->unk_08, 1);
+        Sprite_SetDrawFlag(v0->unk_08, 1);
     }
 
     if (v0->unk_786 != 2) {
-        CellActor_SetAnim(v0->unk_0C, 6);
-        CellActor_SetAnim(v0->unk_10, 7);
+        Sprite_SetAnim(v0->unk_0C, 6);
+        Sprite_SetAnim(v0->unk_10, 7);
     } else {
-        CellActor_SetAnim(v0->unk_0C, 8);
-        CellActor_SetAnim(v0->unk_10, 9);
+        Sprite_SetAnim(v0->unk_0C, 8);
+        Sprite_SetAnim(v0->unk_10, 9);
     }
 
     SysTask_Done(param0);
@@ -379,7 +379,7 @@ static void ov19_021D9088(SysTask *param0, void *param1)
 
 void ov19_021D9230(UnkStruct_ov19_021D8E00 *param0)
 {
-    CellActor_SetAnim(param0->unk_04, 1);
+    Sprite_SetAnim(param0->unk_04, 1);
 
     param0->unk_780 = (12 << FX32_SHIFT) / 6;
     param0->unk_770 = (param0->unk_768 + 12);
@@ -398,7 +398,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 = *(CellActor_GetPosition(v0->unk_04));
+    VecFx32 v1 = *(Sprite_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -414,7 +414,7 @@ static void ov19_021D928C(SysTask *param0, void *param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        CellActor_SetAnim(v0->unk_04, 2);
+        Sprite_SetAnim(v0->unk_04, 2);
         ov19_021DA038(v0);
 
         v0->unk_787 = 6;
@@ -460,7 +460,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 = *(CellActor_GetPosition(v0->unk_04));
+    VecFx32 v1 = *(Sprite_GetPosition(v0->unk_04));
 
     switch (v0->unk_784) {
     case 0:
@@ -476,7 +476,7 @@ static void ov19_021D93D0(SysTask *param0, void *param1)
         v1.y = v0->unk_770 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        CellActor_SetAnim(v0->unk_04, 1);
+        Sprite_SetAnim(v0->unk_04, 1);
         ov19_021DA1F8(v0);
 
         v0->unk_787 = 6;
@@ -492,7 +492,7 @@ static void ov19_021D93D0(SysTask *param0, void *param1)
         v1.y = v0->unk_768 << FX32_SHIFT;
 
         ov19_021D9E04(v0, &v1);
-        CellActor_SetAnim(v0->unk_04, 0);
+        Sprite_SetAnim(v0->unk_04, 0);
 
         v0->unk_784 = 255;
         v0->unk_78E = 1;
@@ -504,18 +504,18 @@ static void ov19_021D93D0(SysTask *param0, void *param1)
 void ov19_021D94B4(UnkStruct_ov19_021D8E00 *param0)
 {
     VecFx32 v0;
-    CellActor *v1;
+    Sprite *v1;
 
-    CellActor_SetAnim(param0->unk_04, 1);
+    Sprite_SetAnim(param0->unk_04, 1);
 
     param0->unk_788 = 0;
 
     v1 = ov19_021DA224(param0);
-    v0 = *(CellActor_GetPosition(v1));
-    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, CellActor_GetPriority(v1));
+    v0 = *(Sprite_GetPosition(v1));
+    ov19_021D9554(param0, param0->unk_4C->unk_00, v0.y, 1, Sprite_GetPriority(v1));
 
-    v0 = *(CellActor_GetPosition(param0->unk_4C->unk_00));
-    ov19_021D9554(param0, v1, v0.y, -1, CellActor_GetPriority(param0->unk_4C->unk_00));
+    v0 = *(Sprite_GetPosition(param0->unk_4C->unk_00));
+    ov19_021D9554(param0, v1, v0.y, -1, Sprite_GetPriority(param0->unk_4C->unk_00));
 
     param0->unk_784 = 0;
 }
@@ -523,7 +523,7 @@ void ov19_021D94B4(UnkStruct_ov19_021D8E00 *param0)
 BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0)
 {
     if (ov19_021D95E0(param0)) {
-        CellActor_SetAnim(param0->unk_04, 2);
+        Sprite_SetAnim(param0->unk_04, 2);
         ov19_021DA110(param0);
         return 1;
     }
@@ -531,14 +531,14 @@ BOOL ov19_021D9530(UnkStruct_ov19_021D8E00 *param0)
     return 0;
 }
 
-static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, CellActor *param1, fx32 param2, s32 param3, u32 param4)
+static void ov19_021D9554(UnkStruct_ov19_021D8E00 *param0, Sprite *param1, fx32 param2, s32 param3, u32 param4)
 {
     UnkStruct_ov19_021D9554 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021D9554));
 
     if (v0) {
         VecFx32 v1;
 
-        v1 = *CellActor_GetPosition(param1);
+        v1 = *Sprite_GetPosition(param1);
 
         v0->unk_00 = param1;
         v0->unk_04 = 12;
@@ -578,7 +578,7 @@ static void ov19_021D9600(SysTask *param0, void *param1)
     UnkStruct_ov19_021D9554 *v0 = (UnkStruct_ov19_021D9554 *)param1;
     VecFx32 v1;
 
-    v1 = *CellActor_GetPosition(v0->unk_00);
+    v1 = *Sprite_GetPosition(v0->unk_00);
 
     if (v0->unk_04) {
         fx32 v2;
@@ -595,12 +595,12 @@ static void ov19_021D9600(SysTask *param0, void *param1)
         v2 = v0->unk_24 * CalcSineDegrees(v0->unk_18 >> FX32_SHIFT);
         v1.x = v0->unk_14 + v2;
 
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
     } else {
         v1.x = v0->unk_14;
         v1.y = v0->unk_10;
 
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
         ov19_021D79B8(param1, ov19_021D95F4, v0->unk_28);
         SysTask_Done(param0);
     }
@@ -611,10 +611,10 @@ void ov19_021D9690(UnkStruct_ov19_021D8E00 *param0)
     VecFx32 v0;
 
     if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-        CellActor_SetAnim(param0->unk_04, 3);
+        Sprite_SetAnim(param0->unk_04, 3);
     }
 
-    v0 = *CellActor_GetPosition(param0->unk_04);
+    v0 = *Sprite_GetPosition(param0->unk_04);
     v0.y += (-2 * FX32_ONE);
 
     ov19_021D9E04(param0, &v0);
@@ -639,21 +639,21 @@ static void ov19_021D9718(SysTask *param0, void *param1)
     switch (v0->unk_784) {
     case 0:
         if (++(v0->unk_787) >= 4) {
-            VecFx32 v1 = *CellActor_GetPosition(v0->unk_04);
+            VecFx32 v1 = *Sprite_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)) {
-                CellActor_SetAnim(v0->unk_04, 4);
+                Sprite_SetAnim(v0->unk_04, 4);
             }
 
             v0->unk_784++;
         }
         break;
     case 1: {
-        VecFx32 v2 = *CellActor_GetPosition(v0->unk_04);
+        VecFx32 v2 = *Sprite_GetPosition(v0->unk_04);
 
         if (v0->unk_787) {
             v2.y += v0->unk_780;
@@ -671,7 +671,7 @@ static void ov19_021D9718(SysTask *param0, void *param1)
 
 void ov19_021D97FC(UnkStruct_ov19_021D8E00 *param0)
 {
-    VecFx32 v0 = *CellActor_GetPosition(param0->unk_04);
+    VecFx32 v0 = *Sprite_GetPosition(param0->unk_04);
 
     param0->unk_770 = (v0.y >> FX32_SHIFT) + -4;
     param0->unk_780 = (-4 * FX32_ONE) / 4;
@@ -687,8 +687,8 @@ BOOL ov19_021D9858(UnkStruct_ov19_021D8E00 *param0)
 {
     if (param0->unk_788 == 0) {
         if ((param0->unk_78C == 0) && (param0->unk_78D == 0)) {
-            if (CellActor_GetActiveAnim(param0->unk_04) != 0) {
-                CellActor_SetAnim(param0->unk_04, 0);
+            if (Sprite_GetActiveAnim(param0->unk_04) != 0) {
+                Sprite_SetAnim(param0->unk_04, 0);
             }
         }
 
@@ -704,7 +704,7 @@ static void ov19_021D9894(SysTask *param0, void *param1)
     VecFx32 v1;
 
     v0 = (UnkStruct_ov19_021D8E00 *)param1;
-    v1 = *CellActor_GetPosition(v0->unk_04);
+    v1 = *Sprite_GetPosition(v0->unk_04);
 
     if (v0->unk_787) {
         v1.y += v0->unk_780;
@@ -725,12 +725,12 @@ void ov19_021D9900(UnkStruct_ov19_021D8E00 *param0)
     }
 
     ov19_021DA204(param0);
-    CellActor_SetAnim(param0->unk_04, 0);
+    Sprite_SetAnim(param0->unk_04, 0);
 }
 
 void ov19_021D9938(UnkStruct_ov19_021D8E00 *param0)
 {
-    CellActor_SetAnim(param0->unk_04, 1);
+    Sprite_SetAnim(param0->unk_04, 1);
     ov19_021DA7B8(param0->unk_48, param0->unk_4C, 1);
 
     param0->unk_784 = 0;
@@ -749,7 +749,7 @@ BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 *param0)
     case 1:
         if (ov19_021D3B18(v0)) {
             if (ov19_021D3B20(v0)) {
-                CellActor_SetAnim(param0->unk_04, 0);
+                Sprite_SetAnim(param0->unk_04, 0);
                 ov19_021DA204(param0);
                 return 1;
             } else {
@@ -760,7 +760,7 @@ BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 *param0)
         break;
     case 2:
         if (ov19_021DA7E0(param0->unk_48, param0->unk_4C)) {
-            CellActor_SetAnim(param0->unk_04, 2);
+            Sprite_SetAnim(param0->unk_04, 2);
             return 1;
         }
 
@@ -772,10 +772,10 @@ BOOL ov19_021D995C(UnkStruct_ov19_021D8E00 *param0)
 
 void ov19_021D99F4(UnkStruct_ov19_021D8E00 *param0)
 {
-    CellActor_SetExplicitPriority(param0->unk_04, 1);
+    Sprite_SetExplicitPriority(param0->unk_04, 1);
 
     if (param0->unk_78C) {
-        CellActor_SetExplicitPriority(param0->unk_4C->unk_00, 1);
+        Sprite_SetExplicitPriority(param0->unk_4C->unk_00, 1);
     }
 
     if (param0->unk_78D) {
@@ -785,10 +785,10 @@ void ov19_021D99F4(UnkStruct_ov19_021D8E00 *param0)
 
 void ov19_021D9A2C(UnkStruct_ov19_021D8E00 *param0)
 {
-    CellActor_SetExplicitPriority(param0->unk_04, 2);
+    Sprite_SetExplicitPriority(param0->unk_04, 2);
 
     if (param0->unk_78C) {
-        CellActor_SetExplicitPriority(param0->unk_4C->unk_00, 2);
+        Sprite_SetExplicitPriority(param0->unk_4C->unk_00, 2);
     }
 
     if (param0->unk_78D) {
@@ -825,20 +825,20 @@ void ov19_021D9AB0(UnkStruct_ov19_021D8E00 *param0, u32 param1)
 void ov19_021D9AEC(UnkStruct_ov19_021D8E00 *param0)
 {
     if (ov19_021D5EE0(param0->unk_790)) {
-        CellActor_SetExplicitPalette(param0->unk_04, 1);
+        Sprite_SetExplicitPalette(param0->unk_04, 1);
     } else {
-        CellActor_SetExplicitPalette(param0->unk_04, 0);
+        Sprite_SetExplicitPalette(param0->unk_04, 0);
     }
 }
 
 void ov19_021D9B10(UnkStruct_ov19_021D8E00 *param0)
 {
-    CellActor_SetAnim(param0->unk_04, 1);
+    Sprite_SetAnim(param0->unk_04, 1);
 }
 
 void ov19_021D9B1C(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1)
 {
-    *param1 = *(CellActor_GetPosition(param0->unk_04));
+    *param1 = *(Sprite_GetPosition(param0->unk_04));
 }
 
 void ov19_021D9B34(UnkStruct_ov19_021D8E00 *param0)
@@ -862,13 +862,13 @@ static void ov19_021D9B78(SysTask *param0, void *param1)
 
     switch (v0->unk_784) {
     case 0:
-        CellActor_SetAnim(v0->unk_04, 1);
+        Sprite_SetAnim(v0->unk_04, 1);
         ov19_021DE954(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DE9A8(v0->unk_760)) {
-            CellActor_SetAnim(v0->unk_04, 2);
+            Sprite_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -896,13 +896,13 @@ static void ov19_021D9C18(SysTask *param0, void *param1)
 
     switch (v0->unk_784) {
     case 0:
-        CellActor_SetAnim(v0->unk_04, 1);
+        Sprite_SetAnim(v0->unk_04, 1);
         ov19_021DEA18(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEA64(v0->unk_760)) {
-            CellActor_SetAnim(v0->unk_04, 0);
+            Sprite_SetAnim(v0->unk_04, 0);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -929,13 +929,13 @@ static void ov19_021D9CB4(SysTask *param0, void *param1)
 
     switch (v0->unk_784) {
     case 0:
-        CellActor_SetAnim(v0->unk_04, 1);
+        Sprite_SetAnim(v0->unk_04, 1);
         ov19_021DEA74(v0->unk_760);
         v0->unk_784++;
         break;
     case 1:
         if (ov19_021DEB08(v0->unk_760)) {
-            CellActor_SetAnim(v0->unk_04, 2);
+            Sprite_SetAnim(v0->unk_04, 2);
             v0->unk_788 = 0;
             SysTask_Done(param0);
         }
@@ -945,14 +945,14 @@ static void ov19_021D9CB4(SysTask *param0, void *param1)
 void ov19_021D9D10(UnkStruct_ov19_021D8E00 *param0)
 {
     if (param0->unk_78D) {
-        CellActor_SetAnim(param0->unk_04, 1);
+        Sprite_SetAnim(param0->unk_04, 1);
     }
 }
 
 void ov19_021D9D28(UnkStruct_ov19_021D8E00 *param0)
 {
     if (param0->unk_78D) {
-        CellActor_SetAnim(param0->unk_04, 0);
+        Sprite_SetAnim(param0->unk_04, 0);
         param0->unk_78D = 0;
     }
 }
@@ -992,7 +992,7 @@ static void ov19_021D9D48(s32 *param0, s32 *param1, u8 *param2, UnkStruct_ov19_0
 
 static void ov19_021D9E04(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1)
 {
-    CellActor_SetPosition(param0->unk_04, param1);
+    Sprite_SetPosition(param0->unk_04, param1);
 
     if (param0->unk_78C) {
         VecFx32 v0;
@@ -1003,7 +1003,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;
-            CellActor_SetPosition(param0->unk_4C[v1].unk_00, &v0);
+            Sprite_SetPosition(param0->unk_4C[v1].unk_00, &v0);
         }
     }
 
@@ -1015,7 +1015,7 @@ static void ov19_021D9E04(UnkStruct_ov19_021D8E00 *param0, VecFx32 *param1)
         VecFx32 v2 = *param1;
 
         v2.y += (24 << FX32_SHIFT);
-        CellActor_SetPosition(param0->unk_08, &v2);
+        Sprite_SetPosition(param0->unk_08, &v2);
     }
 }
 
@@ -1142,7 +1142,7 @@ static void ov19_021DA204(UnkStruct_ov19_021D8E00 *param0)
     param0->unk_754 = 0;
 }
 
-static CellActor *ov19_021DA224(UnkStruct_ov19_021D8E00 *param0)
+static Sprite *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 9d82b858ba..283360822d 100644
--- a/src/overlay019/ov19_021DA270.c
+++ b/src/overlay019/ov19_021DA270.c
@@ -10,14 +10,14 @@
 #include "overlay019/struct_ov19_021DA384.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "narc.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 
-BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4)
+BOOL ov19_021DA270(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *param3, NARC *param4)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dPaletteData *v1;
@@ -103,7 +103,7 @@ void ov19_021DA3F0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *par
 {
     while (param2--) {
         if (param1->unk_00 != NULL) {
-            CellActor_Delete(param1->unk_00);
+            Sprite_Delete(param1->unk_00);
             param1->unk_00 = NULL;
         }
 
@@ -119,7 +119,7 @@ void ov19_021DA418(const UnkStruct_ov19_021DCD18 *param0, UnkStruct_ov19_021DCD1
 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;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
     u16 v2;
     u8 v3;
     u8 v4;
@@ -150,7 +150,7 @@ void ov19_021DA428(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, s32 para
 
     GF_ASSERT(param7->unk_00 != NULL);
 
-    CellActor_SetExplicitPalette(param7->unk_00, 2 + param7->unk_2C);
+    Sprite_SetExplicitPalette(param7->unk_00, 2 + param7->unk_2C);
     ov19_021DA63C(param0, param7, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v5);
 }
@@ -158,7 +158,7 @@ void ov19_021DA428(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, s32 para
 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;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
     BOOL v2;
     u8 v3, v4;
 
@@ -186,7 +186,7 @@ void ov19_021DA548(UnkStruct_ov19_021DA384 *param0, BoxPokemon *param1, u32 para
 
     GF_ASSERT(param10->unk_00 != NULL);
 
-    CellActor_SetExplicitPalette(param10->unk_00, 2 + param10->unk_2C);
+    Sprite_SetExplicitPalette(param10->unk_00, 2 + param10->unk_2C);
     ov19_021DA63C(param0, param10, ov19_021D5EC8(param0->unk_40));
     BoxPokemon_ExitDecryptionContext(param1, v2);
 }
@@ -198,20 +198,20 @@ void ov19_021DA63C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *par
 
         if (param2 & 1) {
             if (param1->unk_30 == 0) {
-                CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
+                Sprite_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)) {
-                CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
+                Sprite_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_XLU);
                 return;
             }
         }
     }
 
-    CellActor_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(param1->unk_00, GX_OAM_MODE_NORMAL);
 }
 
 void ov19_021DA68C(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1, u32 param2)
@@ -266,31 +266,31 @@ void ov19_021DA754(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *par
 
         NNS_G2dLoadImage1DMapping(v0, param2 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &(param1->unk_04));
 
-        CellActor_SetImageProxy(param1->unk_00, &(param1->unk_04));
+        Sprite_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)) {
-        CellActor_SetAffineOverwriteMode(param1->unk_00, 1);
+        Sprite_SetAffineOverwriteMode(param1->unk_00, 1);
     } else {
-        CellActor_SetAffineOverwriteMode(param1->unk_00, 0);
+        Sprite_SetAffineOverwriteMode(param1->unk_00, 0);
     }
 
-    CellActor_SetAnim(param1->unk_00, param2);
+    Sprite_SetAnim(param1->unk_00, param2);
 }
 
 BOOL ov19_021DA7E0(UnkStruct_ov19_021DA384 *param0, UnkStruct_ov19_021DCD18 *param1)
 {
-    return CellActor_IsAnimated(param1->unk_00) == 0;
+    return Sprite_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;
 
-    CellActor_SetExplicitPalette(param1->unk_00, v0);
+    Sprite_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 2a2db5b061..3a9ddb9239 100644
--- a/src/overlay019/ov19_021DA814.c
+++ b/src/overlay019/ov19_021DA814.c
@@ -8,12 +8,12 @@
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA8D8.h"
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 
-BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, CellActorCollection *param3, NARC *param4)
+BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, SpriteList *param3, NARC *param4)
 {
     param0->unk_44 = param1;
     param0->unk_3C = param3;
@@ -32,14 +32,14 @@ BOOL ov19_021DA814(UnkStruct_ov19_021DA8D8 *param0, UnkStruct_ov19_021D61B0 *par
 
 void ov19_021DA864(UnkStruct_ov19_021DA8D8 *param0, NARC *param1)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
 
     NNS_G2dInitImageProxy(&(param0->unk_18));
 
     Graphics_LoadImageMappingFromOpenNARC(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);
-    CellActor_SetExplicitPalette(param0->unk_04, 1);
+    Sprite_SetExplicitPalette(param0->unk_04, 1);
 }
 
 void ov19_021DA8D8(UnkStruct_ov19_021DA8D8 *param0)
@@ -59,13 +59,13 @@ void ov19_021DA8FC(UnkStruct_ov19_021DA8D8 *param0, int param1)
 {
     switch (param1) {
     case 0:
-        CellActor_SetAnim(param0->unk_04, 0);
+        Sprite_SetAnim(param0->unk_04, 0);
         break;
     case 1:
-        CellActor_SetAnim(param0->unk_04, 1);
+        Sprite_SetAnim(param0->unk_04, 1);
         break;
     case 2:
-        CellActor_SetAnim(param0->unk_04, 2);
+        Sprite_SetAnim(param0->unk_04, 2);
         break;
     }
 }
diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c
index e107cfb6b0..acd61dc43f 100644
--- a/src/overlay019/ov19_021DA92C.c
+++ b/src/overlay019/ov19_021DA92C.c
@@ -13,12 +13,12 @@
 #include "overlay019/struct_ov19_021DA9E0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -55,7 +55,7 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p
 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, BgConfig *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6)
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4, const MessageLoader *param5, NARC *param6)
 {
     int v0;
 
@@ -132,7 +132,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0)
     }
 
     if (param0->unk_30) {
-        CellActor_Delete(param0->unk_30);
+        Sprite_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
@@ -141,7 +141,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0] != NULL) {
-            CellActor_Delete(param0->unk_3C[v0]);
+            Sprite_Delete(param0->unk_3C[v0]);
         }
     }
 
@@ -212,7 +212,7 @@ void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0)
 static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0)
 {
     NNSG2dImageProxy v0;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
     u32 v2, v3, v4;
 
     v2 = sub_0207C944();
@@ -228,7 +228,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);
 
-        CellActor_SetDrawFlag(param0->unk_3C[v4], 0);
+        Sprite_SetDrawFlag(param0->unk_3C[v4], 0);
     }
 
     NNS_G2dInitImageProxy(&v0);
@@ -349,12 +349,12 @@ static void ov19_021DADCC(UnkStruct_ov19_021DA9E0 *param0, fx32 param1)
     VecFx32 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = *CellActor_GetPosition(param0->unk_3C[v0]);
+        v1 = *Sprite_GetPosition(param0->unk_3C[v0]);
         v1.y -= param1;
 
-        CellActor_SetPosition(param0->unk_3C[v0], &v1);
+        Sprite_SetPosition(param0->unk_3C[v0], &v1);
 
-        if ((v0 == 0) && CellActor_GetDrawFlag(param0->unk_3C[v0])) {
+        if ((v0 == 0) && Sprite_GetDrawFlag(param0->unk_3C[v0])) {
             u32 v2, v3;
 
             v2 = v1.x >> FX32_SHIFT;
@@ -368,7 +368,7 @@ static void ov19_021DAE10(UnkStruct_ov19_021DA9E0 *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetDrawFlag(param0->unk_3C[v0], 0);
+        Sprite_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -418,23 +418,23 @@ static void ov19_021DAE60(Window *param0, UnkStruct_ov19_021DA9E0 *param1, u32 p
 
         Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0C), 0, 1504 * 0x20, 0, 1, 10);
 
-        v2 = *CellActor_GetPosition(param1->unk_3C[0]);
+        v2 = *Sprite_GetPosition(param1->unk_3C[0]);
         v2.y = (176 + (16 * param3)) << FX32_SHIFT;
 
-        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);
+        Sprite_SetPosition(param1->unk_3C[0], &v2);
+        Sprite_SetExplicitPalette(param1->unk_3C[0], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0C));
+        Sprite_SetDrawFlag(param1->unk_3C[0], 1);
 
         if (param1->unk_10->unk_4C.unk_0C != param1->unk_10->unk_4C.unk_0D) {
             Graphics_LoadObjectTiles(sub_0207C944(), sub_0207C908(param1->unk_10->unk_4C.unk_0D), 0, (1504 + 8) * 0x20, 0, 1, 10);
 
             v2.x += (36 << FX32_SHIFT);
 
-            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);
+            Sprite_SetPosition(param1->unk_3C[1], &v2);
+            Sprite_SetExplicitPalette(param1->unk_3C[1], 10 + sub_0207C92C(param1->unk_10->unk_4C.unk_0D));
+            Sprite_SetDrawFlag(param1->unk_3C[1], 1);
         } else {
-            CellActor_SetDrawFlag(param1->unk_3C[1], 0);
+            Sprite_SetDrawFlag(param1->unk_3C[1], 0);
         }
     }
         return;
diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c
index 8c52e2b8bf..b109f03e71 100644
--- a/src/overlay019/ov19_021DB2FC.c
+++ b/src/overlay019/ov19_021DB2FC.c
@@ -9,7 +9,6 @@
 #include "overlay019/struct_ov19_021DF964.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "heap.h"
@@ -17,6 +16,7 @@
 #include "message.h"
 #include "narc.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "text.h"
@@ -28,7 +28,7 @@ static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3,
 static void ov19_021DB84C(BgConfig *param0, Window *param1);
 static void ov19_021DB898(BgConfig *param0, Window *param1);
 
-BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *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, BgConfig *param3, SpriteList *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 e896992b26..75916e8ca6 100644
--- a/src/overlay019/ov19_021DB8E4.c
+++ b/src/overlay019/ov19_021DB8E4.c
@@ -16,7 +16,6 @@
 #include "overlay019/struct_ov19_021DBA9C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
@@ -24,6 +23,7 @@
 #include "message.h"
 #include "narc.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -70,7 +70,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, BgConfig *param3, CellActorCollection *param4, NARC *param5)
+BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4, NARC *param5)
 {
     int v0;
 
@@ -357,7 +357,7 @@ static void ov19_021DBD9C(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param
 
 static void ov19_021DBDF4(UnkStruct_ov19_021DBA9C *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     UnkStruct_ov19_021DA384 *v1;
     NNSG2dImageProxy v2;
     VecFx32 v3;
@@ -377,9 +377,9 @@ static void ov19_021DBDF4(UnkStruct_ov19_021DBA9C *param0)
 
         GF_ASSERT(param0->unk_48[v4] != NULL);
 
-        CellActor_SetDrawFlag(param0->unk_48[v4], 0);
+        Sprite_SetDrawFlag(param0->unk_48[v4], 0);
         VEC_Set(&v3, FX32_CONST(32 + v4 * 32), FX32_CONST(88), 0);
-        CellActor_SetPosition(param0->unk_48[v4], &v3);
+        Sprite_SetPosition(param0->unk_48[v4], &v3);
         ov19_021DBD68(param0, v5);
 
         if (++v5 >= 18) {
@@ -398,7 +398,7 @@ static void ov19_021DBEF8(UnkStruct_ov19_021DBA9C *param0)
 
     for (v0 = 0; v0 < 7; v0++) {
         if (param0->unk_48[v0] != NULL) {
-            CellActor_Delete(param0->unk_48[v0]);
+            Sprite_Delete(param0->unk_48[v0]);
             param0->unk_48[v0] = NULL;
         }
     }
@@ -412,7 +412,7 @@ static void ov19_021DBF18(UnkStruct_ov19_021DBA9C *param0)
 
     for (v1 = 0; v1 < 7; v1++) {
         ov19_021DBD9C(param0, v1, v0);
-        CellActor_SetDrawFlag(param0->unk_48[v1], 1);
+        Sprite_SetDrawFlag(param0->unk_48[v1], 1);
 
         if (++v0 >= 18) {
             v0 = 0;
@@ -710,7 +710,7 @@ static void ov19_021DC46C(SysTask *param0, void *param1)
 static void ov19_021DC4F8(UnkStruct_ov19_021DBA9C *param0, u32 param1)
 {
     if (param1 != 0) {
-        CellActorResourceData v0;
+        SpriteResourcesHeader v0;
         UnkStruct_ov19_021DA384 *v1;
         NNSG2dImageProxy v2;
         NNSG2dCharacterData *v3;
@@ -728,7 +728,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) {
-            CellActor_SetExplicitPalette(param0->unk_90, 6);
+            Sprite_SetExplicitPalette(param0->unk_90, 6);
         }
 
         Heap_FreeToHeap(v4);
@@ -744,13 +744,13 @@ static void ov19_021DC5B8(UnkStruct_ov19_021DBA9C *param0, fx32 param1)
         v0.y = param1;
         v0.z = 0;
 
-        CellActor_SetPosition(param0->unk_90, &v0);
+        Sprite_SetPosition(param0->unk_90, &v0);
     }
 }
 
 static void ov19_021DC5E0(UnkStruct_ov19_021DBA9C *param0)
 {
     if (param0->unk_90) {
-        CellActor_Delete(param0->unk_90);
+        Sprite_Delete(param0->unk_90);
     }
 }
diff --git a/src/overlay019/ov19_021DC5F0.c b/src/overlay019/ov19_021DC5F0.c
index c5f5ad8657..2e17fe5d76 100644
--- a/src/overlay019/ov19_021DC5F0.c
+++ b/src/overlay019/ov19_021DC5F0.c
@@ -14,12 +14,12 @@
 #include "overlay019/struct_ov19_021DCD18.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "narc.h"
 #include "party.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 
@@ -45,7 +45,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, BgConfig *param3, CellActorCollection *param4, NARC *param5)
+BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4, NARC *param5)
 {
     param0->unk_00 = param1;
     param0->unk_0C = param2;
@@ -222,7 +222,7 @@ static void ov19_021DC8E8(SysTask *param0, void *param1)
 
     for (v3 = 0; v3 < v4; v3++) {
         if (v0->unk_3C[v2].unk_00 != NULL) {
-            CellActor_SetPosition(v0->unk_3C[v2].unk_00, v1);
+            Sprite_SetPosition(v0->unk_3C[v2].unk_00, v1);
         }
 
         v2++;
@@ -247,7 +247,7 @@ void ov19_021DC96C(UnkStruct_ov19_021DC680 *param0)
     if (param0->unk_28 > v0) {
         VecFx32 v1;
 
-        v1 = *CellActor_GetPosition(param0->unk_3C[v0].unk_00);
+        v1 = *Sprite_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;
@@ -270,7 +270,7 @@ static void ov19_021DCA18(SysTask *param0, void *param1)
     BOOL v2;
 
     v0 = (UnkStruct_ov19_021DC680 *)param1;
-    v1 = *CellActor_GetPosition(v0->unk_3C[v0->unk_28].unk_00);
+    v1 = *Sprite_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;
@@ -282,7 +282,7 @@ static void ov19_021DCA18(SysTask *param0, void *param1)
         v2 = 0;
     }
 
-    CellActor_SetPosition(v0->unk_3C[v0->unk_28].unk_00, &v1);
+    Sprite_SetPosition(v0->unk_3C[v0->unk_28].unk_00, &v1);
 
     if (v2) {
         v0->unk_2C = 0;
@@ -398,7 +398,7 @@ void ov19_021DCC80(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    CellActor_SetExplicitPriority(v2->unk_00, 1);
+    Sprite_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -416,7 +416,7 @@ void ov19_021DCCD4(UnkStruct_ov19_021DC680 *param0, u32 param1, const UnkStruct_
 
     ov19_021DA418(param2, v2, 1);
     ov19_021DA754(param0->unk_38, v2, v1);
-    CellActor_SetExplicitPriority(v2->unk_00, 1);
+    Sprite_SetExplicitPriority(v2->unk_00, 1);
     ov19_021D78AC(v2->unk_00, 4 + v0);
 
     param0->unk_28 = param1;
@@ -491,17 +491,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 = *CellActor_GetPosition(param0->unk_3C[v1].unk_00);
+            v0 = *Sprite_GetPosition(param0->unk_3C[v1].unk_00);
             v0.y += param1;
-            CellActor_SetPosition(param0->unk_3C[v1].unk_00, &v0);
+            Sprite_SetPosition(param0->unk_3C[v1].unk_00, &v0);
 
             if (param1 < 0) {
                 if (v0.y < 851968) {
-                    CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, 1);
+                    Sprite_SetDrawFlag(param0->unk_3C[v1].unk_00, 1);
                 }
             } else {
                 if (v0.y >= 851968) {
-                    CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, 0);
+                    Sprite_SetDrawFlag(param0->unk_3C[v1].unk_00, 0);
                 }
             }
         } else {
@@ -521,7 +521,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]);
-        CellActor_SetDrawFlag(param0->unk_3C[v1].unk_00, param1);
+        Sprite_SetDrawFlag(param0->unk_3C[v1].unk_00, param1);
     }
 }
 
diff --git a/src/overlay019/ov19_021DCF88.c b/src/overlay019/ov19_021DCF88.c
index 526bda6832..d46d70e0b1 100644
--- a/src/overlay019/ov19_021DCF88.c
+++ b/src/overlay019/ov19_021DCF88.c
@@ -12,12 +12,12 @@
 #include "overlay019/struct_ov19_021DCF88_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -27,7 +27,7 @@
 typedef struct {
     UnkStruct_ov19_021DCF88 *unk_00;
     u32 unk_04;
-    CellActor *unk_08;
+    Sprite *unk_08;
     u16 unk_0C;
     s16 unk_0E;
     fx32 unk_10;
@@ -37,7 +37,7 @@ typedef struct {
 
 typedef struct {
     void *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
     fx32 unk_08;
     fx32 unk_0C;
     fx32 unk_10;
@@ -53,7 +53,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov19_021DCF88 *unk_00;
-    CellActor **unk_04;
+    Sprite **unk_04;
     UnkStruct_ov19_021DDBD0 unk_08[10];
     u8 unk_1C0[10];
     u8 unk_1CA;
@@ -66,14 +66,14 @@ struct UnkStruct_ov19_021DCF88_t {
     UnkStruct_ov19_021D61B0 *unk_00;
     const UnkStruct_ov19_021D4DF0 *unk_04;
     BgConfig *unk_08;
-    CellActorCollection *unk_0C;
+    SpriteList *unk_0C;
     u32 unk_10;
     SysTask *unk_14;
     NNSG2dImagePaletteProxy unk_18;
-    CellActor *unk_2C;
-    CellActor *unk_30;
-    CellActor *unk_34[8];
-    CellActor *unk_54[10];
+    Sprite *unk_2C;
+    Sprite *unk_30;
+    Sprite *unk_34[8];
+    Sprite *unk_54[10];
     int unk_7C;
     int unk_80;
     Strbuf *unk_84;
@@ -111,7 +111,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, CellActor *param1, UnkStruct_ov19_021DDBD0 *param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7);
+static void ov19_021DDBF8(UnkStruct_ov19_021DDBF8 *param0, Sprite *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);
@@ -299,7 +299,7 @@ static const u16 Unk_ov19_021E0264[] = {
     0x0
 };
 
-BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4)
+BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4)
 {
     if (ov19_021D5E08(param2) == 4) {
         *param0 = NULL;
@@ -388,11 +388,11 @@ void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0)
         }
 
         if (param0->unk_2C) {
-            CellActor_Delete(param0->unk_2C);
+            Sprite_Delete(param0->unk_2C);
         }
 
         if (param0->unk_30) {
-            CellActor_Delete(param0->unk_30);
+            Sprite_Delete(param0->unk_30);
         }
 
         if (param0->unk_84 != NULL) {
@@ -401,13 +401,13 @@ void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0)
 
         for (v0 = 0; v0 < 8; v0++) {
             if (param0->unk_34[v0]) {
-                CellActor_Delete(param0->unk_34[v0]);
+                Sprite_Delete(param0->unk_34[v0]);
             }
         }
 
         for (v0 = 0; v0 < 10; v0++) {
             if (param0->unk_54[v0]) {
-                CellActor_Delete(param0->unk_54[v0]);
+                Sprite_Delete(param0->unk_54[v0]);
             }
         }
 
@@ -437,7 +437,7 @@ void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1)
 
 static void ov19_021DD224(UnkStruct_ov19_021DCF88 *param0, NARC *param1)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     NNSG2dImageProxy v1;
 
     ov19_021DD2BC(param0, param1);
@@ -450,10 +450,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);
 
-    CellActor_SetFlipMode(param0->unk_30, 1);
+    Sprite_SetFlipMode(param0->unk_30, 1);
 
     if (ov19_021D5E08(param0->unk_04) == 3) {
-        CellActor_SetAnim(param0->unk_30, 1);
+        Sprite_SetAnim(param0->unk_30, 1);
     }
 }
 
@@ -544,7 +544,7 @@ void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0)
             v2->unk_18 = Unk_ov19_021E0258[v0] >> FX32_SHIFT;
 
             if (v2->unk_08 != NULL) {
-                CellActor_SetAnim(v2->unk_08, 1);
+                Sprite_SetAnim(v2->unk_08, 1);
             }
 
             ov19_021DD344(param0, v1, v2);
@@ -568,7 +568,7 @@ static void ov19_021DD46C(SysTask *param0, void *param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (CellActor_IsAnimated(v0->unk_08) == 0) {
+        if (Sprite_IsAnimated(v0->unk_08) == 0) {
             v0->unk_04++;
         }
         break;
@@ -592,7 +592,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) {
-            CellActor_SetAnim(v0->unk_08, 0);
+            Sprite_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -606,7 +606,7 @@ static void ov19_021DD544(SysTask *param0, void *param1)
 
     switch (v0->unk_04) {
     case 0:
-        if (CellActor_IsAnimated(v0->unk_08) == 0) {
+        if (Sprite_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++;
@@ -641,7 +641,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) {
-            CellActor_SetAnim(v0->unk_08, 0);
+            Sprite_SetAnim(v0->unk_08, 0);
             ov19_021DD358(v1);
         }
         break;
@@ -799,7 +799,7 @@ BOOL ov19_021DD820(UnkStruct_ov19_021DCF88 *param0)
 
 static void ov19_021DD854(UnkStruct_ov19_021DCF88 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     UnkStruct_ov19_021DBA9C *v1;
     NNSG2dImageProxy v2;
     int v3, v4;
@@ -832,7 +832,7 @@ static void ov19_021DD854(UnkStruct_ov19_021DCF88 *param0)
 
 static void ov19_021DD8F8(UnkStruct_ov19_021DCF88 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     UnkStruct_ov19_021DBA9C *v1;
     int v2, v3, v4, v5, v6, v7, v8;
 
@@ -904,7 +904,7 @@ static void ov19_021DD998(UnkStruct_ov19_021DCF88 *param0)
 
     for (v0 = 0; v0 < 10; v0++) {
         if (param0->unk_54[v0]) {
-            CellActor_Delete(param0->unk_54[v0]);
+            Sprite_Delete(param0->unk_54[v0]);
             param0->unk_54[v0] = NULL;
         }
     }
@@ -925,7 +925,7 @@ static u32 ov19_021DD9B8(u32 param0, u32 param1)
 
 static void ov19_021DD9DC(UnkStruct_ov19_021DCF88 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     NNSG2dImageProxy v1;
     u32 v2;
     int v3;
@@ -941,7 +941,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);
 
-        CellActor_SetAnim(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
+        Sprite_SetAnim(param0->unk_34[v3], ov19_021DD9B8(v3, v2));
     }
 
     param0->unk_80 = ov19_021D5EC0(param0->unk_04);
@@ -953,7 +953,7 @@ static void ov19_021DDA7C(UnkStruct_ov19_021DCF88 *param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if (param0->unk_34[v0]) {
-            CellActor_Delete(param0->unk_34[v0]);
+            Sprite_Delete(param0->unk_34[v0]);
             param0->unk_34[v0] = NULL;
         }
     }
@@ -978,7 +978,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;
-        CellActor_SetPosition(v0->unk_04, &v1);
+        Sprite_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -986,7 +986,7 @@ static void ov19_021DDA9C(SysTask *param0, void *param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        CellActor_SetPosition(v0->unk_04, &v1);
+        Sprite_SetPosition(v0->unk_04, &v1);
         ov19_021DDBD0(param0, v0);
     }
 }
@@ -1011,7 +1011,7 @@ static void ov19_021DDB20(SysTask *param0, void *param1)
         v1.y = Unk_ov19_021E028C[v2].y << FX32_SHIFT;
         v1.z = 0;
 
-        CellActor_SetPosition(v0->unk_04, &v1);
+        Sprite_SetPosition(v0->unk_04, &v1);
     } else {
         u32 v3 = v0->unk_0C >> FX32_SHIFT;
 
@@ -1019,7 +1019,7 @@ static void ov19_021DDB20(SysTask *param0, void *param1)
         v1.y = Unk_ov19_021E028C[v3].y << FX32_SHIFT;
         v1.z = 0;
 
-        CellActor_SetPosition(v0->unk_04, &v1);
+        Sprite_SetPosition(v0->unk_04, &v1);
 
         if (v0->unk_18) {
             v0->unk_14 = v0->unk_28;
@@ -1043,7 +1043,7 @@ static void ov19_021DDBD0(SysTask *param0, UnkStruct_ov19_021DDBD0 *param1)
     SysTask_Done(param0);
 }
 
-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_021DDBF8(UnkStruct_ov19_021DDBF8 *param0, Sprite *param1, UnkStruct_ov19_021DDBD0 *param2, u32 param3, u32 param4, u32 param5, u32 param6, BOOL param7)
 {
     SysTaskFunc v0;
 
@@ -1470,7 +1470,7 @@ void ov19_021DE2F4(UnkStruct_ov19_021DCF88 *param0)
             u32 v1 = ov19_021D5EC8(param0->unk_04);
 
             for (v0 = 0; v0 < 8; v0++) {
-                CellActor_SetAnim(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
+                Sprite_SetAnim(param0->unk_34[v0], ov19_021DD9B8(v0, v1));
             }
         }
     }
diff --git a/src/overlay019/ov19_021DE3E8.c b/src/overlay019/ov19_021DE3E8.c
index d6f6c3cca8..05886e476a 100644
--- a/src/overlay019/ov19_021DE3E8.c
+++ b/src/overlay019/ov19_021DE3E8.c
@@ -14,10 +14,10 @@
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "item.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 
@@ -35,10 +35,10 @@ struct UnkStruct_ov19_021DE3E8_t {
     UnkStruct_ov19_021D61B0 *unk_04;
     const UnkStruct_ov19_021D4DF0 *unk_08;
     BgConfig *unk_0C;
-    CellActorCollection *unk_10;
+    SpriteList *unk_10;
     UnkStruct_ov19_021DA384 *unk_14;
     UnkStruct_ov19_021D8E00 *unk_18;
-    CellActor *unk_1C[3];
+    Sprite *unk_1C[3];
     int unk_28[3];
     int unk_34;
     int unk_38;
@@ -46,7 +46,7 @@ struct UnkStruct_ov19_021DE3E8_t {
 
 typedef struct {
     UnkStruct_ov19_021DE3E8 *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
     VecFx32 unk_08;
     VecFx32 unk_14;
     fx32 unk_20;
@@ -68,7 +68,7 @@ static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param
 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, BgConfig *param3, CellActorCollection *param4)
+BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4)
 {
     UnkStruct_ov19_021DE3E8 *v0 = Heap_AllocFromHeap(10, sizeof(UnkStruct_ov19_021DE3E8));
 
@@ -100,7 +100,7 @@ void ov19_021DE440(UnkStruct_ov19_021DE3E8 *param0)
 static void ov19_021DE450(UnkStruct_ov19_021DE3E8 *param0)
 {
     if (param0->unk_00) {
-        CellActorResourceData v0;
+        SpriteResourcesHeader v0;
         NNSG2dImageProxy v1;
         NNSG2dCharacterData *v2;
         void *v3;
@@ -120,9 +120,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);
 
-                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);
+                Sprite_SetExplicitPalette(param0->unk_1C[v5], Unk_ov19_021E04CC[v5].unk_04);
+                Sprite_SetDrawFlag(param0->unk_1C[v5], 0);
+                Sprite_SetAffineOverwriteMode(param0->unk_1C[v5], 1);
 
                 param0->unk_28[v5] = 0;
             }
@@ -145,7 +145,7 @@ static void ov19_021DE51C(UnkStruct_ov19_021DE3E8 *param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_1C[v0]) {
-            CellActor_Delete(param0->unk_1C[v0]);
+            Sprite_Delete(param0->unk_1C[v0]);
         }
     }
 }
@@ -200,8 +200,8 @@ static void ov19_021DE59C(UnkStruct_ov19_021DE3E8 *param0)
         int v1 = ov19_021DE538(param0, 1);
 
         ov19_021DE718(param0, v1, v0);
-        CellActor_SetAnim(param0->unk_1C[v1], 6);
-        CellActor_SetDrawFlag(param0->unk_1C[v1], 1);
+        Sprite_SetAnim(param0->unk_1C[v1], 6);
+        Sprite_SetDrawFlag(param0->unk_1C[v1], 1);
     }
 }
 
@@ -227,13 +227,13 @@ static void ov19_021DE5D4(UnkStruct_ov19_021DE3E8 *param0)
 
         Graphics_LoadObjectTiles(16, Item_FileID(v0, 1), 0, Unk_ov19_021E04CC[v3].unk_00, 0, 0, 10);
         Graphics_LoadPalette(16, Item_FileID(v0, 2), 1, Unk_ov19_021E04CC[v3].unk_04 * 0x20, 0x20, 10);
-        CellActor_SetExplicitPriority(param0->unk_1C[v3], v2);
+        Sprite_SetExplicitPriority(param0->unk_1C[v3], v2);
 
         ov19_021D78AC(param0->unk_1C[v3], 2);
 
-        CellActor_SetPosition(param0->unk_1C[v3], &v1);
-        CellActor_SetAnim(param0->unk_1C[v3], 0);
-        CellActor_SetDrawFlag(param0->unk_1C[v3], 1);
+        Sprite_SetPosition(param0->unk_1C[v3], &v1);
+        Sprite_SetAnim(param0->unk_1C[v3], 0);
+        Sprite_SetDrawFlag(param0->unk_1C[v3], 1);
     }
 }
 
@@ -268,10 +268,10 @@ static void ov19_021DE718(UnkStruct_ov19_021DE3E8 *param0, int param1, int param
 
         Graphics_LoadObjectTiles(16, Item_FileID(param2, 1), 0, Unk_ov19_021E04CC[param1].unk_00, 0, 0, 10);
         Graphics_LoadPalette(16, Item_FileID(param2, 2), 1, Unk_ov19_021E04CC[param1].unk_04 * 0x20, 0x20, 10);
-        CellActor_SetExplicitPriority(param0->unk_1C[param1], v1);
+        Sprite_SetExplicitPriority(param0->unk_1C[param1], v1);
 
         ov19_021D78AC(param0->unk_1C[param1], 3);
-        CellActor_SetPosition(param0->unk_1C[param1], &v0);
+        Sprite_SetPosition(param0->unk_1C[param1], &v0);
     }
 }
 
@@ -284,7 +284,7 @@ void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            CellActor_SetAnim(param0->unk_1C[v0], 2);
+            Sprite_SetAnim(param0->unk_1C[v0], 2);
         }
 
         v1 = ov19_021D5E74(param0->unk_08);
@@ -294,8 +294,8 @@ void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0)
 
             if (v0 >= 0) {
                 ov19_021DE718(param0, v0, v1);
-                CellActor_SetAnim(param0->unk_1C[v0], 1);
-                CellActor_SetDrawFlag(param0->unk_1C[v0], 1);
+                Sprite_SetAnim(param0->unk_1C[v0], 1);
+                Sprite_SetDrawFlag(param0->unk_1C[v0], 1);
             }
         }
     }
@@ -309,7 +309,7 @@ BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0)
         int v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
+            if (Sprite_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
         }
@@ -317,7 +317,7 @@ BOOL ov19_021DE800(UnkStruct_ov19_021DE3E8 *param0)
         v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
+            if (Sprite_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -335,7 +335,7 @@ static void ov19_021DE858(UnkStruct_ov19_021DE3E8 *param0, int param1, const Vec
     if (v0) {
         v0->unk_00 = param0;
         v0->unk_04 = param0->unk_1C[param1];
-        v0->unk_08 = *(CellActor_GetPosition(v0->unk_04));
+        v0->unk_08 = *(Sprite_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;
@@ -360,15 +360,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;
-            CellActor_SetPosition(v0->unk_04, &v0->unk_08);
+            Sprite_SetPosition(v0->unk_04, &v0->unk_08);
             v0->unk_2C--;
         } else {
-            CellActor_SetPosition(v0->unk_04, &v0->unk_14);
+            Sprite_SetPosition(v0->unk_04, &v0->unk_14);
             v0->unk_30++;
         }
         break;
     case 1:
-        if (CellActor_IsAnimated(v0->unk_04) == 0) {
+        if (Sprite_IsAnimated(v0->unk_04) == 0) {
             ov19_021D78AC(v0->unk_04, v0->unk_28);
             v0->unk_00->unk_34--;
             SysTask_Done(param0);
@@ -392,7 +392,7 @@ void ov19_021DE954(UnkStruct_ov19_021DE3E8 *param0)
             v1.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v0, 3);
-            CellActor_SetAnim(param0->unk_1C[v0], 3);
+            Sprite_SetAnim(param0->unk_1C[v0], 3);
             ov19_021DE858(param0, v0, &v1, 2, 12);
         }
     }
@@ -410,7 +410,7 @@ void ov19_021DE9B8(UnkStruct_ov19_021DE3E8 *param0)
 
         if (v0 >= 0) {
             ov19_021DE57C(param0, v0, 2);
-            CellActor_SetAnim(param0->unk_1C[v0], 2);
+            Sprite_SetAnim(param0->unk_1C[v0], 2);
         }
     }
 }
@@ -421,7 +421,7 @@ BOOL ov19_021DE9E4(UnkStruct_ov19_021DE3E8 *param0)
         int v0 = ov19_021DE560(param0, 2);
 
         if (v0 >= 0) {
-            if (CellActor_IsAnimated(param0->unk_1C[v0])) {
+            if (Sprite_IsAnimated(param0->unk_1C[v0])) {
                 return 0;
             }
 
@@ -443,7 +443,7 @@ void ov19_021DEA18(UnkStruct_ov19_021DE3E8 *param0)
 
             ov19_021DE694(param0, &v1, &v2);
             ov19_021DE57C(param0, v0, 1);
-            CellActor_SetAnim(param0->unk_1C[v0], 4);
+            Sprite_SetAnim(param0->unk_1C[v0], 4);
             ov19_021DE858(param0, v0, &v1, 3, 12);
         }
     }
@@ -466,7 +466,7 @@ void ov19_021DEA74(UnkStruct_ov19_021DE3E8 *param0)
 
             ov19_021DE694(param0, &v2, &v3);
             ov19_021DE57C(param0, v0, 1);
-            CellActor_SetAnim(param0->unk_1C[v0], 4);
+            Sprite_SetAnim(param0->unk_1C[v0], 4);
 
             ov19_021DE858(param0, v0, &v2, 3, 12);
             ov19_021D9B1C(param0->unk_18, &v2);
@@ -475,7 +475,7 @@ void ov19_021DEA74(UnkStruct_ov19_021DE3E8 *param0)
             v2.y += (8 << FX32_SHIFT);
 
             ov19_021DE57C(param0, v1, 3);
-            CellActor_SetAnim(param0->unk_1C[v1], 3);
+            Sprite_SetAnim(param0->unk_1C[v1], 3);
             ov19_021DE858(param0, v1, &v2, 2, 12);
         }
     }
@@ -492,7 +492,7 @@ void ov19_021DEB18(UnkStruct_ov19_021DE3E8 *param0)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            CellActor_SetAnim(param0->unk_1C[v0], 5);
+            Sprite_SetAnim(param0->unk_1C[v0], 5);
             param0->unk_38 = v0;
             return;
         }
@@ -500,7 +500,7 @@ void ov19_021DEB18(UnkStruct_ov19_021DE3E8 *param0)
         v0 = ov19_021DE560(param0, 1);
 
         if (v0 >= 0) {
-            CellActor_SetAnim(param0->unk_1C[v0], 2);
+            Sprite_SetAnim(param0->unk_1C[v0], 2);
             param0->unk_38 = v0;
             return;
         }
@@ -513,7 +513,7 @@ BOOL ov19_021DEB60(UnkStruct_ov19_021DE3E8 *param0)
 {
     if (param0->unk_00) {
         if (param0->unk_38 != -1) {
-            if (CellActor_IsAnimated(param0->unk_1C[param0->unk_38])) {
+            if (Sprite_IsAnimated(param0->unk_1C[param0->unk_38])) {
                 return 0;
             }
 
@@ -536,7 +536,7 @@ void ov19_021DEB9C(UnkStruct_ov19_021DE3E8 *param0, const VecFx32 *param1)
             v1.x += (0 << FX32_SHIFT);
             v1.y += (8 << FX32_SHIFT);
 
-            CellActor_SetPosition(param0->unk_1C[v0], &v1);
+            Sprite_SetPosition(param0->unk_1C[v0], &v1);
         }
     }
 }
@@ -547,7 +547,7 @@ void ov19_021DEBDC(UnkStruct_ov19_021DE3E8 *param0, u32 param1)
         int v0 = ov19_021DE560(param0, 3);
 
         if (v0 >= 0) {
-            CellActor_SetExplicitPriority(param0->unk_1C[v0], param1);
+            Sprite_SetExplicitPriority(param0->unk_1C[v0], param1);
         }
     }
 }
diff --git a/src/overlay019/ov19_021DEC04.c b/src/overlay019/ov19_021DEC04.c
index 5d4732811a..5f2fb98131 100644
--- a/src/overlay019/ov19_021DEC04.c
+++ b/src/overlay019/ov19_021DEC04.c
@@ -13,7 +13,6 @@
 #include "overlay019/struct_ov19_021DEC04_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
@@ -22,6 +21,7 @@
 #include "narc.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -32,13 +32,13 @@ struct UnkStruct_ov19_021DEC04_t {
     UnkStruct_ov19_021D61B0 *unk_04;
     const UnkStruct_ov19_021D4DF0 *unk_08;
     BgConfig *unk_0C;
-    CellActorCollection *unk_10;
+    SpriteList *unk_10;
     UnkStruct_ov19_021DA384 *unk_14;
     u32 unk_18[2];
-    CellActor *unk_20[2];
-    CellActor *unk_28[2];
-    CellActor *unk_30;
-    CellActor *unk_34[2][5];
+    Sprite *unk_20[2];
+    Sprite *unk_28[2];
+    Sprite *unk_30;
+    Sprite *unk_34[2][5];
     void *unk_5C;
     NNSG2dCellDataBank *unk_60;
     void *unk_64;
@@ -81,7 +81,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, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6)
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, SpriteList *param4, MessageLoader *param5, NARC *param6)
 {
     if (ov19_021D5E08(param2) != 4) {
         *param0 = NULL;
@@ -152,11 +152,11 @@ void ov19_021DEDDC(UnkStruct_ov19_021DEC04 *param0, BOOL param1)
         int v0 = ov19_021D5F9C(param0->unk_08);
 
         if (param1) {
-            CellActor_SetAnim(param0->unk_28[v0 ^ 1], 2);
-            CellActor_SetAnim(param0->unk_28[v0], 0);
+            Sprite_SetAnim(param0->unk_28[v0 ^ 1], 2);
+            Sprite_SetAnim(param0->unk_28[v0], 0);
         } else {
-            CellActor_SetAnim(param0->unk_28[v0 ^ 1], 1);
-            CellActor_SetAnim(param0->unk_28[v0], 0);
+            Sprite_SetAnim(param0->unk_28[v0 ^ 1], 1);
+            Sprite_SetAnim(param0->unk_28[v0], 0);
         }
 
         ov19_021DEEFC(param0);
@@ -399,10 +399,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));
-            CellActor_SetPosition(param0->unk_34[param1][v5], &v6);
+            Sprite_SetPosition(param0->unk_34[param1][v5], &v6);
             ov19_021D78AC(param0->unk_34[param1][v5], 0);
             ov19_021D78AC(param0->unk_34[param1 ^ 1][v5], 1);
-            CellActor_SetDrawFlag(param0->unk_34[param1][v5], 1);
+            Sprite_SetDrawFlag(param0->unk_34[param1][v5], 1);
             v7++;
         }
     } else {
@@ -418,7 +418,7 @@ static void ov19_021DF250(UnkStruct_ov19_021DEC04 *param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        CellActor_SetDrawFlag(param0->unk_34[param1][v0], 0);
+        Sprite_SetDrawFlag(param0->unk_34[param1][v0], 0);
     }
 }
 
@@ -580,7 +580,7 @@ static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1)
         { 256, 568 },
     };
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
     u32 v3, v4, v5;
 
     param0->unk_5C = Graphics_GetCellBankFromOpenNARC(param1, 135, 1, &(param0->unk_60), 10);
@@ -594,21 +594,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);
 
-        CellActor_SetExplicitPalette(param0->unk_28[v4], v4);
-        CellActor_SetAnim(param0->unk_28[v4], 0);
+        Sprite_SetExplicitPalette(param0->unk_28[v4], v4);
+        Sprite_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);
-            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);
+            Sprite_SetAnim(param0->unk_34[v4][v5], 5 + v4);
+            Sprite_SetExplicitPalette(param0->unk_34[v4][v5], v4);
+            Sprite_SetDrawFlag(param0->unk_34[v4][v5], 0);
         }
     }
 
-    CellActor_SetFlipMode(param0->unk_28[1], 1);
+    Sprite_SetFlipMode(param0->unk_28[1], 1);
     param0->unk_30 = ov19_021D785C(param0->unk_10, &v2, 128, 176 + 384, 0, NNS_G2D_VRAM_TYPE_2DSUB);
-    CellActor_SetAnim(param0->unk_30, 3);
-    CellActor_SetExplicitPalette(param0->unk_30, 2);
+    Sprite_SetAnim(param0->unk_30, 3);
+    Sprite_SetExplicitPalette(param0->unk_30, 2);
     param0->unk_380 = SysTask_Start(ov19_021DF930, param0, 1);
 
     ov19_021DF730(param0, v3);
@@ -624,7 +624,7 @@ static void ov19_021DF730(UnkStruct_ov19_021DEC04 *param0, u32 param1)
         { 144, 394 },
     };
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
     int v3;
 
     ov19_021D783C(&v2, &v1, ov19_021D77D0(param0->unk_04), ov19_021DA80C(param0->unk_14), ov19_021DA810(param0->unk_14), 1);
@@ -635,7 +635,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);
-        CellActor_SetDrawFlag(param0->unk_20[v3], 0);
+        Sprite_SetDrawFlag(param0->unk_20[v3], 0);
     }
 }
 
@@ -648,15 +648,15 @@ static void ov19_021DF7D0(UnkStruct_ov19_021DEC04 *param0)
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_20[v0]);
-        CellActor_Delete(param0->unk_28[v0]);
+        Sprite_Delete(param0->unk_20[v0]);
+        Sprite_Delete(param0->unk_28[v0]);
 
         for (v1 = 0; v1 < 5; v1++) {
-            CellActor_Delete(param0->unk_34[v0][v1]);
+            Sprite_Delete(param0->unk_34[v0][v1]);
         }
     }
 
-    CellActor_Delete(param0->unk_30);
+    Sprite_Delete(param0->unk_30);
     Heap_FreeToHeap(param0->unk_5C);
     Heap_FreeToHeap(param0->unk_64);
 }
@@ -665,7 +665,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);
-    CellActor *v2 = param0->unk_20[v0];
+    Sprite *v2 = param0->unk_20[v0];
     BoxPokemon *v3 = (BoxPokemon *)(v1->unk_00);
     NNSG2dCharacterData *v4;
 
@@ -678,10 +678,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);
 
-        CellActor_SetExplicitPalette(v2, v5);
-        CellActor_SetDrawFlag(v2, 1);
+        Sprite_SetExplicitPalette(v2, v5);
+        Sprite_SetDrawFlag(v2, 1);
     } else {
-        CellActor_SetDrawFlag(v2, 0);
+        Sprite_SetDrawFlag(v2, 0);
     }
 }
 
@@ -707,13 +707,13 @@ static void ov19_021DF930(SysTask *param0, void *param1)
     UnkStruct_ov19_021DEC04 *v0 = param1;
     BOOL v1 = ov19_021D5FC0(v0->unk_08);
 
-    if (CellActor_GetActiveAnim(v0->unk_30) == 3) {
+    if (Sprite_GetActiveAnim(v0->unk_30) == 3) {
         if (v1) {
-            CellActor_SetAnim(v0->unk_30, 4);
+            Sprite_SetAnim(v0->unk_30, 4);
         }
     } else {
         if (v1 == 0) {
-            CellActor_SetAnim(v0->unk_30, 3);
+            Sprite_SetAnim(v0->unk_30, 3);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D2098.c b/src/overlay020/ov20_021D2098.c
index daa87b09ac..5a689b0f5f 100644
--- a/src/overlay020/ov20_021D2098.c
+++ b/src/overlay020/ov20_021D2098.c
@@ -20,12 +20,12 @@
 #include "overlay020/struct_ov20_021D4AD4_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "narc.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -39,7 +39,7 @@ typedef struct UnkStruct_ov20_021D2128_t {
     const UnkStruct_ov20_021D16E8 *unk_18;
     const UnkStruct_020998EC *unk_1C;
     BgConfig *unk_20;
-    CellActorCollection *unk_24;
+    SpriteList *unk_24;
     G2dRenderer unk_28;
     NNSG2dImageProxy unk_1B4[2];
     NNSG2dImagePaletteProxy unk_1FC[2];
@@ -144,7 +144,7 @@ void ov20_021D2128(UnkStruct_ov20_021D2128 *param0)
         SysTask_Done(param0->unk_04);
 
         RenderOam_Free();
-        CellActorCollection_Delete(param0->unk_24);
+        SpriteList_Delete(param0->unk_24);
 
         Heap_FreeToHeap(param0->unk_20);
         Heap_FreeToHeap(param0);
@@ -165,7 +165,7 @@ static void ov20_021D217C(SysTask *param0, void *param1)
 {
     UnkStruct_ov20_021D2128 *v0 = param1;
 
-    CellActorCollection_Update(v0->unk_24);
+    SpriteList_Update(v0->unk_24);
     RenderOam_Transfer();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -956,12 +956,12 @@ BgConfig *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0)
     return param0->unk_20;
 }
 
-CellActorCollection *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0)
+SpriteList *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0)
 {
     return param0->unk_24;
 }
 
-void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3)
+void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3)
 {
     param1->imageProxy = &param0->unk_1B4[param2];
     param1->paletteProxy = &param0->unk_1FC[param2];
@@ -974,13 +974,13 @@ void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param
     param1->isVRamTransfer = 0;
 }
 
-CellActor *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5)
+Sprite *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    CellActorInitParams v0;
-    CellActor *v1;
+    SpriteListTemplate v0;
+    Sprite *v1;
     OSIntrMode v2;
 
-    v0.collection = param0->unk_24;
+    v0.list = param0->unk_24;
     v0.resourceData = param1;
     v0.position.x = param2 * FX32_ONE;
     v0.position.y = param3 * FX32_ONE;
@@ -990,13 +990,13 @@ CellActor *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, CellActorResourceData
     v0.heapID = 35;
 
     v2 = OS_DisableInterrupts();
-    v1 = CellActorCollection_Add(&v0);
+    v1 = SpriteList_Add(&v0);
 
     OS_RestoreInterrupts(v2);
 
     if (v1) {
-        CellActor_SetAnimateFlag(v1, 1);
-        CellActor_SetAnimSpeed(v1, ((FX32_ONE * 2) / 2));
+        Sprite_SetAnimateFlag(v1, 1);
+        Sprite_SetAnimSpeed(v1, ((FX32_ONE * 2) / 2));
     }
 
     return v1;
diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c
index 852a95aefb..a87eb82638 100644
--- a/src/overlay020/ov20_021D2EA4.c
+++ b/src/overlay020/ov20_021D2EA4.c
@@ -11,7 +11,6 @@
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "charcode.h"
 #include "colored_arrow.h"
 #include "font.h"
@@ -20,6 +19,7 @@
 #include "message.h"
 #include "narc.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "text.h"
@@ -43,9 +43,9 @@ typedef struct UnkStruct_ov20_021D30F8_t {
     Window unk_0C;
     Window unk_1C;
     Window unk_2C;
-    CellActor *unk_3C;
-    CellActor *unk_40;
-    CellActor *unk_44;
+    Sprite *unk_3C;
+    Sprite *unk_40;
+    Sprite *unk_44;
     MessageLoader *unk_48;
     Strbuf *unk_4C;
     ColoredArrow *unk_50;
@@ -94,15 +94,15 @@ void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0)
     }
 
     if (param0->unk_3C) {
-        CellActor_Delete(param0->unk_3C);
+        Sprite_Delete(param0->unk_3C);
     }
 
     if (param0->unk_40) {
-        CellActor_Delete(param0->unk_40);
+        Sprite_Delete(param0->unk_40);
     }
 
     if (param0->unk_44) {
-        CellActor_Delete(param0->unk_44);
+        Sprite_Delete(param0->unk_44);
     }
 
     if (param0->unk_48) {
@@ -207,7 +207,7 @@ static void ov20_021D312C(UnkStruct_ov20_021D30F8 *param0)
 
 static void ov20_021D3184(UnkStruct_ov20_021D30F8 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader v0;
     UnkStruct_ov20_021D34CC v1;
 
     if (param0->unk_5C) {
@@ -223,14 +223,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);
 
-    CellActor_SetAnim(param0->unk_40, 13);
+    Sprite_SetAnim(param0->unk_40, 13);
     param0->unk_44 = ov20_021D2E50(param0->unk_00, &v0, 250, 24, 1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    CellActor_SetAnim(param0->unk_44, 12);
+    Sprite_SetAnim(param0->unk_44, 12);
 
     if (ov20_021D1F84(param0->unk_04) != 2) {
-        CellActor_SetDrawFlag(param0->unk_44, 0);
-        CellActor_SetDrawFlag(param0->unk_40, 0);
+        Sprite_SetDrawFlag(param0->unk_44, 0);
+        Sprite_SetDrawFlag(param0->unk_40, 0);
     }
 }
 
@@ -468,26 +468,26 @@ void ov20_021D3690(UnkStruct_ov20_021D30F8 *param0)
 
 void ov20_021D369C(UnkStruct_ov20_021D30F8 *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_3C, param1);
+    Sprite_SetDrawFlag(param0->unk_3C, param1);
     ov20_021D375C(param0, 1);
 }
 
 void ov20_021D36B0(UnkStruct_ov20_021D30F8 *param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        CellActor_SetDrawFlag(param0->unk_40, 0);
-        CellActor_SetDrawFlag(param0->unk_44, 0);
+        Sprite_SetDrawFlag(param0->unk_40, 0);
+        Sprite_SetDrawFlag(param0->unk_44, 0);
     }
 }
 
 void ov20_021D36D0(UnkStruct_ov20_021D30F8 *param0)
 {
     if (ov20_021D1F84(param0->unk_04) == 2) {
-        CellActor_SetDrawFlag(param0->unk_40, 1);
-        CellActor_SetDrawFlag(param0->unk_44, 1);
+        Sprite_SetDrawFlag(param0->unk_40, 1);
+        Sprite_SetDrawFlag(param0->unk_44, 1);
 
-        CellActor_SetAnim(param0->unk_40, 13);
-        CellActor_SetAnim(param0->unk_44, 12);
+        Sprite_SetAnim(param0->unk_40, 13);
+        Sprite_SetAnim(param0->unk_44, 12);
     }
 }
 
@@ -507,10 +507,10 @@ void ov20_021D3700(UnkStruct_ov20_021D30F8 *param0, int param1)
         v0.y = 24 * FX32_ONE;
         v0.z = 0;
 
-        CellActor_SetPosition(param0->unk_3C, &v0);
+        Sprite_SetPosition(param0->unk_3C, &v0);
     }
 
-    CellActor_SetPosition(param0->unk_3C, &v0);
+    Sprite_SetPosition(param0->unk_3C, &v0);
     ov20_021D375C(param0, 1);
 }
 
@@ -518,15 +518,15 @@ static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1)
 {
     if (param0->unk_5C != 0) {
         if (param1) {
-            CellActor_SetAnim(param0->unk_3C, 0);
+            Sprite_SetAnim(param0->unk_3C, 0);
         } else {
-            CellActor_SetAnim(param0->unk_3C, 1);
+            Sprite_SetAnim(param0->unk_3C, 1);
         }
     } else {
         if (param1) {
-            CellActor_SetAnim(param0->unk_3C, 14);
+            Sprite_SetAnim(param0->unk_3C, 14);
         } else {
-            CellActor_SetAnim(param0->unk_3C, 15);
+            Sprite_SetAnim(param0->unk_3C, 15);
         }
     }
 }
diff --git a/src/overlay020/ov20_021D3864.c b/src/overlay020/ov20_021D3864.c
index c5f4637ef0..c9096b98cf 100644
--- a/src/overlay020/ov20_021D3864.c
+++ b/src/overlay020/ov20_021D3864.c
@@ -10,12 +10,12 @@
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "text.h"
 
@@ -23,7 +23,7 @@ typedef struct UnkStruct_ov20_021D3980_t {
     UnkStruct_ov20_021D2128 *unk_00;
     const UnkStruct_ov20_021D16E8 *unk_04;
     const UnkStruct_020998EC *unk_08;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
 } UnkStruct_ov20_021D3980;
 
 static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 param2);
@@ -44,7 +44,7 @@ UnkStruct_ov20_021D3980 *ov20_021D3864(UnkStruct_ov20_021D2128 *param0, const Un
 void ov20_021D3880(UnkStruct_ov20_021D3980 *param0)
 {
     if (param0->unk_0C) {
-        CellActor_Delete(param0->unk_0C);
+        Sprite_Delete(param0->unk_0C);
     }
 
     Heap_FreeToHeap(param0);
@@ -93,33 +93,33 @@ static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 pa
 
 static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader 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);
 
-    CellActor_SetAnim(param0->unk_0C, 2);
-    CellActor_SetDrawFlag(param0->unk_0C, 0);
+    Sprite_SetAnim(param0->unk_0C, 2);
+    Sprite_SetDrawFlag(param0->unk_0C, 0);
 }
 
 void ov20_021D39BC(UnkStruct_ov20_021D3980 *param0)
 {
-    CellActor_SetAnim(param0->unk_0C, 3);
+    Sprite_SetAnim(param0->unk_0C, 3);
 }
 
 void ov20_021D39C8(UnkStruct_ov20_021D3980 *param0)
 {
-    CellActor_SetAnim(param0->unk_0C, 2);
+    Sprite_SetAnim(param0->unk_0C, 2);
 }
 
 void ov20_021D39D4(UnkStruct_ov20_021D3980 *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_0C, param1);
+    Sprite_SetDrawFlag(param0->unk_0C, param1);
 }
 
 BOOL ov20_021D39E0(UnkStruct_ov20_021D3980 *param0)
 {
-    return CellActor_GetDrawFlag(param0->unk_0C);
+    return Sprite_GetDrawFlag(param0->unk_0C);
 }
 
 void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1)
@@ -140,8 +140,8 @@ void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1)
         break;
     }
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
-    CellActor_SetAnim(param0->unk_0C, 2);
+    Sprite_SetPosition(param0->unk_0C, &v0);
+    Sprite_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 7fc6d59266..370c91ac79 100644
--- a/src/overlay020/ov20_021D3A54.c
+++ b/src/overlay020/ov20_021D3A54.c
@@ -15,13 +15,13 @@
 #include "overlay020/struct_ov20_021D4FF0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task_manager.h"
 #include "text.h"
@@ -37,7 +37,7 @@ typedef struct UnkStruct_ov20_021D3E0C_t {
     SysTask *unk_18;
     UnkStruct_ov20_021D4FF0 unk_1C;
     UnkStruct_ov20_021D4E8C unk_3C;
-    CellActor *unk_5C;
+    Sprite *unk_5C;
 } UnkStruct_ov20_021D3E0C;
 
 static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2);
@@ -63,7 +63,7 @@ UnkStruct_ov20_021D3E0C *ov20_021D3A54(UnkStruct_ov20_021D2128 *param0, const Un
 void ov20_021D3A80(UnkStruct_ov20_021D3E0C *param0)
 {
     if (param0->unk_5C) {
-        CellActor_Delete(param0->unk_5C);
+        Sprite_Delete(param0->unk_5C);
     }
 
     Heap_FreeToHeap(param0);
@@ -224,23 +224,23 @@ static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32
 
 static void ov20_021D3E0C(UnkStruct_ov20_021D3E0C *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader 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);
-    CellActor_SetAnim(param0->unk_5C, 4);
-    CellActor_SetDrawFlag(param0->unk_5C, 0);
+    Sprite_SetAnim(param0->unk_5C, 4);
+    Sprite_SetDrawFlag(param0->unk_5C, 0);
 }
 
 void ov20_021D3E48(UnkStruct_ov20_021D3E0C *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_5C, param1);
+    Sprite_SetDrawFlag(param0->unk_5C, param1);
 
     if (param1) {
         if (ov20_021D1F94(param0->unk_04) == 0) {
-            CellActor_SetAnim(param0->unk_5C, 4);
+            Sprite_SetAnim(param0->unk_5C, 4);
         } else {
-            CellActor_SetAnim(param0->unk_5C, 6);
+            Sprite_SetAnim(param0->unk_5C, 6);
         }
     }
 }
@@ -276,8 +276,8 @@ void ov20_021D3E74(UnkStruct_ov20_021D3E0C *param0, u32 param1)
     v0.x *= FX32_ONE;
     v0.y *= FX32_ONE;
 
-    CellActor_SetPosition(param0->unk_5C, &v0);
-    CellActor_SetAnim(param0->unk_5C, v2);
+    Sprite_SetPosition(param0->unk_5C, &v0);
+    Sprite_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 e41ada1d7f..5b3affbe24 100644
--- a/src/overlay020/ov20_021D40E8.c
+++ b/src/overlay020/ov20_021D40E8.c
@@ -14,9 +14,9 @@
 #include "overlay020/struct_ov20_021D4FF0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "heap.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "text.h"
 
@@ -27,9 +27,9 @@ typedef struct UnkStruct_ov20_021D4210_t {
     BgConfig *unk_0C;
     Window unk_10;
     Window unk_20;
-    CellActor *unk_30;
-    CellActor *unk_34;
-    CellActor *unk_38;
+    Sprite *unk_30;
+    Sprite *unk_34;
+    Sprite *unk_38;
     Strbuf *unk_3C;
     UnkStruct_ov20_021D4FF0 unk_40;
     UnkStruct_ov20_021D4E8C unk_60;
@@ -68,15 +68,15 @@ UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const Un
 void ov20_021D4164(UnkStruct_ov20_021D4210 *param0)
 {
     if (param0->unk_30) {
-        CellActor_Delete(param0->unk_30);
+        Sprite_Delete(param0->unk_30);
     }
 
     if (param0->unk_34) {
-        CellActor_Delete(param0->unk_34);
+        Sprite_Delete(param0->unk_34);
     }
 
     if (param0->unk_38) {
-        CellActor_Delete(param0->unk_38);
+        Sprite_Delete(param0->unk_38);
     }
 
     if (param0->unk_3C) {
@@ -110,21 +110,21 @@ void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0)
 
 static void ov20_021D4210(UnkStruct_ov20_021D4210 *param0)
 {
-    CellActorResourceData v0;
+    SpriteResourcesHeader 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);
 
-    CellActor_SetAnim(param0->unk_30, 8);
-    CellActor_SetDrawFlag(param0->unk_30, 0);
+    Sprite_SetAnim(param0->unk_30, 8);
+    Sprite_SetDrawFlag(param0->unk_30, 0);
 
     param0->unk_34 = ov20_021D2E50(param0->unk_00, &v0, 240, 64, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    CellActor_SetAnim(param0->unk_34, 11);
-    CellActor_SetDrawFlag(param0->unk_34, 0);
+    Sprite_SetAnim(param0->unk_34, 11);
+    Sprite_SetDrawFlag(param0->unk_34, 0);
 
     param0->unk_38 = ov20_021D2E50(param0->unk_00, &v0, 240, 144, 4, NNS_G2D_VRAM_TYPE_2DMAIN);
-    CellActor_SetAnim(param0->unk_38, 10);
-    CellActor_SetDrawFlag(param0->unk_38, 0);
+    Sprite_SetAnim(param0->unk_38, 10);
+    Sprite_SetDrawFlag(param0->unk_38, 0);
 }
 
 void ov20_021D4294(UnkStruct_ov20_021D4210 *param0)
@@ -211,14 +211,14 @@ BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 *param0)
 
 void ov20_021D4440(UnkStruct_ov20_021D4210 *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_30, param1);
+    Sprite_SetDrawFlag(param0->unk_30, param1);
 
     if (param1) {
-        CellActor_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
-        CellActor_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
+        Sprite_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        Sprite_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
     } else {
-        CellActor_SetDrawFlag(param0->unk_34, 0);
-        CellActor_SetDrawFlag(param0->unk_38, 0);
+        Sprite_SetDrawFlag(param0->unk_34, 0);
+        Sprite_SetDrawFlag(param0->unk_38, 0);
     }
 }
 
@@ -234,8 +234,8 @@ void ov20_021D4480(UnkStruct_ov20_021D4210 *param0, u32 param1)
     v0.y = (56 + 24 * v2) * FX32_ONE;
     v0.z = 0;
 
-    CellActor_SetPosition(param0->unk_30, &v0);
-    CellActor_SetAnim(param0->unk_30, 8);
+    Sprite_SetPosition(param0->unk_30, &v0);
+    Sprite_SetAnim(param0->unk_30, 8);
 }
 
 void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1)
@@ -282,8 +282,8 @@ void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1)
 BOOL ov20_021D4578(UnkStruct_ov20_021D4210 *param0)
 {
     if (ov20_021D4E8C(&param0->unk_60)) {
-        CellActor_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
-        CellActor_SetDrawFlag(param0->unk_38, ov20_021D2060(param0->unk_04));
+        Sprite_SetDrawFlag(param0->unk_34, ov20_021D204C(param0->unk_04));
+        Sprite_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 9ff114e999..a8659fc484 100644
--- a/src/overlay020/ov20_021D4728.c
+++ b/src/overlay020/ov20_021D4728.c
@@ -13,12 +13,12 @@
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -36,9 +36,9 @@ typedef struct UnkStruct_ov20_021D4AD4_t {
     const UnkStruct_ov20_021D16E8 *unk_04;
     const UnkStruct_020998EC *unk_08;
     BgConfig *unk_0C;
-    CellActorCollection *unk_10;
-    CellActor *unk_14;
-    CellActor *unk_18;
+    SpriteList *unk_10;
+    Sprite *unk_14;
+    Sprite *unk_18;
     UnkStruct_ov20_021D4B2C unk_1C;
     u16 unk_2C[8][77];
     SysTask *unk_4FC;
@@ -65,7 +65,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 CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, UnkStruct_ov20_021D4B2C *param3, int param4, int param5, int param6, int param7);
+static Sprite *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)
 {
@@ -211,22 +211,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);
-    CellActor_SetAnim(param0->unk_14, 0);
-    CellActor_SetDrawFlag(param0->unk_14, 0);
+    Sprite_SetAnim(param0->unk_14, 0);
+    Sprite_SetDrawFlag(param0->unk_14, 0);
 
     param0->unk_18 = ov20_021D4B40(param0, &v1, &v0, &param0->unk_1C, 192, 136, 0, 0);
-    CellActor_SetAnim(param0->unk_18, 2);
-    CellActor_SetDrawFlag(param0->unk_18, 0);
+    Sprite_SetAnim(param0->unk_18, 2);
+    Sprite_SetDrawFlag(param0->unk_18, 0);
 }
 
 static void ov20_021D4AD4(UnkStruct_ov20_021D4AD4 *param0)
 {
     if (param0->unk_14) {
-        CellActor_Delete(param0->unk_14);
+        Sprite_Delete(param0->unk_14);
     }
 
     if (param0->unk_18) {
-        CellActor_Delete(param0->unk_18);
+        Sprite_Delete(param0->unk_18);
     }
 
     ov20_021D4B2C(&param0->unk_1C);
@@ -244,11 +244,11 @@ static void ov20_021D4B2C(UnkStruct_ov20_021D4B2C *param0)
     Heap_FreeToHeap(param0->unk_08);
 }
 
-static CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProxy *param1, NNSG2dImagePaletteProxy *param2, UnkStruct_ov20_021D4B2C *param3, int param4, int param5, int param6, int param7)
+static Sprite *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;
-    CellActor *v2;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
+    Sprite *v2;
 
     v0.imageProxy = param1;
     v0.paletteProxy = param2;
@@ -260,7 +260,7 @@ static CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProx
     v0.multiCellAnimBank = NULL;
     v0.isVRamTransfer = 0;
 
-    v1.collection = param0->unk_10;
+    v1.list = param0->unk_10;
     v1.resourceData = &v0;
     v1.position.x = param4 * FX32_ONE;
     v1.position.y = (param5 + 192) * FX32_ONE;
@@ -269,11 +269,11 @@ static CellActor *ov20_021D4B40(UnkStruct_ov20_021D4AD4 *param0, NNSG2dImageProx
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.heapID = 35;
 
-    v2 = CellActorCollection_Add(&v1);
+    v2 = SpriteList_Add(&v1);
 
     if (v2) {
-        CellActor_SetAnimateFlag(v2, 1);
-        CellActor_SetAnimSpeed(v2, ((FX32_ONE * 2) / 2));
+        Sprite_SetAnimateFlag(v2, 1);
+        Sprite_SetAnimSpeed(v2, ((FX32_ONE * 2) / 2));
     }
 
     return v2;
@@ -360,11 +360,11 @@ static void ov20_021D4C40(SysTask *param0, void *param1)
 void ov20_021D4DBC(UnkStruct_ov20_021D4AD4 *param0, BOOL param1)
 {
     if (param1) {
-        CellActor_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04));
-        CellActor_SetDrawFlag(param0->unk_18, ov20_021D2060(param0->unk_04));
+        Sprite_SetDrawFlag(param0->unk_14, ov20_021D204C(param0->unk_04));
+        Sprite_SetDrawFlag(param0->unk_18, ov20_021D2060(param0->unk_04));
     } else {
-        CellActor_SetDrawFlag(param0->unk_14, 0);
-        CellActor_SetDrawFlag(param0->unk_18, 0);
+        Sprite_SetDrawFlag(param0->unk_14, 0);
+        Sprite_SetDrawFlag(param0->unk_18, 0);
     }
 }
 
@@ -374,20 +374,20 @@ void ov20_021D4DF4(UnkStruct_ov20_021D4AD4 *param0, int param1, int param2)
     case 0:
         switch (param2) {
         case 1:
-            CellActor_SetAnim(param0->unk_14, 1);
+            Sprite_SetAnim(param0->unk_14, 1);
             break;
         case 0:
-            CellActor_SetAnim(param0->unk_14, 0);
+            Sprite_SetAnim(param0->unk_14, 0);
             break;
         }
         break;
     case 1:
         switch (param2) {
         case 1:
-            CellActor_SetAnim(param0->unk_18, 3);
+            Sprite_SetAnim(param0->unk_18, 3);
             break;
         case 0:
-            CellActor_SetAnim(param0->unk_18, 2);
+            Sprite_SetAnim(param0->unk_18, 2);
             break;
         }
         break;
diff --git a/src/overlay021/ov21_021D0D80.c b/src/overlay021/ov21_021D0D80.c
index e9aca199f5..53b6bb8609 100644
--- a/src/overlay021/ov21_021D0D80.c
+++ b/src/overlay021/ov21_021D0D80.c
@@ -51,7 +51,6 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -62,6 +61,7 @@
 #include "pokedex_data_index.h"
 #include "pokemon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "strbuf.h"
@@ -533,22 +533,22 @@ UnkStruct_ov21_021E68F4 *ov21_021D1430(UnkStruct_ov21_021D0F60 *param0, int para
     return &param0->unk_1C24[param1];
 }
 
-void ov21_021D144C(CellActor *param0, int param1)
+void ov21_021D144C(Sprite *param0, int param1)
 {
     switch (param1) {
     case 0:
-        SpriteActor_SetAnimFrame(param0, 1);
+        Sprite_SetAnimFrame(param0, 1);
         break;
     case 2:
-        SpriteActor_SetAnimFrame(param0, 2);
+        Sprite_SetAnimFrame(param0, 2);
         break;
     case 1:
-        SpriteActor_SetAnimFrame(param0, 3);
+        Sprite_SetAnimFrame(param0, 3);
         break;
     case 3:
     case (3 + 1):
-        if (CellActor_GetAnimFrame(param0) > 0) {
-            CellActor_UpdateAnim(param0, -(FX32_ONE * 2));
+        if (Sprite_GetAnimFrame(param0) > 0) {
+            Sprite_UpdateAnim(param0, -(FX32_ONE * 2));
         }
         break;
     default:
@@ -556,9 +556,9 @@ void ov21_021D144C(CellActor *param0, int param1)
     }
 }
 
-void ov21_021D1498(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2)
+void ov21_021D1498(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2)
 {
-    int v0 = CellActor_GetAnimFrame(param0);
+    int v0 = Sprite_GetAnimFrame(param0);
     int v1, v2;
 
     switch (v0) {
@@ -585,12 +585,12 @@ void ov21_021D1498(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param
     }
 }
 
-void ov21_021D1524(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
+void ov21_021D1524(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
 {
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = CellActor_GetAnimFrame(param0);
+    v0 = Sprite_GetAnimFrame(param0);
 
     if (v0 < 2) {
         sub_02012AC0(param1->unk_00, param3);
@@ -713,8 +713,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 statusIndex, fx32 param4, fx32 param5)
 {
-    CellActor *v0;
-    CellActor *v1;
+    Sprite *v0;
+    Sprite *v1;
     UnkStruct_ov21_021D4CB8 v2;
     Window *v3;
     SpriteResource *v4;
@@ -729,17 +729,17 @@ void ov21_021D1778(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D332
     v5.x = param4;
     v5.y = param5;
 
-    CellActor_SetPosition(v0, &v5);
-    CellActor_SetDrawFlag(v0, 1);
+    Sprite_SetPosition(v0, &v5);
+    Sprite_SetDrawFlag(v0, 1);
 
     if (speciesCaughtStatus->caughtStatus == CS_CAUGHT) {
         v5.x = param4 + (-54 * FX32_ONE);
         v5.y = param5;
 
-        CellActor_SetPosition(v1, &v5);
-        CellActor_SetDrawFlag(v1, 1);
+        Sprite_SetPosition(v1, &v5);
+        Sprite_SetDrawFlag(v1, 1);
     } else {
-        CellActor_SetDrawFlag(v1, 0);
+        Sprite_SetDrawFlag(v1, 0);
     }
 
     v4 = ov21_021D2344(param0, 1);
@@ -773,9 +773,9 @@ void ov21_021D1858(UnkStruct_ov21_021D22F8 *param0, int param1, int param2)
     v0.x = param1 << FX32_SHIFT;
     v0.y = param2 << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_00, &v0);
+    Sprite_SetPosition(param0->unk_00, &v0);
     v0.x += (-54 * FX32_ONE);
-    CellActor_SetPosition(param0->unk_04, &v0);
+    Sprite_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 bf5eca42a6..2e1d64210d 100644
--- a/src/overlay021/ov21_021D1FA4.c
+++ b/src/overlay021/ov21_021D1FA4.c
@@ -20,12 +20,12 @@
 #include "overlay022/struct_ov22_022550D4.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "narc.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -111,7 +111,7 @@ void ov21_021D2098(UnkStruct_ov21_021D13FC *param0)
     ov21_021D299C(param0->unk_00);
 
     Heap_FreeToHeap(param0->unk_00);
-    CellActorCollection_Delete(param0->unk_138);
+    SpriteList_Delete(param0->unk_138);
     SpriteResourceCollection_Delete(param0->unk_13C[0]);
     SpriteResourceCollection_Delete(param0->unk_13C[1]);
     SpriteResourceCollection_Delete(param0->unk_13C[2]);
@@ -127,7 +127,7 @@ void ov21_021D2098(UnkStruct_ov21_021D13FC *param0)
 
 void ov21_021D2124(UnkStruct_ov21_021D13FC *param0)
 {
-    CellActorCollection_Update(param0->unk_138);
+    SpriteList_Update(param0->unk_138);
 
     NNS_G2dSetupSoftwareSpriteCamera();
 
@@ -146,7 +146,7 @@ void ov21_021D2164(UnkStruct_ov21_021D13FC *param0, int param1, int param2)
     ov21_021D222C(param0, param1, param2, 0);
 }
 
-Sprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0)
+PokemonSprite *ov21_021D2170(const UnkStruct_ov21_021D13FC *param0)
 {
     return ov21_021D2274(param0, 0);
 }
@@ -194,7 +194,7 @@ void ov21_021D2250(UnkStruct_ov21_021D13FC *param0, int *param1, int *param2, in
     *param2 = sub_020080C0(param0->unk_154[param3], 1);
 }
 
-Sprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1)
+PokemonSprite *ov21_021D2274(const UnkStruct_ov21_021D13FC *param0, int param1)
 {
     return param0->unk_154[param1];
 }
@@ -212,13 +212,13 @@ void ov21_021D2280(const UnkStruct_ov21_021D13FC *param0, BOOL param1, int param
     }
 }
 
-CellActor *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0)
+Sprite *ov21_021D22A8(const UnkStruct_ov21_021D13FC *param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_00);
     return param0->unk_1B0.unk_00;
 }
 
-CellActor *ov21_021D22C4(const UnkStruct_ov21_021D13FC *param0)
+Sprite *ov21_021D22C4(const UnkStruct_ov21_021D13FC *param0)
 {
     GF_ASSERT(param0->unk_1B0.unk_04);
     return param0->unk_1B0.unk_04;
@@ -258,26 +258,26 @@ SpriteResource *ov21_021D2344(const UnkStruct_ov21_021D13FC *param0, int param1)
 
 void ov21_021D2360(const UnkStruct_ov21_021D13FC *param0, GXOamMode param1)
 {
-    CellActor_SetExplicitOAMMode(param0->unk_1B0.unk_00, param1);
-    CellActor_SetExplicitOAMMode(param0->unk_1B0.unk_04, param1);
+    Sprite_SetExplicitOAMMode(param0->unk_1B0.unk_00, param1);
+    Sprite_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)
 {
-    CellActor_SetExplicitPriority(param0->unk_1B0.unk_00, param1);
-    CellActor_SetExplicitPriority(param0->unk_1B0.unk_04, param1);
+    Sprite_SetExplicitPriority(param0->unk_1B0.unk_00, param1);
+    Sprite_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) {
-        CellActor_SetDrawFlag(param0->unk_1B0.unk_00, param1);
+        Sprite_SetDrawFlag(param0->unk_1B0.unk_00, param1);
     }
 
     if (param0->unk_1B0.unk_04) {
-        CellActor_SetDrawFlag(param0->unk_1B0.unk_04, param1);
+        Sprite_SetDrawFlag(param0->unk_1B0.unk_04, param1);
     }
 
     if (param0->unk_1B0.unk_08->unk_00) {
@@ -349,7 +349,7 @@ BOOL ov21_021D24EC(UnkStruct_ov21_021D23F8 *param0)
 
 void ov21_021D24FC(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1)
 {
-    Sprite *v0;
+    PokemonSprite *v0;
     int v1;
 
     v1 = -ov21_021D24B8(param1);
@@ -360,7 +360,7 @@ void ov21_021D24FC(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F
 
 void ov21_021D251C(const UnkStruct_ov21_021D13FC *param0, UnkStruct_ov21_021D23F8 *param1, int param2)
 {
-    Sprite *v0;
+    PokemonSprite *v0;
     int v1;
 
     v1 = -ov21_021D24B8(param1);
@@ -388,13 +388,13 @@ void ov21_021D2584(UnkStruct_ov21_021D2584 *param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_SetDrawFlag(param0->unk_00[v0], param1);
+        Sprite_SetDrawFlag(param0->unk_00[v0], param1);
     }
 }
 
 BOOL ov21_021D25A0(UnkStruct_ov21_021D2584 *param0)
 {
-    return CellActor_GetDrawFlag(param0->unk_00[0]);
+    return Sprite_GetDrawFlag(param0->unk_00[0]);
 }
 
 void ov21_021D25AC(UnkStruct_ov21_021D2584 *param0, BOOL param1)
@@ -850,12 +850,12 @@ void ov21_021D2C58(UnkStruct_ov21_021D22F8 *param0, SpriteResourceCollection **p
 
 static void ov21_021D2C8C(UnkStruct_ov21_021D13FC *param0, int param1)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
 
     SpriteResourcesHeader_Init(&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.collection = param0->unk_138;
+    v1.list = param0->unk_138;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -863,18 +863,18 @@ static void ov21_021D2C8C(UnkStruct_ov21_021D13FC *param0, int param1)
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_00 = CellActorCollection_Add(&v1);
+    param0->unk_1B0.unk_00 = SpriteList_Add(&v1);
 
-    CellActor_SetDrawFlag(param0->unk_1B0.unk_00, 0);
-    CellActor_SetPriority(param0->unk_1B0.unk_00, 1);
+    Sprite_SetDrawFlag(param0->unk_1B0.unk_00, 0);
+    Sprite_SetPriority(param0->unk_1B0.unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_1B0.unk_04 = CellActorCollection_Add(&v1);
+    param0->unk_1B0.unk_04 = SpriteList_Add(&v1);
 
-    CellActor_SetDrawFlag(param0->unk_1B0.unk_04, 0);
-    CellActor_SetAnim(param0->unk_1B0.unk_04, 1);
+    Sprite_SetDrawFlag(param0->unk_1B0.unk_04, 0);
+    Sprite_SetAnim(param0->unk_1B0.unk_04, 1);
 
     param0->unk_1B0.unk_08 = NULL;
     param0->unk_1B0.unk_28 = 0;
@@ -883,10 +883,10 @@ static void ov21_021D2C8C(UnkStruct_ov21_021D13FC *param0, int param1)
 
 static void ov21_021D2D4C(UnkStruct_ov21_021D13FC *param0)
 {
-    CellActor_Delete(param0->unk_1B0.unk_00);
+    Sprite_Delete(param0->unk_1B0.unk_00);
     param0->unk_1B0.unk_00 = NULL;
 
-    CellActor_Delete(param0->unk_1B0.unk_04);
+    Sprite_Delete(param0->unk_1B0.unk_04);
     param0->unk_1B0.unk_04 = NULL;
 
     if (param0->unk_1B0.unk_08) {
@@ -895,14 +895,14 @@ static void ov21_021D2D4C(UnkStruct_ov21_021D13FC *param0)
     }
 }
 
-void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, int param4)
+void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, int param4)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
 
     SpriteResourcesHeader_Init(&v0, 3000, 3000, 3000, 3000, 0xffffffff, 0xffffffff, 0, param4, param2[0], param2[1], param2[2], param2[3], NULL, NULL);
 
-    v1.collection = param1;
+    v1.list = param1;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -910,18 +910,18 @@ void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, CellActorCollection *param1,
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_00 = CellActorCollection_Add(&v1);
+    param0->unk_00 = SpriteList_Add(&v1);
 
-    CellActor_SetDrawFlag(param0->unk_00, 0);
-    CellActor_SetPriority(param0->unk_00, 1);
+    Sprite_SetDrawFlag(param0->unk_00, 0);
+    Sprite_SetPriority(param0->unk_00, 1);
 
     v1.position.x = 0;
     v1.position.y = 0;
 
-    param0->unk_04 = CellActorCollection_Add(&v1);
+    param0->unk_04 = SpriteList_Add(&v1);
 
-    CellActor_SetDrawFlag(param0->unk_04, 0);
-    CellActor_SetAnim(param0->unk_04, 1);
+    Sprite_SetDrawFlag(param0->unk_04, 0);
+    Sprite_SetAnim(param0->unk_04, 1);
 
     param0->unk_08 = NULL;
     param0->unk_28 = 0;
@@ -930,10 +930,10 @@ void ov21_021D2D88(UnkStruct_ov21_021D22F8 *param0, CellActorCollection *param1,
 
 void ov21_021D2E1C(UnkStruct_ov21_021D22F8 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
-    CellActor_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 
     if (param0->unk_08) {
@@ -945,11 +945,11 @@ void ov21_021D2E1C(UnkStruct_ov21_021D22F8 *param0)
 void ov21_021D2E44(UnkStruct_ov21_021D22F8 *param0, BOOL param1)
 {
     if (param0->unk_00) {
-        CellActor_SetDrawFlag(param0->unk_00, param1);
+        Sprite_SetDrawFlag(param0->unk_00, param1);
     }
 
     if (param0->unk_04) {
-        CellActor_SetDrawFlag(param0->unk_04, param1);
+        Sprite_SetDrawFlag(param0->unk_04, param1);
     }
 
     if (param0->unk_08->unk_00) {
@@ -991,14 +991,14 @@ static void ov21_021D2F14(UnkStruct_ov21_021D13FC *param0)
 
 static void ov21_021D2F5C(UnkStruct_ov21_021D13FC *param0, int param1)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     int v2;
     UnkStruct_ov21_021D2584 *v3 = &param0->unk_1E0;
 
     SpriteResourcesHeader_Init(&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.collection = param0->unk_138;
+    v1.list = param0->unk_138;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -1007,8 +1007,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] = CellActorCollection_Add(&v1);
-        CellActor_SetAnim(v3->unk_00[v2], v2);
+        v3->unk_00[v2] = SpriteList_Add(&v1);
+        Sprite_SetAnim(v3->unk_00[v2], v2);
     }
 
     ov21_021D2584(v3, 0);
@@ -1025,7 +1025,7 @@ static void ov21_021D300C(UnkStruct_ov21_021D13FC *param0)
     ov21_021D3054(param0);
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(v1->unk_00[v0]);
+        Sprite_Delete(v1->unk_00[v0]);
     }
 }
 
@@ -1080,7 +1080,7 @@ static void ov21_021D30D8(UnkStruct_ov21_021D2584 *param0, int param1, int param
         v0.x = v1 << FX32_SHIFT;
         v0.y = (v2 << FX32_SHIFT) + (192 << FX32_SHIFT);
 
-        CellActor_SetPosition(param0->unk_00[v3], &v0);
+        Sprite_SetPosition(param0->unk_00[v3], &v0);
     }
 }
 
diff --git a/src/overlay021/ov21_021D4C0C.c b/src/overlay021/ov21_021D4C0C.c
index 8f5719c990..bfec73633d 100644
--- a/src/overlay021/ov21_021D4C0C.c
+++ b/src/overlay021/ov21_021D4C0C.c
@@ -11,18 +11,18 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "heap.h"
 #include "message.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "text.h"
 #include "unk_02012744.h"
 
 typedef struct UnkStruct_ov21_021D4C0C_t {
     UnkStruct_02012744 *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     BgConfig *unk_08;
     UnkStruct_ov21_021D4CA0 *unk_0C;
     int unk_10;
diff --git a/src/overlay021/ov21_021D5AEC.c b/src/overlay021/ov21_021D5AEC.c
index 402d05c0ce..7859ef6850 100644
--- a/src/overlay021/ov21_021D5AEC.c
+++ b/src/overlay021/ov21_021D5AEC.c
@@ -26,10 +26,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -59,17 +59,17 @@ typedef struct {
 } UnkStruct_ov21_021D7464;
 
 typedef struct {
-    CellActor *unk_00[9];
+    Sprite *unk_00[9];
     int unk_24;
     UnkStruct_ov21_021D4CA0 *unk_28[9];
     int unk_4C;
-    CellActor *unk_50[9];
-    CellActor *unk_74;
+    Sprite *unk_50[9];
+    Sprite *unk_74;
     fx32 unk_78;
-    CellActor *unk_7C;
+    Sprite *unk_7C;
     SpriteResourceCollection *unk_80[4];
-    CellActorResourceData unk_90;
-    CellActorResourceData unk_B4;
+    SpriteResourcesHeader unk_90;
+    SpriteResourcesHeader unk_B4;
     void *unk_D8;
     NNSG2dScreenData *unk_DC;
     PokedexLoadingScreen loadingScreen;
@@ -149,7 +149,7 @@ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
 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 dexIndex);
 static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3, int param4);
-static void ov21_021D6CA4(CellActor *param0, int *param1, int *param2);
+static void ov21_021D6CA4(Sprite *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);
@@ -827,42 +827,42 @@ static void ov21_021D65DC(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
 
 static void ov21_021D6744(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2)
 {
-    CellActorInitParams v0;
+    SpriteListTemplate v0;
     int v1;
 
-    memset(&v0, 0, sizeof(CellActorInitParams));
-    v0.collection = param1->unk_138;
+    memset(&v0, 0, sizeof(SpriteListTemplate));
+    v0.list = 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] = CellActorCollection_Add(&v0);
-        CellActor_SetAnim(param0->unk_00[v1], 0);
+        param0->unk_00[v1] = SpriteList_Add(&v0);
+        Sprite_SetAnim(param0->unk_00[v1], 0);
     }
 
     v0.priority = 0;
 
     for (v1 = 0; v1 < 9; v1++) {
-        param0->unk_50[v1] = CellActorCollection_Add(&v0);
-        CellActor_SetAnim(param0->unk_50[v1], 1);
+        param0->unk_50[v1] = SpriteList_Add(&v0);
+        Sprite_SetAnim(param0->unk_50[v1], 1);
     }
 
     v0.priority = 0;
-    param0->unk_74 = CellActorCollection_Add(&v0);
+    param0->unk_74 = SpriteList_Add(&v0);
 
-    CellActor_SetAnim(param0->unk_74, 2);
+    Sprite_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 = CellActorCollection_Add(&v0);
+    param0->unk_7C = SpriteList_Add(&v0);
 
-    CellActor_SetDrawFlag(param0->unk_7C, 0);
-    CellActor_SetExplicitOAMMode(param0->unk_7C, GX_OAM_MODE_XLU);
+    Sprite_SetDrawFlag(param0->unk_7C, 0);
+    Sprite_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)
@@ -931,14 +931,14 @@ static void ov21_021D68C8(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
         ov21_021D217C(param1, 0);
 
         if (param0->unk_7C) {
-            CellActor_SetDrawFlag(param0->unk_7C, 1);
+            Sprite_SetDrawFlag(param0->unk_7C, 1);
         }
     } else {
         ov21_021D1890(param1, param2->unk_04, pokeCaughtStatus->species, 2, 56, 80);
         ov21_021D217C(param1, 1);
 
         if (param0->unk_7C) {
-            CellActor_SetDrawFlag(param0->unk_7C, 0);
+            Sprite_SetDrawFlag(param0->unk_7C, 0);
         }
     }
 }
@@ -959,15 +959,15 @@ static void ov21_021D695C(UnkStruct_ov21_021D71A8 *param0)
     int v0;
 
     for (v0 = 0; v0 < 9; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        CellActor_Delete(param0->unk_50[v0]);
+        Sprite_Delete(param0->unk_50[v0]);
     }
 
-    CellActor_Delete(param0->unk_74);
-    CellActor_Delete(param0->unk_7C);
+    Sprite_Delete(param0->unk_74);
+    Sprite_Delete(param0->unk_7C);
 }
 
 static void ov21_021D6994(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_021D5B68 *param1)
@@ -1000,7 +1000,7 @@ static void ov21_021D69A0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
         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);
 
-        CellActor_SetPosition(param0->unk_00[v0], &v1);
+        Sprite_SetPosition(param0->unk_00[v0], &v1);
 
         v5 = 4 - v2;
 
@@ -1016,15 +1016,15 @@ static void ov21_021D69A0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
 
         v6 += 32;
 
-        CellActor_SetPriority(param0->unk_00[v0], v6);
+        Sprite_SetPriority(param0->unk_00[v0], v6);
 
         if (v2 == 4) {
-            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 0);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 0);
         } else {
             if (7 + (v5 - 1) < 9) {
-                CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 7 + (v5 - 1));
+                Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 7 + (v5 - 1));
             } else {
-                CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 9);
+                Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0], 9);
             }
         }
 
@@ -1052,9 +1052,9 @@ static void ov21_021D6A58(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
         v0 %= 9;
 
         if ((v1 + 4) >= v2) {
-            CellActor_SetDrawFlag(param0->unk_00[v0], 0);
+            Sprite_SetDrawFlag(param0->unk_00[v0], 0);
         } else {
-            CellActor_SetDrawFlag(param0->unk_00[v0], 1);
+            Sprite_SetDrawFlag(param0->unk_00[v0], 1);
         }
     } else {
         if (param1->unk_08 == 2) {
@@ -1067,9 +1067,9 @@ static void ov21_021D6A58(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
             v0 = param0->unk_24;
 
             if ((v1 - 4) < 0) {
-                CellActor_SetDrawFlag(param0->unk_00[v0], 0);
+                Sprite_SetDrawFlag(param0->unk_00[v0], 0);
             } else {
-                CellActor_SetDrawFlag(param0->unk_00[v0], 1);
+                Sprite_SetDrawFlag(param0->unk_00[v0], 1);
             }
         } else {
             ov21_021D6ED0(param0, param1);
@@ -1113,22 +1113,22 @@ static void ov21_021D6AE4(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
             }
         }
 
-        CellActor_SetDrawFlag(param0->unk_50[v3], isCaught);
+        Sprite_SetDrawFlag(param0->unk_50[v3], isCaught);
 
         if (isCaught) {
-            v0 = CellActor_GetPosition(param0->unk_00[v3]);
+            v0 = Sprite_GetPosition(param0->unk_00[v3]);
 
             v1.x = v0->x + (-54 * FX32_ONE);
             v1.y = v0->y;
 
-            CellActor_SetPosition(param0->unk_50[v3], &v1);
+            Sprite_SetPosition(param0->unk_50[v3], &v1);
 
-            v10 = CellActor_GetExplicitPaletteOffset(param0->unk_00[v3]);
-            CellActor_SetExplicitPaletteOffset(param0->unk_50[v3], v10);
+            v10 = Sprite_GetExplicitPaletteOffset(param0->unk_00[v3]);
+            Sprite_SetExplicitPaletteOffset(param0->unk_50[v3], v10);
 
-            v9 = CellActor_GetPriority(param0->unk_00[v3]);
+            v9 = Sprite_GetPriority(param0->unk_00[v3]);
             v9--;
-            CellActor_SetPriority(param0->unk_50[v3], v9);
+            Sprite_SetPriority(param0->unk_50[v3], v9);
         }
     }
 }
@@ -1148,7 +1148,7 @@ static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
     v0.y += (58 * FX32_ONE);
     v0.x = (248 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_74, &v0);
+    Sprite_SetPosition(param0->unk_74, &v0);
 }
 
 static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3)
@@ -1184,11 +1184,11 @@ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
             ov21_021D6CA4(param0->unk_00[v4], &v1, &v2);
             sub_020128C4(param0->unk_28[v4]->unk_00, v1, v2);
 
-            v5 = CellActor_GetPriority(param0->unk_00[v4]);
+            v5 = Sprite_GetPriority(param0->unk_00[v4]);
             v5--;
             sub_02012A30(param0->unk_28[v4]->unk_00, v5);
 
-            v6 = CellActor_GetExplicitPaletteOffset(param0->unk_00[v4]);
+            v6 = Sprite_GetExplicitPaletteOffset(param0->unk_00[v4]);
             sub_02012A90(param0->unk_28[v4]->unk_00, v6);
         }
 
@@ -1196,11 +1196,11 @@ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
     }
 }
 
-static void ov21_021D6CA4(CellActor *param0, int *param1, int *param2)
+static void ov21_021D6CA4(Sprite *param0, int *param1, int *param2)
 {
     const VecFx32 *v0;
 
-    v0 = CellActor_GetPosition(param0);
+    v0 = Sprite_GetPosition(param0);
 
     *param1 = v0->x >> FX32_SHIFT;
     *param2 = v0->y >> FX32_SHIFT;
@@ -1337,9 +1337,9 @@ static void ov21_021D6ED0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_
 
     for (v2 = 0; v2 < 9; v2++) {
         if ((v0 >= 0) && (v0 < v4)) {
-            CellActor_SetDrawFlag(param0->unk_00[v1], 1);
+            Sprite_SetDrawFlag(param0->unk_00[v1], 1);
         } else {
-            CellActor_SetDrawFlag(param0->unk_00[v1], 0);
+            Sprite_SetDrawFlag(param0->unk_00[v1], 0);
         }
 
         v1 = (v1 + 1) % 9;
@@ -1351,7 +1351,7 @@ static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
 {
     fx32 v0;
     int v1;
-    Sprite *v2;
+    PokemonSprite *v2;
 
     v0 = FX_Mul(31 << FX32_SHIFT, ((64 * 10) - param2->unk_0C) << FX32_SHIFT);
     v0 = FX_Div(v0, (64 * 10) << FX32_SHIFT);
@@ -1363,7 +1363,7 @@ static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
 
 static void ov21_021D6F64(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D5B68 *param1)
 {
-    Sprite *v0;
+    PokemonSprite *v0;
 
     v0 = ov21_021D2170(param0);
     sub_02007DEC(v0, 23, 31);
@@ -1472,11 +1472,11 @@ static void ov21_021D70E8(UnkStruct_ov21_021D71A8 *param0)
 {
     int v0;
 
-    CellActor_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 9; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
-        CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        Sprite_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);
@@ -1488,11 +1488,11 @@ static void ov21_021D7124(UnkStruct_ov21_021D71A8 *param0)
 {
     int v0;
 
-    CellActor_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(param0->unk_74, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 9; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
-        CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        Sprite_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);
@@ -1506,7 +1506,7 @@ static void ov21_021D7160(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13
     int v1;
 
     v1 = (param0->unk_24 + 4) % 9;
-    v0 = CellActor_GetPosition(param0->unk_00[v1]);
+    v0 = Sprite_GetPosition(param0->unk_00[v1]);
 
     ov21_021D1778(param1, param2->unk_04, param3, PokedexSort_CurrentStatusIndex(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 7d4ef8362a..61648f775c 100644
--- a/src/overlay021/ov21_021D76B0.c
+++ b/src/overlay021/ov21_021D76B0.c
@@ -26,11 +26,11 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -71,11 +71,11 @@ typedef struct {
 } UnkStruct_ov21_021D7B8C;
 
 typedef struct {
-    CellActor *unk_00[3];
+    Sprite *unk_00[3];
     UnkStruct_ov21_021D4CA0 *unk_0C[3];
-    CellActor *unk_18;
-    CellActor *unk_1C;
-    CellActor *unk_20;
+    Sprite *unk_18;
+    Sprite *unk_1C;
+    Sprite *unk_20;
     UnkStruct_ov21_021D4CA0 *unk_24;
     u16 unk_28;
     u16 unk_2A;
@@ -95,7 +95,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(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4);
+static void ov21_021D84A8(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4);
 static void ov21_021D7A64(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1, enum HeapId heapID);
 static void ov21_021D7B20(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1);
 static void ov21_021D7B70(UnkStruct_ov21_021D7A64 *param0);
@@ -592,13 +592,13 @@ static void ov21_021D7E3C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
 
 static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 8;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -608,67 +608,67 @@ static void ov21_021D7E80(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
     v1.position.y = 40 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v1);
+    param0->unk_00[0] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[0], 2);
+    Sprite_SetAnim(param0->unk_00[0], 2);
 
     if (param2->unk_1C->unk_04->unk_1740 == 1) {
-        CellActor_SetDrawFlag(param0->unk_00[0], 0);
+        Sprite_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] = CellActorCollection_Add(&v1);
+    param0->unk_00[1] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[1], 0);
+    Sprite_SetAnim(param0->unk_00[1], 0);
 
     if ((ov21_021D36A4(param2->unk_1C->unk_04, 1) == 0) || (param2->unk_1C->unk_04->unk_1740 == 1)) {
-        CellActor_SetDrawFlag(param0->unk_00[1], 0);
+        Sprite_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] = CellActorCollection_Add(&v1);
+    param0->unk_00[2] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[2], 1);
+    Sprite_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 = CellActorCollection_Add(&v1);
+    param0->unk_18 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_18, 3);
+    Sprite_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 = CellActorCollection_Add(&v1);
+    param0->unk_1C = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_1C, 4);
+    Sprite_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 = CellActorCollection_Add(&v1);
+    param0->unk_20 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_20, 5);
+    Sprite_SetAnim(param0->unk_20, 5);
 }
 
 static void ov21_021D7FEC(UnkStruct_ov21_021D7C64 *param0)
 {
-    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);
+    Sprite_Delete(param0->unk_00[0]);
+    Sprite_Delete(param0->unk_00[1]);
+    Sprite_Delete(param0->unk_00[2]);
+    Sprite_Delete(param0->unk_18);
+    Sprite_Delete(param0->unk_1C);
+    Sprite_Delete(param0->unk_20);
 }
 
 static void ov21_021D8018(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, const UnkStruct_ov21_021D77D4 *param2, int param3)
@@ -918,7 +918,7 @@ static void ov21_021D8434(UnkStruct_ov21_021D7A64 *param0, int param1, int param
     }
 }
 
-static void ov21_021D84A8(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
+static void ov21_021D84A8(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
diff --git a/src/overlay021/ov21_021D94BC.c b/src/overlay021/ov21_021D94BC.c
index 7b74cbd578..be110d9410 100644
--- a/src/overlay021/ov21_021D94BC.c
+++ b/src/overlay021/ov21_021D94BC.c
@@ -29,10 +29,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -85,11 +85,11 @@ typedef struct {
 } UnkStruct_ov21_021D9B24;
 
 typedef struct {
-    CellActor *unk_00[6];
+    Sprite *unk_00[6];
     UnkStruct_ov21_021D4CA0 *unk_18[6];
-    CellActor *unk_30[15];
+    Sprite *unk_30[15];
     UnkStruct_ov21_021D4CA0 *unk_6C[15];
-    CellActor *unk_A8[15];
+    Sprite *unk_A8[15];
     SpriteResource *unk_E4[4];
     SpriteResource *unk_F4[4];
     int unk_104;
@@ -129,16 +129,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, CellActorInitParams *param1, int param2, int param3);
+static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *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, CellActorInitParams *param1);
+static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *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, 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_021DB944(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1);
+static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1);
+static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1);
+static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1);
+static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *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);
@@ -2347,14 +2347,14 @@ static void ov21_021DB6C8(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95
 
 static void ov21_021DB708(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2372,14 +2372,14 @@ static void ov21_021DB78C(UnkStruct_ov21_021DC96C *param0)
 
 static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2389,7 +2389,7 @@ static void ov21_021DB79C(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95
     ov21_021DB81C(param0, &v1, param0->unk_104, param0->unk_108);
 }
 
-static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1, int param2, int param3)
+static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1, int param2, int param3)
 {
     switch (param2) {
     case 0:
@@ -2413,7 +2413,7 @@ static void ov21_021DB81C(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *
     }
 }
 
-static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0;
 
@@ -2445,20 +2445,20 @@ static void ov21_021DB858(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *
             break;
         }
 
-        param0->unk_00[v0] = CellActorCollection_Add(param1);
+        param0->unk_00[v0] = SpriteList_Add(param1);
 
         switch (v0) {
         case 0:
-            CellActor_SetAnim(param0->unk_00[v0], 3);
+            Sprite_SetAnim(param0->unk_00[v0], 3);
             break;
         case 1:
         case 2:
         case 3:
         case 4:
-            CellActor_SetAnim(param0->unk_00[v0], 2);
+            Sprite_SetAnim(param0->unk_00[v0], 2);
             break;
         case 5:
-            CellActor_SetAnim(param0->unk_00[v0], 1);
+            Sprite_SetAnim(param0->unk_00[v0], 1);
             break;
         }
     }
@@ -2469,7 +2469,7 @@ static void ov21_021DB90C(UnkStruct_ov21_021DC96C *param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -2479,13 +2479,13 @@ static void ov21_021DB924(UnkStruct_ov21_021DC96C *param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            CellActor_Delete(param0->unk_30[v0]);
+            Sprite_Delete(param0->unk_30[v0]);
             param0->unk_30[v0] = NULL;
         }
     }
 }
 
-static void ov21_021DB944(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DB944(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0, v1;
 
@@ -2496,13 +2496,13 @@ 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] = CellActorCollection_Add(param1);
-            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = SpriteList_Add(param1);
+            Sprite_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
 
-static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DB9B4(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0, v1;
 
@@ -2513,13 +2513,13 @@ 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] = CellActorCollection_Add(param1);
-            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = SpriteList_Add(param1);
+            Sprite_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 }
 
-static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DBA24(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0, v1;
 
@@ -2530,8 +2530,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] = CellActorCollection_Add(param1);
-            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = SpriteList_Add(param1);
+            Sprite_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2539,12 +2539,12 @@ 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] = CellActorCollection_Add(param1);
+    param0->unk_30[10] = SpriteList_Add(param1);
 
-    CellActor_SetAnim(param0->unk_30[10], 5);
+    Sprite_SetAnim(param0->unk_30[10], 5);
 }
 
-static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DBAB8(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0, v1;
 
@@ -2555,8 +2555,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] = CellActorCollection_Add(param1);
-            CellActor_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
+            param0->unk_30[(v0 * 2) + v1] = SpriteList_Add(param1);
+            Sprite_SetAnim(param0->unk_30[(v0 * 2) + v1], 0);
         }
     }
 
@@ -2564,20 +2564,20 @@ 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] = CellActorCollection_Add(param1);
+    param0->unk_30[8] = SpriteList_Add(param1);
 
-    CellActor_SetAnim(param0->unk_30[8], 0);
+    Sprite_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] = CellActorCollection_Add(param1);
+    param0->unk_30[9] = SpriteList_Add(param1);
 
-    CellActor_SetAnim(param0->unk_30[9], 4);
+    Sprite_SetAnim(param0->unk_30[9], 4);
 }
 
-static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, CellActorInitParams *param1)
+static void ov21_021DBB74(UnkStruct_ov21_021DC96C *param0, SpriteListTemplate *param1)
 {
     int v0, v1;
 
@@ -2588,23 +2588,23 @@ 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] = CellActorCollection_Add(param1);
+            param0->unk_30[(v0 * 3) + v1] = SpriteList_Add(param1);
 
-            CellActor_SetAnim(param0->unk_30[(v0 * 3) + v1], 6);
+            Sprite_SetAnim(param0->unk_30[(v0 * 3) + v1], 6);
         }
     }
 }
 
 static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95CC *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3, v4;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 15;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2617,53 +2617,53 @@ static void ov21_021DBBE4(UnkStruct_ov21_021DC96C *param0, UnkStruct_ov21_021D95
         for (v4 = 0; v4 < 3; v4++) {
             v1.position.x = 28 + (v4 * 56);
             v1.position.x <<= FX32_SHIFT;
-            param0->unk_A8[(v3 * 3) + v4] = CellActorCollection_Add(&v1);
+            param0->unk_A8[(v3 * 3) + v4] = SpriteList_Add(&v1);
 
             switch ((v3 * 3) + v4) {
             case 0:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 0);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             case 1:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 5);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 5);
                 break;
             case 2:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 10);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 10);
                 break;
             case 3:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 1);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 1);
                 break;
             case 4:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 6);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 6);
                 break;
             case 5:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 11);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 11);
                 break;
             case 6:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 2);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 2);
                 break;
             case 7:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 9);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 9);
                 break;
             case 8:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 12);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 12);
                 break;
             case 9:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 3);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 3);
                 break;
             case 10:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 8);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 8);
                 break;
             case 11:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 13);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 13);
                 break;
             case 12:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 4);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 4);
                 break;
             case 13:
-                CellActor_SetAnim(param0->unk_A8[(v3 * 3) + v4], 7);
+                Sprite_SetAnim(param0->unk_A8[(v3 * 3) + v4], 7);
                 break;
             case 14:
-                CellActor_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
+                Sprite_SetDrawFlag(param0->unk_A8[(v3 * 3) + v4], 0);
                 break;
             }
         }
@@ -2676,7 +2676,7 @@ static void ov21_021DBDA0(UnkStruct_ov21_021DC96C *param0)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_A8[v0]) {
-            CellActor_Delete(param0->unk_A8[v0]);
+            Sprite_Delete(param0->unk_A8[v0]);
             param0->unk_A8[v0] = NULL;
         }
     }
@@ -3485,7 +3485,7 @@ static void ov21_021DC8D0(UnkStruct_ov21_021DC96C *param0, int param1)
 
     for (v0 = 0; v0 < 15; v0++) {
         if (param0->unk_30[v0]) {
-            CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
+            Sprite_SetExplicitOAMMode(param0->unk_30[v0], param1);
         }
 
         if (param0->unk_6C[v0]) {
@@ -3493,7 +3493,7 @@ static void ov21_021DC8D0(UnkStruct_ov21_021DC96C *param0, int param1)
         }
 
         if (param0->unk_A8[v0]) {
-            CellActor_SetExplicitOAMMode(param0->unk_A8[v0], param1);
+            Sprite_SetExplicitOAMMode(param0->unk_A8[v0], param1);
         }
     }
 }
@@ -3505,7 +3505,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]) {
-                CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
+                Sprite_SetExplicitOAMMode(param0->unk_30[v0], param1);
             }
 
             if (param0->unk_6C[v0]) {
@@ -3522,7 +3522,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]) {
-                CellActor_SetExplicitOAMMode(param0->unk_30[v0], param1);
+                Sprite_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 17120d55a2..b247c94c0a 100644
--- a/src/overlay021/ov21_021DC9BC.c
+++ b/src/overlay021/ov21_021DC9BC.c
@@ -25,12 +25,12 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
 #include "rtc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -114,10 +114,10 @@ typedef struct {
 
 typedef struct {
     int encounterTime;
-    CellActor *cellActorArray[NUMDUNGEONS * 2];
+    Sprite *cellActorArray[NUMDUNGEONS * 2];
     SpriteResource *unk_B4[4];
     int numDungeons;
-    CellActor *AreaUnknownCellActor;
+    Sprite *AreaUnknownCellActor;
     UnkStruct_ov21_021D4CA0 *AreaUnknownSpriteManager;
     SpriteResource *unk_D0[4];
     UnkStruct_ov21_021D4CA0 *unk_E0[3];
@@ -586,14 +586,14 @@ static void ov21_021DD114(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
 
 static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0 *param1, enum HeapId heapID)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -601,12 +601,12 @@ static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     v1.position.x = 160 * FX32_ONE;
     v1.position.y = 96 * FX32_ONE;
 
-    mapDisplay->AreaUnknownCellActor = CellActorCollection_Add(&v1);
+    mapDisplay->AreaUnknownCellActor = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(mapDisplay->AreaUnknownCellActor, 2);
+    Sprite_SetAnim(mapDisplay->AreaUnknownCellActor, 2);
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -615,9 +615,9 @@ static void ov21_021DD1A8(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
     v1.position.y = 0;
 
     for (v3 = 0; v3 < (NUMDUNGEONS * 2); v3++) {
-        mapDisplay->cellActorArray[v3] = CellActorCollection_Add(&v1);
-        CellActor_SetDrawFlag(mapDisplay->cellActorArray[v3], 0);
-        CellActor_SetExplicitOAMMode(mapDisplay->cellActorArray[v3], GX_OAM_MODE_XLU);
+        mapDisplay->cellActorArray[v3] = SpriteList_Add(&v1);
+        Sprite_SetDrawFlag(mapDisplay->cellActorArray[v3], 0);
+        Sprite_SetExplicitOAMMode(mapDisplay->cellActorArray[v3], GX_OAM_MODE_XLU);
     }
 }
 
@@ -625,11 +625,11 @@ static void PokedexMapDisplay_DeleteCellActors(PokedexMapDisplay *mapDisplay)
 {
     int cellActorIndex;
 
-    CellActor_Delete(mapDisplay->AreaUnknownCellActor);
+    Sprite_Delete(mapDisplay->AreaUnknownCellActor);
     mapDisplay->AreaUnknownCellActor = NULL;
 
     for (cellActorIndex = 0; cellActorIndex < (NUMDUNGEONS * 2); cellActorIndex++) {
-        CellActor_Delete(mapDisplay->cellActorArray[cellActorIndex]);
+        Sprite_Delete(mapDisplay->cellActorArray[cellActorIndex]);
         mapDisplay->cellActorArray[cellActorIndex] = NULL;
     }
 }
@@ -700,7 +700,7 @@ static void PokedexMapDisplay_OAMMode_XLU(PokedexMapDisplay *mapDisplay)
 {
     int v0;
 
-    CellActor_SetExplicitOAMMode(mapDisplay->AreaUnknownCellActor, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(mapDisplay->AreaUnknownCellActor, GX_OAM_MODE_XLU);
     sub_02012AF0(mapDisplay->AreaUnknownSpriteManager->unk_00, GX_OAM_MODE_XLU);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -712,7 +712,7 @@ static void PokedexMapDisplay_OAMMode_Normal(PokedexMapDisplay *mapDisplay)
 {
     int v0;
 
-    CellActor_SetExplicitOAMMode(mapDisplay->AreaUnknownCellActor, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(mapDisplay->AreaUnknownCellActor, GX_OAM_MODE_NORMAL);
     sub_02012AF0(mapDisplay->AreaUnknownSpriteManager->unk_00, GX_OAM_MODE_NORMAL);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -907,7 +907,7 @@ static void ov21_021DD8B4(PokedexMapDisplay *mapDisplay)
     memset(mapDisplay->pokedexFieldMap_2, 0, sizeof(u8) * (POKEDEXMAPHEIGHT * POKEDEXMAPWIDTH));
 
     for (v0 = 0; v0 < mapDisplay->numDungeons; v0++) {
-        CellActor_SetDrawFlag(mapDisplay->cellActorArray[v0], 0);
+        Sprite_SetDrawFlag(mapDisplay->cellActorArray[v0], 0);
     }
 
     mapDisplay->numDungeons = 0;
@@ -1120,10 +1120,10 @@ static void ov21_021DD964(PokedexMapDisplay *mapDisplay, UnkStruct_ov21_021DCAE0
 static void ov21_021DD9E8(PokedexMapDisplay *mapDisplay, const EncounterCollection *encounterCollection)
 {
     if ((mapDisplay->numVisibleDungeons <= 0) && (mapDisplay->numVisibleFields <= 0) && (mapDisplay->dungeonsZero <= 0) && (mapDisplay->fieldsZero <= 0)) {
-        CellActor_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 1);
+        Sprite_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 1);
         sub_020129D0(mapDisplay->AreaUnknownSpriteManager->unk_00, 1);
     } else {
-        CellActor_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 0);
+        Sprite_SetDrawFlag(mapDisplay->AreaUnknownCellActor, 0);
         sub_020129D0(mapDisplay->AreaUnknownSpriteManager->unk_00, 0);
     }
 }
@@ -1206,7 +1206,7 @@ static void ov21_021DDB8C(PokedexMapDisplay *mapDisplay)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
 
     for (dungeonIndex = 0; dungeonIndex < mapDisplay->numDungeons; dungeonIndex++) {
-        CellActor_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
+        Sprite_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
     }
 }
 
@@ -1218,7 +1218,7 @@ static void ov21_021DDBCC(PokedexMapDisplay *mapDisplay)
     GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 1);
 
     for (dungeonIndex = 0; dungeonIndex < mapDisplay->numDungeons; dungeonIndex++) {
-        CellActor_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
+        Sprite_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
     }
 }
 
@@ -1233,7 +1233,7 @@ static void ov21_021DDC14(PokedexMapDisplay *mapDisplay)
 
         if (mapDisplay->unk_810 == 0) {
             for (dungeonIndex = 0; dungeonIndex < mapDisplay->numDungeons; dungeonIndex++) {
-                CellActor_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 1);
+                Sprite_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 1);
             }
 
             mapDisplay->unk_810 = 1;
@@ -1261,7 +1261,7 @@ static void ov21_021DDC14(PokedexMapDisplay *mapDisplay)
             GXLayers_EngineAToggleLayers(GX_BLEND_PLANEMASK_BG1, 0);
         } else {
             for (dungeonIndex = 0; dungeonIndex < mapDisplay->numDungeons; dungeonIndex++) {
-                CellActor_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
+                Sprite_SetDrawFlag(mapDisplay->cellActorArray[dungeonIndex], 0);
             }
         }
     }
@@ -1269,7 +1269,7 @@ static void ov21_021DDC14(PokedexMapDisplay *mapDisplay)
 
 static void ov21_021DDCF4(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_021DCACC *param1)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
     int species = PokedexSort_CurrentSpecies(param1->unk_00);
 
     ov21_021D1890(param0->unk_00, param1->unk_00, species, 2, 40, 120);
diff --git a/src/overlay021/ov21_021DDD2C.c b/src/overlay021/ov21_021DDD2C.c
index 4be0f1ebb5..af755d8a08 100644
--- a/src/overlay021/ov21_021DDD2C.c
+++ b/src/overlay021/ov21_021DDD2C.c
@@ -20,9 +20,9 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -60,7 +60,7 @@ typedef struct {
 } UnkStruct_ov21_021DDE4C;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     SpriteResource *unk_04[4];
     void *unk_14;
     int unk_18;
@@ -332,12 +332,12 @@ static int ov21_021DDFB4(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
 
 static void ov21_021DE040(UnkStruct_ov21_021DDEC8 *param0)
 {
-    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
 }
 
 static void ov21_021DE04C(UnkStruct_ov21_021DDEC8 *param0)
 {
-    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    Sprite_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)
@@ -428,13 +428,13 @@ static void ov21_021DE224(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDD
 
 static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -443,14 +443,14 @@ static void ov21_021DE258(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDD
     v1.position.y = 0;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00 = CellActorCollection_Add(&v1);
+    param0->unk_00 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00, 0);
+    Sprite_SetAnim(param0->unk_00, 0);
 }
 
 static void ov21_021DE2E0(UnkStruct_ov21_021DDEC8 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
 }
 
 static void ov21_021DE2EC(UnkStruct_ov21_021DDE4C *param0, UnkStruct_ov21_021DDDA4 *param1, enum HeapId heapID)
@@ -589,8 +589,8 @@ static void ov21_021DE49C(UnkStruct_ov21_021DDEC8 *param0, const UnkStruct_ov21_
     v0.y = param2->unk_04 << FX32_SHIFT;
     v0.y += (192 << FX32_SHIFT);
 
-    CellActor_SetPosition(param0->unk_00, &v0);
-    CellActor_SetAnim(param0->unk_00, ov21_021DCA28(param1->unk_00));
+    Sprite_SetPosition(param0->unk_00, &v0);
+    Sprite_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 446bb00a02..72f4efa587 100644
--- a/src/overlay021/ov21_021DE668.c
+++ b/src/overlay021/ov21_021DE668.c
@@ -26,13 +26,13 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
 #include "pokedex_data_index.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -49,8 +49,8 @@ typedef struct {
 } UnkStruct_ov21_021DE760;
 
 typedef struct {
-    CellActor *unk_00[3];
-    CellActor *unk_0C;
+    Sprite *unk_00[3];
+    Sprite *unk_0C;
     UnkStruct_ov21_021D4CA0 *unk_10;
     SpriteResource *unk_14[4];
     SpriteResource *unk_24[4];
@@ -541,13 +541,13 @@ static void ov21_021DEE38(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
 
 static void ov21_021DEE80(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -555,13 +555,13 @@ static void ov21_021DEE80(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
     v1.position.y = (88 * FX32_ONE);
     v1.position.x = (120 * FX32_ONE);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v1);
+    param0->unk_00[0] = SpriteList_Add(&v1);
 }
 
 static void ov21_021DEEF8(UnkStruct_ov21_021DF374 *param0)
 {
     if (param0->unk_00[0]) {
-        CellActor_Delete(param0->unk_00[0]);
+        Sprite_Delete(param0->unk_00[0]);
     }
 }
 
@@ -579,7 +579,7 @@ static void ov21_021DEF3C(UnkStruct_ov21_021DE760 *param0)
 
 static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
     int species = PokedexSort_CurrentSpecies(param1->unk_04);
 
     ov21_021D1890(param0->unk_00, param1->unk_04, species, 2, 48, 72);
@@ -588,7 +588,7 @@ static void ov21_021DEF54(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_
 
 static void ov21_021DEF8C(UnkStruct_ov21_021DE760 *param0)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
 
     sub_02007DEC(v0, 6, 1);
     sub_02008780(v0);
@@ -627,8 +627,8 @@ static void ov21_021DF054(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
 
 static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int species = PokedexSort_CurrentSpecies(param2->unk_04);
     int type1, type2;
@@ -641,7 +641,7 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -649,15 +649,15 @@ static void ov21_021DF098(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
     v1.position.x = (170 * FX32_ONE);
     v1.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[1] = CellActorCollection_Add(&v1);
+    param0->unk_00[1] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[1], 0 + type1);
+    Sprite_SetAnim(param0->unk_00[1], 0 + type1);
 
     if (type1 != type2) {
         v1.position.x = (220 * FX32_ONE);
         v1.position.y = (72 * FX32_ONE);
-        param0->unk_00[2] = CellActorCollection_Add(&v1);
-        CellActor_SetAnim(param0->unk_00[2], 0 + type2);
+        param0->unk_00[2] = SpriteList_Add(&v1);
+        Sprite_SetAnim(param0->unk_00[2], 0 + type2);
     } else {
         param0->unk_00[2] = NULL;
     }
@@ -728,18 +728,18 @@ int ov21_021DF180(int param0)
 static void ov21_021DF1F8(UnkStruct_ov21_021DF374 *param0)
 {
     if (param0->unk_00[1]) {
-        CellActor_Delete(param0->unk_00[1]);
+        Sprite_Delete(param0->unk_00[1]);
     }
 
     if (param0->unk_00[2]) {
-        CellActor_Delete(param0->unk_00[2]);
+        Sprite_Delete(param0->unk_00[2]);
     }
 }
 
 static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE760 *param1, const UnkStruct_ov21_021DE6D4 *param2, int param3)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int species = PokedexSort_CurrentSpecies(param2->unk_04);
     Window *v4;
@@ -748,7 +748,7 @@ static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -756,9 +756,9 @@ static void ov21_021DF214(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_0C = CellActorCollection_Add(&v1);
+    param0->unk_0C = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_0C, 0x11);
+    Sprite_SetAnim(param0->unk_0C, 0x11);
 
     if (PokedexSort_CurrentCaughtStatus(param2->unk_04) != 2) {
         species = 0;
@@ -805,7 +805,7 @@ Window *ov21_021DF30C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2)
 
 static void ov21_021DF35C(UnkStruct_ov21_021DF374 *param0)
 {
-    CellActor_Delete(param0->unk_0C);
+    Sprite_Delete(param0->unk_0C);
     param0->unk_0C = NULL;
     ov21_021D4D1C(param0->unk_10);
 }
@@ -966,11 +966,11 @@ static void ov21_021DF64C(UnkStruct_ov21_021DF374 *param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+            Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         }
     }
 
-    CellActor_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_XLU);
     sub_02012AF0(param0->unk_10->unk_00, GX_OAM_MODE_XLU);
 }
 
@@ -980,11 +980,11 @@ static void ov21_021DF680(UnkStruct_ov21_021DF374 *param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_00[v0]) {
-            CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         }
     }
 
-    CellActor_SetExplicitOAMMode(param0->unk_0C, GX_OAM_MODE_NORMAL);
+    Sprite_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 b0aa6567a9..630c64082d 100644
--- a/src/overlay021/ov21_021DF734.c
+++ b/src/overlay021/ov21_021DF734.c
@@ -21,12 +21,12 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "inlines.h"
 #include "narc.h"
 #include "pltt_transfer.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -51,13 +51,13 @@ typedef struct {
 } UnkStruct_ov21_021DF858;
 
 typedef struct {
-    CellActor *unk_00[4];
+    Sprite *unk_00[4];
     SpriteResource *unk_10[4];
     UnkStruct_ov21_021D4CA0 *unk_20[2];
     UnkStruct_ov21_021D2648 unk_28[4];
     int unk_A8[4];
     int unk_B8;
-    CellActor *unk_BC;
+    Sprite *unk_BC;
     int unk_C0;
     BOOL unk_C4;
     int unk_C8;
@@ -553,15 +553,15 @@ static void ov21_021DFDC8(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8
 
 static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, int param3)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3, v4;
     int v5;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -574,12 +574,12 @@ static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8
         v1.position.x = v3 << FX32_SHIFT;
         v1.position.y = (v4 + 8) << FX32_SHIFT;
 
-        param0->unk_00[v5] = CellActorCollection_Add(&v1);
+        param0->unk_00[v5] = SpriteList_Add(&v1);
 
         if ((v5 % 2) == 0) {
-            CellActor_SetAnim(param0->unk_00[v5], 0);
+            Sprite_SetAnim(param0->unk_00[v5], 0);
         } else {
-            CellActor_SetAnim(param0->unk_00[v5], 2);
+            Sprite_SetAnim(param0->unk_00[v5], 2);
         }
     }
 
@@ -587,14 +587,14 @@ static void ov21_021DFE0C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8
     v1.position.y = 96 << FX32_SHIFT;
     v1.priority = 0;
 
-    param0->unk_BC = CellActorCollection_Add(&v1);
+    param0->unk_BC = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_BC, 1);
-    CellActor_SetAnimateFlag(param0->unk_BC, 1);
-    CellActor_SetExplicitPriority(param0->unk_BC, 0);
+    Sprite_SetAnim(param0->unk_BC, 1);
+    Sprite_SetAnimateFlag(param0->unk_BC, 1);
+    Sprite_SetExplicitPriority(param0->unk_BC, 0);
 
     if (param2->unk_10 <= 1) {
-        CellActor_SetDrawFlag(param0->unk_BC, 0);
+        Sprite_SetDrawFlag(param0->unk_BC, 0);
     }
 }
 
@@ -603,10 +603,10 @@ static void ov21_021DFF18(UnkStruct_ov21_021DFFF8 *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 
-    CellActor_Delete(param0->unk_BC);
+    Sprite_Delete(param0->unk_BC);
 }
 
 static void ov21_021DFF38(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2, BOOL param3)
@@ -652,10 +652,10 @@ static void ov21_021DFFF8(UnkStruct_ov21_021DFFF8 *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
     }
 
-    CellActor_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_XLU);
+    Sprite_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);
@@ -667,10 +667,10 @@ static void ov21_021E0038(UnkStruct_ov21_021DFFF8 *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
     }
 
-    CellActor_SetExplicitOAMMode(param0->unk_BC, GX_OAM_MODE_NORMAL);
+    Sprite_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);
@@ -742,7 +742,7 @@ static BOOL ov21_021E015C(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF8
     v1.x = param0->unk_28[param2].unk_00 << FX32_SHIFT;
     v1.y = (param0->unk_28[param2].unk_04 + 8) << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_00[v2], &v1);
+    Sprite_SetPosition(param0->unk_00[v2], &v1);
 
     return v0;
 }
@@ -1275,7 +1275,7 @@ static void ov21_021E0BF8(UnkStruct_ov21_021DFFF8 *param0)
 
 static void ov21_021E0C10(UnkStruct_ov21_021DFFF8 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_BC, 0);
+    Sprite_SetDrawFlag(param0->unk_BC, 0);
 
     param0->unk_C0 = (16 + 8);
     param0->unk_C4 = 1;
@@ -1287,7 +1287,7 @@ static void ov21_021E0C30(UnkStruct_ov21_021DFFF8 *param0)
         param0->unk_C0--;
 
         if (param0->unk_C0 <= 0) {
-            CellActor_SetDrawFlag(param0->unk_BC, 1);
+            Sprite_SetDrawFlag(param0->unk_BC, 1);
             param0->unk_C4 = 0;
         }
     }
diff --git a/src/overlay021/ov21_021E0C68.c b/src/overlay021/ov21_021E0C68.c
index 04c29246dc..d87760a5da 100644
--- a/src/overlay021/ov21_021E0C68.c
+++ b/src/overlay021/ov21_021E0C68.c
@@ -24,11 +24,11 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "message.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -55,7 +55,7 @@ typedef struct {
 } UnkStruct_ov21_021E0D7C;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     UnkStruct_ov21_021D4CA0 *unk_04;
     SpriteResource *unk_08[4];
     UnkStruct_ov21_021D2648 unk_18;
@@ -471,7 +471,7 @@ static void ov21_021E1210(UnkStruct_ov21_021E0D7C *param0)
 
 static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
     int species = PokedexSort_CurrentSpecies(param1->unk_04);
 
     ov21_021D1890(param0->unk_00, param1->unk_04, species, 2, 48, 72);
@@ -480,7 +480,7 @@ static void ov21_021E1228(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_
 
 static void ov21_021E1260(UnkStruct_ov21_021E0D7C *param0)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
 
     sub_02007DEC(v0, 6, 1);
     sub_02008780(v0);
@@ -520,8 +520,8 @@ static void ov21_021E1328(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
 
 static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1, const UnkStruct_ov21_021E0D68 *param2, int param3)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int species = PokedexSort_CurrentSpecies(param2->unk_04);
     Window *v4;
@@ -530,7 +530,7 @@ static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -538,9 +538,9 @@ static void ov21_021E136C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
     v1.position.x = (192 * FX32_ONE);
     v1.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = CellActorCollection_Add(&v1);
+    param0->unk_00 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00, 0x11);
+    Sprite_SetAnim(param0->unk_00, 0x11);
 
     if (PokedexSort_CurrentCaughtStatus(param2->unk_04) != 2) {
         species = 0;
@@ -586,7 +586,7 @@ static Window *ov21_021E1460(UnkStruct_ov21_021E0D7C *param0, int param1, int pa
 
 static void ov21_021E14BC(UnkStruct_ov21_021E14D4 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
     param0->unk_00 = NULL;
     ov21_021D4D1C(param0->unk_04);
 }
@@ -744,13 +744,13 @@ static BOOL ov21_021E1730(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
 
 static void ov21_021E17AC(UnkStruct_ov21_021E14D4 *param0)
 {
-    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    Sprite_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)
 {
-    CellActor_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    Sprite_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 ac2e3f10aa..54beba5902 100644
--- a/src/overlay021/ov21_021E1924.c
+++ b/src/overlay021/ov21_021E1924.c
@@ -29,10 +29,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -74,10 +74,10 @@ typedef struct {
 } UnkStruct_ov21_021E1E74;
 
 typedef struct {
-    CellActor *unk_00[8];
+    Sprite *unk_00[8];
     UnkStruct_ov21_021D4CA0 *unk_20[8];
     SpriteResource *unk_40[4];
-    CellActor *unk_50[8];
+    Sprite *unk_50[8];
     SpriteResource *unk_70[4];
     int unk_80[8];
     void *unk_A0[8];
@@ -105,10 +105,10 @@ static void ov21_021E1D40(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
 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, 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_021E26A0(UnkStruct_ov21_021E1A90 *param0, Sprite *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(Sprite *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(CellActor *param0, int param1, int param2);
+static void ov21_021E29A4(Sprite *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);
@@ -704,14 +704,14 @@ static void ov21_021E226C(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
 
 static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -721,16 +721,16 @@ static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
     v1.position.y = 132 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v1);
-    CellActor_SetAnim(param0->unk_00[0], 0);
+    param0->unk_00[0] = SpriteList_Add(&v1);
+    Sprite_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] = CellActorCollection_Add(&v1);
+    param0->unk_00[1] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[1], 0);
+    Sprite_SetAnim(param0->unk_00[1], 0);
     SpriteResourcesHeader_Init(&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;
@@ -739,9 +739,9 @@ static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
 
     for (v3 = 0; v3 < (7 - 2 + 1); ++v3) {
         v1.position.x = Unk_ov21_021E9D80[v3];
-        param0->unk_00[v3 + 2] = CellActorCollection_Add(&v1);
+        param0->unk_00[v3 + 2] = SpriteList_Add(&v1);
 
-        CellActor_SetAnim(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
+        Sprite_SetAnim(param0->unk_00[v3 + 2], Unk_ov21_021E9D98[v3]);
     }
 
     v1.priority = 31 - 1;
@@ -750,15 +750,15 @@ static void ov21_021E22C8(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
     v1.position.y = (132 + 2) << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_50[0] = CellActorCollection_Add(&v1);
-    CellActor_SetAnim(param0->unk_50[0], 13);
+    param0->unk_50[0] = SpriteList_Add(&v1);
+    Sprite_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] = CellActorCollection_Add(&v1);
-    CellActor_SetAnim(param0->unk_50[1], 12);
+    param0->unk_50[1] = SpriteList_Add(&v1);
+    Sprite_SetAnim(param0->unk_50[1], 12);
 
     for (v3 = 1 + 1; v3 < 8; v3++) {
         param0->unk_50[v3] = NULL;
@@ -770,10 +770,10 @@ static void ov21_021E2458(UnkStruct_ov21_021E2588 *param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
 
         if (param0->unk_50[v0]) {
-            CellActor_Delete(param0->unk_50[v0]);
+            Sprite_Delete(param0->unk_50[v0]);
         }
     }
 }
@@ -849,14 +849,14 @@ static void ov21_021E2588(UnkStruct_ov21_021E2588 *param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        Sprite_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]) {
-            CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
+            Sprite_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_XLU);
         }
     }
 }
@@ -866,14 +866,14 @@ static void ov21_021E25C0(UnkStruct_ov21_021E2588 *param0)
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        Sprite_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]) {
-            CellActor_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(param0->unk_50[v0], GX_OAM_MODE_NORMAL);
         }
     }
 }
@@ -912,7 +912,7 @@ static BOOL ov21_021E2664(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A
     return 0;
 }
 
-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_021E26A0(UnkStruct_ov21_021E1A90 *param0, Sprite *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;
@@ -923,7 +923,7 @@ static void ov21_021E26A0(UnkStruct_ov21_021E1A90 *param0, CellActor *param1, Un
     ov21_021D144C(param1, param3);
     ov21_021E274C(param1, param2, param4, param8, param9);
 
-    v0 = CellActor_GetAnimFrame(param1);
+    v0 = Sprite_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -962,7 +962,7 @@ static void ov21_021E26A0(UnkStruct_ov21_021E1A90 *param0, CellActor *param1, Un
     }
 }
 
-static void ov21_021E274C(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
+static void ov21_021E274C(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
 {
     ov21_021D1524(param0, param1, param2, param3, param4);
 }
@@ -1086,39 +1086,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) {
-        CellActor_SetDrawFlag(param0->unk_00[2], 0);
+        Sprite_SetDrawFlag(param0->unk_00[2], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[2], 1);
+        Sprite_SetDrawFlag(param0->unk_00[2], 1);
     }
 
     if ((param1->unk_38 & 2) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[3], 0);
+        Sprite_SetDrawFlag(param0->unk_00[3], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[3], 1);
+        Sprite_SetDrawFlag(param0->unk_00[3], 1);
     }
 
     if ((param1->unk_38 & 4) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[4], 0);
+        Sprite_SetDrawFlag(param0->unk_00[4], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[4], 1);
+        Sprite_SetDrawFlag(param0->unk_00[4], 1);
     }
 
     if ((param1->unk_38 & 8) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[5], 0);
+        Sprite_SetDrawFlag(param0->unk_00[5], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[5], 1);
+        Sprite_SetDrawFlag(param0->unk_00[5], 1);
     }
 
     if ((param1->unk_38 & 16) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[6], 0);
+        Sprite_SetDrawFlag(param0->unk_00[6], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[6], 1);
+        Sprite_SetDrawFlag(param0->unk_00[6], 1);
     }
 
     if ((param1->unk_38 & 32) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[7], 0);
+        Sprite_SetDrawFlag(param0->unk_00[7], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_00[7], 1);
+        Sprite_SetDrawFlag(param0->unk_00[7], 1);
     }
 }
 
@@ -1141,7 +1141,7 @@ static void ov21_021E2968(UnkStruct_ov21_021E1E74 *param0, UnkStruct_ov21_021E1A
     }
 }
 
-static void ov21_021E29A4(CellActor *param0, int param1, int param2)
+static void ov21_021E29A4(Sprite *param0, int param1, int param2)
 {
     int v0;
 
@@ -1150,8 +1150,8 @@ static void ov21_021E29A4(CellActor *param0, int param1, int param2)
     v0 = Unk_ov21_021E9D98[param2 - 2];
 
     if (param1 == 1) {
-        CellActor_SetAnim(param0, v0 + 1);
+        Sprite_SetAnim(param0, v0 + 1);
     } else {
-        CellActor_SetAnim(param0, v0);
+        Sprite_SetAnim(param0, v0);
     }
 }
diff --git a/src/overlay021/ov21_021E29DC.c b/src/overlay021/ov21_021E29DC.c
index 67438e3237..dce039cabc 100644
--- a/src/overlay021/ov21_021E29DC.c
+++ b/src/overlay021/ov21_021E29DC.c
@@ -32,10 +32,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -107,7 +107,7 @@ typedef struct {
 } UnkStruct_ov21_021E37B4;
 
 typedef struct {
-    CellActor *unk_00[6];
+    Sprite *unk_00[6];
     SpriteResource *unk_18[4];
 } UnkStruct_ov21_021E3900;
 
@@ -1276,14 +1276,14 @@ static void ov21_021E3AAC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E34
 
 static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 32;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -1312,8 +1312,8 @@ static void ov21_021E3AF0(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E34
             break;
         }
 
-        param0->unk_00[v3] = CellActorCollection_Add(&v1);
-        CellActor_SetAnim(param0->unk_00[v3], v3);
+        param0->unk_00[v3] = SpriteList_Add(&v1);
+        Sprite_SetAnim(param0->unk_00[v3], v3);
     }
 }
 
@@ -1322,7 +1322,7 @@ static void ov21_021E3BC0(UnkStruct_ov21_021E3900 *param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -1602,6 +1602,6 @@ static void ov21_021E3FC0(UnkStruct_ov21_021E326C *param0, int param1, int param
 static void ov21_021E3FE4(UnkStruct_ov21_021E3900 *param0, const UnkStruct_ov21_021E342C *param1)
 {
     if (PokedexSort_CanDetectForms(param1->unk_08) == 0) {
-        CellActor_SetDrawFlag(param0->unk_00[4], 0);
+        Sprite_SetDrawFlag(param0->unk_00[4], 0);
     }
 }
diff --git a/src/overlay021/ov21_021E3FFC.c b/src/overlay021/ov21_021E3FFC.c
index ef80a9eb20..80e1cf85c9 100644
--- a/src/overlay021/ov21_021E3FFC.c
+++ b/src/overlay021/ov21_021E3FFC.c
@@ -19,9 +19,9 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -52,12 +52,12 @@ typedef struct {
 } UnkStruct_ov21_021E4898;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     int unk_04;
 } UnkStruct_ov21_021E4B30_sub1;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_ov21_021E4B30_sub2;
@@ -115,7 +115,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(CellActor *param0, int param1);
+static void ov21_021E4C38(Sprite *param0, int param1);
 
 void ov21_021E3FFC(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID)
 {
@@ -371,7 +371,7 @@ static int ov21_021E4288(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
 
 static void ov21_021E4328(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_021E40F4 *param1)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
     int species = PokedexSort_CurrentSpecies(param1->unk_04);
 
     ov21_021D1890(param0->unk_00, param1->unk_04, species, 2, 48, 64);
@@ -384,10 +384,10 @@ static void ov21_021E4360(UnkStruct_ov21_021E4360 *param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
+            Sprite_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_XLU);
         }
 
-        CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_XLU);
     }
 }
 
@@ -397,10 +397,10 @@ static void ov21_021E4394(UnkStruct_ov21_021E4360 *param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(param0->unk_20[v0].unk_00[v1].unk_00, GX_OAM_MODE_NORMAL);
         }
 
-        CellActor_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_20[v0].unk_48.unk_00, GX_OAM_MODE_NORMAL);
     }
 }
 
@@ -568,14 +568,14 @@ static void ov21_021E4770(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41
 
 static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3, v4;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 17;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -585,10 +585,10 @@ static void ov21_021E47CC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41
 
     for (v3 = 0; v3 < 9; v3++) {
         for (v4 = 0; v4 < 9; v4++) {
-            param0->unk_20[v3].unk_00[v4].unk_00 = CellActorCollection_Add(&v1);
+            param0->unk_20[v3].unk_00[v4].unk_00 = SpriteList_Add(&v1);
         }
 
-        param0->unk_20[v3].unk_48.unk_00 = CellActorCollection_Add(&v1);
+        param0->unk_20[v3].unk_48.unk_00 = SpriteList_Add(&v1);
     }
 }
 
@@ -598,10 +598,10 @@ static void ov21_021E4868(UnkStruct_ov21_021E4360 *param0)
 
     for (v0 = 0; v0 < 9; v0++) {
         for (v1 = 0; v1 < 9; v1++) {
-            CellActor_Delete(param0->unk_20[v0].unk_00[v1].unk_00);
+            Sprite_Delete(param0->unk_20[v0].unk_00[v1].unk_00);
         }
 
-        CellActor_Delete(param0->unk_20[v0].unk_48.unk_00);
+        Sprite_Delete(param0->unk_20[v0].unk_48.unk_00);
     }
 }
 
@@ -750,18 +750,18 @@ static void ov21_021E4B30(UnkStruct_ov21_021E4B30 *param0, int param1)
     v1.y = 96 << FX32_SHIFT;
 
     for (v0 = 0; v0 < 9; v0++) {
-        CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
-        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
+        Sprite_SetPosition(param0->unk_00[v0].unk_00, &v1);
+        Sprite_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
 
         v1.y += -8 << FX32_SHIFT;
 
-        CellActor_SetAnim(param0->unk_00[v0].unk_00, 1);
+        Sprite_SetAnim(param0->unk_00[v0].unk_00, 1);
     }
 
     v1.y = 96 << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_48.unk_00, &v1);
-    CellActor_SetDrawFlag(param0->unk_48.unk_00, 0);
+    Sprite_SetPosition(param0->unk_48.unk_00, &v1);
+    Sprite_SetDrawFlag(param0->unk_48.unk_00, 0);
 }
 
 static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1)
@@ -770,17 +770,17 @@ static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1)
     int v1 = 0;
 
     for (v0 = 0; v0 < param1; v0++) {
-        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 1);
+        Sprite_SetDrawFlag(param0->unk_00[v0].unk_00, 1);
         param0->unk_00[v0].unk_04 = 2 * (v0 + 1);
     }
 
     for (v0 = 0; v0 < 9; v0++) {
-        if (CellActor_GetDrawFlag(param0->unk_00[v0].unk_00)) {
+        if (Sprite_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 {
-                CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
+                Sprite_SetDrawFlag(param0->unk_00[v0].unk_00, 0);
             }
         }
     }
@@ -790,7 +790,7 @@ static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1)
         param0->unk_48.unk_08 = 16;
 
         if (param0->unk_48.unk_04 < v1) {
-            CellActor_SetDrawFlag(param0->unk_48.unk_00, 1);
+            Sprite_SetDrawFlag(param0->unk_48.unk_00, 1);
         }
 
         param0->unk_48.unk_04 = v1;
@@ -804,20 +804,20 @@ static void ov21_021E4B94(UnkStruct_ov21_021E4B30 *param0, int param1)
             param0->unk_48.unk_08--;
         }
     } else {
-        CellActor_SetDrawFlag(param0->unk_48.unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_48.unk_00, 0);
     }
 }
 
-static void ov21_021E4C38(CellActor *param0, int param1)
+static void ov21_021E4C38(Sprite *param0, int param1)
 {
     VecFx32 v0;
     const VecFx32 *v1;
 
-    v1 = CellActor_GetPosition(param0);
+    v1 = Sprite_GetPosition(param0);
     v0 = *v1;
     v0.y = (96 + (-8 * param1)) << FX32_SHIFT;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_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 c8a0afc04c..20889715df 100644
--- a/src/overlay021/ov21_021E4CA4.c
+++ b/src/overlay021/ov21_021E4CA4.c
@@ -24,11 +24,11 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -97,12 +97,12 @@ typedef struct {
 } UnkStruct_ov21_021E5C80;
 
 typedef struct {
-    CellActor *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_00;
+    Sprite *unk_04;
     UnkStruct_ov21_021E5C80 unk_08;
-    CellActor *unk_20;
+    Sprite *unk_20;
     UnkStruct_ov21_021E5C80 unk_24;
-    CellActor *unk_3C;
+    Sprite *unk_3C;
     int unk_40;
     fx32 unk_44;
     int unk_48;
@@ -146,9 +146,9 @@ static void ov21_021E5DE8(UnkStruct_ov21_021E51DC *param0, UnkStruct_ov21_021E4D
 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(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_021E5C80(Sprite *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, BOOL param3);
+static void ov21_021E5CF8(Sprite *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3);
+static void ov21_021E5D90(Sprite *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);
@@ -439,10 +439,10 @@ static int ov21_021E4F78(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
 
 static void ov21_021E5004(UnkStruct_ov21_021E5004 *param0)
 {
-    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);
+    Sprite_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_XLU);
+    Sprite_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);
@@ -450,10 +450,10 @@ static void ov21_021E5004(UnkStruct_ov21_021E5004 *param0)
 
 static void ov21_021E5040(UnkStruct_ov21_021E5004 *param0)
 {
-    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);
+    Sprite_SetExplicitOAMMode(param0->unk_00, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(param0->unk_3C, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(param0->unk_04, GX_OAM_MODE_NORMAL);
+    Sprite_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);
@@ -841,15 +841,15 @@ static void ov21_021E56F0(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
 
 static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
     int v4, v5;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -859,32 +859,32 @@ static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
     v1.position.y = 67 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_3C = CellActorCollection_Add(&v1);
+    param0->unk_3C = SpriteList_Add(&v1);
 
-    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);
+    Sprite_SetAnim(param0->unk_3C, 4);
+    Sprite_SetAnimateFlag(param0->unk_3C, 1);
+    Sprite_SetAnimSpeed(param0->unk_3C, (FX32_ONE * 2));
+    Sprite_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 = CellActorCollection_Add(&v1);
+    param0->unk_00 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00, 1);
-    CellActor_SetAffineOverwriteMode(param0->unk_00, 1);
+    Sprite_SetAnim(param0->unk_00, 1);
+    Sprite_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 = CellActorCollection_Add(&v1);
+    param0->unk_04 = SpriteList_Add(&v1);
 
-    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);
+    Sprite_SetAnim(param0->unk_04, 3);
+    Sprite_SetAnimateFlag(param0->unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_04, (FX32_ONE * 2));
+    Sprite_SetAnimFrame(param0->unk_04, 5);
 
     param0->unk_08.unk_00 = 3;
     param0->unk_08.unk_04 = 2;
@@ -896,12 +896,12 @@ static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
     v1.position.y = 166 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_20 = CellActorCollection_Add(&v1);
+    param0->unk_20 = SpriteList_Add(&v1);
 
-    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);
+    Sprite_SetAnim(param0->unk_20, 6);
+    Sprite_SetAnimateFlag(param0->unk_20, 1);
+    Sprite_SetAnimSpeed(param0->unk_20, (FX32_ONE * 2));
+    Sprite_SetAnimFrame(param0->unk_20, 5);
 
     param0->unk_24.unk_00 = 6;
     param0->unk_24.unk_04 = 5;
@@ -912,10 +912,10 @@ static void ov21_021E5734(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
 
 static void ov21_021E5898(UnkStruct_ov21_021E5004 *param0)
 {
-    CellActor_Delete(param0->unk_00);
-    CellActor_Delete(param0->unk_3C);
-    CellActor_Delete(param0->unk_04);
-    CellActor_Delete(param0->unk_20);
+    Sprite_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_3C);
+    Sprite_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_20);
 }
 
 static void ov21_021E58B8(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2)
@@ -977,14 +977,14 @@ static void ov21_021E59B4(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_
     int v0;
 
     if (param0->unk_40 != param1->unk_34) {
-        v0 = CellActor_GetAnimFrame(param0->unk_3C);
+        v0 = Sprite_GetAnimFrame(param0->unk_3C);
 
         if (param1->unk_34 == 0) {
-            CellActor_SetAnim(param0->unk_3C, 4);
-            SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
+            Sprite_SetAnim(param0->unk_3C, 4);
+            Sprite_SetAnimFrame(param0->unk_3C, 8 - v0);
         } else {
-            CellActor_SetAnim(param0->unk_3C, 0);
-            SpriteActor_SetAnimFrame(param0->unk_3C, 8 - v0);
+            Sprite_SetAnim(param0->unk_3C, 0);
+            Sprite_SetAnimFrame(param0->unk_3C, 8 - v0);
         }
 
         param0->unk_40 = param1->unk_34;
@@ -1105,7 +1105,7 @@ static void ov21_021E5AD8(UnkStruct_ov21_021E51DC *param0)
 
 static void ov21_021E5B50(UnkStruct_ov21_021E5004 *param0, const UnkStruct_ov21_021E51DC *param1)
 {
-    CellActor_SetAffineZRotation(param0->unk_00, CalcRadialAngle(14, param1->unk_5C));
+    Sprite_SetAffineZRotation(param0->unk_00, CalcRadialAngle(14, param1->unk_5C));
 }
 
 static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, const UnkStruct_ov21_021E51DC *param2)
@@ -1165,7 +1165,7 @@ static void ov21_021E5C4C(UnkStruct_ov21_021E5004 *param0)
     }
 }
 
-static void ov21_021E5C80(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3)
+static void ov21_021E5C80(Sprite *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1173,7 +1173,7 @@ static void ov21_021E5C80(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BO
         param3 = 1;
     }
 
-    v0 = CellActor_GetAnimFrame(param0);
+    v0 = Sprite_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1185,21 +1185,21 @@ static void ov21_021E5C80(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BO
         break;
     case 2:
         if (v0 > param1->unk_14) {
-            SpriteActor_SetAnimFrame(param0, param1->unk_14);
-            CellActor_SetAnimSpeed(param0, 0);
+            Sprite_SetAnimFrame(param0, param1->unk_14);
+            Sprite_SetAnimSpeed(param0, 0);
         }
         break;
     case 1:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        CellActor_SetAnimSpeed(param0, (FX32_ONE * 2));
+        Sprite_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
     }
 }
 
-static void ov21_021E5CF8(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3)
+static void ov21_021E5CF8(Sprite *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2, int param3)
 {
     int v0;
 
@@ -1207,7 +1207,7 @@ static void ov21_021E5CF8(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BO
         param3 = 3;
     }
 
-    v0 = CellActor_GetAnimFrame(param0);
+    v0 = Sprite_GetAnimFrame(param0);
 
     if (param1->unk_0C != param2) {
         ov21_021E5D90(param0, param1, param2);
@@ -1222,39 +1222,39 @@ static void ov21_021E5CF8(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BO
             ov21_021E5D90(param0, param1, 1);
         }
 
-        SpriteActor_SetAnimFrame(param0, param1->unk_14 - 1);
+        Sprite_SetAnimFrame(param0, param1->unk_14 - 1);
         break;
     case 2:
-        SpriteActor_SetAnimFrame(param0, param1->unk_14);
-        CellActor_SetAnimSpeed(param0, 0);
+        Sprite_SetAnimFrame(param0, param1->unk_14);
+        Sprite_SetAnimSpeed(param0, 0);
         break;
     case 3:
     case 100:
         ov21_021E5D90(param0, param1, param2);
-        CellActor_SetAnimSpeed(param0, (FX32_ONE * 2));
+        Sprite_SetAnimSpeed(param0, (FX32_ONE * 2));
         break;
     default:
         break;
     }
 }
 
-static void ov21_021E5D90(CellActor *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2)
+static void ov21_021E5D90(Sprite *param0, UnkStruct_ov21_021E5C80 *param1, BOOL param2)
 {
     int v0;
 
-    v0 = CellActor_GetAnimFrame(param0);
+    v0 = Sprite_GetAnimFrame(param0);
 
     if (param2 == 1) {
         if (param1->unk_08 == param1->unk_00) {
-            CellActor_SetAnim(param0, param1->unk_04);
+            Sprite_SetAnim(param0, param1->unk_04);
             param1->unk_08 = param1->unk_04;
-            SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
+            Sprite_SetAnimFrame(param0, param1->unk_10 - v0);
         }
     } else {
         if (param1->unk_08 == param1->unk_04) {
-            CellActor_SetAnim(param0, param1->unk_00);
+            Sprite_SetAnim(param0, param1->unk_00);
             param1->unk_08 = param1->unk_00;
-            SpriteActor_SetAnimFrame(param0, param1->unk_10 - v0);
+            Sprite_SetAnimFrame(param0, param1->unk_10 - v0);
         }
     }
 }
diff --git a/src/overlay021/ov21_021E68F4.c b/src/overlay021/ov21_021E68F4.c
index ee448c1f2d..0e3e688b79 100644
--- a/src/overlay021/ov21_021E68F4.c
+++ b/src/overlay021/ov21_021E68F4.c
@@ -25,10 +25,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -65,10 +65,10 @@ typedef struct {
 } UnkStruct_ov21_021E6DAC;
 
 typedef struct {
-    CellActor *unk_00[2];
+    Sprite *unk_00[2];
     UnkStruct_ov21_021D4CA0 *unk_08[2];
     SpriteResource *unk_10[4];
-    CellActor *unk_20[4];
+    Sprite *unk_20[4];
     int unk_30[2];
     void *unk_38[2];
 } UnkStruct_ov21_021E6C60;
@@ -95,8 +95,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, 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_021E71D0(UnkStruct_ov21_021E6A34 *param0, Sprite *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(Sprite *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);
@@ -364,7 +364,7 @@ static void ov21_021E6C60(UnkStruct_ov21_021E6C60 *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -374,7 +374,7 @@ static void ov21_021E6C88(UnkStruct_ov21_021E6C60 *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_08[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -563,14 +563,14 @@ static void ov21_021E6FD8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
 
 static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -580,17 +580,17 @@ static void ov21_021E700C(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
     v1.position.y = 120 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v1);
+    param0->unk_00[0] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[0], 1);
+    Sprite_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] = CellActorCollection_Add(&v1);
+    param0->unk_00[1] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[1], 1);
+    Sprite_SetAnim(param0->unk_00[1], 1);
 }
 
 static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0)
@@ -598,7 +598,7 @@ static void ov21_021E70BC(UnkStruct_ov21_021E6C60 *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -658,7 +658,7 @@ static void ov21_021E71B8(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A
     }
 }
 
-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_021E71D0(UnkStruct_ov21_021E6A34 *param0, Sprite *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;
@@ -669,7 +669,7 @@ static void ov21_021E71D0(UnkStruct_ov21_021E6A34 *param0, CellActor *param1, Un
     ov21_021D144C(param1, param3);
     ov21_021E727C(param1, param2, param4, param8, param9);
 
-    v0 = CellActor_GetAnimFrame(param1);
+    v0 = Sprite_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -708,7 +708,7 @@ static void ov21_021E71D0(UnkStruct_ov21_021E6A34 *param0, CellActor *param1, Un
     }
 }
 
-static void ov21_021E727C(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
+static void ov21_021E727C(Sprite *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 93518c06df..d3fdaec80e 100644
--- a/src/overlay021/ov21_021E737C.c
+++ b/src/overlay021/ov21_021E737C.c
@@ -24,7 +24,6 @@
 #include "overlay022/struct_ov22_02255800.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "message.h"
@@ -34,6 +33,7 @@
 #include "pokedex_data_index.h"
 #include "pokedex_heightweight.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -78,10 +78,10 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02015214 *unk_00;
-    CellActor *unk_04;
-    CellActor *unk_08;
-    CellActor *unk_0C;
-    CellActor *unk_10;
+    Sprite *unk_04;
+    Sprite *unk_08;
+    Sprite *unk_0C;
+    Sprite *unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -94,10 +94,10 @@ typedef struct {
 
 typedef struct {
     UnkStruct_02015214 *unk_00;
-    CellActor *unk_04;
-    CellActor *unk_08;
-    CellActor *unk_0C;
-    CellActor *unk_10;
+    Sprite *unk_04;
+    Sprite *unk_08;
+    Sprite *unk_0C;
+    Sprite *unk_10;
     int unk_14;
     int unk_18;
     int unk_1C;
@@ -105,7 +105,7 @@ typedef struct {
 } UnkStruct_ov21_021E81F8;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     fx32 unk_04;
     fx32 unk_08;
     s16 unk_0C;
@@ -116,10 +116,10 @@ typedef struct {
 } UnkStruct_ov21_021E82C8;
 
 typedef struct {
-    CellActor *unk_00;
-    CellActor *unk_04;
-    CellActor *unk_08;
-    CellActor *unk_0C[2];
+    Sprite *unk_00;
+    Sprite *unk_04;
+    Sprite *unk_08;
+    Sprite *unk_0C[2];
     SpriteResource *unk_14[4];
     SpriteResource *unk_24[4];
     const UnkStruct_ov21_021E9DB0 *unk_34;
@@ -164,7 +164,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, CellActor *param1, CellActor *param2, CellActor *param3, CellActor *param4, u16 param5);
+static void ov21_021E80D4(UnkStruct_02015214 *param0, Sprite *param1, Sprite *param2, Sprite *param3, Sprite *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);
@@ -625,8 +625,8 @@ static void ov21_021E7AA0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
 
 static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     VecFx32 v3;
     short v4;
@@ -636,7 +636,7 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -644,37 +644,37 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_00 = CellActorCollection_Add(&v1);
+    param0->unk_00 = SpriteList_Add(&v1);
 
     if (PokedexSort_TrainerGender(param2->unk_00) == 0) {
-        CellActor_SetAnim(param0->unk_00, 3);
+        Sprite_SetAnim(param0->unk_00, 3);
     } else {
-        CellActor_SetAnim(param0->unk_00, 4);
+        Sprite_SetAnim(param0->unk_00, 4);
     }
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = (96 + 10) << FX32_SHIFT;
 
-    param0->unk_08 = CellActorCollection_Add(&v1);
+    param0->unk_08 = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_08, 1);
-    CellActor_SetExplicitPriority(param0->unk_08, 1);
+    Sprite_SetAnim(param0->unk_08, 1);
+    Sprite_SetExplicitPriority(param0->unk_08, 1);
 
     v1.position.x = 184 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[0] = CellActorCollection_Add(&v1);
-    CellActor_SetAnim(param0->unk_0C[0], 0);
+    param0->unk_0C[0] = SpriteList_Add(&v1);
+    Sprite_SetAnim(param0->unk_0C[0], 0);
 
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = (64 + 24) << FX32_SHIFT;
 
-    param0->unk_0C[1] = CellActorCollection_Add(&v1);
+    param0->unk_0C[1] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_0C[1], 0);
+    Sprite_SetAnim(param0->unk_0C[1], 0);
     SpriteResourcesHeader_Init(&v0, SpriteResource_GetID(param0->unk_14[0]), SpriteResource_GetID(param0->unk_14[1]), SpriteResource_GetID(param0->unk_14[2]), SpriteResource_GetID(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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -682,17 +682,17 @@ static void ov21_021E7B34(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E74
     v1.position.x = 72 << FX32_SHIFT;
     v1.position.y = 64 << FX32_SHIFT;
 
-    param0->unk_04 = CellActorCollection_Add(&v1);
-    CellActor_SetExplicitPaletteWithOffset(param0->unk_04, PokeIconPaletteIndex(species, v7, 0));
+    param0->unk_04 = SpriteList_Add(&v1);
+    Sprite_SetExplicitPaletteWithOffset(param0->unk_04, PokeIconPaletteIndex(species, v7, 0));
 }
 
 static void ov21_021E7CCC(UnkStruct_ov21_021E7714 *param0)
 {
-    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]);
+    Sprite_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_08);
+    Sprite_Delete(param0->unk_0C[0]);
+    Sprite_Delete(param0->unk_0C[1]);
 }
 
 static void ov21_021E7CF0(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, const UnkStruct_ov21_021E7468 *param2, enum HeapId heapID)
@@ -904,7 +904,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, CellActor *param1, CellActor *param2, CellActor *param3, CellActor *param4, u16 param5)
+static void ov21_021E80D4(UnkStruct_02015214 *param0, Sprite *param1, Sprite *param2, Sprite *param3, Sprite *param4, u16 param5)
 {
     fx32 v0, v1;
     VecFx32 v2;
@@ -917,16 +917,16 @@ static void ov21_021E80D4(UnkStruct_02015214 *param0, CellActor *param1, CellAct
     v2.x = (128 << FX32_SHIFT) + v0;
     v2.y = (64 << FX32_SHIFT) + v1;
 
-    CellActor_SetPosition(param3, &v2);
+    Sprite_SetPosition(param3, &v2);
     v2.y += 24 << FX32_SHIFT;
-    CellActor_SetPosition(param1, &v2);
+    Sprite_SetPosition(param1, &v2);
 
     v2.x = (128 << FX32_SHIFT) - v0;
     v2.y = (64 << FX32_SHIFT) - v1;
 
-    CellActor_SetPosition(param4, &v2);
+    Sprite_SetPosition(param4, &v2);
     v2.y += 24 << FX32_SHIFT;
-    CellActor_SetPosition(param2, &v2);
+    Sprite_SetPosition(param2, &v2);
 }
 
 static void ov21_021E8188(UnkStruct_ov21_021E7714 *param0, UnkStruct_ov21_021E747C *param1, u16 param2, u16 param3, int param4)
@@ -992,7 +992,7 @@ static void ov21_021E8258(UnkStruct_ov21_021E7714 *param0, s16 param1, int param
 
     param0->unk_98.unk_10 = (-param1 / 1) * 2;
 
-    v0 = CellActor_GetPosition(param0->unk_98.unk_00);
+    v0 = Sprite_GetPosition(param0->unk_98.unk_00);
 
     param0->unk_98.unk_04 = v0->x;
     param0->unk_98.unk_08 = v0->y;
@@ -1018,7 +1018,7 @@ static void ov21_021E82C8(SysTask *param0, void *param1)
         v2.x = v0->unk_04;
         v2.y = v0->unk_08 + (v1 << FX32_SHIFT);
 
-        CellActor_SetPosition(v0->unk_00, &v2);
+        Sprite_SetPosition(v0->unk_00, &v2);
 
         if (v0->unk_14 >= v0->unk_10) {
             v0->unk_14 = 0;
@@ -1030,7 +1030,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;
-            CellActor_SetPosition(v0->unk_00, &v2);
+            Sprite_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1044,7 +1044,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;
-            CellActor_SetPosition(v0->unk_00, &v2);
+            Sprite_SetPosition(v0->unk_00, &v2);
         }
 
         v0->unk_14++;
@@ -1063,7 +1063,7 @@ static void ov21_021E82C8(SysTask *param0, void *param1)
     case 3:
         v2.x = v0->unk_04;
         v2.y = v0->unk_08;
-        CellActor_SetPosition(v0->unk_00, &v2);
+        Sprite_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 ca4fb9b3c1..bc7d917c94 100644
--- a/src/overlay021/ov21_021E8484.c
+++ b/src/overlay021/ov21_021E8484.c
@@ -25,10 +25,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -65,10 +65,10 @@ typedef struct {
 } UnkStruct_ov21_021E88B0;
 
 typedef struct {
-    CellActor *unk_00[1];
+    Sprite *unk_00[1];
     UnkStruct_ov21_021D4CA0 *unk_04[1];
     SpriteResource *unk_08[4];
-    CellActor *unk_18[4];
+    Sprite *unk_18[4];
     int unk_28[1];
     void *unk_2C[1];
 } UnkStruct_ov21_021E8794;
@@ -95,8 +95,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, 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_021E8BE8(UnkStruct_ov21_021E8584 *param0, Sprite *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(Sprite *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);
@@ -352,7 +352,7 @@ static void ov21_021E8794(UnkStruct_ov21_021E8794 *param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_XLU);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_XLU);
     }
 }
@@ -362,7 +362,7 @@ static void ov21_021E87AC(UnkStruct_ov21_021E8794 *param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0], GX_OAM_MODE_NORMAL);
         sub_02012AF0(param0->unk_04[v0]->unk_00, GX_OAM_MODE_NORMAL);
     }
 }
@@ -535,14 +535,14 @@ static void ov21_021E8A74(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85
 
 static void ov21_021E8AA8(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E8584 *param1, int param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int v3;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -552,9 +552,9 @@ static void ov21_021E8AA8(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85
     v1.position.y = 144 << FX32_SHIFT;
     v1.position.y += (192 << FX32_SHIFT);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v1);
+    param0->unk_00[0] = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(param0->unk_00[0], 2);
+    Sprite_SetAnim(param0->unk_00[0], 2);
 }
 
 static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0)
@@ -562,7 +562,7 @@ static void ov21_021E8B34(UnkStruct_ov21_021E8794 *param0)
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -610,7 +610,7 @@ static void ov21_021E8BDC(UnkStruct_ov21_021E8794 *param0, UnkStruct_ov21_021E85
     }
 }
 
-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_021E8BE8(UnkStruct_ov21_021E8584 *param0, Sprite *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;
@@ -621,7 +621,7 @@ static void ov21_021E8BE8(UnkStruct_ov21_021E8584 *param0, CellActor *param1, Un
     ov21_021D144C(param1, param3);
     ov21_021E8C94(param1, param2, param4, param8, param9);
 
-    v0 = CellActor_GetAnimFrame(param1);
+    v0 = Sprite_GetAnimFrame(param1);
 
     switch (v0) {
     case 0:
@@ -660,12 +660,12 @@ static void ov21_021E8BE8(UnkStruct_ov21_021E8584 *param0, CellActor *param1, Un
     }
 }
 
-static void ov21_021E8C94(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
+static void ov21_021E8C94(Sprite *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4)
 {
     int v0;
 
     ov21_021D1498(param0, param1, param2);
-    v0 = CellActor_GetAnimFrame(param0);
+    v0 = Sprite_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 1323436fb1..3ca8a28de6 100644
--- a/src/overlay021/ov21_021E8D48.c
+++ b/src/overlay021/ov21_021E8D48.c
@@ -22,7 +22,6 @@
 #include "overlay021/struct_ov21_021E8E0C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -32,6 +31,7 @@
 #include "palette.h"
 #include "pokedex_data_index.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -46,17 +46,17 @@
 #include "res/text/bank/pokedex.h"
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     SpriteResource *unk_04[4];
 } UnkStruct_ov21_021E94F8;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     UnkStruct_ov21_021D4CA0 *unk_04;
 } UnkStruct_ov21_021E95B0;
 
 typedef struct {
-    CellActor *unk_00[2];
+    Sprite *unk_00[2];
     SpriteResource *unk_08[4];
 } UnkStruct_ov21_021E968C;
 
@@ -72,9 +72,9 @@ typedef struct UnkStruct_ov21_021E8D48_t {
     BgConfig *unk_00;
     Window *unk_04;
     PaletteData *unk_08;
-    Sprite *unk_0C;
+    PokemonSprite *unk_0C;
     G2dRenderer unk_10;
-    CellActorCollection *unk_19C;
+    SpriteList *unk_19C;
     SpriteResourceCollection *unk_1A0[4];
     UnkStruct_ov21_021D4C0C *unk_1B0;
     UnkStruct_ov21_021D22F8 unk_1B4;
@@ -90,9 +90,9 @@ typedef struct UnkStruct_ov21_021E8D48_t {
 } UnkStruct_ov21_021E8D48;
 
 static void ov21_021E9828(SysTask *param0, void *param1);
-static void ov21_021E98D8(PaletteData *param0, Sprite *param1);
-static void ov21_021E98F8(PaletteData *param0, Sprite *param1, int param2, int param3, int param4, int param5, int param6);
-static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1);
+static void ov21_021E98D8(PaletteData *param0, PokemonSprite *param1);
+static void ov21_021E98F8(PaletteData *param0, PokemonSprite *param1, int param2, int param3, int param4, int param5, int param6);
+static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1);
 static void ov21_021E8E0C(UnkStruct_ov21_021E8D48 *param0, const UnkStruct_ov21_021E8E0C *param1);
 static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0);
 static void ov21_021E90B0(BgConfig *param0, int param1);
@@ -103,22 +103,22 @@ static void ov21_021E9208(SpriteResourceCollection **param0, int param1);
 static void ov21_021E9228(SpriteResourceCollection **param0);
 static void ov21_021E9240(UnkStruct_ov21_021D22F8 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, int param4);
 static void ov21_021E92B0(UnkStruct_ov21_021D22F8 *param0);
-static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4);
+static PokemonSprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4);
 static void ov21_021E92C4(SpriteResource **param0, SpriteResourceCollection **param1, int param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov21_021E9344(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov21_021E93C4(SpriteResource **param0, SpriteResourceCollection **param1);
-static void ov21_021E93F8(SpriteResource **param0, SpriteResourceCollection **param1, CellActorResourceData *param2, int param3);
+static void ov21_021E93F8(SpriteResource **param0, SpriteResourceCollection **param1, SpriteResourcesHeader *param2, int param3);
 static void ov21_021E9458(UnkStruct_ov21_021E94F8 *param0, SpriteResourceCollection **param1, int param2, int param3);
 static void ov21_021E94A4(UnkStruct_ov21_021E94F8 *param0, SpriteResourceCollection **param1);
-static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3);
+static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3);
 static void ov21_021E94F8(UnkStruct_ov21_021E94F8 *param0);
-static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, SpriteResource **param4);
+static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, SpriteResource **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, SpriteResource *param4);
 static void ov21_021E95B0(UnkStruct_ov21_021E95B0 *param0);
 static void ov21_021E95BC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollection **param1, int param2, int param3, NARC *param4);
 static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollection **param1);
-static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, int param4);
+static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, int param4);
 static void ov21_021E968C(UnkStruct_ov21_021E968C *param0);
 static void ov21_021E96A8(BgConfig *param0, int param1, NARC *param2);
 static void ov21_021E97C4(BgConfig *param0, int param1, NARC *param2);
@@ -178,7 +178,7 @@ BOOL ov21_021E8DEC(const UnkStruct_ov21_021E8D48 *param0)
     return 0;
 }
 
-Sprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0)
+PokemonSprite *ov21_021E8E00(UnkStruct_ov21_021E8D48 *param0)
 {
     return param0->unk_0C;
 }
@@ -266,7 +266,7 @@ static void ov21_021E900C(UnkStruct_ov21_021E8D48 *param0)
     ov21_021D2C58(&param0->unk_1B4, param0->unk_1A0);
     ov21_021E9228(param0->unk_1A0);
 
-    CellActorCollection_Delete(param0->unk_19C);
+    SpriteList_Delete(param0->unk_19C);
 
     ov21_021E91F0(param0->unk_04);
     ov21_021E9194(param0->unk_00);
@@ -477,7 +477,7 @@ static void ov21_021E93C4(SpriteResource **param0, SpriteResourceCollection **pa
     SpriteResourceCollection_Remove(param1[3], param0[3]);
 }
 
-static void ov21_021E93F8(SpriteResource **param0, SpriteResourceCollection **param1, CellActorResourceData *param2, int param3)
+static void ov21_021E93F8(SpriteResource **param0, SpriteResourceCollection **param1, SpriteResourcesHeader *param2, int param3)
 {
     SpriteResourcesHeader_Init(param2, SpriteResource_GetID(param0[0]), SpriteResource_GetID(param0[1]), SpriteResource_GetID(param0[2]), SpriteResource_GetID(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL);
 }
@@ -498,14 +498,14 @@ static void ov21_021E94A4(UnkStruct_ov21_021E94F8 *param0, SpriteResourceCollect
     ov21_021E93C4(param0->unk_04, param1);
 }
 
-static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3)
+static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3)
 {
-    CellActorInitParams v0;
-    CellActorResourceData v1;
+    SpriteListTemplate v0;
+    SpriteResourcesHeader v1;
 
     ov21_021E93F8(param0->unk_04, param2, &v1, 2);
 
-    v0.collection = param1;
+    v0.list = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -513,23 +513,23 @@ static void ov21_021E94B0(UnkStruct_ov21_021E94F8 *param0, CellActorCollection *
     v0.position.x = (120 * FX32_ONE);
     v0.position.y = (88 * FX32_ONE);
 
-    param0->unk_00 = CellActorCollection_Add(&v0);
+    param0->unk_00 = SpriteList_Add(&v0);
     GF_ASSERT(param0->unk_00);
 }
 
 static void ov21_021E94F8(UnkStruct_ov21_021E94F8 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
 }
 
-static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, SpriteResource **param4)
+static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, SpriteResource **param4)
 {
-    CellActorInitParams v0;
-    CellActorResourceData v1;
+    SpriteListTemplate v0;
+    SpriteResourcesHeader v1;
 
     ov21_021E93F8(param4, param2, &v1, 2);
 
-    v0.collection = param1;
+    v0.list = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -537,15 +537,15 @@ static void ov21_021E9504(UnkStruct_ov21_021E95B0 *param0, CellActorCollection *
     v0.position.x = (192 * FX32_ONE);
     v0.position.y = (52 * FX32_ONE);
 
-    param0->unk_00 = CellActorCollection_Add(&v0);
+    param0->unk_00 = SpriteList_Add(&v0);
 
     GF_ASSERT(param0->unk_00);
-    CellActor_SetAnim(param0->unk_00, 0x11);
+    Sprite_SetAnim(param0->unk_00, 0x11);
 }
 
 static void ov21_021E9554(UnkStruct_ov21_021E95B0 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
 }
 
 static void ov21_021E9560(UnkStruct_ov21_021E95B0 *param0, UnkStruct_ov21_021D4C0C *param1, int param2, int param3, SpriteResource *param4)
@@ -586,10 +586,10 @@ static void ov21_021E95EC(UnkStruct_ov21_021E968C *param0, SpriteResourceCollect
     ov21_021E93C4(param0->unk_08, param1);
 }
 
-static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, int param4)
+static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, int param4)
 {
-    CellActorInitParams v0;
-    CellActorResourceData v1;
+    SpriteListTemplate v0;
+    SpriteResourcesHeader v1;
     int type1, type2;
 
     type1 = SpeciesData_GetSpeciesValue(param4, SPECIES_DATA_TYPE_1);
@@ -599,7 +599,7 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *
 
     ov21_021E93F8(param0->unk_08, param2, &v1, 2);
 
-    v0.collection = param1;
+    v0.list = param1;
     v0.resourceData = &v1;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.priority = 32;
@@ -607,15 +607,15 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *
     v0.position.x = (170 * FX32_ONE);
     v0.position.y = (72 * FX32_ONE);
 
-    param0->unk_00[0] = CellActorCollection_Add(&v0);
+    param0->unk_00[0] = SpriteList_Add(&v0);
 
-    CellActor_SetAnim(param0->unk_00[0], 0 + type1);
+    Sprite_SetAnim(param0->unk_00[0], 0 + type1);
 
     if (type1 != type2) {
         v0.position.x = (220 * FX32_ONE);
         v0.position.y = (72 * FX32_ONE);
-        param0->unk_00[1] = CellActorCollection_Add(&v0);
-        CellActor_SetAnim(param0->unk_00[1], 0 + type2);
+        param0->unk_00[1] = SpriteList_Add(&v0);
+        Sprite_SetAnim(param0->unk_00[1], 0 + type2);
     } else {
         param0->unk_00[1] = NULL;
     }
@@ -624,11 +624,11 @@ static void ov21_021E95F8(UnkStruct_ov21_021E968C *param0, CellActorCollection *
 static void ov21_021E968C(UnkStruct_ov21_021E968C *param0)
 {
     if (param0->unk_00[0]) {
-        CellActor_Delete(param0->unk_00[0]);
+        Sprite_Delete(param0->unk_00[0]);
     }
 
     if (param0->unk_00[1]) {
-        CellActor_Delete(param0->unk_00[1]);
+        Sprite_Delete(param0->unk_00[1]);
     }
 }
 
@@ -711,23 +711,23 @@ static void ov21_021E9828(SysTask *param0, void *param1)
         ov21_021E9A9C(&v0->unk_228);
     }
 
-    CellActorCollection_Update(v0->unk_19C);
+    SpriteList_Update(v0->unk_19C);
 }
 
-static void ov21_021E98D8(PaletteData *param0, Sprite *param1)
+static void ov21_021E98D8(PaletteData *param0, PokemonSprite *param1)
 {
     PaletteData_LoadBufferFromHardware(param0, 0, 0, 32 * 0x10);
     PaletteData_LoadBufferFromHardware(param0, 2, 0, (((16 - 2) * 16) * sizeof(u16)));
 }
 
-static void ov21_021E98F8(PaletteData *param0, Sprite *param1, int param2, int param3, int param4, int param5, int param6)
+static void ov21_021E98F8(PaletteData *param0, PokemonSprite *param1, int param2, int param3, int param4, int param5, int param6)
 {
     sub_020086FC(param1, param2, param4, param5, param6);
     PaletteData_StartFade(param0, 0x1 | 0x4, 0xffff, param5, param3, param4, param6);
     PaletteData_SetAutoTransparent(param0, 0);
 }
 
-static BOOL ov21_021E9948(PaletteData *param0, Sprite *param1)
+static BOOL ov21_021E9948(PaletteData *param0, PokemonSprite *param1)
 {
     BOOL v0[2];
 
@@ -759,7 +759,7 @@ static void ov21_021E998C(Window *param0, enum HeapId heapID)
     MessageLoader_Free(pokedexMessageBank);
 }
 
-static Sprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4)
+static PokemonSprite *ov21_021E99E0(UnkStruct_02007768 *param0, Pokemon *param1, int param2, int param3, int param4)
 {
     ArchivedSprite v0;
 
diff --git a/src/overlay021/pokedex_enc_data.c b/src/overlay021/pokedex_enc_data.c
index 7a77a27060..59ffb7f639 100644
--- a/src/overlay021/pokedex_enc_data.c
+++ b/src/overlay021/pokedex_enc_data.c
@@ -3,10 +3,10 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 
 enum PokedexEncFileIndex {
     PEFI_DUNGEONMORNING = 4,
@@ -136,7 +136,7 @@ u32 PokedexEncData_LocateVisibleFields(u8 *pokedexFieldMap, int mapHeight, int m
     return numVisibleFields;
 }
 
-void PokedexEncData_LocateDungeonOnMap(CellActor *cellActor, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinates, int animID, int coronetAnimID)
+void PokedexEncData_LocateDungeonOnMap(Sprite *cellActor, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinates, int animID, int coronetAnimID)
 {
     VecFx32 position;
 
@@ -145,16 +145,16 @@ void PokedexEncData_LocateDungeonOnMap(CellActor *cellActor, int xOffset, int yO
     position.x <<= FX32_SHIFT;
     position.y <<= FX32_SHIFT;
 
-    CellActor_SetPosition(cellActor, &position);
+    Sprite_SetPosition(cellActor, &position);
 
     if (dungeonCoordinates->isMtCoronet) {
-        CellActor_SetAnim(cellActor, coronetAnimID);
+        Sprite_SetAnim(cellActor, coronetAnimID);
     } else {
-        CellActor_SetAnim(cellActor, animID);
+        Sprite_SetAnim(cellActor, animID);
     }
 }
 
-int PokedexEncData_LocateVisibleDungeons(CellActor **cellActorArray, int initialNumVisibleDungeons, int maxNumDungeons, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinatesArray, const EncounterLocations *encounterLocations, int animID, int coronetAnimID, const u8 *invisibleDungeons, u32 numInvisibleDungeons, u32 *cellActorsModified)
+int PokedexEncData_LocateVisibleDungeons(Sprite **cellActorArray, int initialNumVisibleDungeons, int maxNumDungeons, int xOffset, int yOffset, int xScale, int yScale, const DungeonCoordinates *dungeonCoordinatesArray, const EncounterLocations *encounterLocations, int animID, int coronetAnimID, const u8 *invisibleDungeons, u32 numInvisibleDungeons, u32 *cellActorsModified)
 {
     int locationIndex, skipIndex;
     int numVisibleDungeons = initialNumVisibleDungeons;
diff --git a/src/overlay021/pokedex_height_check.c b/src/overlay021/pokedex_height_check.c
index 54075a569f..6db48cab2c 100644
--- a/src/overlay021/pokedex_height_check.c
+++ b/src/overlay021/pokedex_height_check.c
@@ -20,7 +20,6 @@
 #include "overlay021/struct_ov21_021E6B20.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "message.h"
@@ -28,6 +27,7 @@
 #include "narc.h"
 #include "pokedex_data_index.h"
 #include "pokedex_heightweight.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -49,7 +49,7 @@ typedef struct {
 
 typedef struct {
     SpriteResource *heightCheckGraphics[4];
-    CellActor *trainerHeightCellActor;
+    Sprite *trainerHeightCellActor;
 } HeightCheckVisuals;
 
 static UnkStruct_ov21_021E6104 *ov21_021E608C(enum HeapId heapID, UnkStruct_ov21_021D0F60 *param1);
@@ -82,10 +82,10 @@ static void DisplayHeightLabels(UnkStruct_ov21_021E6118 *param0, enum HeapId hea
 static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1, enum HeapId heapID);
 static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1);
 static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0);
-static void SetTrainerPosition(CellActor *trainerHeightCellActor, short trainerPos);
-static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos);
-static void SetTrainerScale(CellActor *trainerHeightCellActor, short trainerScale);
-static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale);
+static void SetTrainerPosition(Sprite *trainerHeightSprite, short trainerPos);
+static void SetSpeciesPosition(PokemonSprite *speciesSprite, short pokemonPos);
+static void SetTrainerScale(Sprite *trainerHeightSprite, short trainerScale);
+static void SetSpeciesScale(PokemonSprite *speciesSprite, short pokemonScale);
 
 void ov21_021E6014(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, enum HeapId heapID)
 {
@@ -264,12 +264,12 @@ static int ov21_021E6204(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
 
 static void SetTrainerHeightLarge(HeightCheckVisuals *heightCheckVisuals)
 {
-    CellActor_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_XLU);
+    Sprite_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_XLU);
 }
 
 static void SetTrainerHeightNormal(HeightCheckVisuals *heightCheckVisuals)
 {
-    CellActor_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_NORMAL);
+    Sprite_SetExplicitOAMMode(heightCheckVisuals->trainerHeightCellActor, GX_OAM_MODE_NORMAL);
 }
 
 static void ov21_021E628C(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, BOOL param3)
@@ -347,42 +347,42 @@ static void GetHeightCheckGraphics(HeightCheckVisuals *heightCheckVisuals, UnkSt
     UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
     NARC *pokedexGraphicsNarc = ov21_021D26E0(v0);
 
-    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_TILES] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphicsNarc, 93, 1, 93 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
 
-    SpriteTransfer_RequestCharAtEnd(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_TILES]);
+    SpriteTransfer_RequestCharAtEnd(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]);
 
-    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PALETTE] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID);
+    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphicsNarc, 14, 0, 14 + 7000, NNS_G2D_VRAM_TYPE_2DMAIN, 5, heapID);
 
-    SpriteTransfer_RequestPlttFreeSpace(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PALETTE]);
-    SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_RequestPlttFreeSpace(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]);
+    SpriteResource_ReleaseData(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]);
 
-    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_SPRITE] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID);
-    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_SPRITE_ANIM] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID);
+    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphicsNarc, 91, 1, 91 + 7000, 2, heapID);
+    heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphicsNarc, 92, 1, 92 + 7000, 3, heapID);
 }
 
 static void FreeSprites(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1)
 {
     UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
 
-    SpriteTransfer_ResetCharTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteTransfer_ResetPlttTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PALETTE]);
-    SpriteResourceCollection_Remove(v0->unk_13C[0], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteResourceCollection_Remove(v0->unk_13C[1], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PALETTE]);
-    SpriteResourceCollection_Remove(v0->unk_13C[2], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_SPRITE]);
-    SpriteResourceCollection_Remove(v0->unk_13C[3], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_SPRITE_ANIM]);
+    SpriteTransfer_ResetCharTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteTransfer_ResetPlttTransfer(heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]);
+    SpriteResourceCollection_Remove(v0->unk_13C[0], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteResourceCollection_Remove(v0->unk_13C[1], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_PLTT]);
+    SpriteResourceCollection_Remove(v0->unk_13C[2], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_CELL]);
+    SpriteResourceCollection_Remove(v0->unk_13C[3], heightCheckVisuals->heightCheckGraphics[SPRITE_RESOURCE_ANIM]);
 }
 
 static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID)
 {
-    CellActorResourceData trainerResource;
-    CellActorInitParams trainerCellParams;
+    SpriteResourcesHeader trainerResource;
+    SpriteListTemplate trainerCellParams;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
     int species = PokedexSort_CurrentSpecies(param2->unk_04);
 
     SpriteResourcesHeader_Init(&trainerResource, 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);
 
-    trainerCellParams.collection = v2->unk_138;
+    trainerCellParams.list = v2->unk_138;
     trainerCellParams.resourceData = &trainerResource;
     trainerCellParams.priority = 31;
     trainerCellParams.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -394,12 +394,12 @@ static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStru
     trainerCellParams.position.x = 168 << FX32_SHIFT;
     trainerCellParams.position.y = (88 + trainerPos) << FX32_SHIFT;
 
-    heightCheckVisuals->trainerHeightCellActor = CellActorCollection_Add(&trainerCellParams);
+    heightCheckVisuals->trainerHeightCellActor = SpriteList_Add(&trainerCellParams);
 
     if (PokedexSort_TrainerGender(param2->unk_04) == GENDER_MALE) {
-        CellActor_SetAnim(heightCheckVisuals->trainerHeightCellActor, 5);
+        Sprite_SetAnim(heightCheckVisuals->trainerHeightCellActor, 5);
     } else {
-        CellActor_SetAnim(heightCheckVisuals->trainerHeightCellActor, 6);
+        Sprite_SetAnim(heightCheckVisuals->trainerHeightCellActor, 6);
     }
 
     SetTrainerPosition(heightCheckVisuals->trainerHeightCellActor, trainerPos);
@@ -408,7 +408,7 @@ static void DisplayTrainerHeight(HeightCheckVisuals *heightCheckVisuals, UnkStru
 
 static void FreeTrainerHeight(HeightCheckVisuals *heightCheckVisuals)
 {
-    CellActor_Delete(heightCheckVisuals->trainerHeightCellActor);
+    Sprite_Delete(heightCheckVisuals->trainerHeightCellActor);
 }
 
 static void DummyForMatching2(HeightCheckVisuals *heightCheckVisuals, UnkStruct_ov21_021E6118 *param1, const UnkStruct_ov21_021E6104 *param2, enum HeapId heapID)
@@ -482,7 +482,7 @@ static void DisplayHeightValues(UnkStruct_ov21_021E6118 *param0, const UnkStruct
 
 static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_021E6104 *param1)
 {
-    Sprite *speciesSprite = ov21_021D2170(param0->unk_00);
+    PokemonSprite *speciesSprite = ov21_021D2170(param0->unk_00);
     int species = PokedexSort_CurrentSpecies(param1->unk_04);
 
     short pokemonPos = Pokedex_HeightWeightData_PokemonPos(param1->unk_04->HWData, species);
@@ -499,38 +499,38 @@ static void DisplaySpeciesHeight(UnkStruct_ov21_021E6118 *param0, const UnkStruc
 
 static void ClearSpeciesSprite(UnkStruct_ov21_021E6118 *param0)
 {
-    Sprite *speciesSprite = ov21_021D2170(param0->unk_00);
+    PokemonSprite *speciesSprite = ov21_021D2170(param0->unk_00);
 
     sub_02007DEC(speciesSprite, 6, 1);
     sub_02008780(speciesSprite);
 }
 
-static void SetTrainerPosition(CellActor *trainerHeightCellActor, short trainerPos)
+static void SetTrainerPosition(Sprite *trainerHeightSprite, short trainerPos)
 {
     VecFx32 position;
 
     position.x = 168 << FX32_SHIFT;
     position.y = (88 + trainerPos) << FX32_SHIFT;
 
-    CellActor_SetPosition(trainerHeightCellActor, &position);
+    Sprite_SetPosition(trainerHeightSprite, &position);
 }
 
-static void SetSpeciesPosition(Sprite *speciesSprite, short pokemonPos)
+static void SetSpeciesPosition(PokemonSprite *speciesSprite, short pokemonPos)
 {
     sub_02007DEC(speciesSprite, 1, 88 + pokemonPos);
 }
 
-static void SetTrainerScale(CellActor *trainerHeightCellActor, short trainerScale)
+static void SetTrainerScale(Sprite *trainerHeightSprite, short trainerScale)
 {
     VecFx32 scale;
 
     scale.x = FX_Div(0x100 << FX32_SHIFT, trainerScale << FX32_SHIFT);
     scale.y = scale.x;
 
-    CellActor_SetAffineScaleEx(trainerHeightCellActor, &scale, 2);
+    Sprite_SetAffineScaleEx(trainerHeightSprite, &scale, 2);
 }
 
-static void SetSpeciesScale(Sprite *speciesSprite, short pokemonScale)
+static void SetSpeciesScale(PokemonSprite *speciesSprite, short pokemonScale)
 {
     fx32 scale = FX_Div(0x100 << FX32_SHIFT, pokemonScale << FX32_SHIFT);
     pokemonScale = FX_Mul(scale, 0x100 << FX32_SHIFT) >> FX32_SHIFT;
diff --git a/src/overlay021/pokedex_search.c b/src/overlay021/pokedex_search.c
index ccae15d2fc..fff9f52f8d 100644
--- a/src/overlay021/pokedex_search.c
+++ b/src/overlay021/pokedex_search.c
@@ -22,10 +22,10 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -76,10 +76,10 @@ typedef struct {
     enum FilterForm filterForm;
     BOOL noneFound;
     int noneFoundTimer;
-    CellActor *form;
+    Sprite *form;
     SpriteResource *searchGraphics[4];
     PokedexLoadingScreen loadingScreen;
-    CellActor *pokeball;
+    Sprite *pokeball;
     void *tileMap;
     NNSG2dScreenData *screenData;
 } PokedexSearchDisplay;
@@ -587,7 +587,7 @@ static void FreeDisplayMap(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_0
 
 static void ov21_021D8C00(UnkStruct_ov21_021D879C *param0)
 {
-    Sprite *v0 = ov21_021D2170(param0->unk_00);
+    PokemonSprite *v0 = ov21_021D2170(param0->unk_00);
 
     sub_02007DEC(v0, 6, 1);
     sub_02008780(v0);
@@ -598,42 +598,42 @@ static void GetSearchGraphics(PokedexSearchDisplay *searchDisplay, UnkStruct_ov2
     UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
     NARC *pokedexGraphics = ov21_021D26E0(v0);
 
-    searchDisplay->searchGraphics[SPRITE_RESOURCE_TILES] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphics, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
+    searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR] = SpriteResourceCollection_AddTilesFrom(v0->unk_13C[0], pokedexGraphics, 81, 1, 81 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, heapID);
 
-    SpriteTransfer_RequestCharAtEnd(searchDisplay->searchGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_TILES]);
+    SpriteTransfer_RequestCharAtEnd(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]);
 
-    searchDisplay->searchGraphics[SPRITE_RESOURCE_PALETTE] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphics, 3, 0, 3 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, 12, heapID);
+    searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT] = SpriteResourceCollection_AddPaletteFrom(v0->unk_13C[1], pokedexGraphics, 3, 0, 3 + 15000, NNS_G2D_VRAM_TYPE_2DMAIN, 12, heapID);
 
-    SpriteTransfer_RequestPlttFreeSpace(searchDisplay->searchGraphics[SPRITE_RESOURCE_PALETTE]);
-    SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_RequestPlttFreeSpace(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]);
+    SpriteResource_ReleaseData(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]);
 
-    searchDisplay->searchGraphics[SPRITE_RESOURCE_SPRITE] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphics, 79, 1, 79 + 15000, SPRITE_RESOURCE_SPRITE, heapID);
-    searchDisplay->searchGraphics[SPRITE_RESOURCE_SPRITE_ANIM] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphics, 80, 1, 80 + 15000, SPRITE_RESOURCE_SPRITE_ANIM, heapID);
+    searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL] = SpriteResourceCollection_AddFrom(v0->unk_13C[2], pokedexGraphics, 79, 1, 79 + 15000, SPRITE_RESOURCE_CELL, heapID);
+    searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM] = SpriteResourceCollection_AddFrom(v0->unk_13C[3], pokedexGraphics, 80, 1, 80 + 15000, SPRITE_RESOURCE_ANIM, heapID);
 }
 
 static void FreeSearchGraphics(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_021D879C *param1)
 {
     UnkStruct_ov21_021D13FC *v0 = param1->unk_00;
 
-    SpriteTransfer_ResetCharTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteTransfer_ResetPlttTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_ResetCharTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteTransfer_ResetPlttTransfer(searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]);
 
-    SpriteResourceCollection_Remove(v0->unk_13C[0], searchDisplay->searchGraphics[SPRITE_RESOURCE_TILES]);
-    SpriteResourceCollection_Remove(v0->unk_13C[1], searchDisplay->searchGraphics[SPRITE_RESOURCE_PALETTE]);
-    SpriteResourceCollection_Remove(v0->unk_13C[2], searchDisplay->searchGraphics[SPRITE_RESOURCE_SPRITE]);
-    SpriteResourceCollection_Remove(v0->unk_13C[3], searchDisplay->searchGraphics[SPRITE_RESOURCE_SPRITE_ANIM]);
+    SpriteResourceCollection_Remove(v0->unk_13C[0], searchDisplay->searchGraphics[SPRITE_RESOURCE_CHAR]);
+    SpriteResourceCollection_Remove(v0->unk_13C[1], searchDisplay->searchGraphics[SPRITE_RESOURCE_PLTT]);
+    SpriteResourceCollection_Remove(v0->unk_13C[2], searchDisplay->searchGraphics[SPRITE_RESOURCE_CELL]);
+    SpriteResourceCollection_Remove(v0->unk_13C[3], searchDisplay->searchGraphics[SPRITE_RESOURCE_ANIM]);
 }
 
 static void InitCellActors(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_021D879C *param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     UnkStruct_ov21_021D13FC *v2 = param1->unk_00;
 
     SpriteResourcesHeader_Init(&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.collection = v2->unk_138;
+    v1.list = v2->unk_138;
     v1.resourceData = &v0;
     v1.priority = 31;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -641,25 +641,25 @@ static void InitCellActors(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_0
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 164 << FX32_SHIFT;
-    searchDisplay->form = CellActorCollection_Add(&v1);
+    searchDisplay->form = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(searchDisplay->form, 3);
+    Sprite_SetAnim(searchDisplay->form, 3);
 
     v1.position.x = 128 << FX32_SHIFT;
     v1.position.y = 96 << FX32_SHIFT;
 
-    searchDisplay->pokeball = CellActorCollection_Add(&v1);
+    searchDisplay->pokeball = SpriteList_Add(&v1);
 
-    CellActor_SetAnim(searchDisplay->pokeball, 17);
-    CellActor_SetDrawFlag(searchDisplay->pokeball, FALSE);
-    CellActor_SetAffineOverwriteMode(searchDisplay->pokeball, AFFINE_OVERWRITE_MODE_NORMAL);
-    CellActor_SetExplicitPriority(searchDisplay->pokeball, 0);
+    Sprite_SetAnim(searchDisplay->pokeball, 17);
+    Sprite_SetDrawFlag(searchDisplay->pokeball, FALSE);
+    Sprite_SetAffineOverwriteMode(searchDisplay->pokeball, AFFINE_OVERWRITE_MODE_NORMAL);
+    Sprite_SetExplicitPriority(searchDisplay->pokeball, 0);
 }
 
 static void FreeCellActors(PokedexSearchDisplay *searchDisplay)
 {
-    CellActor_Delete(searchDisplay->form);
-    CellActor_Delete(searchDisplay->pokeball);
+    Sprite_Delete(searchDisplay->form);
+    Sprite_Delete(searchDisplay->pokeball);
 }
 
 static void DescriptionMessage(UnkStruct_ov21_021D879C *param0, int filterMethod, enum HeapId heapID)
@@ -954,52 +954,52 @@ static void FilterType2Message(UnkStruct_ov21_021D879C *param0, int typeFilter2,
 static void FilterFormSilhouette(PokedexSearchDisplay *searchDisplay, int filterForm)
 {
     if (filterForm == FF_NONE) {
-        CellActor_SetDrawFlag(searchDisplay->form, 0);
+        Sprite_SetDrawFlag(searchDisplay->form, 0);
     } else {
-        CellActor_SetDrawFlag(searchDisplay->form, 1);
+        Sprite_SetDrawFlag(searchDisplay->form, 1);
 
         switch (filterForm) {
         case FF_QUADRUPED:
-            CellActor_SetAnim(searchDisplay->form, 3);
+            Sprite_SetAnim(searchDisplay->form, 3);
             break;
         case FF_BIPEDALTAILLESS:
-            CellActor_SetAnim(searchDisplay->form, 4);
+            Sprite_SetAnim(searchDisplay->form, 4);
             break;
         case FF_BIPEDALTAILED:
-            CellActor_SetAnim(searchDisplay->form, 5);
+            Sprite_SetAnim(searchDisplay->form, 5);
             break;
         case FF_SERPENTINE:
-            CellActor_SetAnim(searchDisplay->form, 6);
+            Sprite_SetAnim(searchDisplay->form, 6);
             break;
         case FF_MULTIWINGED:
-            CellActor_SetAnim(searchDisplay->form, 7);
+            Sprite_SetAnim(searchDisplay->form, 7);
             break;
         case FF_WINGED:
-            CellActor_SetAnim(searchDisplay->form, 8);
+            Sprite_SetAnim(searchDisplay->form, 8);
             break;
         case FF_INSECTOID:
-            CellActor_SetAnim(searchDisplay->form, 9);
+            Sprite_SetAnim(searchDisplay->form, 9);
             break;
         case FF_HEADBASE:
-            CellActor_SetAnim(searchDisplay->form, 10);
+            Sprite_SetAnim(searchDisplay->form, 10);
             break;
         case FF_HEADARMS:
-            CellActor_SetAnim(searchDisplay->form, 11);
+            Sprite_SetAnim(searchDisplay->form, 11);
             break;
         case FF_HEADLEGS:
-            CellActor_SetAnim(searchDisplay->form, 12);
+            Sprite_SetAnim(searchDisplay->form, 12);
             break;
         case FF_TENTACLES:
-            CellActor_SetAnim(searchDisplay->form, 13);
+            Sprite_SetAnim(searchDisplay->form, 13);
             break;
         case FF_FINS:
-            CellActor_SetAnim(searchDisplay->form, 14);
+            Sprite_SetAnim(searchDisplay->form, 14);
             break;
         case FF_HEAD:
-            CellActor_SetAnim(searchDisplay->form, 15);
+            Sprite_SetAnim(searchDisplay->form, 15);
             break;
         case FF_MULTIBODY:
-            CellActor_SetAnim(searchDisplay->form, 16);
+            Sprite_SetAnim(searchDisplay->form, 16);
             break;
         default:
             break;
@@ -1025,10 +1025,10 @@ static void LoadingScreenTransition(PokedexSearchDisplay *searchDisplay, UnkStru
 static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, UnkStruct_ov21_021D879C *param1, const PokedexSearchSettings *searchSettings, enum HeapId heapID)
 {
     if (searchSettings->screenTimer == 32) {
-        CellActor_SetDrawFlag(searchDisplay->pokeball, TRUE);
+        Sprite_SetDrawFlag(searchDisplay->pokeball, TRUE);
         SearchingMessage(param1, heapID);
     } else if (searchSettings->screenTimer == 0) {
-        CellActor_SetDrawFlag(searchDisplay->pokeball, FALSE);
+        Sprite_SetDrawFlag(searchDisplay->pokeball, FALSE);
         Window_FillTilemap(&param1->unk_00->unk_04, 0);
         Window_ScheduleCopyToVRAM(&param1->unk_00->unk_04);
     }
@@ -1037,7 +1037,7 @@ static void LoadingScreenAnimation(PokedexSearchDisplay *searchDisplay, UnkStruc
     int angle = ((180 * 0xffff) / 360) * time;
     angle = angle / 4;
 
-    CellActor_SetAffineZRotation(searchDisplay->pokeball, (u16)angle);
+    Sprite_SetAffineZRotation(searchDisplay->pokeball, (u16)angle);
 }
 
 static void SearchingMessage(UnkStruct_ov21_021D879C *param0, enum HeapId heapID)
diff --git a/src/overlay022/ov22_02255094.c b/src/overlay022/ov22_02255094.c
index 28ba96b276..29bfddec74 100644
--- a/src/overlay022/ov22_02255094.c
+++ b/src/overlay022/ov22_02255094.c
@@ -16,7 +16,6 @@
 #include "overlay022/struct_ov22_0225A0E4.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -25,6 +24,7 @@
 #include "pltt_transfer.h"
 #include "render_oam.h"
 #include "resource_collection.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -149,14 +149,14 @@ void ov22_022551D0(UnkStruct_ov22_0225A0E4 *param0)
     sub_020151EC(param0->unk_00);
 }
 
-CellActor *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3, int param4, int param5)
+Sprite *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2, int param3, int param4, int param5)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
 
     SpriteResourcesHeader_Init(&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.collection = param0->unk_44;
+    v1.list = param0->unk_44;
     v1.resourceData = &v0;
     v1.position.x = param2 << FX32_SHIFT;
     v1.position.y = param3 << FX32_SHIFT;
@@ -165,7 +165,7 @@ CellActor *ov22_022551E4(UnkStruct_ov22_0225A0E4 *param0, int param1, int param2
     v1.vramType = param5;
     v1.heapID = 14;
 
-    return CellActorCollection_Add(&v1);
+    return SpriteList_Add(&v1);
 }
 
 void ov22_02255248(UnkStruct_ov22_0225A0E4 *param0, NARC *param1, int param2, BOOL param3, int param4, int param5)
@@ -719,7 +719,7 @@ static void ov22_022559F8(UnkStruct_ov22_0225A0E4 *param0)
 
 static void ov22_02255A98(UnkStruct_ov22_0225A0E4 *param0)
 {
-    CellActorCollection_Delete(param0->unk_44);
+    SpriteList_Delete(param0->unk_44);
 
     {
         int v0;
@@ -736,7 +736,7 @@ static void ov22_02255A98(UnkStruct_ov22_0225A0E4 *param0)
 
 static void ov22_02255AC0(UnkStruct_ov22_0225A0E4 *param0)
 {
-    CellActorCollection_Update(param0->unk_44);
+    SpriteList_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 5af4cae66e..0dcc593d64 100644
--- a/src/overlay022/ov22_02255D44.c
+++ b/src/overlay022/ov22_02255D44.c
@@ -50,7 +50,6 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "game_records.h"
@@ -61,6 +60,7 @@
 #include "pokemon.h"
 #include "render_text.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -439,7 +439,7 @@ int ov22_02256174(OverlayManager *param0, int *param1)
     ov22_0225894C(v2->unk_18, &v0->unk_1E8);
     ov22_022566C0(v0);
 
-    CellActorCollection_SetActive(v0->unk_00.unk_44, 0);
+    SpriteList_SetActive(v0->unk_00.unk_44, 0);
     sub_02039734();
     ReserveVramForWirelessIconChars(NNS_G2D_VRAM_TYPE_2DMAIN, GX_OBJVRAMMODE_CHAR_1D_32K);
     ReserveSlotsForWirelessIconPalette(NNS_G2D_VRAM_TYPE_2DMAIN);
@@ -1274,7 +1274,7 @@ static void ov22_0225718C(UnkStruct_ov22_02255D44 *param0)
     ov22_022568DC(param0);
 
     sub_0200F344(0, 0x0);
-    CellActorCollection_SetActive(param0->unk_00.unk_44, 1);
+    SpriteList_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 30fbe4e3cd..e7d5769929 100644
--- a/src/overlay022/ov22_02259C58.c
+++ b/src/overlay022/ov22_02259C58.c
@@ -16,12 +16,12 @@
 #include "overlay022/struct_ov22_0225A154.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "error_handling.h"
 #include "font.h"
 #include "message.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -52,7 +52,7 @@ void ov22_02259C58(UnkStruct_ov22_02259C58 *param0, UnkStruct_ov22_02259C58_1 *p
     GF_ASSERT(param0);
     GF_ASSERT(param1);
 
-    param0->unk_00 = CellActorCollection_AddEx(param1->unk_00);
+    param0->unk_00 = SpriteList_AddEx(param1->unk_00);
     GF_ASSERT(param0->unk_00);
 
     param0->unk_04 = param1->unk_0C;
@@ -73,7 +73,7 @@ void ov22_02259C9C(UnkStruct_ov22_0225A154 *param0, UnkStruct_ov22_02259C9C *par
 
     v0.unk_00 = param1->unk_14;
     v0.unk_04 = param1->unk_10;
-    v0.unk_08 = param1->unk_00.unk_00->collection;
+    v0.unk_08 = param1->unk_00.unk_00->list;
     v0.unk_0C = param1->unk_18;
     v0.unk_10 = param0->unk_00.unk_00;
     v0.unk_14 = param1->unk_24;
@@ -89,7 +89,7 @@ void ov22_02259C9C(UnkStruct_ov22_0225A154 *param0, UnkStruct_ov22_02259C9C *par
 
 void ov22_02259CE8(UnkStruct_ov22_02259C58 *param0)
 {
-    CellActor_Delete(param0->unk_00);
+    Sprite_Delete(param0->unk_00);
     memset(param0, 0, sizeof(UnkStruct_ov22_02259C58));
 }
 
@@ -147,17 +147,17 @@ static void ov22_02259D94(UnkStruct_ov22_02259C58 *param0, void *param1)
 
 void ov22_02259D98(UnkStruct_ov22_02259C58 *param0)
 {
-    SpriteActor_SetAnimFrame(param0->unk_00, 2);
+    Sprite_SetAnimFrame(param0->unk_00, 2);
 }
 
 void ov22_02259DA4(UnkStruct_ov22_02259C58 *param0)
 {
-    SpriteActor_SetAnimFrame(param0->unk_00, 0);
+    Sprite_SetAnimFrame(param0->unk_00, 0);
 }
 
 void ov22_02259DB0(UnkStruct_ov22_02259C58 *param0)
 {
-    SpriteActor_SetAnimFrame(param0->unk_00, 1);
+    Sprite_SetAnimFrame(param0->unk_00, 1);
 }
 
 void ov22_02259DBC(UnkStruct_ov22_02259D2C *param0, UnkStruct_ov22_0225A0E4 *param1)
@@ -297,12 +297,12 @@ static void ov22_0225A02C(u32 param0, u32 param1, void *param2)
 static void ov22_0225A0E4(UnkStruct_ov22_02259C58 *param0, int param1, UnkStruct_ov22_0225A0E4 *param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_ov22_02259C58_1 v0;
-    CellActorResourceData v1;
-    CellActorInitParamsEx v2;
+    SpriteResourcesHeader v1;
+    AffineSpriteListTemplate v2;
 
     SpriteResourcesHeader_Init(&v1, param1, 0, param1, param1, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, param2->unk_48[0], param2->unk_48[1], param2->unk_48[2], param2->unk_48[3], NULL, NULL);
 
-    v2.collection = param2->unk_44;
+    v2.list = param2->unk_44;
     v2.resourceData = &v1;
     v2.position.x = param3 << 12;
     v2.position.y = param4 << 12;
@@ -322,13 +322,13 @@ static void ov22_0225A0E4(UnkStruct_ov22_02259C58 *param0, int param1, UnkStruct
 static void ov22_0225A154(UnkStruct_ov22_0225A154 *param0, int param1, UnkStruct_ov22_0225A0E4 *param2, const UnkStruct_02012744 *param3, const Window *param4, int param5, int param6, int param7, int param8)
 {
     UnkStruct_ov22_02259C9C v0;
-    CellActorResourceData v1;
-    CellActorInitParamsEx v2;
+    SpriteResourcesHeader v1;
+    AffineSpriteListTemplate v2;
     SpriteResource *v3;
 
     SpriteResourcesHeader_Init(&v1, param1, 0, param1, param1, 0xFFFFFFFF, 0xFFFFFFFF, 0, 0, param2->unk_48[0], param2->unk_48[1], param2->unk_48[2], param2->unk_48[3], NULL, NULL);
 
-    v2.collection = param2->unk_44;
+    v2.list = param2->unk_44;
     v2.resourceData = &v1;
     v2.position.x = param5 << 12;
     v2.position.y = param6 << 12;
@@ -460,11 +460,11 @@ static void ov22_0225A3DC(UnkStruct_ov22_02259C58 *param0, int param1, int param
     const VecFx32 *v0;
     VecFx32 v1;
 
-    v0 = CellActor_GetPosition(param0->unk_00);
+    v0 = Sprite_GetPosition(param0->unk_00);
     v1 = *v0;
     v1.x += param1 << FX32_SHIFT;
     v1.y += param2 << FX32_SHIFT;
-    CellActor_SetPosition(param0->unk_00, &v1);
+    Sprite_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 a082c1545e..89d386c7fe 100644
--- a/src/overlay022/ov22_0225A428.c
+++ b/src/overlay022/ov22_0225A428.c
@@ -16,12 +16,12 @@
 #include "overlay022/struct_ov22_0225AE9C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "message.h"
 #include "narc.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -40,10 +40,10 @@ static s32 ov22_0225A7CC(Window *param0, int param1, int param2, int param3, int
 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, TextColor 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, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, NARC *param4);
+static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, NARC *param4);
 static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1);
 static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, SpriteResourceCollection **param1);
-static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6);
+static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6);
 static void ov22_0225AC58(UnkStruct_ov22_0225AB54 *param0, SpriteResourceCollection **param1);
 static void ov22_0225AC8C(UnkStruct_ov22_0225AB54 *param0);
 static void ov22_0225AD5C(UnkStruct_ov22_0225AB54 *param0);
@@ -54,7 +54,7 @@ static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C *param0);
 static BOOL ov22_0225AF34(const UnkStruct_ov22_0225AE9C *param0);
 static void ov22_0225AA34(SpriteResource **param0, SpriteResourceCollection **param1, int param2, NARC *param3, int param4, int param5, int param6, int param7, int param8, int param9);
 static void ov22_0225AAC0(SpriteResource **param0, SpriteResourceCollection **param1);
-static void ov22_0225AAF4(SpriteResource **param0, SpriteResourceCollection **param1, CellActorResourceData *param2, int param3);
+static void ov22_0225AAF4(SpriteResource **param0, SpriteResourceCollection **param1, SpriteResourcesHeader *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);
 
@@ -283,16 +283,16 @@ static s32 ov22_0225A8B4(Window *param0, int param1, int param2, int param3, int
     return v1;
 }
 
-static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, NARC *param4)
+static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, NARC *param4)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate 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.collection = param1;
+    v1.list = param1;
     v1.resourceData = &v0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.priority = 0;
@@ -307,11 +307,11 @@ static void ov22_0225A914(UnkStruct_ov22_0225A914 *param0, CellActorCollection *
             v1.position.x = 38 + (18 * v3);
             v1.position.x *= FX32_ONE;
 
-            param0->unk_10[(v2 * 10) + v3] = CellActorCollection_Add(&v1);
-            CellActor_SetAnim(param0->unk_10[(v2 * 10) + v3], 1);
+            param0->unk_10[(v2 * 10) + v3] = SpriteList_Add(&v1);
+            Sprite_SetAnim(param0->unk_10[(v2 * 10) + v3], 1);
 
             if (((v2 * 10) + v3) >= param3) {
-                CellActor_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
+                Sprite_SetDrawFlag(param0->unk_10[(v2 * 10) + v3], 0);
             }
         }
     }
@@ -323,11 +323,11 @@ static void ov22_0225A9C8(UnkStruct_ov22_0225A914 *param0, int param1)
 
     if (param0->unk_60 < param1) {
         for (v0 = param0->unk_60; v0 < param1; v0++) {
-            CellActor_SetAnim(param0->unk_10[v0], 0);
+            Sprite_SetAnim(param0->unk_10[v0], 0);
         }
     } else if (param0->unk_60 > param1) {
         for (v0 = param0->unk_60 - 1; v0 >= param1; v0--) {
-            CellActor_SetAnim(param0->unk_10[v0], 1);
+            Sprite_SetAnim(param0->unk_10[v0], 1);
         }
     }
 
@@ -339,7 +339,7 @@ static void ov22_0225AA10(UnkStruct_ov22_0225A914 *param0, SpriteResourceCollect
     int v0;
 
     for (v0 = 0; v0 < 20; v0++) {
-        CellActor_Delete(param0->unk_10[v0]);
+        Sprite_Delete(param0->unk_10[v0]);
     }
 
     ov22_0225AAC0(param0->unk_00, param1);
@@ -371,21 +371,21 @@ static void ov22_0225AAC0(SpriteResource **param0, SpriteResourceCollection **pa
     SpriteResourceCollection_Remove(param1[3], param0[3]);
 }
 
-static void ov22_0225AAF4(SpriteResource **param0, SpriteResourceCollection **param1, CellActorResourceData *param2, int param3)
+static void ov22_0225AAF4(SpriteResource **param0, SpriteResourceCollection **param1, SpriteResourcesHeader *param2, int param3)
 {
     SpriteResourcesHeader_Init(param2, SpriteResource_GetID(param0[0]), SpriteResource_GetID(param0[1]), SpriteResource_GetID(param0[2]), SpriteResource_GetID(param0[3]), 0xffffffff, 0xffffffff, 0, param3, param1[0], param1[1], param1[2], param1[3], NULL, NULL);
 }
 
-static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6)
+static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, SpriteList *param1, SpriteResourceCollection **param2, int param3, BgConfig *param4, UnkStruct_02095C60 *param5, NARC *param6)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate 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.collection = param1;
+    v1.list = param1;
     v1.resourceData = &v0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v1.priority = 0;
@@ -396,7 +396,7 @@ static void ov22_0225AB54(UnkStruct_ov22_0225AB54 *param0, CellActorCollection *
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.x = 103 + (v2 * 24);
         v1.position.x *= FX32_ONE;
-        param0->unk_10[v2] = CellActorCollection_Add(&v1);
+        param0->unk_10[v2] = SpriteList_Add(&v1);
     }
 
     param0->unk_1C = param3;
@@ -475,14 +475,14 @@ static void ov22_0225ACE4(UnkStruct_ov22_0225AB54 *param0)
         v1 = v2 / v3;
 
         GF_ASSERT(v1 <= 10);
-        CellActor_SetAnim(param0->unk_10[v0], 0 + v1);
+        Sprite_SetAnim(param0->unk_10[v0], 0 + v1);
 
         v2 -= v1 * v3;
         v3 /= 10;
 
         if (param0->unk_90 == 0) {
             if (param0->unk_1C <= 10) {
-                CellActor_SetExplicitPaletteWithOffset(param0->unk_10[v0], 1);
+                Sprite_SetExplicitPaletteWithOffset(param0->unk_10[v0], 1);
 
                 if (v0 == 2 - 1) {
                     param0->unk_90 = 1;
@@ -540,7 +540,7 @@ static void ov22_0225ADC0(UnkStruct_ov22_0225AB54 *param0, UnkStruct_ov22_0225AE
 
     for (v0 = 0; v0 < 2; v0++) {
         param1->unk_04[v0] = param0->unk_10[v0];
-        CellActor_SetAffineOverwriteMode(param1->unk_04[v0], 2);
+        Sprite_SetAffineOverwriteMode(param1->unk_04[v0], 2);
         v4.x = 103 + (v0 * 24);
         v4.x *= FX32_ONE;
         param1->unk_0C[v0] = v4;
@@ -586,19 +586,19 @@ static void ov22_0225AE9C(UnkStruct_ov22_0225AE9C *param0)
     v0.y = param0->unk_24.unk_00;
     v0.z = param0->unk_24.unk_00;
 
-    CellActor_SetAffineScale(param0->unk_04[0], &v0);
-    CellActor_SetAffineScale(param0->unk_04[1], &v0);
+    Sprite_SetAffineScale(param0->unk_04[0], &v0);
+    Sprite_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;
 
-    CellActor_SetPosition(param0->unk_04[0], &v1);
+    Sprite_SetPosition(param0->unk_04[0], &v1);
 
     v1 = param0->unk_0C[1];
     v1.y -= param0->unk_4C.unk_00;
 
-    CellActor_SetPosition(param0->unk_04[1], &v1);
+    Sprite_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 fbe4342877..96a501664b 100644
--- a/src/overlay022/ov22_0225B660.c
+++ b/src/overlay022/ov22_0225B660.c
@@ -16,7 +16,6 @@
 #include "overlay022/struct_ov22_0225B1BC_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -24,6 +23,7 @@
 #include "message.h"
 #include "overlay_manager.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -40,7 +40,7 @@ typedef struct {
     u32 unk_0C;
     UnkStruct_ov22_0225B1BC *unk_10;
     UnkStruct_ov22_0225A0E4 unk_14;
-    CellActor *unk_1FC;
+    Sprite *unk_1FC;
     Window *unk_200;
 } UnkStruct_ov22_0225B85C;
 
@@ -224,7 +224,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);
 
-    CellActor_SetExplicitPriority(param0->unk_1FC, 1);
+    Sprite_SetExplicitPriority(param0->unk_1FC, 1);
 }
 
 static void ov22_0225BA00(UnkStruct_ov22_0225B85C *param0)
@@ -233,7 +233,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);
-    CellActor_Delete(param0->unk_1FC);
+    Sprite_Delete(param0->unk_1FC);
 }
 
 static void ov22_0225BA40(UnkStruct_ov22_0225B85C *param0)
@@ -283,11 +283,11 @@ static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0)
     GF_ASSERT(v8);
     v5 = StringTemplate_Default(13);
 
-    CellActor_SetAnim(param0->unk_1FC, 5);
+    Sprite_SetAnim(param0->unk_1FC, 5);
     v0.x = 48 << FX32_SHIFT;
     v0.y = 144 << FX32_SHIFT;
     v0.z = 0;
-    CellActor_SetPosition(param0->unk_1FC, &v0);
+    Sprite_SetPosition(param0->unk_1FC, &v0);
 
     v7 = Strbuf_Init(12, 13);
     sub_0202A1A0(param0->unk_00, v7);
@@ -330,7 +330,7 @@ static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0)
     int v8, v9;
     int v10;
 
-    CellActor_SetAnim(param0->unk_1FC, param0->unk_08);
+    Sprite_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 500889d676..671b290aa5 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -25,7 +25,6 @@
 #include "bg_window.h"
 #include "brightness_controller.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
@@ -47,6 +46,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -135,13 +135,13 @@ typedef struct {
     FieldSystem *fieldSystem;
     BgConfig *unk_04;
     MATHRandContext32 unk_08;
-    CellActorCollection *unk_20;
+    SpriteList *unk_20;
     G2dRenderer unk_24;
     SpriteResourceCollection *unk_1B0[4];
     SpriteResource *unk_1C0[8];
-    CellActorResourceData unk_1E0;
-    CellActorResourceData unk_204[2];
-    CellActor *unk_24C[8];
+    SpriteResourcesHeader unk_1E0;
+    SpriteResourcesHeader unk_204[2];
+    Sprite *unk_24C[8];
     UnkStruct_ov23_0223E6F8 unk_26C[250];
     Menu *unk_848;
     UnkStruct_ov23_0223E6F8 *unk_84C[8];
@@ -1253,35 +1253,35 @@ static void ov23_0223ED68(int param0, int param1, BOOL param2, BOOL param3, BOOL
     VecFx32 v3;
 
     if (param2) {
-        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[0], 0);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[0], 0);
     } else {
-        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[0], 1);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[0], 1);
     }
 
     if (param3) {
-        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 2);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[3], 2);
         Sound_PlayEffect(1700);
     } else if (param2) {
-        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 3);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[3], 3);
         Sound_PlayEffect(1698);
     } else {
-        CellActor_SetAnim(Unk_ov23_02257740->unk_24C[3], 4);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[3], 4);
         Sound_PlayEffect(1699);
     }
 
-    CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[0], 1);
-    CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[3], 1);
+    Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[0], 1);
+    Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[3], 1);
 
     v3.x = FX32_ONE * (param0 + 8);
     v3.y = FX32_ONE * (param1 + 8);
 
-    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[0], &v3);
-    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
+    Sprite_SetPosition(Unk_ov23_02257740->unk_24C[0], &v3);
+    Sprite_SetPosition(Unk_ov23_02257740->unk_24C[3], &v3);
 
     if (param4) {
-        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);
+        Sprite_SetAnim(Unk_ov23_02257740->unk_24C[4], 5);
+        Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[4], 1);
+        Sprite_SetPosition(Unk_ov23_02257740->unk_24C[4], &v3);
     }
 }
 
@@ -1383,7 +1383,7 @@ static void ov23_0223F020(UnkStruct_ov23_0223EE80 *param0)
         }
     }
 
-    CellActorCollection_Delete(Unk_ov23_02257740->unk_20);
+    SpriteList_Delete(Unk_ov23_02257740->unk_20);
     RenderOam_Free();
 
     CharTransfer_Free();
@@ -1499,11 +1499,11 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         ov23_02240CFC(v0);
         ov23_02240B84(Unk_ov23_02257740->unk_04);
         ov23_0223FDE0(v0);
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
         break;
     case 14:
         ov23_0223FDE0(v0);
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
 
         v0->unk_08--;
 
@@ -1515,7 +1515,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         }
         break;
     case 15:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
 
         if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1527,7 +1527,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         }
         break;
     case 16:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
 
         if (ov23_022409F0(v0)) {
             v0->unk_00 = 17;
@@ -1537,7 +1537,7 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         }
         break;
     case 17:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
 
         if (Text_IsPrinterActive(Unk_ov23_02257740->unk_A24) == 0) {
             v0->unk_4C--;
@@ -1553,13 +1553,13 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         }
         break;
     case 18:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
         ov23_02254044(ov23_0224219C());
         StartScreenTransition(3, 16, 16, 0x0, 6, 1, 29);
         (v0->unk_00)++;
         break;
     case 19:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
 
         if (IsScreenTransitionDone()) {
             sub_02039794();
@@ -1614,10 +1614,10 @@ static void ov23_0223F118(SysTask *param0, void *param1)
         }
 
         ov23_02240B84(Unk_ov23_02257740->unk_04);
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
         break;
     case 23:
-        CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+        SpriteList_Update(Unk_ov23_02257740->unk_20);
         StartScreenTransition(3, 2, 2, 0x0, 15, 1, 29);
         Sound_PlayEffect(1697);
         v0->unk_00 = 24;
@@ -1627,12 +1627,12 @@ static void ov23_0223F118(SysTask *param0, void *param1)
             int v3;
 
             for (v3 = 0; v3 < 8; v3++) {
-                CellActor_SetDrawFlag(Unk_ov23_02257740->unk_24C[v3], 0);
+                Sprite_SetDrawFlag(Unk_ov23_02257740->unk_24C[v3], 0);
             }
 
             v0->unk_00 = 25;
         } else {
-            CellActorCollection_Update(Unk_ov23_02257740->unk_20);
+            SpriteList_Update(Unk_ov23_02257740->unk_20);
         }
 
         break;
@@ -1998,8 +1998,8 @@ static void ov23_0223FDE0(UnkStruct_ov23_0223EE80 *param0)
                 v4.x = FX32_ONE * v1;
                 v4.y = FX32_ONE * v2;
 
-                CellActor_SetAnim(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
-                CellActor_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
+                Sprite_SetAnim(Unk_ov23_02257740->unk_24C[5 + v3], 8 + v3);
+                Sprite_SetPosition(Unk_ov23_02257740->unk_24C[5 + v3], &v4);
             }
         }
     }
@@ -2364,13 +2364,13 @@ static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            CellActor_SetAnim(Unk_ov23_02257740->unk_24C[2], 6);
-            CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
+            Sprite_SetAnim(Unk_ov23_02257740->unk_24C[2], 6);
+            Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 80;
 
-            CellActor_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
+            Sprite_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     case 1:
@@ -2383,13 +2383,13 @@ static void ov23_022404F8(BgConfig *param0, int param1, int param2, int param3)
         }
 
         if (2 == param3) {
-            CellActor_SetAnim(Unk_ov23_02257740->unk_24C[2], 7);
-            CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
+            Sprite_SetAnim(Unk_ov23_02257740->unk_24C[2], 7);
+            Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[2], 1);
 
             v0.x = FX32_ONE * 232;
             v0.y = FX32_ONE * 152;
 
-            CellActor_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
+            Sprite_SetPosition(Unk_ov23_02257740->unk_24C[2], &v0);
         }
         break;
     }
@@ -2420,7 +2420,7 @@ static void ov23_02240688(BgConfig *param0)
     v4 = 6 - (v1 % 24) / 4;
 
     ov23_02240660(&v0);
-    CellActor_SetAnim(Unk_ov23_02257740->unk_24C[1], v4);
+    Sprite_SetAnim(Unk_ov23_02257740->unk_24C[1], v4);
 
     v1 = v1 + 8;
     v2 = ((26 * 8) - v1) / 8;
@@ -2652,7 +2652,7 @@ static void ov23_02240B84(BgConfig *param0)
     v3.x -= Unk_ov23_02257740->unk_A2D * FX32_ONE;
     v3.y -= Unk_ov23_02257740->unk_A2E * FX32_ONE;
 
-    CellActor_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3);
+    Sprite_SetPosition(Unk_ov23_02257740->unk_24C[1], &v3);
 }
 
 static void ov23_02240C94(BgConfig *param0)
@@ -2801,12 +2801,12 @@ static void ov23_02240E88(void)
 static void ov23_0224108C(void)
 {
     int v0, v1;
-    CellActorInitParamsEx v2;
+    AffineSpriteListTemplate v2;
 
     for (v0 = 0; v0 < 2; v0++) {
         SpriteResourcesHeader_Init(&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.collection = Unk_ov23_02257740->unk_20;
+        v2.list = 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);
@@ -2823,13 +2823,13 @@ static void ov23_0224108C(void)
 
         if (v0 == 0) {
             for (v1 = 2; v1 <= 7; v1++) {
-                Unk_ov23_02257740->unk_24C[v1] = CellActorCollection_AddEx(&v2);
-                CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v1], 1);
+                Unk_ov23_02257740->unk_24C[v1] = SpriteList_AddEx(&v2);
+                Sprite_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v1], 1);
             }
         }
 
-        Unk_ov23_02257740->unk_24C[v0] = CellActorCollection_AddEx(&v2);
-        CellActor_SetAnimateFlag(Unk_ov23_02257740->unk_24C[v0], 1);
+        Unk_ov23_02257740->unk_24C[v0] = SpriteList_AddEx(&v2);
+        Sprite_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 9856160b65..ee1b7b3ef3 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -24,7 +24,6 @@
 #include "bg_window.h"
 #include "brightness_controller.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "comm_player_manager.h"
 #include "communication_information.h"
@@ -40,6 +39,7 @@
 #include "narc.h"
 #include "player_avatar.h"
 #include "pltt_transfer.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -113,14 +113,14 @@ typedef struct {
     UnkStruct_ov23_02248A6C *unk_00[8];
     SysTask *unk_20[8];
     FieldSystem *fieldSystem;
-    CellActorCollection *unk_44;
+    SpriteList *unk_44;
     G2dRenderer unk_48;
     SpriteResourceCollection *unk_1D4[2][4];
     SpriteResource *unk_1F4[2][4];
-    CellActorResourceData unk_214;
-    CellActorResourceData unk_238;
-    CellActor *unk_25C[32];
-    CellActor *unk_2DC[4];
+    SpriteResourcesHeader unk_214;
+    SpriteResourcesHeader unk_238;
+    Sprite *unk_25C[32];
+    Sprite *unk_2DC[4];
     FieldTask *unk_2EC;
     SysTask *unk_2F0;
     SysTask *unk_2F4;
@@ -3264,7 +3264,7 @@ static void ov23_02246370(int param0)
 
     for (v0 = 0; v0 < param0; v0++) {
         if (Unk_ov23_02257764->unk_25C[v0] != NULL) {
-            CellActor_Delete(Unk_ov23_02257764->unk_25C[v0]);
+            Sprite_Delete(Unk_ov23_02257764->unk_25C[v0]);
             Unk_ov23_02257764->unk_25C[v0] = NULL;
         }
     }
@@ -3294,7 +3294,7 @@ static void ov23_02246370(int param0)
     }
 
     if (Unk_ov23_02257764->unk_44) {
-        CellActorCollection_Delete(Unk_ov23_02257764->unk_44);
+        SpriteList_Delete(Unk_ov23_02257764->unk_44);
     }
 
     Unk_ov23_02257764->unk_44 = NULL;
@@ -3305,10 +3305,10 @@ static void ov23_0224644C(int param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = Unk_ov23_02257764->unk_44;
+        v0.list = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3325,12 +3325,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] = CellActorCollection_AddEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = SpriteList_AddEx(&v0);
 
-            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);
-            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3341,7 +3341,7 @@ static void ov23_0224644C(int param0)
 static void ov23_02246548(int param0)
 {
     if (Unk_ov23_02257764->unk_25C[param0]) {
-        CellActor_Delete(Unk_ov23_02257764->unk_25C[param0]);
+        Sprite_Delete(Unk_ov23_02257764->unk_25C[param0]);
         Unk_ov23_02257764->unk_25C[param0] = NULL;
     }
 }
@@ -3368,7 +3368,7 @@ static void ov23_02246574(int param0, UnkStruct_ov23_02245ED4 *param1, int param
         v3.x = FX32_ONE * (v6) + v4;
         v3.y = FX32_ONE * (v7) + v5;
 
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3468,7 +3468,7 @@ static BOOL ov23_02246640(BgConfig *param0, UnkStruct_ov23_02245ED4 *param1)
         param1->unk_110 = 0;
     }
 
-    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
+    SpriteList_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3655,10 +3655,10 @@ static void ov23_02246D44(UnkStruct_ov23_022468DC *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = Unk_ov23_02257764->unk_44;
+        v0.list = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3675,14 +3675,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] = CellActorCollection_AddEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = SpriteList_AddEx(&v0);
 
-            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);
-            CellActor_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
-            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], (param0->unk_08[v1] * 2));
+            Sprite_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], v1 * 4);
+            Sprite_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[v1], GX_OAM_MODE_XLU);
+            Sprite_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3703,7 +3703,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;
 
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[param0], &v3);
         param1->unk_134[param0] += 0x250 + param0 * 100;
 
         v5 = FX_SinIdx(param1->unk_134[param0]) + FX32_ONE;
@@ -3712,7 +3712,7 @@ static void ov23_02246E90(int param0, UnkStruct_ov23_022468DC *param1)
         v3.y = FX32_ONE - v4;
         v3.z = FX32_ONE - v4;
 
-        CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[param0], &v3);
+        Sprite_SetAffineScale(Unk_ov23_02257764->unk_25C[param0], &v3);
     }
 }
 
@@ -3749,7 +3749,7 @@ static BOOL ov23_02246F20(BgConfig *param0, UnkStruct_ov23_022468DC *param1)
 
             if ((Unk_ov23_022563E8[param1->unk_08[v0]] * FX32_ONE) > v11) {
                 Sound_PlayEffect(1574);
-                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
+                Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v0], param1->unk_08[v0] * 2 + 1);
                 param1->unk_E4[v0] = 1;
                 break;
             }
@@ -3782,7 +3782,7 @@ static BOOL ov23_02246F20(BgConfig *param0, UnkStruct_ov23_022468DC *param1)
         }
     }
 
-    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
+    SpriteList_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -3833,10 +3833,10 @@ static void ov23_022471D8(UnkStruct_ov23_022471D8 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = Unk_ov23_02257764->unk_44;
+        v0.list = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -3853,14 +3853,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] = CellActorCollection_AddEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = SpriteList_AddEx(&v0);
 
-            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);
-            CellActor_SetPriority(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
-            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
+            Sprite_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetPriority(Unk_ov23_02257764->unk_25C[v1], 15 - v1);
+            Sprite_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -3875,7 +3875,7 @@ static void ov23_0224730C(UnkStruct_ov23_022471D8 *param0, int param1, int param
     param0->unk_44[param1] = param3;
     param0->unk_BC[param1] = param5;
 
-    CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[param1], 1);
+    Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[param1], 1);
 }
 
 static void ov23_0224733C(UnkStruct_ov23_022471D8 *param0, int param1)
@@ -3918,10 +3918,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;
 
-            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v1);
+            Sprite_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v1);
 
             if (param0->unk_44[v0] > (param0->unk_120 + 35)) {
-                CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 0);
+                Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 0);
                 param0->unk_80[v0] = 0;
             }
         }
@@ -3951,15 +3951,15 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
             param1->unk_125 = 2;
             param1->unk_120 = 0;
             param1->unk_11C = 5;
-            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[0], 0);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[0], 0);
         }
         break;
     case 2:
         v11.x = 128 * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
-        CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 1);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 1);
 
         if (param1->unk_120 > 65) {
             param1->unk_125 = 3;
@@ -4019,7 +4019,7 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 4:
         if (param1->unk_124 == 0) {
@@ -4043,7 +4043,7 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
 
         v11.x = (128 + param1->unk_12C) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         break;
     case 5:
         if (param1->unk_124 == 0) {
@@ -4051,29 +4051,29 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
             SpriteTransfer_ReplaceCharData(param1->unk_F8[0], param1->unk_F8[6]);
 
             for (v0 = 1; v0 < 9; v0++) {
-                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v0], 1);
+                Sprite_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;
 
-                CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v11);
-                CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
+                Sprite_SetPosition(Unk_ov23_02257764->unk_25C[v0], &v11);
+                Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[v0], 1);
             }
 
-            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[10], 1);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[10], 1);
 
             v11.x = 100 * FX32_ONE;
             v11.y = (param1->unk_120 + 21) * FX32_ONE;
 
-            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);
+            Sprite_SetPosition(Unk_ov23_02257764->unk_25C[10], &v11);
+            Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[10], 1);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[11], 1);
 
             v11.x = 122 * FX32_ONE;
             v11.y = param1->unk_120 * FX32_ONE;
 
-            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[11], &v11);
-            CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[11], 1);
+            Sprite_SetPosition(Unk_ov23_02257764->unk_25C[11], &v11);
+            Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[11], 1);
         }
 
         param1->unk_124++;
@@ -4081,11 +4081,11 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
         v11.x = (128 - (10 / 2) + (LCRNG_Next() % 10)) * FX32_ONE;
         v11.y = param1->unk_120 * FX32_ONE;
 
-        CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
+        Sprite_SetPosition(Unk_ov23_02257764->unk_25C[0], &v11);
         param1->unk_120 += 1;
 
         if (param1->unk_124 % 8) {
-            CellActor_SetAnim(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[0], 3 + param1->unk_124 / 8);
         }
 
         if (param1->unk_124 == 75) {
@@ -4098,11 +4098,11 @@ static BOOL ov23_02247568(BgConfig *param0, UnkStruct_ov23_022471D8 *param1)
             param1->unk_114 = NULL;
         }
 
-        CellActor_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 0);
+        Sprite_SetDrawFlag(Unk_ov23_02257764->unk_25C[0], 0);
         return 1;
     }
 
-    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
+    SpriteList_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4307,10 +4307,10 @@ static void ov23_02247E38(UnkStruct_ov23_02247E38 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = Unk_ov23_02257764->unk_44;
+        v0.list = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -4327,13 +4327,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] = CellActorCollection_AddEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = SpriteList_AddEx(&v0);
 
-            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);
-            CellActor_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
+            Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetExplicitPriority(Unk_ov23_02257764->unk_25C[v1], 1);
         }
     }
 
@@ -4420,14 +4420,14 @@ static BOOL ov23_02247F4C(BgConfig *param0, UnkStruct_ov23_02247E38 *param1)
         v11.y = FX32_ONE * v4;
         v11.z = FX32_ONE * v4;
 
-        CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
-        CellActor_SetAnimNoRestart(Unk_ov23_02257764->unk_25C[0], v1);
+        Sprite_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v11);
+        Sprite_SetAnimNoRestart(Unk_ov23_02257764->unk_25C[0], v1);
         break;
     case 2:
         break;
     }
 
-    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
+    SpriteList_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4722,13 +4722,13 @@ static BOOL ov23_02248614(BgConfig *param0, UnkStruct_ov23_02248748 *param1)
     v2.x = param1->unk_28 * FX32_ONE;
     v2.y = param1->unk_2C * FX32_ONE;
 
-    CellActor_SetPosition(Unk_ov23_02257764->unk_25C[0], &v2);
+    Sprite_SetPosition(Unk_ov23_02257764->unk_25C[0], &v2);
 
     v2.x = (param1->unk_30 * FX32_ONE) / 10;
     v2.y = v2.z = v2.x;
 
-    CellActor_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
-    CellActor_SetExplicitOAMMode(Unk_ov23_02257764->unk_25C[0], GX_OAM_MODE_XLU);
+    Sprite_SetAffineScale(Unk_ov23_02257764->unk_25C[0], &v2);
+    Sprite_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);
 
@@ -4746,7 +4746,7 @@ static BOOL ov23_02248614(BgConfig *param0, UnkStruct_ov23_02248748 *param1)
             v2.x = v3 * FX32_ONE;
             v2.y = v4 * FX32_ONE;
 
-            CellActor_SetPosition(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
+            Sprite_SetPosition(Unk_ov23_02257764->unk_25C[v0 + 1 + v1 * 8], &v2);
         }
     }
 
@@ -4756,7 +4756,7 @@ static BOOL ov23_02248614(BgConfig *param0, UnkStruct_ov23_02248748 *param1)
         return 1;
     }
 
-    CellActorCollection_Update(Unk_ov23_02257764->unk_44);
+    SpriteList_Update(Unk_ov23_02257764->unk_44);
     return 0;
 }
 
@@ -4767,10 +4767,10 @@ static void ov23_02248748(UnkStruct_ov23_02248748 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = Unk_ov23_02257764->unk_44;
+        v0.list = Unk_ov23_02257764->unk_44;
         v0.resourceData = &Unk_ov23_02257764->unk_238;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -4787,19 +4787,19 @@ 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] = CellActorCollection_AddEx(&v0);
+            Unk_ov23_02257764->unk_25C[v1] = SpriteList_AddEx(&v0);
 
             if (v1 == 0) {
-                CellActor_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
-                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
+                Sprite_SetAffineOverwriteMode(Unk_ov23_02257764->unk_25C[v1], 2);
+                Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 0);
             } else if (v1 < 9) {
-                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 1);
+                Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 1);
             } else {
-                CellActor_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
+                Sprite_SetAnim(Unk_ov23_02257764->unk_25C[v1], 2);
             }
 
-            CellActor_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
-            SpriteActor_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
+            Sprite_SetAnimateFlag(Unk_ov23_02257764->unk_25C[v1], 1);
+            Sprite_SetAnimFrame(Unk_ov23_02257764->unk_25C[v1], 0);
         }
     }
 
@@ -4846,13 +4846,13 @@ static void ov23_02248884(SysTask *param0, void *param1)
 
         for (v1 = 0; v1 < 25; v1++) {
             if (Unk_ov23_02257764->unk_25C[v1] != NULL) {
-                CellActor_Delete(Unk_ov23_02257764->unk_25C[v1]);
+                Sprite_Delete(Unk_ov23_02257764->unk_25C[v1]);
             }
 
             Unk_ov23_02257764->unk_25C[v1] = NULL;
         }
 
-        CellActorCollection_Delete(Unk_ov23_02257764->unk_44);
+        SpriteList_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 4a72f9daab..212126065d 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -10,7 +10,6 @@
 #include "overlay023/struct_ov23_0224942C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "comm_player_manager.h"
 #include "communication_system.h"
 #include "field_message.h"
@@ -20,6 +19,7 @@
 #include "narc.h"
 #include "player_avatar.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -45,13 +45,13 @@ struct UnkStruct_ov23_0224942C_t {
     int unk_A4[17][4];
     FieldSystem *fieldSystem;
     BgConfig *unk_1B8;
-    CellActorCollection *unk_1BC;
+    SpriteList *unk_1BC;
     G2dRenderer unk_1C0;
     SpriteResourceCollection *unk_34C[4];
     SpriteResource *unk_35C[4];
-    CellActorResourceData unk_36C;
-    CellActor *unk_390[8];
-    CellActor *unk_3B0[17];
+    SpriteResourcesHeader unk_36C;
+    Sprite *unk_390[8];
+    Sprite *unk_3B0[17];
     Window unk_3F4;
     int unk_404;
     int unk_408;
@@ -65,7 +65,7 @@ static void ov23_0224944C(BgConfig *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], CellActor *param1[]);
+static void ov23_022492C8(int param0[][3], Sprite *param1[]);
 static void ov23_0224944C(BgConfig *param0, Window *param1);
 static void ov23_02249438(BgConfig *param0);
 static void ov23_0224966C(BgConfig *param0, Window *param1, int *param2, int *param3, int *param4, UnkStruct_ov23_02249724 *param5);
@@ -74,7 +74,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], CellActor *param1[]);
+static void ov23_0224937C(int param0[][4], Sprite *param1[]);
 static void ov23_02249334(int param0[][4]);
 
 static UnkStruct_ov23_0224942C *Unk_ov23_02257768;
@@ -99,9 +99,9 @@ static void ov23_02248F1C(SysTask *param0, void *param1)
         SpriteResourcesHeader_Init(&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);
 
         {
-            CellActorInitParamsEx v3;
+            AffineSpriteListTemplate v3;
 
-            v3.collection = v0->unk_1BC;
+            v3.list = v0->unk_1BC;
             v3.resourceData = &v0->unk_36C;
             v3.position.x = FX32_CONST(32);
             v3.position.y = FX32_CONST(96) + (192 << FX32_SHIFT);
@@ -115,20 +115,20 @@ static void ov23_02248F1C(SysTask *param0, void *param1)
             v3.heapID = 4;
 
             for (v2 = 0; v2 < (7 + 1); v2++) {
-                v0->unk_390[v2] = CellActorCollection_AddEx(&v3);
-                CellActor_SetAnimateFlag(v0->unk_390[v2], 1);
-                CellActor_SetDrawFlag(v0->unk_390[v2], 0);
+                v0->unk_390[v2] = SpriteList_AddEx(&v3);
+                Sprite_SetAnimateFlag(v0->unk_390[v2], 1);
+                Sprite_SetDrawFlag(v0->unk_390[v2], 0);
 
                 if (v2 == 0) {
-                    CellActor_SetAnim(v0->unk_390[v2], 1);
+                    Sprite_SetAnim(v0->unk_390[v2], 1);
                 }
             }
 
             for (v2 = 0; v2 < 16 + 1; v2++) {
-                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);
+                v0->unk_3B0[v2] = SpriteList_AddEx(&v3);
+                Sprite_SetAnimateFlag(v0->unk_3B0[v2], 1);
+                Sprite_SetDrawFlag(v0->unk_3B0[v2], 0);
+                Sprite_SetAnim(v0->unk_3B0[v2], 2);
             }
         }
 
@@ -155,7 +155,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);
-        CellActorCollection_Update(v0->unk_1BC);
+        SpriteList_Update(v0->unk_1BC);
         break;
     case 6:
         if (FieldMessage_FinishedPrinting(v0->unk_404)) {
@@ -170,7 +170,7 @@ static void ov23_02248F1C(SysTask *param0, void *param1)
             SpriteResourceCollection_Delete(v0->unk_34C[v2]);
         }
 
-        CellActorCollection_Delete(v0->unk_1BC);
+        SpriteList_Delete(v0->unk_1BC);
         Window_EraseMessageBox(&v0->unk_3F4, 0);
         Window_Remove(&v0->unk_3F4);
         Bg_FreeTilemapBuffer(v1, 7);
@@ -242,7 +242,7 @@ static void ov23_02249214(PlayerAvatar *const playerAvatar, int param1[][2], int
     }
 }
 
-static void ov23_022492C8(int param0[][3], CellActor *param1[])
+static void ov23_022492C8(int param0[][3], Sprite *param1[])
 {
     int v0;
 
@@ -254,10 +254,10 @@ static void ov23_022492C8(int param0[][3], CellActor *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;
 
-            CellActor_SetPosition(param1[v0], &v1);
-            CellActor_SetDrawFlag(param1[v0], 1);
+            Sprite_SetPosition(param1[v0], &v1);
+            Sprite_SetDrawFlag(param1[v0], 1);
         } else {
-            CellActor_SetDrawFlag(param1[v0], 0);
+            Sprite_SetDrawFlag(param1[v0], 0);
         }
     }
 }
@@ -283,7 +283,7 @@ static void ov23_02249334(int param0[][4])
     }
 }
 
-static void ov23_0224937C(int param0[][4], CellActor *param1[])
+static void ov23_0224937C(int param0[][4], Sprite *param1[])
 {
     int v0;
 
@@ -295,18 +295,18 @@ static void ov23_0224937C(int param0[][4], CellActor *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;
 
-            CellActor_SetPosition(param1[v0], &v1);
+            Sprite_SetPosition(param1[v0], &v1);
 
             if (param0[v0][2] != param0[v0][3]) {
                 if (param0[v0][2] != 0) {
-                    CellActor_SetAnim(param1[v0], param0[v0][2]);
-                    CellActor_SetDrawFlag(param1[v0], 1);
+                    Sprite_SetAnim(param1[v0], param0[v0][2]);
+                    Sprite_SetDrawFlag(param1[v0], 1);
                 } else {
-                    CellActor_SetDrawFlag(param1[v0], 0);
+                    Sprite_SetDrawFlag(param1[v0], 0);
                 }
             }
         } else {
-            CellActor_SetDrawFlag(param1[v0], 0);
+            Sprite_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 4334908122..e67684ba95 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -29,7 +29,6 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "comm_player_manager.h"
 #include "communication_system.h"
 #include "field_map_change.h"
@@ -44,6 +43,7 @@
 #include "player_avatar.h"
 #include "render_window.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -71,10 +71,10 @@ typedef struct {
 
 static void ov23_0224F460(UnkStruct_ov23_02250CD4 *param0);
 static void ov23_0224F498(UnkStruct_ov23_02250CD4 *param0);
-static void ov23_0224F4D0(CellActor *param0, u32 param1);
-static void ov23_0224F500(CellActor *param0, u16 param1, u16 param2);
+static void ov23_0224F4D0(Sprite *param0, u32 param1);
+static void ov23_0224F500(Sprite *param0, u16 param1, u16 param2);
 static void ov23_0224F52C(UnkStruct_ov23_02250CD4 *param0, u16 param1, u16 param2);
-static void ov23_0224F560(CellActor *param0);
+static void ov23_0224F560(Sprite *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);
@@ -210,7 +210,7 @@ static void ov23_0224F294(UnkStruct_ov23_02250CD4 *param0, u8 *param1, u32 param
 
         {
             VecFx32 v4 = { FX32_ONE, FX32_ONE, FX32_ONE };
-            CellActor_SetAffineScaleEx(param0->unk_23C[1 + v1]->sprite, &v4, 1);
+            Sprite_SetAffineScaleEx(param0->unk_23C[1 + v1]->sprite, &v4, 1);
         }
     }
 
@@ -235,26 +235,26 @@ static void ov23_0224F498(UnkStruct_ov23_02250CD4 *param0)
     u16 v0;
 
     for (v0 = 0; v0 < param0->unk_25C; v0++) {
-        CellActor_UpdateAnim(param0->unk_23C[v0]->sprite, FX32_ONE);
+        Sprite_UpdateAnim(param0->unk_23C[v0]->sprite, FX32_ONE);
     }
 }
 
-static void ov23_0224F4D0(CellActor *param0, u32 param1)
+static void ov23_0224F4D0(Sprite *param0, u32 param1)
 {
     VecFx32 v0;
 
-    v0 = *(CellActor_GetPosition(param0));
+    v0 = *(Sprite_GetPosition(param0));
     v0.y = (20 + 24 * param1) * FX32_ONE;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 }
 
-static void ov23_0224F500(CellActor *param0, u16 param1, u16 param2)
+static void ov23_0224F500(Sprite *param0, u16 param1, u16 param2)
 {
-    u32 v0 = CellActor_GetActiveAnim(param0);
+    u32 v0 = Sprite_GetActiveAnim(param0);
 
-    CellActor_SetAnim(param0, (v0 / 3) * 3 + param1);
-    CellActor_SetExplicitPaletteWithOffset(param0, param2);
+    Sprite_SetAnim(param0, (v0 / 3) * 3 + param1);
+    Sprite_SetExplicitPaletteWithOffset(param0, param2);
 }
 
 static void ov23_0224F52C(UnkStruct_ov23_02250CD4 *param0, u16 param1, u16 param2)
@@ -263,13 +263,13 @@ static void ov23_0224F52C(UnkStruct_ov23_02250CD4 *param0, u16 param1, u16 param
     ov23_0224F500(param0->unk_23C[1 + param2]->sprite, 1, 1);
 }
 
-static void ov23_0224F560(CellActor *param0)
+static void ov23_0224F560(Sprite *param0)
 {
-    if ((CellActor_GetActiveAnim(param0) % 3) != 1) {
+    if ((Sprite_GetActiveAnim(param0) % 3) != 1) {
         return;
     }
 
-    if (CellActor_IsAnimated(param0) == 0) {
+    if (Sprite_IsAnimated(param0) == 0) {
         ov23_0224F500(param0, 2, 1);
     }
 }
@@ -633,7 +633,7 @@ static BOOL ov23_0224FA58(SysTask *param0, void *param1)
     switch (v0->unk_2A0) {
     case 0xffffffff:
         ov23_0224F498(v0);
-        CellActorCollection_Update(v0->unk_74.unk_00);
+        SpriteList_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 c89a443253..ea304d8165 100644
--- a/src/overlay056/ov56_022561C0.c
+++ b/src/overlay056/ov56_022561C0.c
@@ -15,7 +15,6 @@
 #include "overlay056/struct_ov56_02256468_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "field_message.h"
 #include "field_task.h"
 #include "font.h"
@@ -25,6 +24,7 @@
 #include "message.h"
 #include "message_util.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -70,12 +70,12 @@ struct UnkStruct_ov56_02256468_t {
     MessageLoader *unk_1C;
     u16 *unk_20;
     NNSG2dScreenData *unk_24;
-    CellActorCollection *unk_28;
+    SpriteList *unk_28;
     G2dRenderer unk_2C;
     SpriteResourceCollection *unk_1B8[4];
     SpriteResource *unk_1C8[4];
-    CellActorResourceData unk_1D8;
-    CellActor *unk_1FC[8];
+    SpriteResourcesHeader unk_1D8;
+    Sprite *unk_1FC[8];
     int unk_21C;
     int unk_220;
     int unk_224;
@@ -106,7 +106,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(CellActor *param0, int param1);
+static void ov56_02256994(Sprite *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);
@@ -165,7 +165,7 @@ static void ov56_022561C0(SysTask *param0, void *param1)
         ov56_02256D04(v0);
         ov56_022568E0(v0);
         ov56_022571D0(v0);
-        CellActorCollection_Update(v0->unk_28);
+        SpriteList_Update(v0->unk_28);
         break;
     case 3:
         break;
@@ -253,7 +253,7 @@ void ov56_02256468(UnkStruct_ov56_02256468 *param0)
             SpriteResourceCollection_Delete(param0->unk_1B8[v1]);
         }
 
-        CellActorCollection_Delete(param0->unk_28);
+        SpriteList_Delete(param0->unk_28);
         MessageLoader_Free(param0->unk_1C);
         StringTemplate_Free(param0->unk_18);
 
@@ -404,9 +404,9 @@ static void ov56_02256704(UnkStruct_ov56_02256468 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_28;
+        v1.list = param0->unk_28;
         v1.resourceData = &param0->unk_1D8;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -421,10 +421,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_1FC[v0] = SpriteList_AddEx(&v1);
 
-            CellActor_SetAnimateFlag(param0->unk_1FC[v0], 1);
-            CellActor_SetAnim(param0->unk_1FC[v0], v0);
+            Sprite_SetAnimateFlag(param0->unk_1FC[v0], 1);
+            Sprite_SetAnim(param0->unk_1FC[v0], v0);
         }
     }
 }
@@ -517,7 +517,7 @@ static const TouchScreenRect Unk_ov56_02257250[] = {
     { 0xff, 0x0, 0x0, 0x0 }
 };
 
-static void ov56_02256994(CellActor *param0, int param1)
+static void ov56_02256994(Sprite *param0, int param1)
 {
     VecFx32 v0;
 
@@ -525,7 +525,7 @@ static void ov56_02256994(CellActor *param0, int param1)
     v0.y = FX32_CONST(param1) + (192 << FX32_SHIFT);
     v0.z = 0;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 }
 
 static void ov56_022569E0(UnkStruct_ov56_02256468 *param0)
@@ -537,7 +537,7 @@ static void ov56_022569E0(UnkStruct_ov56_02256468 *param0)
         param0->unk_2D8.unk_04 = param0->unk_2D8.unk_00 - 3;
     }
 
-    CellActor_SetDrawFlag(param0->unk_1FC[2], param0->unk_2D8.unk_06);
+    Sprite_SetDrawFlag(param0->unk_1FC[2], param0->unk_2D8.unk_06);
 
     if (param0->unk_2D8.unk_06) {
         if (ov56_02257184(param0) == 1) {
@@ -954,11 +954,11 @@ static void ov56_0225718C(UnkStruct_ov56_02256468 *param0, int param1)
     u16 v0;
     u16 v1;
 
-    v0 = CellActor_GetAnimFrame(param0->unk_1FC[param1]);
-    v1 = CellActor_GetActiveAnim(param0->unk_1FC[param1]);
+    v0 = Sprite_GetAnimFrame(param0->unk_1FC[param1]);
+    v1 = Sprite_GetActiveAnim(param0->unk_1FC[param1]);
 
     if ((v0 > 1) || (v1 != param1 + 4)) {
-        CellActor_SetAnim(param0->unk_1FC[param1], param1 + 4);
+        Sprite_SetAnim(param0->unk_1FC[param1], param1 + 4);
     }
 
     param0->unk_2F4[param1] = 1;
@@ -970,18 +970,18 @@ static void ov56_022571D0(UnkStruct_ov56_02256468 *param0)
     u16 v1;
 
     for (v0 = 0; v0 < 2; v0++) {
-        v1 = CellActor_GetAnimFrame(param0->unk_1FC[v0]);
+        v1 = Sprite_GetAnimFrame(param0->unk_1FC[v0]);
 
         if (param0->unk_2F4[v0] == 1) {
             if (v1 >= 1) {
-                CellActor_SetAnimateFlag(param0->unk_1FC[v0], 0);
+                Sprite_SetAnimateFlag(param0->unk_1FC[v0], 0);
             }
 
             param0->unk_2F4[v0] = 0;
         } else {
-            if (CellActor_GetAnimateFlag(param0->unk_1FC[v0]) == 0) {
-                CellActor_SetAnimateFlag(param0->unk_1FC[v0], 1);
-                SpriteActor_SetAnimFrame(param0->unk_1FC[v0], 1 + 1);
+            if (Sprite_GetAnimateFlag(param0->unk_1FC[v0]) == 0) {
+                Sprite_SetAnimateFlag(param0->unk_1FC[v0], 1);
+                Sprite_SetAnimFrame(param0->unk_1FC[v0], 1 + 1);
             }
         }
     }
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 3cd651c854..0e226ea053 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -15,7 +15,6 @@
 #include "overlay072/struct_ov72_0223E2A8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -32,6 +31,7 @@
 #include "pltt_transfer.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -73,7 +73,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(CellActor *param0, int param1, int param2);
+static void ov58_021D1A10(Sprite *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);
@@ -111,8 +111,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(CellActor **param0, int param1);
-static void ov58_021D1CDC(CellActor **param0, BOOL param1);
+static void ov58_021D1CAC(Sprite **param0, int param1);
+static void ov58_021D1CDC(Sprite **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);
@@ -289,7 +289,7 @@ int ov58_021D0F08(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_34);
+    SpriteList_Update(v0->unk_34);
 
     return 0;
 }
@@ -316,7 +316,7 @@ int ov58_021D1018(OverlayManager *param0, int *param1)
             SpriteResourceCollection_Delete(v0->unk_1C4[v2]);
         }
 
-        CellActorCollection_Delete(v0->unk_34);
+        SpriteList_Delete(v0->unk_34);
         RenderOam_Free();
         CharTransfer_Free();
         PlttTransfer_Free();
@@ -664,9 +664,9 @@ static void ov58_021D16D8(UnkStruct_02095EAC *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_34;
+        v1.list = param0->unk_34;
         v1.resourceData = &param0->unk_1F4;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -683,11 +683,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_23C[v0] = SpriteList_AddEx(&v1);
 
-            CellActor_SetAnimateFlag(param0->unk_23C[v0], 1);
-            CellActor_SetAnim(param0->unk_23C[v0], v0);
-            CellActor_SetDrawFlag(param0->unk_23C[v0], 0);
+            Sprite_SetAnimateFlag(param0->unk_23C[v0], 1);
+            Sprite_SetAnim(param0->unk_23C[v0], v0);
+            Sprite_SetDrawFlag(param0->unk_23C[v0], 0);
         }
 
         for (v0 = 0; v0 < 9 + 3; v0++) {
@@ -695,28 +695,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_2AC[v0] = SpriteList_AddEx(&v1);
 
-            CellActor_SetAnimateFlag(param0->unk_2AC[v0], 1);
-            CellActor_SetAnim(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
+            Sprite_SetAnimateFlag(param0->unk_2AC[v0], 1);
+            Sprite_SetAnim(param0->unk_2AC[v0], Unk_ov58_021D2EEC[v0][2]);
 
             if (v0 >= 8) {
-                CellActor_SetExplicitPriority(param0->unk_2AC[v0], 2);
+                Sprite_SetExplicitPriority(param0->unk_2AC[v0], 2);
             }
         }
 
-        CellActor_SetAnim(param0->unk_2AC[0], 6);
+        Sprite_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] = CellActorCollection_AddEx(&v1);
+            param0->unk_274[v0] = SpriteList_AddEx(&v1);
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_274[v0], 1);
+            Sprite_SetAnim(param0->unk_274[v0], v0);
+            Sprite_SetPriority(param0->unk_274[v0], 1);
+            Sprite_SetDrawFlag(param0->unk_274[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -762,7 +762,7 @@ static void ov58_021D19D4(UnkStruct_02095EAC *param0)
     Window_Remove(&param0->unk_33C);
 }
 
-static void ov58_021D1A10(CellActor *param0, int param1, int param2)
+static void ov58_021D1A10(Sprite *param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -770,7 +770,7 @@ static void ov58_021D1A10(CellActor *param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8);
     v0.z = 0;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov58_021D2EB8[] = {
@@ -857,9 +857,9 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
 
             for (v3 = 0; v3 < 3; v3++) {
                 if ((v0 - 9) == v3) {
-                    CellActor_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
+                    Sprite_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3 + 1);
                 } else {
-                    CellActor_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3);
+                    Sprite_SetAnim(param0->unk_2AC[9 + v3], 29 + 2 * v3);
                 }
             }
 
@@ -872,11 +872,11 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
     }
 
     v1 = sub_02022644(Unk_ov58_021D2DDC);
-    CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
+    Sprite_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 0);
 
     if (v1 != 0xffffffff) {
         ov58_021D1A10(param0->unk_23C[CommSys_CurNetId()], gSystem.touchX, gSystem.touchY);
-        CellActor_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
+        Sprite_SetDrawFlag(param0->unk_23C[CommSys_CurNetId()], 1);
     }
 
     {
@@ -893,25 +893,25 @@ static void ov58_021D1A80(UnkStruct_02095EAC *param0)
     }
 }
 
-static void ov58_021D1CAC(CellActor **param0, int param1)
+static void ov58_021D1CAC(Sprite **param0, int param1)
 {
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
         if (v0 == param1) {
-            CellActor_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
+            Sprite_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2] + 1);
         } else {
-            CellActor_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2]);
+            Sprite_SetAnim(param0[v0], Unk_ov58_021D2EEC[v0][2]);
         }
     }
 }
 
-static void ov58_021D1CDC(CellActor **param0, BOOL param1)
+static void ov58_021D1CDC(Sprite **param0, BOOL param1)
 {
     if (param1 == 1) {
-        CellActor_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
+        Sprite_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2] + 1);
     } else {
-        CellActor_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2]);
+        Sprite_SetAnim(param0[8], Unk_ov58_021D2EEC[8][2]);
     }
 }
 
@@ -1573,10 +1573,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)) {
-                CellActor_SetDrawFlag(param0->unk_23C[v0], 1);
+                Sprite_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 {
-                CellActor_SetDrawFlag(param0->unk_23C[v0], 0);
+                Sprite_SetDrawFlag(param0->unk_23C[v0], 0);
             }
         }
     }
@@ -1630,9 +1630,9 @@ static void ov58_021D28E4(Window *param0, int param1, u32 param2, UnkStruct_0209
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param3->unk_398[v0][0] == NULL) {
-            CellActor_SetDrawFlag(param3->unk_274[v0], 0);
+            Sprite_SetDrawFlag(param3->unk_274[v0], 0);
         } else {
-            CellActor_SetDrawFlag(param3->unk_274[v0], 1);
+            Sprite_SetDrawFlag(param3->unk_274[v0], 1);
         }
     }
 
@@ -1779,7 +1779,7 @@ static int ov58_021D2B5C(UnkStruct_02095EAC *param0)
 
             if (param0->unk_945C) {
                 ov58_021D2D10(param0);
-                CellActor_SetAnim(param0->unk_2AC[8], Unk_ov58_021D2EEC[8][2]);
+                Sprite_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 4f6543c235..113aa0123d 100644
--- a/src/overlay059/ov59_021D0D80.c
+++ b/src/overlay059/ov59_021D0D80.c
@@ -15,7 +15,6 @@
 #include "overlay059/struct_ov59_021D109C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -35,6 +34,7 @@
 #include "pltt_transfer.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -282,7 +282,7 @@ int ov59_021D0F00(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_50);
+    SpriteList_Update(v0->unk_50);
 
     return 0;
 }
@@ -300,7 +300,7 @@ int ov59_021D0FF4(OverlayManager *param0, int *param1)
         SpriteResourceCollection_Delete(v0->unk_1E0[v1]);
     }
 
-    CellActorCollection_Delete(v0->unk_50);
+    SpriteList_Delete(v0->unk_50);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -635,9 +635,9 @@ static void ov59_021D1598(UnkStruct_020961E8 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_50;
+        v1.list = param0->unk_50;
         v1.resourceData = &param0->unk_268;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -650,20 +650,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] = CellActorCollection_AddEx(&v1);
+        param0->unk_28C[0] = SpriteList_AddEx(&v1);
 
-        CellActor_SetAnimateFlag(param0->unk_28C[0], 1);
-        CellActor_SetDrawFlag(param0->unk_28C[0], 1);
+        Sprite_SetAnimateFlag(param0->unk_28C[0], 1);
+        Sprite_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] = CellActorCollection_AddEx(&v1);
+            param0->unk_28C[v0 + 1] = SpriteList_AddEx(&v1);
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_28C[v0 + 1], 1);
+            Sprite_SetAnim(param0->unk_28C[v0 + 1], 27 + (v0 - 1) * 2);
+            Sprite_SetDrawFlag(param0->unk_28C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1041,7 +1041,7 @@ void ov59_021D1D40(UnkStruct_020961E8 *param0)
 {
     MessageLoader_GetStrbuf(param0->unk_28, 18, param0->unk_48);
     ov59_021D1784(&param0->unk_36C, param0->unk_48, TEXT_SPEED_INSTANT);
-    CellActor_SetAnim(param0->unk_28C[0], 37);
+    Sprite_SetAnim(param0->unk_28C[0], 37);
 
     param0->unk_0C.unk_00 = 1;
 }
@@ -1100,7 +1100,7 @@ static int ov59_021D1E0C(UnkStruct_020961E8 *param0, int param1)
         Sound_StopEffect(1624, 8);
         ov59_021D2628(param0, 13, 0);
         ov59_021D19B0(param0, 29);
-        CellActor_SetAnim(param0->unk_28C[0], 0);
+        Sprite_SetAnim(param0->unk_28C[0], 0);
 
         param0->unk_0C.unk_00 = 0;
         param0->unk_3B4 = 0;
@@ -1614,13 +1614,13 @@ static void ov59_021D26E8(UnkStruct_020961E8 *param0)
             v2 = TrainerInfo_Appearance(param0->unk_3C8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                CellActor_SetAnim(param0->unk_28C[v0 + 1], 38 + v3 * 2);
+                Sprite_SetAnim(param0->unk_28C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov59_021D2860(param0->unk_390, param0->unk_3A0, v0, v2, v3);
-                CellActor_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2);
+                Sprite_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2);
             }
         }
-            CellActor_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
+            Sprite_SetDrawFlag(param0->unk_28C[v0 + 1], 1);
             param0->unk_3F0[v0] = 2;
             v1 = 1;
             break;
@@ -1629,9 +1629,9 @@ static void ov59_021D26E8(UnkStruct_020961E8 *param0)
         case 3:
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3C8[v0][0]);
-                CellActor_SetAnim(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
+                Sprite_SetAnim(param0->unk_28C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                CellActor_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
+                Sprite_SetAnim(param0->unk_28C[v0 + 1], 27 + v0 * 2 + 1);
             }
 
             param0->unk_3F0[v0] = 0;
diff --git a/src/overlay062/ov62_0222F2C0.c b/src/overlay062/ov62_0222F2C0.c
index 6d3d48d14b..4fe10924c7 100644
--- a/src/overlay062/ov62_0222F2C0.c
+++ b/src/overlay062/ov62_0222F2C0.c
@@ -708,7 +708,7 @@ void ov62_0222FF7C(UnkStruct_0208C06C *param0)
             continue;
         }
 
-        Sprite_GetPositionXY2(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2);
+        ManagedSprite_GetPositionXY(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2);
 
         param0->unk_534.unk_C8[v0].unk_10->rect.top = v2 - 16;
         param0->unk_534.unk_C8[v0].unk_10->rect.bottom = v2 + 16;
@@ -723,7 +723,7 @@ void ov62_02230014(UnkStruct_0208C06C *param0)
     s16 v1, v2;
 
     for (v0 = 0; v0 < 5; v0++) {
-        Sprite_GetPositionXY2(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2);
+        ManagedSprite_GetPositionXY(param0->unk_534.unk_C8[v0].unk_00, &v1, &v2);
         param0->unk_534.unk_C8[v0].unk_10->rect.top = 0;
         param0->unk_534.unk_C8[v0].unk_10->rect.bottom = 0;
         param0->unk_534.unk_C8[v0].unk_10->rect.left = 0;
diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c
index b92b305b3a..4725b2ac67 100644
--- a/src/overlay062/ov62_022300D8.c
+++ b/src/overlay062/ov62_022300D8.c
@@ -16,13 +16,13 @@
 #include "overlay062/struct_ov62_022312B0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "graphics.h"
 #include "math.h"
 #include "message.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -197,9 +197,9 @@ void ov62_02230464(UnkStruct_0208C06C *param0)
                     ov62_02230E68(param0->unk_6F8[v5].unk_00[v4], v6[v5], 192 / 2);
                 }
 
-                Sprite_TickOneFrame(param0->unk_6F8[v5].unk_00[v4]);
-                Sprite_SetAffineOverwriteMode(param0->unk_6F8[v5].unk_00[v4], AFFINE_OVERWRITE_MODE_DOUBLE);
-                Sprite_SetAffineScale(param0->unk_6F8[v5].unk_00[v4], v7[v5], 1.0f);
+                ManagedSprite_TickFrame(param0->unk_6F8[v5].unk_00[v4]);
+                ManagedSprite_SetAffineOverwriteMode(param0->unk_6F8[v5].unk_00[v4], AFFINE_OVERWRITE_MODE_DOUBLE);
+                ManagedSprite_SetAffineScale(param0->unk_6F8[v5].unk_00[v4], v7[v5], 1.0f);
 
                 param0->unk_6F8[v5].unk_28 = 0;
                 param0->unk_6F8[v5].unk_19 = v5 % 3;
@@ -342,11 +342,11 @@ void ov62_022307C0(UnkStruct_0208C06C *param0)
         if (param0->unk_534.unk_1A4 - 1 == v0) {
             v2 = v2;
             v3 = (25 + (36 * (5 - 1)));
-            Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (2 - 1));
+            ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (2 - 1));
         } else {
             v2 = v2 - (4 * (param0->unk_534.unk_1A4 - v0));
             v3 = (16 * (param0->unk_534.unk_1A4 - v0 - 1)) + (25 + (36 * (5 - (param0->unk_534.unk_1A4 - v0))));
-            Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (3 - 1));
+            ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (3 - 1));
         }
 
         ov62_02230E68(param0->unk_534.unk_00[v0].unk_00, v2, v3);
@@ -394,8 +394,8 @@ void ov62_0223088C(UnkStruct_0208C06C *param0)
         v2.priority = Unk_ov62_022488A8[1][v0];
         v1->unk_00[v0].unk_00 = SpriteSystem_NewSprite(v3, v4, &v2);
 
-        Sprite_TickOneFrame(v1->unk_00[v0].unk_00);
-        Sprite_SetDrawFlag2(v1->unk_00[v0].unk_00, 1);
+        ManagedSprite_TickFrame(v1->unk_00[v0].unk_00);
+        ManagedSprite_SetDrawFlag(v1->unk_00[v0].unk_00, 1);
         ov62_02230E68(v1->unk_00[v0].unk_00, v2.x + 8, v2.y);
 
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -406,9 +406,9 @@ void ov62_0223088C(UnkStruct_0208C06C *param0)
         v2.priority = Unk_ov62_022488A8[0][v0];
         v1->unk_C8[v0].unk_00 = SpriteSystem_NewSprite(v3, v4, &v2);
 
-        Sprite_TickOneFrame(v1->unk_C8[v0].unk_00);
+        ManagedSprite_TickFrame(v1->unk_C8[v0].unk_00);
         ov62_02230E68(v1->unk_C8[v0].unk_00, v2.x, v2.y);
-        Sprite_SetDrawFlag2(v1->unk_C8[v0].unk_00, param0->unk_818[v0].unk_00);
+        ManagedSprite_SetDrawFlag(v1->unk_C8[v0].unk_00, param0->unk_818[v0].unk_00);
     }
 
     v0 = 0;
@@ -425,11 +425,11 @@ void ov62_0223088C(UnkStruct_0208C06C *param0)
         if (param0->unk_534.unk_1A4 - 1 == v0) {
             v6 = v6;
             v7 = (25 + (36 * (5 - 1)));
-            Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, 2 - 1);
+            ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, 2 - 1);
         } else {
             v6 = v6 - (4 * (param0->unk_534.unk_1A4 - v0));
             v7 = (16 * (param0->unk_534.unk_1A4 - v0 - 1)) + (25 + (36 * (5 - (param0->unk_534.unk_1A4 - v0))));
-            Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (3 - 1));
+            ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v0].unk_00, (3 - 1));
         }
 
         ov62_02230E68(param0->unk_534.unk_00[v0].unk_00, v6, v7);
@@ -445,13 +445,13 @@ void ov62_02230A5C(UnkStruct_0208C06C *param0)
     int v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_534.unk_C8[v0].unk_00, param0->unk_818[v0].unk_00);
+        ManagedSprite_SetDrawFlag(param0->unk_534.unk_C8[v0].unk_00, param0->unk_818[v0].unk_00);
 
         if (param0->unk_818[v0].unk_00 == 0) {
             continue;
         }
 
-        Sprite_SetAnim(param0->unk_534.unk_C8[v0].unk_00, param0->unk_818[v0].unk_0C);
+        ManagedSprite_SetAnim(param0->unk_534.unk_C8[v0].unk_00, param0->unk_818[v0].unk_0C);
         ov62_02230FC8(param0, &param0->unk_534.unk_C8[v0], param0->unk_818[v0].unk_08, &param0->unk_818[v0]);
     }
 }
@@ -475,11 +475,11 @@ void ov62_02230AF0(UnkStruct_0208C06C *param0)
     }
 
     for (v0 = 0; v0 < param0->unk_534.unk_1A4; v0++) {
-        Sprite_SetAnim(param0->unk_534.unk_00[v0].unk_00, param0->unk_534.unk_190[v0]->unk_0C);
+        ManagedSprite_SetAnim(param0->unk_534.unk_00[v0].unk_00, param0->unk_534.unk_190[v0]->unk_0C);
         ov62_02230FC8(param0, &param0->unk_534.unk_00[v0], param0->unk_534.unk_190[v0]->unk_08, param0->unk_534.unk_190[v0]);
         sub_020128C4(param0->unk_534.unk_00[v0].unk_14, 36, -8);
         sub_020129D0(param0->unk_534.unk_00[v0].unk_14, 1);
-        Sprite_SetDrawFlag2(param0->unk_534.unk_00[v0].unk_00, 1);
+        ManagedSprite_SetDrawFlag(param0->unk_534.unk_00[v0].unk_00, 1);
     }
 }
 
@@ -501,18 +501,18 @@ void ov62_02230B9C(UnkStruct_0208C06C *param0, BOOL param1)
     for (v0 = 0; v0 < 5; v0++) {
         if (param0->unk_534.unk_00[v0].unk_0C == 0) {
             sub_020129D0(param0->unk_534.unk_00[v0].unk_14, 0);
-            Sprite_SetDrawFlag2(param0->unk_534.unk_00[v0].unk_00, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_534.unk_00[v0].unk_00, 0);
         } else {
             sub_020129D0(param0->unk_534.unk_00[v0].unk_14, param1);
-            Sprite_SetDrawFlag2(param0->unk_534.unk_00[v0].unk_00, param1);
+            ManagedSprite_SetDrawFlag(param0->unk_534.unk_00[v0].unk_00, param1);
         }
 
         if (param0->unk_534.unk_C8[v0].unk_0C == 0) {
             sub_020129D0(param0->unk_534.unk_C8[v0].unk_14, 0);
-            Sprite_SetDrawFlag2(param0->unk_534.unk_C8[v0].unk_00, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_534.unk_C8[v0].unk_00, 0);
         } else {
             sub_020129D0(param0->unk_534.unk_C8[v0].unk_14, param1);
-            Sprite_SetDrawFlag2(param0->unk_534.unk_C8[v0].unk_00, param1);
+            ManagedSprite_SetDrawFlag(param0->unk_534.unk_C8[v0].unk_00, param1);
         }
     }
 }
@@ -545,8 +545,8 @@ void ov62_02230C28(SysTask *param0, void *param1)
             v0->unk_2C++;
             v0->unk_28 = 0;
         } else {
-            Sprite_GetPositionFxXY(v0->unk_00[0], &v1, &v2);
-            Sprite_GetPositionFxXY(v0->unk_00[1], &v3, &v4);
+            ManagedSprite_GetPositionFxXY(v0->unk_00[0], &v1, &v2);
+            ManagedSprite_GetPositionFxXY(v0->unk_00[1], &v3, &v4);
 
             v1 = v1 + ((CalcSineDegrees_Wraparound((v0->unk_20 * 0xffff) / 360) * 1) * (v0->unk_18 * -1));
             v3 = v1;
@@ -554,8 +554,8 @@ void ov62_02230C28(SysTask *param0, void *param1)
             v0->unk_20 += 32;
             v0->unk_20 %= 360;
 
-            Sprite_SetPositionFxXY(v0->unk_00[0], v1, v2);
-            Sprite_SetPositionFxXY(v0->unk_00[1], v3, v4);
+            ManagedSprite_SetPositionFxXY(v0->unk_00[0], v1, v2);
+            ManagedSprite_SetPositionFxXY(v0->unk_00[1], v3, v4);
 
             v0->unk_28++;
         }
@@ -572,8 +572,8 @@ void ov62_02230C28(SysTask *param0, void *param1)
             0,
         };
 
-        Sprite_GetPositionXY2(v0->unk_00[0], &v5, &v6);
-        Sprite_GetPositionXY2(v0->unk_00[1], &v5, &v7);
+        ManagedSprite_GetPositionXY(v0->unk_00[0], &v5, &v6);
+        ManagedSprite_GetPositionXY(v0->unk_00[1], &v5, &v7);
 
         if (v0->unk_28 == 0) {
             v0->unk_14 = v0->unk_16 - v5;
@@ -589,20 +589,20 @@ void ov62_02230C28(SysTask *param0, void *param1)
             v0->unk_28++;
         }
 
-        Sprite_SetPositionXY2(v0->unk_00[0], v5, v6);
-        Sprite_SetPositionXY2(v0->unk_00[1], v5, v7);
+        ManagedSprite_SetPositionXY(v0->unk_00[0], v5, v6);
+        ManagedSprite_SetPositionXY(v0->unk_00[1], v5, v7);
     } break;
     case 3: {
         fx32 v9, v10;
         fx32 v11, v12;
 
         if (v0->unk_28 == 0) {
-            Sprite_GetPositionFxXY(v0->unk_00[0], &v0->unk_0C, &v10);
+            ManagedSprite_GetPositionFxXY(v0->unk_00[0], &v0->unk_0C, &v10);
             v0->unk_28++;
         }
 
-        Sprite_GetPositionFxXY(v0->unk_00[0], &v9, &v10);
-        Sprite_GetPositionFxXY(v0->unk_00[1], &v11, &v12);
+        ManagedSprite_GetPositionFxXY(v0->unk_00[0], &v9, &v10);
+        ManagedSprite_GetPositionFxXY(v0->unk_00[1], &v11, &v12);
 
         v9 = v0->unk_0C + ((CalcSineDegrees_Wraparound((v0->unk_20 * 0xffff) / 360) * 3) * (v0->unk_18 * -1));
         v11 = v9;
@@ -615,25 +615,25 @@ void ov62_02230C28(SysTask *param0, void *param1)
 
         v0->unk_20 %= 360;
 
-        Sprite_SetPositionFxXY(v0->unk_00[0], v9, v10);
-        Sprite_SetPositionFxXY(v0->unk_00[1], v11, v12);
+        ManagedSprite_SetPositionFxXY(v0->unk_00[0], v9, v10);
+        ManagedSprite_SetPositionFxXY(v0->unk_00[1], v11, v12);
     } break;
     }
 
     if ((v0->unk_2C >= 2) && (v0->unk_10 > 0.1f)) {
         v0->unk_10 -= 0.10f;
 
-        Sprite_SetAffineScale(v0->unk_00[0], v0->unk_10, 1.0f);
-        Sprite_SetAffineScale(v0->unk_00[1], v0->unk_10, 1.0f);
+        ManagedSprite_SetAffineScale(v0->unk_00[0], v0->unk_10, 1.0f);
+        ManagedSprite_SetAffineScale(v0->unk_00[1], v0->unk_10, 1.0f);
     }
 }
 
-void ov62_02230E68(CellActorData *param0, s16 param1, s16 param2)
+void ov62_02230E68(ManagedSprite *param0, s16 param1, s16 param2)
 {
-    Sprite_SetPositionXYWithSubscreenOffset2(param0, param1, param2, (256 * FX32_ONE));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0, param1, param2, (256 * FX32_ONE));
 }
 
-void ov62_02230E74(CellActorData *param0, s16 *param1, s16 *param2)
+void ov62_02230E74(ManagedSprite *param0, s16 *param1, s16 *param2)
 {
     Sprite_GetPositionXYWithSubscreenOffset2(param0, param1, param2, (256 * FX32_ONE));
 }
@@ -663,7 +663,7 @@ void ov62_02230E80(UnkStruct_0208C06C *param0)
             v4 = sub_02012898(&v6, v8[v11], 102);
 
             CharTransfer_AllocRange(v4, 1, v8[v11], &v7[v11]->unk_1C);
-            Sprite_GetPositionXY2(v7[v11]->unk_00, &v0, &v1);
+            ManagedSprite_GetPositionXY(v7[v11]->unk_00, &v0, &v1);
 
             v2.unk_00 = param0->unk_14.unk_3C;
             v2.unk_04 = &v6;
@@ -779,7 +779,7 @@ void ov62_0223118C(UnkStruct_ov62_022312B0 *param0, UnkStruct_ov62_0223118C *par
     v4 = sub_02012898(&v6, param2, 102);
 
     CharTransfer_AllocRange(v4, 1, param2, &param0->unk_14);
-    Sprite_GetPositionXY2(param0->unk_08, &v0, &v1);
+    ManagedSprite_GetPositionXY(param0->unk_08, &v0, &v1);
 
     v2.unk_00 = param1->unk_3C;
     v2.unk_04 = &v6;
@@ -874,9 +874,9 @@ void ov62_022313BC(UnkStruct_0208C06C *param0)
     SpriteManager_UnloadAnimObjById(param0->unk_14.unk_08, 11924);
 }
 
-CellActorData *ov62_022313E0(UnkStruct_0208C06C *param0, int param1)
+ManagedSprite *ov62_022313E0(UnkStruct_0208C06C *param0, int param1)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1.x = 128;
@@ -902,9 +902,9 @@ CellActorData *ov62_022313E0(UnkStruct_0208C06C *param0, int param1)
 
     v0 = SpriteSystem_NewSprite(param0->unk_14.unk_04, param0->unk_14.unk_08, &v1);
 
-    Sprite_SetExplicitPalette2(v0, 2);
-    Sprite_SetAnim(v0, 0);
-    Sprite_TickOneFrame(v0);
+    ManagedSprite_SetExplicitPalette(v0, 2);
+    ManagedSprite_SetAnim(v0, 0);
+    ManagedSprite_TickFrame(v0);
 
     return v0;
 }
diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c
index f9a7683e1f..f56ec1837b 100644
--- a/src/overlay062/ov62_02231690.c
+++ b/src/overlay062/ov62_02231690.c
@@ -548,7 +548,7 @@ static void ov62_02232080(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
 static void ov62_022320A0(UnkStruct_ov62_022323B8 *param0, int param1)
 {
     if (param0->unk_04) {
-        Sprite_SetDrawFlag2(param0->unk_04, param1);
+        ManagedSprite_SetDrawFlag(param0->unk_04, param1);
     }
 }
 
@@ -627,14 +627,14 @@ static void ov62_022320EC(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
         param0->unk_04 = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v8);
         v2 = PokeIconPaletteIndex(v1, v3, v0);
 
-        Sprite_SetExplicitPaletteOffset(param0->unk_04, v4 + v2);
-        Sprite_SetAnim(param0->unk_04, 1);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_04, v4 + v2);
+        ManagedSprite_SetAnim(param0->unk_04, 1);
     }
 }
 
 static void ov62_022321F4(UnkStruct_ov62_022323B8 *param0, int param1)
 {
-    Sprite_SetDrawFlag2(param0->unk_08, param1);
+    ManagedSprite_SetDrawFlag(param0->unk_08, param1);
 }
 
 static void ov62_02232200(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1)
@@ -740,8 +740,8 @@ static void ov62_0223226C(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p
     v4.resources[5] = SPRITE_RESOURCE_NONE;
 
     param0->unk_08 = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v4);
-    Sprite_SetAnim(param0->unk_08, 1);
-    Sprite_TickOneFrame(param0->unk_08);
+    ManagedSprite_SetAnim(param0->unk_08, 1);
+    ManagedSprite_TickFrame(param0->unk_08);
 }
 
 void ov62_02232378(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *param1)
@@ -1709,7 +1709,7 @@ void ov62_02233310(UnkStruct_ov62_02233310 *param0)
 
 void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
     NARC *v2 = param1->unk_14.unk_00;
     BgConfig *v3 = param1->unk_14.unk_10;
@@ -1745,20 +1745,20 @@ void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
     param0->unk_2C[0] = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v1);
     param0->unk_2C[1] = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v1);
 
-    Sprite_SetExplicitPalette2(param0->unk_2C[0], 2);
-    Sprite_SetExplicitPalette2(param0->unk_2C[1], 2);
-    Sprite_SetAnim(param0->unk_2C[0], 0);
-    Sprite_SetAnim(param0->unk_2C[1], 0);
-    Sprite_TickOneFrame(param0->unk_2C[0]);
-    Sprite_TickOneFrame(param0->unk_2C[1]);
-    Sprite_SetFlipMode2(param0->unk_2C[1], 2);
+    ManagedSprite_SetExplicitPalette(param0->unk_2C[0], 2);
+    ManagedSprite_SetExplicitPalette(param0->unk_2C[1], 2);
+    ManagedSprite_SetAnim(param0->unk_2C[0], 0);
+    ManagedSprite_SetAnim(param0->unk_2C[1], 0);
+    ManagedSprite_TickFrame(param0->unk_2C[0]);
+    ManagedSprite_TickFrame(param0->unk_2C[1]);
+    ManagedSprite_SetFlipMode(param0->unk_2C[1], 2);
 
     if (param2 == 1) {
-        Sprite_SetPositionXY2(param0->unk_2C[0], 256 / 2, 24);
-        Sprite_SetPositionXY2(param0->unk_2C[1], 256 / 2, 120);
+        ManagedSprite_SetPositionXY(param0->unk_2C[0], 256 / 2, 24);
+        ManagedSprite_SetPositionXY(param0->unk_2C[1], 256 / 2, 120);
     } else {
-        Sprite_SetPositionXY2(param0->unk_2C[0], 256 / 2, 24 + 64);
-        Sprite_SetPositionXY2(param0->unk_2C[1], 256 / 2, 120 + 64);
+        ManagedSprite_SetPositionXY(param0->unk_2C[0], 256 / 2, 24 + 64);
+        ManagedSprite_SetPositionXY(param0->unk_2C[1], 256 / 2, 120 + 64);
     }
 
     ov62_02233454(param0);
@@ -1766,47 +1766,47 @@ void ov62_0223331C(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1,
 
 void ov62_02233434(UnkStruct_ov62_02233310 *param0, s16 param1, s16 param2)
 {
-    Sprite_SetPositionXY2(param0->unk_2C[0], 256 / 2, param1);
-    Sprite_SetPositionXY2(param0->unk_2C[1], 256 / 2, param2);
+    ManagedSprite_SetPositionXY(param0->unk_2C[0], 256 / 2, param1);
+    ManagedSprite_SetPositionXY(param0->unk_2C[1], 256 / 2, param2);
 }
 
 void ov62_02233454(UnkStruct_ov62_02233310 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_2C[0], 1);
-    Sprite_SetDrawFlag2(param0->unk_2C[1], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2C[0], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2C[1], 1);
 
     if (param0->unk_08 == 0) {
-        Sprite_SetDrawFlag2(param0->unk_2C[0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[0], 0);
     }
 
     if (param0->unk_08 + param0->unk_10 >= param0->unk_04) {
-        Sprite_SetDrawFlag2(param0->unk_2C[1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[1], 0);
     }
 
-    Sprite_TickTwoFrame(param0->unk_2C[0]);
-    Sprite_TickTwoFrame(param0->unk_2C[1]);
+    ManagedSprite_TickTwoFrames(param0->unk_2C[0]);
+    ManagedSprite_TickTwoFrames(param0->unk_2C[1]);
 }
 
 void ov62_0223349C(UnkStruct_ov62_02233310 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_2C[0], 1);
-    Sprite_SetDrawFlag2(param0->unk_2C[1], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2C[0], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2C[1], 1);
 
     if (param0->unk_08 == 0) {
-        Sprite_SetDrawFlag2(param0->unk_2C[0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[0], 0);
     }
 
     if (param0->unk_08 + param0->unk_10 >= param0->unk_04) {
-        Sprite_SetDrawFlag2(param0->unk_2C[1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[1], 0);
     }
 
     if (param0->unk_10 >= param0->unk_04) {
-        Sprite_SetDrawFlag2(param0->unk_2C[0], 0);
-        Sprite_SetDrawFlag2(param0->unk_2C[1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2C[1], 0);
     }
 
-    Sprite_TickTwoFrame(param0->unk_2C[0]);
-    Sprite_TickTwoFrame(param0->unk_2C[1]);
+    ManagedSprite_TickTwoFrames(param0->unk_2C[0]);
+    ManagedSprite_TickTwoFrames(param0->unk_2C[1]);
 }
 
 void ov62_022334FC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1)
@@ -1818,9 +1818,9 @@ void ov62_022334FC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1)
     Sprite_DeleteAndFreeResources(param0->unk_2C[1]);
 }
 
-static CellActorData *ov62_0223352C(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1, int param2, int param3)
+static ManagedSprite *ov62_0223352C(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1, int param2, int param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1.x = 128;
@@ -1845,9 +1845,9 @@ static CellActorData *ov62_0223352C(UnkStruct_ov62_0223359C *param0, UnkStruct_0
     }
 
     v0 = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v1);
-    Sprite_SetExplicitPalette2(v0, 2);
-    Sprite_SetAnim(v0, param3);
-    Sprite_TickOneFrame(v0);
+    ManagedSprite_SetExplicitPalette(v0, 2);
+    ManagedSprite_SetAnim(v0, param3);
+    ManagedSprite_TickFrame(v0);
 
     return v0;
 }
@@ -1868,8 +1868,8 @@ void ov62_022335BC(UnkStruct_ov62_0223359C *param0, UnkStruct_0208C06C *param1,
     param0->unk_18[0] = ov62_0223352C(param0, param1, 2, param2);
     param0->unk_18[1] = ov62_0223352C(param0, param1, 2, param2);
 
-    Sprite_SetPositionXY2(param0->unk_18[0], 0 + 24, 72 + 64);
-    Sprite_SetPositionXY2(param0->unk_18[1], 256 - 24, 72 + 64);
+    ManagedSprite_SetPositionXY(param0->unk_18[0], 0 + 24, 72 + 64);
+    ManagedSprite_SetPositionXY(param0->unk_18[1], 256 - 24, 72 + 64);
 }
 
 void ov62_022335F4(UnkStruct_ov62_0223359C *param0)
@@ -1930,8 +1930,8 @@ void ov62_02233664(UnkStruct_ov62_0223359C *param0)
     v3 = TouchScreen_GetHoldState(&v0, &v1);
 
     if (param0->unk_14) {
-        Sprite_TickTwoFrame(param0->unk_18[0]);
-        Sprite_TickTwoFrame(param0->unk_18[1]);
+        ManagedSprite_TickTwoFrames(param0->unk_18[0]);
+        ManagedSprite_TickTwoFrames(param0->unk_18[1]);
     }
 
     if ((param0->unk_04 == 0) && (v3 == 0)) {
@@ -2188,9 +2188,9 @@ void ov62_02233A74(NARC *param0)
     NARC_dtor(param0);
 }
 
-CellActorData *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5)
+ManagedSprite *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param2, int param3, int param4, int param5)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteSystem *v1;
     SpriteManager *v2;
     PaletteData *v3;
@@ -2226,14 +2226,14 @@ CellActorData *ov62_02233A7C(UnkStruct_0208C06C *param0, NARC *param1, int param
     v0 = SpriteSystem_NewSprite(v1, v2, &v4);
     v5 = PokeIconPaletteIndex(param3, param4, param5);
 
-    Sprite_SetExplicitPaletteOffset(v0, 4 + v5);
-    Sprite_SetAnim(v0, 1);
-    Sprite_TickOneFrame(v0);
+    ManagedSprite_SetExplicitPaletteOffset(v0, 4 + v5);
+    ManagedSprite_SetAnim(v0, 1);
+    ManagedSprite_TickFrame(v0);
 
     return v0;
 }
 
-void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, CellActorData *param2)
+void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, ManagedSprite *param2)
 {
     int v0;
 
@@ -2245,7 +2245,7 @@ void ov62_02233B24(UnkStruct_0208C06C *param0, int param1, CellActorData *param2
     Sprite_DeleteAndFreeResources(param2);
 }
 
-void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, CellActorData *param2)
+void ov62_02233B40(UnkStruct_0208C06C *param0, int param1, ManagedSprite *param2)
 {
     int v0;
 
@@ -2599,10 +2599,10 @@ static void ov62_02234000(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p
         param0->unk_0C[v3] = SpriteSystem_NewSprite(param1->unk_14.unk_04, param1->unk_14.unk_08, &v4);
 
         v5 = PokeIconPaletteIndex(v1, v2, 0);
-        Sprite_SetExplicitPaletteOffset(param0->unk_0C[v3], 4 + v5);
-        Sprite_SetAnim(param0->unk_0C[v3], 1);
-        Sprite_TickOneFrame(param0->unk_0C[v3]);
-        Sprite_SetPriority(param0->unk_0C[v3], 12 - v0);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_0C[v3], 4 + v5);
+        ManagedSprite_SetAnim(param0->unk_0C[v3], 1);
+        ManagedSprite_TickFrame(param0->unk_0C[v3]);
+        ManagedSprite_SetPriority(param0->unk_0C[v3], 12 - v0);
         v3++;
     }
 }
@@ -2638,7 +2638,7 @@ void ov62_0223427C(UnkStruct_ov62_02233F74 *param0, int param1)
 
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_0C[v0]) {
-            Sprite_SetDrawFlag2(param0->unk_0C[v0], param1);
+            ManagedSprite_SetDrawFlag(param0->unk_0C[v0], param1);
         }
     }
 }
@@ -2795,10 +2795,10 @@ void ov62_0223454C(UnkStruct_0208C06C *param0, UnkStruct_ov62_022312B0 *param1,
 
     ov62_0223118C(param1, &param0->unk_14, param2);
     ov62_0223124C(param1, &param0->unk_14, param3);
-    Sprite_SetPositionXY2(param1->unk_08, param4, param5);
+    ManagedSprite_SetPositionXY(param1->unk_08, param4, param5);
     sub_020128C4(param1->unk_0C, param6, param7);
     sub_020129D0(param1->unk_0C, param9);
-    Sprite_SetAnim(param1->unk_08, param8);
+    ManagedSprite_SetAnim(param1->unk_08, param8);
 }
 
 void ov62_022345A8(UnkStruct_ov62_022312B0 *param0)
diff --git a/src/overlay062/ov62_02234A10.c b/src/overlay062/ov62_02234A10.c
index d859c78d03..fe6a80320f 100644
--- a/src/overlay062/ov62_02234A10.c
+++ b/src/overlay062/ov62_02234A10.c
@@ -295,8 +295,8 @@ BOOL ov62_02235008(UnkStruct_0208C06C *param0)
                 v0->unk_00[v1].unk_08 = (25 + (36 * (v1)) + (16 * (5 - (param0->unk_534.unk_1AC))));
 
                 ov62_02230E68(param0->unk_534.unk_C8[v1].unk_00, 42, (25 + (36 * (5 - 1)) + (16 * (5 - (param0->unk_534.unk_1AC)))));
-                Sprite_GetPositionFxXY(param0->unk_534.unk_C8[v1].unk_00, &v0->unk_00[v1].unk_0C, &v2);
-                Sprite_SetPositionFxXY(param0->unk_534.unk_C8[v1].unk_00, v0->unk_00[v1].unk_0C, (25 + (36 * (5 - 1)) + (16 * (5 - (param0->unk_534.unk_1AC)))) * FX32_ONE);
+                ManagedSprite_GetPositionFxXY(param0->unk_534.unk_C8[v1].unk_00, &v0->unk_00[v1].unk_0C, &v2);
+                ManagedSprite_SetPositionFxXY(param0->unk_534.unk_C8[v1].unk_00, v0->unk_00[v1].unk_0C, (25 + (36 * (5 - 1)) + (16 * (5 - (param0->unk_534.unk_1AC)))) * FX32_ONE);
                 sub_020128C4(param0->unk_534.unk_C8[v1].unk_14, 36, -8);
                 sub_020129D0(param0->unk_534.unk_C8[v1].unk_14, 1);
             }
@@ -339,7 +339,7 @@ BOOL ov62_02235008(UnkStruct_0208C06C *param0)
                 v7 = v0->unk_00[v3].unk_0C + (CalcSineDegrees_Wraparound((v0->unk_00[v3].unk_04 * 0xffff) / 360) * 16);
                 v0->unk_00[v3].unk_04 += (-4 * 1);
 
-                Sprite_SetPositionFxXY(param0->unk_534.unk_C8[v3].unk_00, v7, v8);
+                ManagedSprite_SetPositionFxXY(param0->unk_534.unk_C8[v3].unk_00, v7, v8);
                 sub_020128C4(param0->unk_534.unk_C8[v3].unk_14, 36, -8);
             }
             if (v4 == param0->unk_534.unk_1AC) {
diff --git a/src/overlay062/ov62_02235278.c b/src/overlay062/ov62_02235278.c
index 31a1a40106..3e861de3a9 100644
--- a/src/overlay062/ov62_02235278.c
+++ b/src/overlay062/ov62_02235278.c
@@ -303,10 +303,10 @@ static BOOL ov62_02235580(UnkStruct_0208C06C *param0)
                             v5->unk_04 = v5->unk_00;
                             v5->unk_06 = (25 + (36 * (5 - 1)));
 
-                            Sprite_SetAnim(param0->unk_534.unk_00[v4].unk_00, param0->unk_818[param0->unk_534.unk_1B0].unk_0C);
+                            ManagedSprite_SetAnim(param0->unk_534.unk_00[v4].unk_00, param0->unk_818[param0->unk_534.unk_1B0].unk_0C);
                             ov62_02230FC8(param0, &param0->unk_534.unk_00[param0->unk_534.unk_1A4], param0->unk_818[param0->unk_534.unk_1B0].unk_08, &param0->unk_818[param0->unk_534.unk_1B0]);
                             sub_020129D0(param0->unk_534.unk_00[param0->unk_534.unk_1A4].unk_14, 1);
-                            Sprite_SetDrawFlag2(param0->unk_534.unk_00[v4].unk_00, 1);
+                            ManagedSprite_SetDrawFlag(param0->unk_534.unk_00[v4].unk_00, 1);
                         } else {
                             v5->unk_04 = v5->unk_00 - 4;
                             v5->unk_06 = (16 * (param0->unk_534.unk_1A4 - v4)) + (25 + (36 * (5 - (param0->unk_534.unk_1A4 - v4) - 1)));
@@ -324,9 +324,9 @@ static BOOL ov62_02235580(UnkStruct_0208C06C *param0)
 
             for (v4 = 0; v4 < param0->unk_534.unk_1A4; v4++) {
                 if (v4 == param0->unk_534.unk_1A4) {
-                    Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v4].unk_00, (2 - 1));
+                    ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v4].unk_00, (2 - 1));
                 } else {
-                    Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v4].unk_00, (3 - 1));
+                    ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v4].unk_00, (3 - 1));
                 }
             }
         }
@@ -432,9 +432,9 @@ static BOOL ov62_02235854(UnkStruct_0208C06C *param0)
 
                 for (v3 = 0; v3 < param0->unk_534.unk_1A4; v3++) {
                     if (v3 == param0->unk_534.unk_1A4 - 1) {
-                        Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v3].unk_00, (2 - 1));
+                        ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v3].unk_00, (2 - 1));
                     } else {
-                        Sprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v3].unk_00, (3 - 1));
+                        ManagedSprite_SetExplicitPaletteOffset(param0->unk_534.unk_00[v3].unk_00, (3 - 1));
                     }
                 }
             }
diff --git a/src/overlay062/ov62_02235E64.c b/src/overlay062/ov62_02235E64.c
index c7fc42fff6..a602da3dd9 100644
--- a/src/overlay062/ov62_02235E64.c
+++ b/src/overlay062/ov62_02235E64.c
@@ -738,8 +738,8 @@ static void ov62_02236C20(UnkStruct_0208C06C *param0)
     ov62_0223118C(&v0->unk_158[0], &param0->unk_14, NNS_G2D_VRAM_TYPE_2DSUB);
     ov62_0223124C(&v0->unk_158[0], &param0->unk_14, 3);
 
-    Sprite_SetAnim(v0->unk_158[0].unk_08, 0);
-    Sprite_SetPositionXY2(v0->unk_158[0].unk_08, 80, 232);
+    ManagedSprite_SetAnim(v0->unk_158[0].unk_08, 0);
+    ManagedSprite_SetPositionXY(v0->unk_158[0].unk_08, 80, 232);
     sub_020128C4(v0->unk_158[0].unk_0C, 36, -8);
     sub_020129D0(v0->unk_158[0].unk_0C, 1);
 }
diff --git a/src/overlay062/ov62_02236CBC.c b/src/overlay062/ov62_02236CBC.c
index 7b902353bf..9132aa6a0d 100644
--- a/src/overlay062/ov62_02236CBC.c
+++ b/src/overlay062/ov62_02236CBC.c
@@ -13,13 +13,13 @@
 #include "overlay062/struct_ov62_022312B0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "touch_screen.h"
 #include "unk_02005474.h"
@@ -35,12 +35,12 @@ typedef struct {
     f32 unk_04[5];
     int unk_18[5];
     int unk_2C[5];
-    CellActorData *unk_40[5];
-    CellActorData *unk_54[5];
-    CellActorData *unk_68[5];
-    CellActorData *unk_7C[5];
+    ManagedSprite *unk_40[5];
+    ManagedSprite *unk_54[5];
+    ManagedSprite *unk_68[5];
+    ManagedSprite *unk_7C[5];
     int unk_90;
-    CellActorData *unk_94[2];
+    ManagedSprite *unk_94[2];
     UnkStruct_ov62_022312B0 unk_9C[2];
     int unk_D4;
     int unk_D8;
@@ -74,9 +74,9 @@ static void ov62_02236CBC(UnkStruct_0208C06C *param0, int param1)
     UnkStruct_ov62_02236CBC *v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetPositionXY2(v0->unk_9C[1].unk_08, 128, 232);
+        ManagedSprite_SetPositionXY(v0->unk_9C[1].unk_08, 128, 232);
     } else {
-        Sprite_SetPositionXY2(v0->unk_9C[1].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_9C[1].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_9C[1].unk_0C, 36, -8);
@@ -106,15 +106,15 @@ static void ov62_02236D48(UnkStruct_0208C06C *param0)
     ov62_0223118C(&v0->unk_9C[1], &param0->unk_14, NNS_G2D_VRAM_TYPE_2DSUB);
     ov62_0223124C(&v0->unk_9C[1], &param0->unk_14, 3);
 
-    Sprite_SetPositionXY2(v0->unk_9C[1].unk_08, 128, 232);
+    ManagedSprite_SetPositionXY(v0->unk_9C[1].unk_08, 128, 232);
     sub_020128C4(v0->unk_9C[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_9C[1].unk_0C, 1);
 
     v0->unk_94[1] = ov62_022313E0(param0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    Sprite_SetPositionXY2(v0->unk_94[1], 220, 160 + 64);
-    Sprite_SetAnim(v0->unk_94[1], 2);
-    Sprite_SetDrawFlag2(v0->unk_94[1], 0);
+    ManagedSprite_SetPositionXY(v0->unk_94[1], 220, 160 + 64);
+    ManagedSprite_SetAnim(v0->unk_94[1], 2);
+    ManagedSprite_SetDrawFlag(v0->unk_94[1], 0);
 
     ov62_02236CBC(param0, 1);
 }
@@ -284,9 +284,9 @@ static void ov62_022371CC(UnkStruct_0208C06C *param0)
 
     for (v0 = 0; v0 < 5; v0++) {
         v4->unk_40[v0] = SpriteSystem_NewSprite(param0->unk_14.unk_04, param0->unk_14.unk_08, &v9);
-        Sprite_SetAnim(v4->unk_40[v0], 1);
-        Sprite_TickOneFrame(v4->unk_40[v0]);
-        Sprite_SetAffineScale(v4->unk_40[v0], v4->unk_04[v0], v4->unk_04[v0]);
+        ManagedSprite_SetAnim(v4->unk_40[v0], 1);
+        ManagedSprite_TickFrame(v4->unk_40[v0]);
+        ManagedSprite_SetAffineScale(v4->unk_40[v0], v4->unk_04[v0], v4->unk_04[v0]);
     }
 
     for (v0 = 0; v0 < 5; v0++) {
@@ -304,14 +304,14 @@ static void ov62_022371CC(UnkStruct_0208C06C *param0)
         v4->unk_54[v0] = SpriteSystem_NewSprite(param0->unk_14.unk_04, param0->unk_14.unk_08, &v9);
 
         if (v0 == 3) {
-            Sprite_SetAnim(v4->unk_54[v0], 0);
+            ManagedSprite_SetAnim(v4->unk_54[v0], 0);
         } else {
-            Sprite_SetAnim(v4->unk_54[v0], 1);
+            ManagedSprite_SetAnim(v4->unk_54[v0], 1);
         }
 
-        Sprite_TickOneFrame(v4->unk_54[v0]);
-        Sprite_SetAffineScale(v4->unk_54[v0], v4->unk_04[v0], v4->unk_04[v0]);
-        Sprite_SetExplicitPalette2(v4->unk_54[v0], 10 + v0);
+        ManagedSprite_TickFrame(v4->unk_54[v0]);
+        ManagedSprite_SetAffineScale(v4->unk_54[v0], v4->unk_04[v0], v4->unk_04[v0]);
+        ManagedSprite_SetExplicitPalette(v4->unk_54[v0], 10 + v0);
     }
 
     v9.resources[0] = 28282;
@@ -336,19 +336,19 @@ static void ov62_022371CC(UnkStruct_0208C06C *param0)
         v4->unk_68[v0] = SpriteSystem_NewSprite(param0->unk_14.unk_04, param0->unk_14.unk_08, &v9);
 
         if (v3[v0] == 0) {
-            Sprite_SetAnim(v4->unk_68[v0], 5);
-            Sprite_SetExplicitPalette2(v4->unk_68[v0], 4 + 5);
-            Sprite_SetDrawFlag2(v4->unk_54[v0], 0);
-            Sprite_SetDrawFlag2(v4->unk_40[v0], 0);
+            ManagedSprite_SetAnim(v4->unk_68[v0], 5);
+            ManagedSprite_SetExplicitPalette(v4->unk_68[v0], 4 + 5);
+            ManagedSprite_SetDrawFlag(v4->unk_54[v0], 0);
+            ManagedSprite_SetDrawFlag(v4->unk_40[v0], 0);
         } else {
             int v11[] = { 0, 1, 4, 3, 2 };
 
-            Sprite_SetAnim(v4->unk_68[v0], v11[v0]);
-            Sprite_SetExplicitPalette2(v4->unk_68[v0], 4 + v11[v0]);
+            ManagedSprite_SetAnim(v4->unk_68[v0], v11[v0]);
+            ManagedSprite_SetExplicitPalette(v4->unk_68[v0], 4 + v11[v0]);
         }
 
-        Sprite_TickOneFrame(v4->unk_68[v0]);
-        Sprite_SetAffineScale(v4->unk_68[v0], v4->unk_04[v0], v4->unk_04[v0]);
+        ManagedSprite_TickFrame(v4->unk_68[v0]);
+        ManagedSprite_SetAffineScale(v4->unk_68[v0], v4->unk_04[v0], v4->unk_04[v0]);
     }
 
     v9.resources[0] = 29292;
@@ -385,22 +385,22 @@ static void ov62_022371CC(UnkStruct_0208C06C *param0)
 
         if (v2[v0] == 0) {
             if (v0 < v1) {
-                Sprite_SetDrawFlag2(v4->unk_7C[v0], 0);
+                ManagedSprite_SetDrawFlag(v4->unk_7C[v0], 0);
             }
         }
 
-        Sprite_SetAnim(v4->unk_7C[v0], v2[v0]);
+        ManagedSprite_SetAnim(v4->unk_7C[v0], v2[v0]);
         ov62_02230E68(v4->unk_7C[v0], 88 + (16 * v0), 72);
-        Sprite_TickOneFrame(v4->unk_7C[v0]);
+        ManagedSprite_TickFrame(v4->unk_7C[v0]);
     }
 
-    Sprite_SetDrawFlag2(v4->unk_7C[4 - 1], TRUE);
-    Sprite_SetDrawFlag2(v4->unk_7C[4 - 0], TRUE);
+    ManagedSprite_SetDrawFlag(v4->unk_7C[4 - 1], TRUE);
+    ManagedSprite_SetDrawFlag(v4->unk_7C[4 - 0], TRUE);
 
     for (v0 = 0; v0 < 5; v0++) {
-        Sprite_SetAffineOverwriteMode(v4->unk_40[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineOverwriteMode(v4->unk_54[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineOverwriteMode(v4->unk_68[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineOverwriteMode(v4->unk_40[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineOverwriteMode(v4->unk_54[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineOverwriteMode(v4->unk_68[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
     }
 }
 
@@ -466,22 +466,22 @@ static BOOL ov62_022375A4(UnkStruct_0208C06C *param0)
         if (v0->unk_2C[0] != 0) {
             v0->unk_04[v1] += 0.05f;
         } else {
-            Sprite_SetAffineOverwriteMode(v0->unk_40[v1], AFFINE_OVERWRITE_MODE_NONE);
-            Sprite_SetAffineOverwriteMode(v0->unk_54[v1], AFFINE_OVERWRITE_MODE_NONE);
-            Sprite_SetAffineOverwriteMode(v0->unk_68[v1], AFFINE_OVERWRITE_MODE_NONE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_40[v1], AFFINE_OVERWRITE_MODE_NONE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_54[v1], AFFINE_OVERWRITE_MODE_NONE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_68[v1], AFFINE_OVERWRITE_MODE_NONE);
             v0->unk_04[v1] = 1.0f;
         }
 
         v4 = (128 << FX32_SHIFT) + CalcSineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
         v5 = (106 << FX32_SHIFT) - CalcCosineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
 
-        Sprite_SetPositionFxXY(v0->unk_68[v1], v4, v5);
-        Sprite_GetPositionXY2(v0->unk_68[v1], &v2, &v3);
-        Sprite_SetPositionXY2(v0->unk_40[v1], v2 - 32, v3 - 2);
-        Sprite_SetPositionXY2(v0->unk_54[v1], v2 + 16, v3 - 2);
-        Sprite_SetAffineScale(v0->unk_68[v1], v0->unk_04[v1], v0->unk_04[v1]);
-        Sprite_SetAffineScale(v0->unk_40[v1], v0->unk_04[v1], v0->unk_04[v1]);
-        Sprite_SetAffineScale(v0->unk_54[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetPositionFxXY(v0->unk_68[v1], v4, v5);
+        ManagedSprite_GetPositionXY(v0->unk_68[v1], &v2, &v3);
+        ManagedSprite_SetPositionXY(v0->unk_40[v1], v2 - 32, v3 - 2);
+        ManagedSprite_SetPositionXY(v0->unk_54[v1], v2 + 16, v3 - 2);
+        ManagedSprite_SetAffineScale(v0->unk_68[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetAffineScale(v0->unk_40[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetAffineScale(v0->unk_54[v1], v0->unk_04[v1], v0->unk_04[v1]);
     }
 
     if (v0->unk_2C[0] == 0) {
@@ -505,9 +505,9 @@ static BOOL ov62_022376C4(UnkStruct_0208C06C *param0)
 
     if (v0->unk_2C[0] == 20) {
         for (v1 = 0; v1 < 5; v1++) {
-            Sprite_SetAffineOverwriteMode(v0->unk_40[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
-            Sprite_SetAffineOverwriteMode(v0->unk_54[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
-            Sprite_SetAffineOverwriteMode(v0->unk_68[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_40[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_54[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
+            ManagedSprite_SetAffineOverwriteMode(v0->unk_68[v1], AFFINE_OVERWRITE_MODE_DOUBLE);
         }
     }
 
@@ -517,21 +517,21 @@ static BOOL ov62_022376C4(UnkStruct_0208C06C *param0)
         if (v0->unk_2C[0] != 0) {
             v0->unk_04[v1] -= 0.05f;
         } else {
-            Sprite_SetDrawFlag2(v0->unk_68[v1], 0);
-            Sprite_SetDrawFlag2(v0->unk_40[v1], 0);
-            Sprite_SetDrawFlag2(v0->unk_54[v1], 0);
+            ManagedSprite_SetDrawFlag(v0->unk_68[v1], 0);
+            ManagedSprite_SetDrawFlag(v0->unk_40[v1], 0);
+            ManagedSprite_SetDrawFlag(v0->unk_54[v1], 0);
         }
 
         v4 = (128 << FX32_SHIFT) - CalcSineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
         v5 = (106 << FX32_SHIFT) - CalcCosineDegrees_Wraparound(v0->unk_2C[v1]) * v0->unk_18[v1];
 
-        Sprite_SetPositionFxXY(v0->unk_68[v1], v4, v5);
-        Sprite_GetPositionXY2(v0->unk_68[v1], &v2, &v3);
-        Sprite_SetPositionXY2(v0->unk_40[v1], v2 - 32, v3 - 2);
-        Sprite_SetPositionXY2(v0->unk_54[v1], v2 + 16, v3 - 2);
-        Sprite_SetAffineScale(v0->unk_68[v1], v0->unk_04[v1], v0->unk_04[v1]);
-        Sprite_SetAffineScale(v0->unk_40[v1], v0->unk_04[v1], v0->unk_04[v1]);
-        Sprite_SetAffineScale(v0->unk_54[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetPositionFxXY(v0->unk_68[v1], v4, v5);
+        ManagedSprite_GetPositionXY(v0->unk_68[v1], &v2, &v3);
+        ManagedSprite_SetPositionXY(v0->unk_40[v1], v2 - 32, v3 - 2);
+        ManagedSprite_SetPositionXY(v0->unk_54[v1], v2 + 16, v3 - 2);
+        ManagedSprite_SetAffineScale(v0->unk_68[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetAffineScale(v0->unk_40[v1], v0->unk_04[v1], v0->unk_04[v1]);
+        ManagedSprite_SetAffineScale(v0->unk_54[v1], v0->unk_04[v1], v0->unk_04[v1]);
     }
 
     if (v0->unk_2C[0] == 0) {
@@ -560,10 +560,10 @@ static void ov62_02237814(UnkStruct_0208C06C *param0)
         v5 = v7[v1][0] << FX32_SHIFT;
         v6 = v7[v1][1] << FX32_SHIFT;
 
-        Sprite_SetPositionFxXY(v0->unk_68[v1], v5, v6);
-        Sprite_GetPositionXY2(v0->unk_68[v1], &v3, &v4);
-        Sprite_SetPositionXY2(v0->unk_40[v1], v3 - 32, v4 - 2);
-        Sprite_SetPositionXY2(v0->unk_54[v1], v3 + 16, v4 - 2);
+        ManagedSprite_SetPositionFxXY(v0->unk_68[v1], v5, v6);
+        ManagedSprite_GetPositionXY(v0->unk_68[v1], &v3, &v4);
+        ManagedSprite_SetPositionXY(v0->unk_40[v1], v3 - 32, v4 - 2);
+        ManagedSprite_SetPositionXY(v0->unk_54[v1], v3 + 16, v4 - 2);
     }
 }
 
diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c
index b6e81766d4..358771acd0 100644
--- a/src/overlay062/ov62_02237D24.c
+++ b/src/overlay062/ov62_02237D24.c
@@ -1303,13 +1303,13 @@ static void ov62_0223958C(UnkStruct_0208C06C *param0, int param1)
     UnkStruct_ov62_02237D24 *v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_198[1].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_198[1].unk_08, 1);
         sub_020129D0(v0->unk_198[1].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_198[0].unk_08, 32, 232);
+        ManagedSprite_SetPositionXY(v0->unk_198[0].unk_08, 32, 232);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_198[1].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_198[1].unk_08, 0);
         sub_020129D0(v0->unk_198[1].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_198[0].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_198[0].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_198[0].unk_0C, 36, -8);
@@ -1330,10 +1330,10 @@ static void ov62_02239608(UnkStruct_0208C06C *param0)
     ov62_0223124C(&v0->unk_198[0], &param0->unk_14, 3);
     ov62_0223124C(&v0->unk_198[1], &param0->unk_14, 53);
 
-    Sprite_SetAnim(v0->unk_198[0].unk_08, 0);
-    Sprite_SetAnim(v0->unk_198[1].unk_08, 4);
-    Sprite_SetPositionXY2(v0->unk_198[0].unk_08, 32, 232);
-    Sprite_SetPositionXY2(v0->unk_198[1].unk_08, 128, 232);
+    ManagedSprite_SetAnim(v0->unk_198[0].unk_08, 0);
+    ManagedSprite_SetAnim(v0->unk_198[1].unk_08, 4);
+    ManagedSprite_SetPositionXY(v0->unk_198[0].unk_08, 32, 232);
+    ManagedSprite_SetPositionXY(v0->unk_198[1].unk_08, 128, 232);
     sub_020128C4(v0->unk_198[0].unk_0C, 36, -8);
     sub_020128C4(v0->unk_198[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_198[0].unk_0C, 1);
diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c
index 048a8546a6..c8f811ef35 100644
--- a/src/overlay062/ov62_02239D60.c
+++ b/src/overlay062/ov62_02239D60.c
@@ -39,6 +39,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -68,8 +69,8 @@ typedef struct {
     int unk_1B0;
     Window unk_1B4[8];
     Window unk_234[8];
-    CellActorData *unk_2B4[30];
-    Sprite *unk_32C;
+    ManagedSprite *unk_2B4[30];
+    PokemonSprite *unk_32C;
     UnkStruct_02023FCC *unk_330[5];
     UnkStruct_02023FCC *unk_344;
     UnkStruct_ov62_022312B0 unk_348[2];
@@ -574,13 +575,13 @@ static void ov62_0223A4C8(UnkStruct_0208C06C *param0, int param1)
     UnkStruct_ov62_02239DBC *v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_348[1].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_348[1].unk_08, 1);
         sub_020129D0(v0->unk_348[1].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_348[0].unk_08, 32, 232);
+        ManagedSprite_SetPositionXY(v0->unk_348[0].unk_08, 32, 232);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_348[1].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_348[1].unk_08, 0);
         sub_020129D0(v0->unk_348[1].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_348[0].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_348[0].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_348[0].unk_0C, 36, -8);
@@ -1115,9 +1116,9 @@ static void ov62_0223AE60(UnkStruct_0208C06C *param0)
             v0->unk_2B4[v5] = SpriteSystem_NewSprite(v1, v2, &v4);
             v8 = PokeIconPaletteIndex(v7, v6, v9);
 
-            Sprite_SetExplicitPaletteOffset(v0->unk_2B4[v5], 4 + v8);
-            Sprite_SetAnim(v0->unk_2B4[v5], 1);
-            Sprite_SetPriority(v0->unk_2B4[v5], 30 - v5);
+            ManagedSprite_SetExplicitPaletteOffset(v0->unk_2B4[v5], 4 + v8);
+            ManagedSprite_SetAnim(v0->unk_2B4[v5], 1);
+            ManagedSprite_SetPriority(v0->unk_2B4[v5], 30 - v5);
         }
     }
 }
@@ -1135,7 +1136,7 @@ static void ov62_0223AFC0(UnkStruct_0208C06C *param0, int param1)
             continue;
         }
 
-        Sprite_SetDrawFlag2(v0->unk_2B4[v1], param1);
+        ManagedSprite_SetDrawFlag(v0->unk_2B4[v1], param1);
     }
 }
 
diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c
index 3f3a9c0f49..b481cb00bd 100644
--- a/src/overlay062/ov62_0223CAEC.c
+++ b/src/overlay062/ov62_0223CAEC.c
@@ -794,13 +794,13 @@ static void ov62_0223D3A8 (UnkStruct_0208C06C * param0, int param1)
     UnkStruct_ov62_0223D518 * v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_A4[0].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_A4[0].unk_08, 1);
         sub_020129D0(v0->unk_A4[0].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_A4[1].unk_08, 128, 232);
+        ManagedSprite_SetPositionXY(v0->unk_A4[1].unk_08, 128, 232);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_A4[0].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_A4[0].unk_08, 0);
         sub_020129D0(v0->unk_A4[0].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_A4[1].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_A4[1].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_A4[0].unk_0C, 36, -8);
@@ -821,8 +821,8 @@ static void ov62_0223D424 (UnkStruct_0208C06C * param0)
     ov62_0223124C(&v0->unk_A4[0], &param0->unk_14, 53);
     ov62_0223124C(&v0->unk_A4[1], &param0->unk_14, 3);
 
-    Sprite_SetPositionXY2(v0->unk_A4[0].unk_08, 32, 232);
-    Sprite_SetPositionXY2(v0->unk_A4[1].unk_08, 128, 232);
+    ManagedSprite_SetPositionXY(v0->unk_A4[0].unk_08, 32, 232);
+    ManagedSprite_SetPositionXY(v0->unk_A4[1].unk_08, 128, 232);
     sub_020128C4(v0->unk_A4[0].unk_0C, 36, -8);
     sub_020128C4(v0->unk_A4[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_A4[0].unk_0C, 0);
diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c
index c67c7230ad..8112b3313e 100644
--- a/src/overlay062/ov62_0223DFA8.c
+++ b/src/overlay062/ov62_0223DFA8.c
@@ -201,7 +201,7 @@ static void ov62_0223DFA8 (UnkStruct_0208C06C * param0)
     for (v1 = 0; v1 < 5; v1++) {
         for (v2 = 0; v2 < 6; v2++) {
             if (v3->unk_2008.unk_0C[v1][v2].unk_04) {
-                Sprite_SetPositionXY2(v3->unk_2008.unk_0C[v1][v2].unk_04, v0[(v1 * 6) + v2][0], v0[(v1 * 6) + v2][1]);
+                ManagedSprite_SetPositionXY(v3->unk_2008.unk_0C[v1][v2].unk_04, v0[(v1 * 6) + v2][0], v0[(v1 * 6) + v2][1]);
             }
         }
     }
@@ -221,10 +221,10 @@ static void ov62_0223E01C (UnkStruct_0208C06C * param0)
     ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
     ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 94);
 
-    Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-    Sprite_SetAnim(v0->unk_114[1].unk_08, 3);
-    Sprite_SetPositionXY2(v0->unk_114[0].unk_08, 32, 232);
-    Sprite_SetPositionXY2(v0->unk_114[1].unk_08, 128, 232);
+    ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+    ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 3);
+    ManagedSprite_SetPositionXY(v0->unk_114[0].unk_08, 32, 232);
+    ManagedSprite_SetPositionXY(v0->unk_114[1].unk_08, 128, 232);
     sub_020128C4(v0->unk_114[0].unk_0C, 36, -8);
     sub_020128C4(v0->unk_114[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_114[0].unk_0C, 1);
@@ -594,8 +594,8 @@ static BOOL ov62_0223E8BC (UnkStruct_0208C06C * param0)
         if (param0->unk_86C == 210) {
             ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 94);
-            Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_114[1].unk_08, 3);
+            ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 3);
         }
 
         ov62_0224088C(param0);
@@ -690,8 +690,8 @@ static BOOL ov62_0223EB28 (UnkStruct_0208C06C * param0)
         if (param0->unk_86C == 210) {
             ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 94);
-            Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_114[1].unk_08, 3);
+            ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 3);
         }
 
         ov62_02240900(param0);
@@ -775,8 +775,8 @@ static BOOL ov62_0223ED7C (UnkStruct_0208C06C * param0)
         if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 0)) {
             ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 111);
-            Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_114[1].unk_08, 1);
+            ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 1);
             ov62_0223F0A8(param0, 1);
             param0->unk_08++;
         }
@@ -867,8 +867,8 @@ static void ov62_0223EF60 (UnkStruct_0208C06C * param0)
             ov62_0223EE88(&v0->unk_114[v1], param0, v1 + 1);
         }
 
-        Sprite_SetPositionXY2(v0->unk_114[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64);
-        Sprite_SetAnim(v0->unk_114[v1].unk_08, v3[v1]);
+        ManagedSprite_SetPositionXY(v0->unk_114[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64);
+        ManagedSprite_SetAnim(v0->unk_114[v1].unk_08, v3[v1]);
         sub_020128C4(v0->unk_114[v1].unk_0C, 36, -8);
         sub_020129D0(v0->unk_114[v1].unk_0C, 1);
     }
@@ -903,13 +903,13 @@ static void ov62_0223F0A8 (UnkStruct_0208C06C * param0, int param1)
     UnkStruct_ov62_0223E01C * v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_114[1].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_114[1].unk_08, 1);
         sub_020129D0(v0->unk_114[1].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_114[0].unk_08, 32, 232);
+        ManagedSprite_SetPositionXY(v0->unk_114[0].unk_08, 32, 232);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_114[1].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_114[1].unk_08, 0);
         sub_020129D0(v0->unk_114[1].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_114[0].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_114[0].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_114[0].unk_0C, 36, -8);
@@ -1327,8 +1327,8 @@ static BOOL ov62_0223F984 (UnkStruct_0208C06C * param0)
             if (v0->unk_1FBC == 6) {
                 ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
                 ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 94);
-                Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-                Sprite_SetAnim(v0->unk_114[1].unk_08, 3);
+                ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+                ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 3);
             }
 
             param0->unk_08++;
@@ -1694,8 +1694,8 @@ static BOOL ov62_02240084 (UnkStruct_0208C06C * param0)
         ov62_0223124C(&v0->unk_114[0], &param0->unk_14, 3);
         ov62_0223124C(&v0->unk_114[1], &param0->unk_14, 94);
 
-        Sprite_SetAnim(v0->unk_114[0].unk_08, 0);
-        Sprite_SetAnim(v0->unk_114[1].unk_08, 3);
+        ManagedSprite_SetAnim(v0->unk_114[0].unk_08, 0);
+        ManagedSprite_SetAnim(v0->unk_114[1].unk_08, 3);
 
         v0->unk_2008.unk_08 = 500;
         v0->unk_2008.unk_04 = param0->unk_14.unk_48C.unk_08;
@@ -2013,12 +2013,12 @@ asm static BOOL ov62_022403F8 (UnkStruct_0208C06C * param0)
     lsl r0, r0, #2
     ldr r0, [r5, r0]
     mov r1, #0
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
     mov r0, #0x4d
     lsl r0, r0, #2
     ldr r0, [r5, r0]
     mov r1, #3
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
  _022405F6:
     add r0, r4, #0
     bl ov62_02240900
@@ -2585,7 +2585,7 @@ static void ov62_02240BF4 (UnkStruct_0208C06C * param0)
             v3->unk_2008.unk_0C[v0][v1].unk_04 = ov62_02233A7C(param0, v3->unk_2008.unk_00, v3->unk_2008.unk_0C[v0][v1].unk_00, v4, v5, v6);
 
             if (v3->unk_2008.unk_0C[v0][v1].unk_04) {
-                Sprite_SetPriority(v3->unk_2008.unk_0C[v0][v1].unk_04, 6 - v1);
+                ManagedSprite_SetPriority(v3->unk_2008.unk_0C[v0][v1].unk_04, 6 - v1);
             }
 
             v3->unk_2008.unk_08++;
@@ -2603,7 +2603,7 @@ static void ov62_02240D98 (UnkStruct_0208C06C * param0, BOOL param1)
     for (v0 = 0; v0 < 5; v0++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (v2->unk_2008.unk_0C[v0][v1].unk_04) {
-                Sprite_SetDrawFlag2(v2->unk_2008.unk_0C[v0][v1].unk_04, param1);
+                ManagedSprite_SetDrawFlag(v2->unk_2008.unk_0C[v0][v1].unk_04, param1);
             }
         }
     }
@@ -2733,7 +2733,7 @@ static void ov62_02240E30 (UnkStruct_0208C06C * param0)
             v5->unk_2008.unk_0C[v2][v1].unk_04 = ov62_02233A7C(param0, v5->unk_2008.unk_00, v5->unk_2008.unk_0C[v2][v1].unk_00, v6, v7, v8);
 
             if (v5->unk_2008.unk_0C[v2][v1].unk_04) {
-                Sprite_SetPriority(v5->unk_2008.unk_0C[v2][v1].unk_04, 6 - v1);
+                ManagedSprite_SetPriority(v5->unk_2008.unk_0C[v2][v1].unk_04, 6 - v1);
             }
 
             v5->unk_2008.unk_08++;
diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c
index 8758d2972b..e2338db245 100644
--- a/src/overlay062/ov62_02241204.c
+++ b/src/overlay062/ov62_02241204.c
@@ -315,7 +315,7 @@ static void ov62_02241204 (UnkStruct_0208C06C * param0)
     for (v1 = 0; v1 < 5; v1++) {
         for (v2 = 0; v2 < 6; v2++) {
             if (v3->unk_50C.unk_0C[v1][v2].unk_04) {
-                Sprite_SetPositionXY2(v3->unk_50C.unk_0C[v1][v2].unk_04, v0[(v1 * 6) + v2][0], v0[(v1 * 6) + v2][1]);
+                ManagedSprite_SetPositionXY(v3->unk_50C.unk_0C[v1][v2].unk_04, v0[(v1 * 6) + v2][0], v0[(v1 * 6) + v2][1]);
             }
         }
     }
@@ -394,7 +394,7 @@ static void ov62_02241278 (UnkStruct_0208C06C * param0)
             v3->unk_50C.unk_0C[v0][v1].unk_04 = ov62_02233A7C(param0, v3->unk_50C.unk_00, v3->unk_50C.unk_0C[v0][v1].unk_00, v8, v9, v10);
 
             if (v3->unk_50C.unk_0C[v0][v1].unk_04) {
-                Sprite_SetPriority(v3->unk_50C.unk_0C[v0][v1].unk_04, 6 - v1);
+                ManagedSprite_SetPriority(v3->unk_50C.unk_0C[v0][v1].unk_04, 6 - v1);
             }
 
             v3->unk_50C.unk_08++;
@@ -412,7 +412,7 @@ static void ov62_0224141C (UnkStruct_0208C06C * param0, BOOL param1)
     for (v0 = 0; v0 < 5; v0++) {
         for (v1 = 0; v1 < 6; v1++) {
             if (v2->unk_50C.unk_0C[v0][v1].unk_04) {
-                Sprite_SetDrawFlag2(v2->unk_50C.unk_0C[v0][v1].unk_04, param1);
+                ManagedSprite_SetDrawFlag(v2->unk_50C.unk_0C[v0][v1].unk_04, param1);
             }
         }
     }
@@ -546,7 +546,7 @@ static void ov62_022414C0 (UnkStruct_0208C06C * param0)
             v5->unk_50C.unk_0C[v2][v1].unk_04 = ov62_02233A7C(param0, v5->unk_50C.unk_00, v5->unk_50C.unk_0C[v2][v1].unk_00, v6, v7, v8);
 
             if (v5->unk_50C.unk_0C[v2][v1].unk_04) {
-                Sprite_SetPriority(v5->unk_50C.unk_0C[v2][v1].unk_04, 6 - v1);
+                ManagedSprite_SetPriority(v5->unk_50C.unk_0C[v2][v1].unk_04, 6 - v1);
             }
 
             v5->unk_50C.unk_08++;
@@ -1974,8 +1974,8 @@ static BOOL ov62_02242F74 (UnkStruct_0208C06C * param0)
             if (v0->unk_0C == 17) {
                 ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
                 ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
-                Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-                Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+                ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+                ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
             }
 
             param0->unk_08++;
@@ -2146,8 +2146,8 @@ static BOOL ov62_02243410 (UnkStruct_0208C06C * param0)
         if (ov62_022315E0(&v0->unk_00, &v0->unk_04, 1, 0)) {
             ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 111);
-            Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_10[1].unk_08, 1);
+            ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 1);
             ov62_02245C08(param0, 1);
             param0->unk_08++;
         }
@@ -2222,8 +2222,8 @@ static BOOL ov62_02243514 (UnkStruct_0208C06C * param0)
             if (param0->unk_86C == 210) {
                 ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
                 ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
-                Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-                Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+                ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+                ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
             }
 
             ov62_02234540(param0, 0);
@@ -2469,8 +2469,8 @@ static BOOL ov62_02243B1C (UnkStruct_0208C06C * param0)
         ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
         ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
 
-        Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-        Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+        ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+        ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
 
         v0->unk_4C0 = 0xffff;
         v0->unk_4C2 = 0xff;
@@ -3250,8 +3250,8 @@ static void ov62_02244BE4 (UnkStruct_0208C06C * param0)
             ov62_022448E0(&v0->unk_10[v1], param0, v1 + 1);
         }
 
-        Sprite_SetPositionXY2(v0->unk_10[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64);
-        Sprite_SetAnim(v0->unk_10[v1].unk_08, v3[v1]);
+        ManagedSprite_SetPositionXY(v0->unk_10[v1].unk_08, 42 + 8, (25 + (36 * (v1)) + (16 * (5 - 4))) + 64);
+        ManagedSprite_SetAnim(v0->unk_10[v1].unk_08, v3[v1]);
         sub_020128C4(v0->unk_10[v1].unk_0C, 36, -8);
         sub_020129D0(v0->unk_10[v1].unk_0C, 1);
     }
@@ -4022,13 +4022,13 @@ static void ov62_02245AC8 (UnkStruct_0208C06C * param0, int param1)
     UnkStruct_ov62_02241204 * v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_10[0].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_10[0].unk_08, 1);
         sub_020129D0(v0->unk_10[0].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_10[1].unk_08, 128, 232 - 64);
+        ManagedSprite_SetPositionXY(v0->unk_10[1].unk_08, 128, 232 - 64);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_10[0].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_10[0].unk_08, 0);
         sub_020129D0(v0->unk_10[0].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_10[1].unk_08, 80, 232 - 64);
+        ManagedSprite_SetPositionXY(v0->unk_10[1].unk_08, 80, 232 - 64);
     }
 
     sub_020128C4(v0->unk_10[0].unk_0C, 36, -8);
@@ -4049,14 +4049,14 @@ static void ov62_02245B24 (UnkStruct_0208C06C * param0)
     ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
     ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 111);
 
-    Sprite_SetPositionXY2(v0->unk_10[0].unk_08, 32, 232 - 64);
-    Sprite_SetPositionXY2(v0->unk_10[1].unk_08, 128, 232 - 64);
+    ManagedSprite_SetPositionXY(v0->unk_10[0].unk_08, 32, 232 - 64);
+    ManagedSprite_SetPositionXY(v0->unk_10[1].unk_08, 128, 232 - 64);
     sub_020128C4(v0->unk_10[0].unk_0C, 36, -8);
     sub_020128C4(v0->unk_10[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_10[0].unk_0C, 1);
     sub_020129D0(v0->unk_10[1].unk_0C, 1);
-    Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-    Sprite_SetAnim(v0->unk_10[1].unk_08, 1);
+    ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+    ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 1);
 
     ov62_02245AC8(param0, 0);
 }
@@ -4079,13 +4079,13 @@ static void ov62_02245C08 (UnkStruct_0208C06C * param0, int param1)
     UnkStruct_ov62_02241204 * v0 = param0->unk_860;
 
     if (param1 == 0) {
-        Sprite_SetDrawFlag2(v0->unk_10[1].unk_08, 1);
+        ManagedSprite_SetDrawFlag(v0->unk_10[1].unk_08, 1);
         sub_020129D0(v0->unk_10[1].unk_0C, 1);
-        Sprite_SetPositionXY2(v0->unk_10[0].unk_08, 32, 232);
+        ManagedSprite_SetPositionXY(v0->unk_10[0].unk_08, 32, 232);
     } else {
-        Sprite_SetDrawFlag2(v0->unk_10[1].unk_08, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_10[1].unk_08, 0);
         sub_020129D0(v0->unk_10[1].unk_0C, 0);
-        Sprite_SetPositionXY2(v0->unk_10[0].unk_08, 80, 232);
+        ManagedSprite_SetPositionXY(v0->unk_10[0].unk_08, 80, 232);
     }
 
     sub_020128C4(v0->unk_10[0].unk_0C, 36, -8);
@@ -4107,17 +4107,17 @@ static void ov62_02245C64 (UnkStruct_0208C06C * param0)
     if (param0->unk_86C == 210) {
         ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
         ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 111);
-        Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-        Sprite_SetAnim(v0->unk_10[1].unk_08, 1);
+        ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+        ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 1);
     } else {
         ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
         ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
-        Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-        Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+        ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+        ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
     }
 
-    Sprite_SetPositionXY2(v0->unk_10[0].unk_08, 32, 232);
-    Sprite_SetPositionXY2(v0->unk_10[1].unk_08, 128, 232);
+    ManagedSprite_SetPositionXY(v0->unk_10[0].unk_08, 32, 232);
+    ManagedSprite_SetPositionXY(v0->unk_10[1].unk_08, 128, 232);
     sub_020128C4(v0->unk_10[0].unk_0C, 36, -8);
     sub_020128C4(v0->unk_10[1].unk_0C, 36, -8);
     sub_020129D0(v0->unk_10[0].unk_0C, 1);
@@ -4472,8 +4472,8 @@ static BOOL ov62_02246428 (UnkStruct_0208C06C * param0)
         if (param0->unk_86C == 210) {
             ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
-            Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+            ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
         }
 
         ov62_022455C4(param0);
@@ -4553,8 +4553,8 @@ static BOOL ov62_02246640 (UnkStruct_0208C06C * param0)
         if (param0->unk_86C == 210) {
             ov62_0223124C(&v0->unk_10[0], &param0->unk_14, 3);
             ov62_0223124C(&v0->unk_10[1], &param0->unk_14, 94);
-            Sprite_SetAnim(v0->unk_10[0].unk_08, 0);
-            Sprite_SetAnim(v0->unk_10[1].unk_08, 3);
+            ManagedSprite_SetAnim(v0->unk_10[0].unk_08, 0);
+            ManagedSprite_SetAnim(v0->unk_10[1].unk_08, 3);
         }
 
         ov62_02245640(param0);
diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c
index 0542cf0ac9..9d52aeb7c9 100644
--- a/src/overlay062/ov62_02246B00.c
+++ b/src/overlay062/ov62_02246B00.c
@@ -8,13 +8,13 @@
 #include "overlay062/struct_ov62_02246BF4_sub1.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "graphics.h"
 #include "heap.h"
 #include "inlines.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "unk_02005474.h"
@@ -203,19 +203,19 @@ BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 *param0)
                     continue;
                 }
 
-                Sprite_OffsetPositionXY2(param0->unk_00[v0].unk_0C, param0->unk_00[v0].unk_14.unk_00, param0->unk_00[v0].unk_14.unk_02);
+                ManagedSprite_OffsetPositionXY(param0->unk_00[v0].unk_0C, param0->unk_00[v0].unk_14.unk_00, param0->unk_00[v0].unk_14.unk_02);
                 param0->unk_00[v0].unk_14.unk_04--;
 
                 if ((v0 >= param0->unk_210) && (v0 < param0->unk_214)) {
-                    Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
+                    ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
                     param0->unk_00[v0].unk_14.unk_05++;
-                    Sprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
+                    ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
                 }
 
                 if ((v0 >= param0->unk_218) && (v0 < param0->unk_21C)) {
-                    Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
+                    ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
                     param0->unk_00[v0].unk_14.unk_05++;
-                    Sprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
+                    ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
                 }
             }
 
@@ -224,19 +224,19 @@ BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 *param0)
                     continue;
                 }
 
-                Sprite_OffsetPositionXY2(param0->unk_150[v0].unk_0C, param0->unk_150[v0].unk_14.unk_00, param0->unk_150[v0].unk_14.unk_02);
+                ManagedSprite_OffsetPositionXY(param0->unk_150[v0].unk_0C, param0->unk_150[v0].unk_14.unk_00, param0->unk_150[v0].unk_14.unk_02);
                 param0->unk_150[v0].unk_14.unk_04--;
             }
 
             if (param0->unk_00[0].unk_14.unk_04 == 0) {
                 for (v0 = param0->unk_210; v0 < param0->unk_214; v0++) {
-                    Sprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
-                    Sprite_TickOneFrame(param0->unk_00[v0].unk_0C);
+                    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+                    ManagedSprite_TickFrame(param0->unk_00[v0].unk_0C);
                 }
 
                 for (v0 = param0->unk_218; v0 < param0->unk_21C; v0++) {
-                    Sprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
-                    Sprite_TickOneFrame(param0->unk_00[v0].unk_0C);
+                    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+                    ManagedSprite_TickFrame(param0->unk_00[v0].unk_0C);
                 }
                 param0->unk_1FC++;
             }
@@ -246,21 +246,21 @@ BOOL ov62_02246DF8(UnkStruct_ov62_02246BF4 *param0)
     case 1:
         for (v0 = param0->unk_210; v0 < param0->unk_214; v0++) {
             if (param0->unk_00[v0].unk_14.unk_05 == 6) {
-                Sprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_NORMAL);
+                ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_NORMAL);
                 continue;
             }
 
-            Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
+            ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
             param0->unk_00[v0].unk_14.unk_05++;
         }
 
         for (v0 = param0->unk_218; v0 < param0->unk_21C; v0++) {
             if (param0->unk_00[v0].unk_14.unk_05 == 6) {
-                Sprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_NORMAL);
+                ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v0].unk_0C, AFFINE_OVERWRITE_MODE_NORMAL);
                 continue;
             }
 
-            Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
+            ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
             param0->unk_00[v0].unk_14.unk_05++;
         }
 
@@ -323,7 +323,7 @@ void ov62_022470A8(UnkStruct_ov62_02246BF4 *param0)
     for (v0 = 0; v0 < param0->unk_204; v0++) {
         if (param0->unk_00[v0].unk_00 == 0) {
             param0->unk_00[v0].unk_00 = 1;
-            Sprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+            ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
         }
 
         v1 = param0->unk_00[v0].unk_00 - 1;
@@ -360,13 +360,13 @@ void ov62_02247160(UnkStruct_ov62_02246BF4 *param0)
     v0 = param0->unk_188[0].unk_00;
     param0->unk_00[v0].unk_00 = 0;
 
-    Sprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
 
     v1 = param0->unk_00[v0].unk_04;
 
     if (v0 > 0) {
         v0--;
-        Sprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+        ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, ov62_02247B3C(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
         v2 = param0->unk_00[v0].unk_04;
 
         if (v1 != v2) {
@@ -476,13 +476,13 @@ void ov62_0224730C(u32 param0, u32 param1, void *param2)
                 v1 = v0->unk_188[0].unk_00;
                 v0->unk_00[v1].unk_00 = param0 - 12 + 1;
 
-                Sprite_SetAnim(v0->unk_00[v1].unk_0C, ov62_02247B3C(v0->unk_00[v1].unk_00, v0->unk_00[v1].unk_08));
+                ManagedSprite_SetAnim(v0->unk_00[v1].unk_0C, ov62_02247B3C(v0->unk_00[v1].unk_00, v0->unk_00[v1].unk_08));
                 ov62_02247968(v0, 1, 1);
                 ov62_022479D4(v0, param0 - 12);
                 ov62_02247968(v0, 1, 0);
                 ov62_02247968(v0, 2, 1);
                 ov62_02247A20(v0, param0 - 12, 2);
-                Sprite_SetAnim(v0->unk_188[2].unk_0C, 3);
+                ManagedSprite_SetAnim(v0->unk_188[2].unk_0C, 3);
 
                 v2 = v0->unk_00[v1].unk_04;
                 v1++;
@@ -661,16 +661,16 @@ void ov62_02247754(UnkStruct_ov62_02246BF4 *param0)
     for (v0 = 0; v0 < param0->unk_204 + 3 - 1; v0++) {
         if (v0 == (param0->unk_150[v2].unk_00 + v2 + 1)) {
             param0->unk_150[v2].unk_0C = SpriteSystem_NewSprite(v4, v5, &v3);
-            Sprite_SetPositionXY2(param0->unk_150[v2].unk_0C, 72 + (v0 * 8) + 4, 24);
-            Sprite_SetAnim(param0->unk_150[v2].unk_0C, 22);
-            Sprite_TickOneFrame(param0->unk_150[v2].unk_0C);
+            ManagedSprite_SetPositionXY(param0->unk_150[v2].unk_0C, 72 + (v0 * 8) + 4, 24);
+            ManagedSprite_SetAnim(param0->unk_150[v2].unk_0C, 22);
+            ManagedSprite_TickFrame(param0->unk_150[v2].unk_0C);
             v2++;
         } else {
             param0->unk_00[v1].unk_0C = SpriteSystem_NewSprite(v4, v5, &v3);
-            Sprite_SetPositionXY2(param0->unk_00[v1].unk_0C, 72 + (v0 * 8) + 4, 24);
-            Sprite_SetAnim(param0->unk_00[v1].unk_0C, ov62_02247B3C(param0->unk_00[v1].unk_00, param0->unk_00[v1].unk_08));
-            Sprite_SetAffineOverwriteMode(param0->unk_00[v1].unk_0C, AFFINE_OVERWRITE_MODE_NONE);
-            Sprite_TickOneFrame(param0->unk_00[v1].unk_0C);
+            ManagedSprite_SetPositionXY(param0->unk_00[v1].unk_0C, 72 + (v0 * 8) + 4, 24);
+            ManagedSprite_SetAnim(param0->unk_00[v1].unk_0C, ov62_02247B3C(param0->unk_00[v1].unk_00, param0->unk_00[v1].unk_08));
+            ManagedSprite_SetAffineOverwriteMode(param0->unk_00[v1].unk_0C, AFFINE_OVERWRITE_MODE_NONE);
+            ManagedSprite_TickFrame(param0->unk_00[v1].unk_0C);
             v1++;
         }
     }
@@ -708,26 +708,26 @@ void ov62_0224784C(UnkStruct_ov62_02246BF4 *param0)
     param0->unk_188[2].unk_0C = SpriteSystem_NewSprite(v1, v2, &v0);
 
     ov62_02247998(param0, 0);
-    Sprite_SetAnim(param0->unk_188[0].unk_0C, 0);
-    Sprite_TickOneFrame(param0->unk_188[0].unk_0C);
+    ManagedSprite_SetAnim(param0->unk_188[0].unk_0C, 0);
+    ManagedSprite_TickFrame(param0->unk_188[0].unk_0C);
 
     param0->unk_188[1].unk_14.unk_00 = 0;
     param0->unk_188[1].unk_14.unk_02 = 0;
     param0->unk_188[1].unk_00 = 1;
 
     ov62_022479D4(param0, 0);
-    Sprite_SetAnim(param0->unk_188[1].unk_0C, param0->unk_188[1].unk_00);
-    Sprite_TickOneFrame(param0->unk_188[1].unk_0C);
-    Sprite_SetExplicitOamMode2(param0->unk_188[1].unk_0C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnim(param0->unk_188[1].unk_0C, param0->unk_188[1].unk_00);
+    ManagedSprite_TickFrame(param0->unk_188[1].unk_0C);
+    ManagedSprite_SetExplicitOamMode(param0->unk_188[1].unk_0C, GX_OAM_MODE_XLU);
 
     param0->unk_188[2].unk_14.unk_00 = 0;
     param0->unk_188[2].unk_14.unk_02 = 0;
     param0->unk_188[2].unk_00 = 1;
 
     ov62_022479D4(param0, 0);
-    Sprite_SetAnim(param0->unk_188[2].unk_0C, param0->unk_188[2].unk_00);
-    Sprite_TickOneFrame(param0->unk_188[2].unk_0C);
-    Sprite_SetExplicitOamMode2(param0->unk_188[2].unk_0C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnim(param0->unk_188[2].unk_0C, param0->unk_188[2].unk_00);
+    ManagedSprite_TickFrame(param0->unk_188[2].unk_0C);
+    ManagedSprite_SetExplicitOamMode(param0->unk_188[2].unk_0C, GX_OAM_MODE_XLU);
     ov62_02247968(param0, 1, 0);
     ov62_02247968(param0, 2, 0);
 }
@@ -735,22 +735,22 @@ void ov62_0224784C(UnkStruct_ov62_02246BF4 *param0)
 void ov62_02247968(UnkStruct_ov62_02246BF4 *param0, int param1, BOOL param2)
 {
     if (param2 == 1) {
-        Sprite_SetDrawFlag2(param0->unk_188[param1].unk_0C, 1);
+        ManagedSprite_SetDrawFlag(param0->unk_188[param1].unk_0C, 1);
     } else {
-        Sprite_SetDrawFlag2(param0->unk_188[param1].unk_0C, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_188[param1].unk_0C, 0);
     }
 }
 
 void ov62_02247998(UnkStruct_ov62_02246BF4 *param0, int param1)
 {
     s16 v0, v1;
-    CellActorData *v2;
+    ManagedSprite *v2;
 
     v2 = param0->unk_00[param1].unk_0C;
     param0->unk_188[0].unk_00 = param1;
 
-    Sprite_GetPositionXY2(v2, &v0, &v1);
-    Sprite_SetPositionXY2(param0->unk_188[0].unk_0C, v0, v1 + 16);
+    ManagedSprite_GetPositionXY(v2, &v0, &v1);
+    ManagedSprite_SetPositionXY(param0->unk_188[0].unk_0C, v0, v1 + 16);
 }
 
 void ov62_022479D4(UnkStruct_ov62_02246BF4 *param0, int param1)
@@ -760,7 +760,7 @@ void ov62_022479D4(UnkStruct_ov62_02246BF4 *param0, int param1)
     v0 = (param0->unk_220.unk_18[param1 + 12].rect.left + param0->unk_220.unk_18[param1 + 12].rect.right) / 2;
     v1 = (param0->unk_220.unk_18[param1 + 12].rect.top + param0->unk_220.unk_18[param1 + 12].rect.bottom) / 2;
 
-    Sprite_SetPositionXY2(param0->unk_188[1].unk_0C, v0 - 0, v1 - 8);
+    ManagedSprite_SetPositionXY(param0->unk_188[1].unk_0C, v0 - 0, v1 - 8);
 }
 
 void ov62_02247A20(UnkStruct_ov62_02246BF4 *param0, int param1, int param2)
@@ -770,14 +770,14 @@ void ov62_02247A20(UnkStruct_ov62_02246BF4 *param0, int param1, int param2)
     v0 = (param0->unk_220.unk_18[param1 + 12].rect.left + param0->unk_220.unk_18[param1 + 12].rect.right) / 2;
     v1 = (param0->unk_220.unk_18[param1 + 12].rect.top + param0->unk_220.unk_18[param1 + 12].rect.bottom) / 2;
 
-    Sprite_SetPositionXY2(param0->unk_188[param2].unk_0C, v0 - 0, v1 - 8);
+    ManagedSprite_SetPositionXY(param0->unk_188[param2].unk_0C, v0 - 0, v1 - 8);
 }
 
 void ov62_02247A70(UnkStruct_ov62_02246BF4 *param0)
 {
-    Sprite_TickOneFrame(param0->unk_188[0].unk_0C);
-    Sprite_TickOneFrame(param0->unk_188[1].unk_0C);
-    Sprite_TickOneFrame(param0->unk_188[2].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_188[0].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_188[1].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_188[2].unk_0C);
 
     {
         int v0 = 2;
@@ -785,13 +785,13 @@ void ov62_02247A70(UnkStruct_ov62_02246BF4 *param0)
         BOOL v2;
 
         for (v0 = 1; v0 < 3; v0++) {
-            v1 = Sprite_GetActiveAnim(param0->unk_188[v0].unk_0C);
+            v1 = ManagedSprite_GetActiveAnim(param0->unk_188[v0].unk_0C);
 
             if (v1 == 3) {
-                v2 = Sprite_IsAnimated(param0->unk_188[v0].unk_0C);
+                v2 = ManagedSprite_IsAnimated(param0->unk_188[v0].unk_0C);
 
                 if (v2 == 0) {
-                    Sprite_SetAnim(param0->unk_188[v0].unk_0C, param0->unk_188[v0].unk_00);
+                    ManagedSprite_SetAnim(param0->unk_188[v0].unk_0C, param0->unk_188[v0].unk_00);
 
                     if (param0->unk_220.unk_78 == 1) {
                         ov62_02247968(param0, 1, 0);
@@ -803,11 +803,11 @@ void ov62_02247A70(UnkStruct_ov62_02246BF4 *param0)
                 }
             } else {
                 if (v1 != param0->unk_188[v0].unk_00) {
-                    Sprite_SetAnim(param0->unk_188[v0].unk_0C, param0->unk_188[v0].unk_00);
+                    ManagedSprite_SetAnim(param0->unk_188[v0].unk_0C, param0->unk_188[v0].unk_00);
                 }
 
                 {
-                    v1 = Sprite_GetActiveAnim(param0->unk_188[2].unk_0C);
+                    v1 = ManagedSprite_GetActiveAnim(param0->unk_188[2].unk_0C);
 
                     if (v1 != 3) {
                         if (param0->unk_220.unk_78 == 1) {
@@ -872,10 +872,10 @@ void ov62_02247B88(UnkStruct_ov62_02246BF4 *param0, int param1)
             }
         }
 
-        Sprite_GetPositionXY2(param0->unk_00[v0].unk_0C, &v3, &v4);
+        ManagedSprite_GetPositionXY(param0->unk_00[v0].unk_0C, &v3, &v4);
 
         if (param1 == 0) {
-            Sprite_SetPositionXY2(param0->unk_00[v0].unk_0C, v2, v4);
+            ManagedSprite_SetPositionXY(param0->unk_00[v0].unk_0C, v2, v4);
         } else {
             param0->unk_00[v0].unk_14.unk_00 = (v2 - v3) / 2;
             param0->unk_00[v0].unk_14.unk_02 = 0;
@@ -884,7 +884,7 @@ void ov62_02247B88(UnkStruct_ov62_02246BF4 *param0, int param1)
         }
 
         if ((v0 == param0->unk_150[v1].unk_00) && (v1 != 3 - 1)) {
-            Sprite_GetPositionXY2(param0->unk_150[v1].unk_0C, &v3, &v4);
+            ManagedSprite_GetPositionXY(param0->unk_150[v1].unk_0C, &v3, &v4);
 
             if (param0->unk_210 == param0->unk_214) {
                 v2 += 8;
@@ -897,7 +897,7 @@ void ov62_02247B88(UnkStruct_ov62_02246BF4 *param0, int param1)
             }
 
             if (param1 == 0) {
-                Sprite_SetPositionXY2(param0->unk_150[v1].unk_0C, v2, v4);
+                ManagedSprite_SetPositionXY(param0->unk_150[v1].unk_0C, v2, v4);
             } else {
                 param0->unk_150[v1].unk_14.unk_00 = (v2 - v3) / 2;
                 param0->unk_150[v1].unk_14.unk_02 = 0;
@@ -916,7 +916,7 @@ static inline void inline_ov62_02247CE0(UnkStruct_ov62_02246BF4 *param0, int par
 
     v2 = &param0->unk_00[param1];
 
-    Sprite_GetPositionXY2(v2->unk_0C, &v0, &v1);
+    ManagedSprite_GetPositionXY(v2->unk_0C, &v0, &v1);
 
     v2->unk_10->rect.top = v1 - param3;
     v2->unk_10->rect.left = v0 - param2;
diff --git a/src/overlay063/ov63_0222AE60.c b/src/overlay063/ov63_0222AE60.c
index 32e73d7925..de3f79eb7b 100644
--- a/src/overlay063/ov63_0222AE60.c
+++ b/src/overlay063/ov63_0222AE60.c
@@ -5,10 +5,10 @@
 
 #include "overlay064/struct_ov64_022302EC.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -18,7 +18,7 @@ typedef struct {
     SpriteResource *unk_04[2];
     u32 unk_0C;
     int unk_10;
-    CellActorResourceData unk_14;
+    SpriteResourcesHeader unk_14;
 } UnkStruct_ov63_0222BB38_sub1;
 
 typedef struct {
@@ -27,8 +27,8 @@ typedef struct {
 
 typedef struct UnkStruct_ov63_0222BB38_t {
     const UnkStruct_ov63_0222BB38_sub1 *unk_00;
-    CellActor *unk_04;
-    CellActor *unk_08;
+    Sprite *unk_04;
+    Sprite *unk_08;
     int unk_0C;
     int unk_10;
     s16 unk_14;
@@ -37,11 +37,11 @@ typedef struct UnkStruct_ov63_0222BB38_t {
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorResourceData unk_10;
+    SpriteResourcesHeader unk_10;
 } UnkStruct_ov63_0222B96C;
 
 typedef struct UnkStruct_ov63_0222AE60_t {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     PaletteData *unk_04;
     UnkStruct_ov63_0222BB38 *unk_08;
     u32 unk_0C;
@@ -294,7 +294,7 @@ static const u8 Unk_ov63_0222D904[10] = {
     0x0
 };
 
-UnkStruct_ov63_0222AE60 *ov63_0222AE60(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3)
+UnkStruct_ov63_0222AE60 *ov63_0222AE60(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3)
 {
     UnkStruct_ov63_0222AE60 *v0;
     int v1;
@@ -435,16 +435,16 @@ 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;
-    CellActorInitParamsEx v1;
+    AffineSpriteListTemplate v1;
     u32 v2;
 
     v0 = ov63_0222BB00(param0);
     v2 = ov63_0222B450(param2);
 
     GF_ASSERT(ov63_0222B7D4(param0, v2) == 1);
-    memset(&v1, 0, sizeof(CellActorInitParamsEx));
+    memset(&v1, 0, sizeof(AffineSpriteListTemplate));
 
-    v1.collection = param0->unk_00;
+    v1.list = 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;
@@ -460,13 +460,13 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
         v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     }
 
-    v0->unk_04 = CellActorCollection_AddEx(&v1);
-    CellActor_SetExplicitPriority(v0->unk_04, param1->unk_06);
+    v0->unk_04 = SpriteList_AddEx(&v1);
+    Sprite_SetExplicitPriority(v0->unk_04, param1->unk_06);
 
     if (param0->unk_10[v2].unk_10 == 1) {
-        CellActor_SetAnim(v0->unk_04, 5 + 1);
+        Sprite_SetAnim(v0->unk_04, 5 + 1);
     } else {
-        CellActor_SetAnim(v0->unk_04, 1);
+        Sprite_SetAnim(v0->unk_04, 1);
     }
 
     v0->unk_0C = 9;
@@ -475,9 +475,9 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
     v0->unk_00 = &param0->unk_10[v2];
 
     if (ov63_0222B96C(&param0->unk_2248)) {
-        memset(&v1, 0, sizeof(CellActorInitParamsEx));
+        memset(&v1, 0, sizeof(AffineSpriteListTemplate));
 
-        v1.collection = param0->unk_00;
+        v1.list = 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;
@@ -493,9 +493,9 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
             v1.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v0->unk_08 = CellActorCollection_AddEx(&v1);
+        v0->unk_08 = SpriteList_AddEx(&v1);
 
-        CellActor_SetExplicitPriority(v0->unk_08, param1->unk_06);
+        Sprite_SetExplicitPriority(v0->unk_08, param1->unk_06);
     } else {
         v0->unk_08 = NULL;
     }
@@ -506,14 +506,14 @@ UnkStruct_ov63_0222BB38 *ov63_0222B0C0(UnkStruct_ov63_0222AE60 *param0, const Un
 void ov63_0222B210(UnkStruct_ov63_0222BB38 *param0)
 {
     if (param0->unk_08 != NULL) {
-        CellActor_Delete(param0->unk_08);
+        Sprite_Delete(param0->unk_08);
     }
 
-    CellActor_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_04);
     memset(param0, 0, sizeof(UnkStruct_ov63_0222BB38));
 }
 
-const CellActor *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0)
+const Sprite *ov63_0222B234(const UnkStruct_ov63_0222BB38 *param0)
 {
     return param0->unk_04;
 }
@@ -526,38 +526,38 @@ void ov63_0222B238(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2)
     v0.y = param2 << FX32_SHIFT;
     v0.z = 0;
 
-    CellActor_SetPosition(param0->unk_04, &v0);
+    Sprite_SetPosition(param0->unk_04, &v0);
 
     if (param0->unk_08) {
         v0.x += 8 << FX32_SHIFT;
         v0.y += 14 << FX32_SHIFT;
 
-        CellActor_SetPosition(param0->unk_08, &v0);
+        Sprite_SetPosition(param0->unk_08, &v0);
     }
 }
 
 void ov63_0222B278(UnkStruct_ov63_0222BB38 *param0, u16 param1)
 {
-    CellActor_SetPriority(param0->unk_04, param1);
+    Sprite_SetPriority(param0->unk_04, param1);
 }
 
 u16 ov63_0222B284(const UnkStruct_ov63_0222BB38 *param0)
 {
-    return CellActor_GetPriority(param0->unk_04);
+    return Sprite_GetPriority(param0->unk_04);
 }
 
 void ov63_0222B294(UnkStruct_ov63_0222BB38 *param0, BOOL param1)
 {
-    CellActor_SetDrawFlag(param0->unk_04, param1);
+    Sprite_SetDrawFlag(param0->unk_04, param1);
 
     if (param0->unk_08) {
-        CellActor_SetDrawFlag(param0->unk_08, param1);
+        Sprite_SetDrawFlag(param0->unk_08, param1);
     }
 }
 
 BOOL ov63_0222B2B0(const UnkStruct_ov63_0222BB38 *param0)
 {
-    return CellActor_GetDrawFlag(param0->unk_04);
+    return Sprite_GetDrawFlag(param0->unk_04);
 }
 
 int ov63_0222B2BC(const UnkStruct_ov63_0222BB38 *param0)
@@ -572,12 +572,12 @@ int ov63_0222B2C4(const UnkStruct_ov63_0222BB38 *param0)
 
 void ov63_0222B2C8(UnkStruct_ov63_0222BB38 *param0, u16 param1)
 {
-    SpriteActor_SetAnimFrame(param0->unk_04, param1);
+    Sprite_SetAnimFrame(param0->unk_04, param1);
 }
 
 u16 ov63_0222B2D4(const UnkStruct_ov63_0222BB38 *param0)
 {
-    return CellActor_GetAnimFrame(param0->unk_04);
+    return Sprite_GetAnimFrame(param0->unk_04);
 }
 
 void ov63_0222B2E0(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2)
@@ -589,7 +589,7 @@ void ov63_0222B2E0(UnkStruct_ov63_0222BB38 *param0, s16 param1, s16 param2)
         v0.y = param2 + 14 << FX32_SHIFT;
         v0.z = 0;
 
-        CellActor_SetPosition(param0->unk_08, &v0);
+        Sprite_SetPosition(param0->unk_08, &v0);
     }
 }
 
@@ -1018,99 +1018,99 @@ static void ov63_0222BB38(UnkStruct_ov63_0222BB38 *param0)
 static void ov63_0222BB50(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, param0->unk_10);
 }
 
 static void ov63_0222BB5C(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 4);
+    Sprite_SetAnimNoRestart(param0->unk_04, 4);
 }
 
 static void ov63_0222BB6C(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BB7C(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_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;
-    CellActor_SetAnimNoRestart(param0->unk_04, 9 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 9 + param0->unk_10);
 }
 
 static void ov63_0222BBA0(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBB0(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBC0(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBD0(UnkStruct_ov63_0222BB38 *param0, int param1)
 {
     param0->unk_10 = param1;
-    CellActor_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
+    Sprite_SetAnimNoRestart(param0->unk_04, 5 + param0->unk_10);
 }
 
 static void ov63_0222BBE0(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BBF0(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC00(UnkStruct_ov63_0222BB38 *param0)
 {
     if (param0->unk_14 == 0) {
-        SpriteActor_SetAnimFrame(param0->unk_04, 1);
+        Sprite_SetAnimFrame(param0->unk_04, 1);
     } else {
-        CellActor_SetAnim(param0->unk_04, 5 + param0->unk_10);
+        Sprite_SetAnim(param0->unk_04, 5 + param0->unk_10);
     }
 }
 
 static void ov63_0222BC20(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (2 * FX32_ONE));
 }
 
 static void ov63_0222BC30(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC40(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (FX32_ONE));
 }
 
 static void ov63_0222BC50(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (8 * FX32_ONE));
+    Sprite_UpdateAnim(param0->unk_04, (8 * FX32_ONE));
 }
 
 static void ov63_0222BC60(UnkStruct_ov63_0222BB38 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_04, (6 * FX32_ONE));
+    Sprite_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 79265c958d..488b4c52a7 100644
--- a/src/overlay063/ov63_0222CCE4.c
+++ b/src/overlay063/ov63_0222CCE4.c
@@ -12,9 +12,9 @@
 #include "overlay063/struct_ov63_0222CE44.h"
 #include "overlay064/struct_ov64_022302EC.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "palette.h"
+#include "sprite.h"
 
 static BOOL ov63_0222D07C(const UnkStruct_ov63_0222CE44 *param0);
 static UnkStruct_ov63_0222CE44 *ov63_0222D08C(UnkStruct_ov63_0222CD2C *param0);
@@ -22,7 +22,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(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4)
+UnkStruct_ov63_0222CD2C *ov63_0222CCE4(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, u32 param4)
 {
     UnkStruct_ov63_0222CD2C *v0;
 
@@ -39,7 +39,7 @@ UnkStruct_ov63_0222CD2C *ov63_0222CCE4(CellActorCollection *param0, PaletteData
     return v0;
 }
 
-UnkStruct_ov63_0222CD2C *ov63_0222CD2C(CellActorCollection *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
+UnkStruct_ov63_0222CD2C *ov63_0222CD2C(SpriteList *param0, PaletteData *param1, u32 param2, u32 param3, int param4, u32 param5, u32 param6)
 {
     UnkStruct_ov63_0222CD2C *v0;
 
@@ -247,7 +247,7 @@ u32 ov63_0222D034(s16 param0, BOOL param1)
 
 u32 ov63_0222D050(const UnkStruct_ov63_0222CE44 *param0)
 {
-    return CellActor_GetExplicitPaletteOffset(ov63_0222B234(param0->unk_04));
+    return Sprite_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 982a62c4d5..8214698b91 100644
--- a/src/overlay064/ov64_0222DCE0.c
+++ b/src/overlay064/ov64_0222DCE0.c
@@ -21,7 +21,7 @@
 #include "ascii_util.h"
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "char_transfer.h"
 #include "enums.h"
 #include "font.h"
@@ -117,7 +117,7 @@ typedef struct {
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     NNSG2dRenderSurface unk_08;
     G2dRenderer unk_78;
     SpriteResourceCollection *unk_204[4];
@@ -128,9 +128,9 @@ typedef struct {
     Strbuf *unk_230;
     Strbuf *unk_234;
     u32 unk_238;
-    CellActorResourceData unk_23C;
+    SpriteResourcesHeader unk_23C;
     SpriteResource *unk_260[4];
-    CellActor *unk_270[2];
+    Sprite *unk_270[2];
     UnkStruct_ov64_022300E4 unk_278;
 } UnkStruct_ov64_0222E21C;
 
@@ -176,7 +176,7 @@ typedef struct {
     ListMenu *unk_F8;
     Menu *unk_FC;
     s32 unk_100;
-    CellActor *unk_104;
+    Sprite *unk_104;
     u32 unk_108;
 } UnkStruct_ov64_0222F0C4;
 
@@ -852,7 +852,7 @@ static void ov64_0222E1A4(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_
 
 static void ov64_0222E21C(UnkStruct_ov64_0222E21C *param0)
 {
-    CellActorCollection_Update(param0->unk_04);
+    SpriteList_Update(param0->unk_04);
 }
 
 static void ov64_0222E228(UnkStruct_ov64_0222E21C *param0)
@@ -1000,7 +1000,7 @@ static void ov64_0222E570(UnkStruct_ov64_0222E21C *param0)
         SpriteResourceCollection_Delete(param0->unk_204[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_04);
+    SpriteList_Delete(param0->unk_04);
     CharTransfer_Free();
     PlttTransfer_Free();
     RenderOam_Free();
@@ -1160,7 +1160,7 @@ static void ov64_0222E990(UnkStruct_ov64_0222E21C *param0, u32 param1)
 
 static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, u32 param1)
 {
-    static CellActorInitParamsEx v0[2] = {
+    static AffineSpriteListTemplate v0[2] = {
         { NULL,
             NULL,
             { (FX32_CONST(6)), (FX32_CONST(98)), 0 },
@@ -1181,15 +1181,15 @@ static void ov64_0222E9A4(UnkStruct_ov64_0222E21C *param0, u32 param1)
     int v1;
 
     for (v1 = 0; v1 < 2; v1++) {
-        v0[v1].collection = param0->unk_04;
+        v0[v1].list = param0->unk_04;
         v0[v1].resourceData = &param0->unk_23C;
         v0[v1].heapID = param1;
 
-        param0->unk_270[v1] = CellActorCollection_AddEx(&v0[v1]);
+        param0->unk_270[v1] = SpriteList_AddEx(&v0[v1]);
 
-        CellActor_SetAnimateFlag(param0->unk_270[v1], 1);
-        CellActor_SetDrawFlag(param0->unk_270[v1], 0);
-        CellActor_SetAnim(param0->unk_270[v1], v1);
+        Sprite_SetAnimateFlag(param0->unk_270[v1], 1);
+        Sprite_SetDrawFlag(param0->unk_270[v1], 0);
+        Sprite_SetAnim(param0->unk_270[v1], v1);
     }
 }
 
@@ -1198,7 +1198,7 @@ static void ov64_0222EA0C(UnkStruct_ov64_0222E21C *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_270[v0]);
+        Sprite_Delete(param0->unk_270[v0]);
     }
 }
 
@@ -1207,7 +1207,7 @@ static void ov64_0222EA28(UnkStruct_ov64_0222E21C *param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetDrawFlag(param0->unk_270[v0], param1);
+        Sprite_SetDrawFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -1216,7 +1216,7 @@ static void ov64_0222EA48(UnkStruct_ov64_0222E21C *param0, BOOL param1)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetAnimateFlag(param0->unk_270[v0], param1);
+        Sprite_SetAnimateFlag(param0->unk_270[v0], param1);
     }
 }
 
@@ -1905,7 +1905,7 @@ static const u16 Unk_ov64_022321BC[3] = {
     0x1BB
 };
 
-static const CellActorInitParamsEx Unk_ov64_022322B4 = {
+static const AffineSpriteListTemplate Unk_ov64_022322B4 = {
     NULL,
     NULL,
     { 0x0, 0x0, 0x0 },
@@ -2119,7 +2119,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 CellActorCollection_AddEx
+    bl SpriteList_AddEx
     mov r2, #0x42
     ldr r1, [sp, #0x14]
     lsl r2, r2, #2
@@ -2127,7 +2127,7 @@ asm static void ov64_0222F414 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_
     add r0, r1, #0
     ldr r0, [r0, r2]
     mov r1, #0
-    bl CellActor_SetDrawFlag
+    bl Sprite_SetDrawFlag
     add sp, #0x58
     pop {r3, r4, r5, r6, r7, pc}
     nop
@@ -2138,7 +2138,7 @@ static void ov64_0222F5F4 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222
 {
     int v0;
 
-    CellActor_Delete(param0->unk_104);
+    Sprite_Delete(param0->unk_104);
     Window_Remove(&param0->unk_C4);
     Strbuf_Free(param0->unk_D4);
 
@@ -2594,12 +2594,12 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     VecFx32 v0;
     u32 v1;
 
-    CellActor_SetDrawFlag(param0->unk_104, 1);
-    CellActor_SetAnim(param0->unk_104, 2);
+    Sprite_SetDrawFlag(param0->unk_104, 1);
+    Sprite_SetAnim(param0->unk_104, 2);
 
     param0->unk_108 = 0;
 
-    CellActor_SetAnimateFlag(param0->unk_104, 1);
+    Sprite_SetAnimateFlag(param0->unk_104, 1);
 
     v1 = param0->unk_04;
 
@@ -2608,7 +2608,7 @@ static void ov64_0222FF5C (UnkStruct_ov64_0222F0C4 * param0)
     v0.x <<= FX32_SHIFT;
     v0.y <<= FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_104, &v0);
+    Sprite_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);
@@ -2621,11 +2621,11 @@ static BOOL ov64_02230008 (UnkStruct_ov64_0222F0C4 * param0)
 {
     u32 v0;
 
-    if (CellActor_IsAnimated(param0->unk_104) == 0) {
+    if (Sprite_IsAnimated(param0->unk_104) == 0) {
         return 1;
     }
 
-    v0 = CellActor_GetAnimFrame(param0->unk_104);
+    v0 = Sprite_GetAnimFrame(param0->unk_104);
 
     if ((v0 - param0->unk_108) >= 2) {
         param0->unk_108 = v0;
@@ -2639,8 +2639,8 @@ static void ov64_02230044 (UnkStruct_ov64_0222F0C4 * param0)
 {
     GX_SetVisibleWnd(GX_WNDMASK_NONE);
 
-    CellActor_SetDrawFlag(param0->unk_104, 0);
-    CellActor_SetAnimateFlag(param0->unk_104, 0);
+    Sprite_SetDrawFlag(param0->unk_104, 0);
+    Sprite_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 2f5fb608de..724dcfa93a 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -29,11 +29,10 @@
 #include "assert.h"
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
-#include "system.h"
 #include "enums.h"
 #include "error_handling.h"
 #include "font.h"
@@ -51,33 +50,32 @@
 #include "narc.h"
 #include "overlay_manager.h"
 #include "party.h"
+#include "pltt_transfer.h"
 #include "poffin.h"
 #include "pokedex.h"
 #include "pokemon.h"
+#include "render_oam.h"
 #include "render_text.h"
 #include "render_window.h"
 #include "rtc.h"
 #include "save_player.h"
 #include "savedata.h"
 #include "sprite_resource.h"
+#include "sprite_transfer.h"
+#include "sprite_util.h"
 #include "strbuf.h"
 #include "string_list.h"
 #include "string_template.h"
+#include "system.h"
 #include "system_flags.h"
 #include "text.h"
 #include "touch_screen.h"
 #include "trainer_info.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
-#include "sprite_util.h"
-#include "sprite_transfer.h"
-#include "render_oam.h"
 #include "unk_0200F174.h"
 #include "unk_02012744.h"
-#include "system.h"
-#include "vram_transfer.h"
 #include "unk_0201E3D8.h"
-#include "pltt_transfer.h"
 #include "unk_02023FCC.h"
 #include "unk_0202ACE0.h"
 #include "unk_0202C858.h"
@@ -92,6 +90,7 @@
 #include "unk_02099550.h"
 #include "unk_0209C390.h"
 #include "vars_flags.h"
+#include "vram_transfer.h"
 
 FS_EXTERN_OVERLAY(overlay63);
 
@@ -830,7 +829,7 @@ int ov65_0222E3FC(OverlayManager *param0, int *param1)
     }
 
     if (v0->unk_18C) {
-        CellActorCollection_Update(v0->unk_18C);
+        SpriteList_Update(v0->unk_18C);
     }
 
     if (ov65_02235194(&v0->unk_3EC) == 1) {
@@ -865,7 +864,7 @@ static void ov65_0222E47C(UnkStruct_ov65_0222EBE0 *param0)
         SpriteResourceCollection_Delete(param0->unk_31C[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_18C);
+    SpriteList_Delete(param0->unk_18C);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -6641,14 +6640,14 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
 {
     BOOL v0;
     int v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
     Window v3;
     Strbuf *v4;
     UnkStruct_02012B20 *v5;
     int v6;
     UnkStruct_020127E8 v7;
     u32 v8;
-    CellActorInitParamsEx v9[3] = {
+    AffineSpriteListTemplate v9[3] = {
         { NULL,
             NULL,
             { FX32_CONST(40), FX32_CONST(172) + (256 * FX32_ONE), 0 },
@@ -6693,13 +6692,13 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 par
     SpriteResourcesHeader_Init(&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].collection = param0->unk_18C;
+        v9[v1].list = param0->unk_18C;
         v9[v1].resourceData = &v2;
         v9[v1].heapID = param2;
 
-        param0->unk_BE0.unk_21C[v1] = CellActorCollection_AddEx(&v9[v1]);
+        param0->unk_BE0.unk_21C[v1] = SpriteList_AddEx(&v9[v1]);
 
-        CellActor_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
+        Sprite_SetAnim(param0->unk_BE0.unk_21C[v1], Unk_ov65_02238930[v1]);
     }
 
     Font_InitManager(FONT_SUBSCREEN, param2);
@@ -6753,7 +6752,7 @@ static void ov65_02234CFC(UnkStruct_ov65_0222EBE0 *param0)
     CharTransfer_ClearRange(&param0->unk_BE0.unk_228);
 
     for (v0 = 0; v0 < 3; v0++) {
-        CellActor_Delete(param0->unk_BE0.unk_21C[v0]);
+        Sprite_Delete(param0->unk_BE0.unk_21C[v0]);
     }
 
     SpriteTransfer_ResetCharTransfer(param0->unk_BE0.unk_20C[0]);
@@ -6780,7 +6779,7 @@ static void ov65_02234D6C(UnkStruct_ov65_0222EBE0 *param0)
 static void ov65_02234DA0(UnkStruct_ov65_0222EBE0 *param0)
 {
     if (param0->unk_BE0.unk_238 == 2) {
-        CellActor_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1);
+        Sprite_SetDrawFlag(param0->unk_BE0.unk_21C[1], 1);
         sub_020129D0(param0->unk_BE0.unk_234, 1);
     }
 
@@ -6828,8 +6827,8 @@ static void ov65_02234E40(u32 param0, u32 param1, void *param2)
 
 static void ov65_02234E50(UnkStruct_ov65_02234E50 *param0, u32 param1)
 {
-    CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
-    SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1));
+    Sprite_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+    Sprite_SetAnimFrame(param0->unk_21C[param1], (5 - 1));
 
     if (param1 == 1) {
         sub_020128C4(param0->unk_234, -18, Unk_ov65_0223893C[0]);
@@ -6843,16 +6842,16 @@ static BOOL ov65_02234E8C(UnkStruct_ov65_02234E50 *param0, u32 param1, u32 param
     u32 v2;
 
     if (param2 == param1) {
-        v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
+        v1 = Sprite_GetAnimFrame(param0->unk_21C[param1]);
 
         if ((param3 == 0) || (param3 == 2)) {
             if (param3 == 0) {
-                CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
+                Sprite_SetAnim(param0->unk_21C[param1], Unk_ov65_0223892C[param1]);
             }
 
             if (v1 < 3) {
-                CellActor_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
-                v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
+                Sprite_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
+                v1 = Sprite_GetAnimFrame(param0->unk_21C[param1]);
 
                 if (param1 == 1) {
                     sub_020128C4(param0->unk_234, -18, Unk_ov65_0223893C[v1]);
@@ -6868,15 +6867,15 @@ static BOOL ov65_02234E8C(UnkStruct_ov65_02234E50 *param0, u32 param1, u32 param
             }
         }
     } else {
-        v2 = CellActor_GetActiveAnim(param0->unk_21C[param1]);
-        v1 = CellActor_GetAnimFrame(param0->unk_21C[param1]);
+        v2 = Sprite_GetActiveAnim(param0->unk_21C[param1]);
+        v1 = Sprite_GetAnimFrame(param0->unk_21C[param1]);
 
         if (v2 == Unk_ov65_0223892C[param1]) {
-            CellActor_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
-            SpriteActor_SetAnimFrame(param0->unk_21C[param1], (5 - 1) - v1);
+            Sprite_SetAnim(param0->unk_21C[param1], Unk_ov65_02238930[param1]);
+            Sprite_SetAnimFrame(param0->unk_21C[param1], (5 - 1) - v1);
         }
 
-        CellActor_UpdateAnim(param0->unk_21C[param1], FX32_CONST(2));
+        Sprite_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 e401289bb9..015d642ba7 100644
--- a/src/overlay065/ov65_02235060.c
+++ b/src/overlay065/ov65_02235060.c
@@ -23,11 +23,11 @@
 #include "overlay065/struct_ov65_022376D0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
 #include "math.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -216,7 +216,7 @@ u32 ov65_02235198(UnkStruct_ov65_02235130 *param0)
 void ov65_02235244(UnkStruct_ov65_02235130 *param0)
 {
     if (param0->unk_00) {
-        CellActorCollection_Update(param0->unk_14.unk_00);
+        SpriteList_Update(param0->unk_14.unk_00);
     }
 }
 
@@ -602,7 +602,7 @@ static void ov65_022358CC(UnkStruct_ov65_022358CC *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
 }
 
 static void ov65_022358F8(UnkStruct_ov65_022358CC *param0, u32 param1, NARC *param2)
@@ -676,11 +676,11 @@ static void ov65_02235A60(UnkStruct_ov65_022358CC *param0)
 
 static void ov65_02235A94(UnkStruct_ov65_022358CC *param0, u32 param1)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
 
-    memset(&v0, 0, sizeof(CellActorInitParamsEx));
+    memset(&v0, 0, sizeof(AffineSpriteListTemplate));
 
-    v0.collection = param0->unk_00;
+    v0.list = param0->unk_00;
     v0.resourceData = &param0->unk_1A0.unk_10;
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.affineScale.x = FX32_ONE;
@@ -688,19 +688,19 @@ static void ov65_02235A94(UnkStruct_ov65_022358CC *param0, u32 param1)
     v0.priority = 0;
     v0.heapID = param1;
 
-    param0->unk_1A0.unk_34 = CellActorCollection_AddEx(&v0);
-    param0->unk_1A0.unk_38 = CellActorCollection_AddEx(&v0);
+    param0->unk_1A0.unk_34 = SpriteList_AddEx(&v0);
+    param0->unk_1A0.unk_38 = SpriteList_AddEx(&v0);
 
-    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);
+    Sprite_SetDrawFlag(param0->unk_1A0.unk_34, 0);
+    Sprite_SetDrawFlag(param0->unk_1A0.unk_38, 0);
+    Sprite_SetAnimateFlag(param0->unk_1A0.unk_34, 1);
+    Sprite_SetAnim(param0->unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235B14(UnkStruct_ov65_022358CC *param0)
 {
-    CellActor_Delete(param0->unk_1A0.unk_34);
-    CellActor_Delete(param0->unk_1A0.unk_38);
+    Sprite_Delete(param0->unk_1A0.unk_34);
+    Sprite_Delete(param0->unk_1A0.unk_38);
 }
 
 static void ov65_02235B30(UnkStruct_ov65_02235130 *param0)
@@ -716,13 +716,13 @@ static void ov65_02235B30(UnkStruct_ov65_02235130 *param0)
     v1.x = v0.unk_00 << FX32_SHIFT;
     v1.y = v0.unk_02 << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_14.unk_1A0.unk_34, &v1);
-    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 1);
+    Sprite_SetPosition(param0->unk_14.unk_1A0.unk_34, &v1);
+    Sprite_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 1);
 }
 
 static void ov65_02235B78(UnkStruct_ov65_02235130 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 0);
+    Sprite_SetDrawFlag(param0->unk_14.unk_1A0.unk_34, 0);
 }
 
 static void ov65_02235B88(UnkStruct_ov65_02235130 *param0, UnkStruct_ov63_0222CC3C param1, u32 param2)
@@ -735,14 +735,14 @@ static void ov65_02235B88(UnkStruct_ov65_02235130 *param0, UnkStruct_ov63_0222CC
     v0.x = param1.unk_00 << FX32_SHIFT;
     v0.y = param1.unk_02 << FX32_SHIFT;
 
-    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);
+    Sprite_SetPosition(param0->unk_14.unk_1A0.unk_38, &v0);
+    Sprite_SetPriority(param0->unk_14.unk_1A0.unk_38, param2);
+    Sprite_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 1);
 }
 
 static void ov65_02235BD8(UnkStruct_ov65_02235130 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_14.unk_1A0.unk_38, 0);
+    Sprite_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 f11504ef89..fed89cc1ff 100644
--- a/src/overlay065/ov65_0223648C.c
+++ b/src/overlay065/ov65_0223648C.c
@@ -23,7 +23,6 @@
 #include "overlay065/struct_ov65_022376D0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -43,6 +42,7 @@
 #include "render_oam.h"
 #include "render_window.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -102,7 +102,7 @@ typedef struct {
     u8 unk_14;
     u8 unk_15;
     u16 unk_16;
-    CellActorCollection *unk_18;
+    SpriteList *unk_18;
     G2dRenderer unk_1C;
     SpriteResourceCollection *unk_1A8[4];
     UnkStruct_ov63_0222BE18 *unk_1B8;
@@ -487,7 +487,7 @@ int ov65_02236548(OverlayManager *param0, int *param1)
     }
 
     ov65_022372B0(&v0->unk_30);
-    CellActorCollection_Update(v0->unk_30.unk_18);
+    SpriteList_Update(v0->unk_30.unk_18);
 
     return 0;
 }
@@ -867,7 +867,7 @@ static void ov65_02236E04(UnkStruct_ov65_02236840 *param0)
     ov63_0222CD9C(param0->unk_1BC);
     ov63_0222BE58(param0->unk_1B8);
 
-    CellActorCollection_Delete(param0->unk_18);
+    SpriteList_Delete(param0->unk_18);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_1A8[v0]);
diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c
index e529e40653..af479fe327 100644
--- a/src/overlay068/ov68_0225C700.c
+++ b/src/overlay068/ov68_0225C700.c
@@ -20,7 +20,6 @@
 #include "overlay068/struct_ov68_0225DC74.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "game_options.h"
@@ -36,6 +35,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -62,7 +62,7 @@ typedef struct {
 typedef struct {
     Window unk_00[1];
     s32 unk_10;
-    CellActor *unk_14;
+    Sprite *unk_14;
     SpriteResource *unk_18[4];
     u16 unk_28;
     u16 unk_2A;
@@ -108,7 +108,7 @@ typedef struct {
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     G2dRenderer unk_08;
     SpriteResourceCollection *unk_194[4];
     NARC *unk_1A4;
@@ -455,7 +455,7 @@ static void ov68_0225C960(UnkStruct_ov68_0225C91C *param0)
 
 static void ov68_0225C980(UnkStruct_ov68_0225C91C *param0)
 {
-    CellActorCollection_Update(param0->unk_04);
+    SpriteList_Update(param0->unk_04);
 }
 
 static void ov68_0225C98C(UnkStruct_ov68_0225C91C *param0)
@@ -542,7 +542,7 @@ static void ov68_0225CB44(UnkStruct_ov68_0225C91C *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_04);
+    SpriteList_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_194[v0]);
@@ -686,19 +686,19 @@ static void ov68_0225CCD0(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB
     }
 
     {
-        CellActorResourceData v1;
-        CellActorInitParams v2 = { 0 };
+        SpriteResourcesHeader v1;
+        SpriteListTemplate v2 = { 0 };
 
         SpriteResourcesHeader_Init(&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.collection = param2->unk_04;
+        v2.list = param2->unk_04;
         v2.resourceData = &v1;
         v2.priority = 0;
         v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v2.heapID = param3;
 
-        param0->unk_14 = CellActorCollection_Add(&v2);
-        CellActor_SetDrawFlag(param0->unk_14, 0);
+        param0->unk_14 = SpriteList_Add(&v2);
+        Sprite_SetDrawFlag(param0->unk_14, 0);
     }
 
     {
@@ -854,7 +854,7 @@ static void ov68_0225D02C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB
     }
 
     {
-        CellActor_Delete(param0->unk_14);
+        Sprite_Delete(param0->unk_14);
     }
 
     {
@@ -888,13 +888,13 @@ static void ov68_0225D06C(UnkStruct_ov68_0225D0F8 *param0, UnkStruct_ov68_0225CB
 
 static void ov68_0225D0F8(UnkStruct_ov68_0225D0F8 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_14, 1);
-    CellActor_SetPosition(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
+    Sprite_SetDrawFlag(param0->unk_14, 1);
+    Sprite_SetPosition(param0->unk_14, &Unk_ov68_0225DD78[param0->unk_10]);
 }
 
 static void ov68_0225D11C(UnkStruct_ov68_0225D0F8 *param0)
 {
-    CellActor_SetAnimateFlag(param0->unk_14, 1);
+    Sprite_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 4813500ba9..46945ecf0a 100644
--- a/src/overlay069/ov69_0225C700.c
+++ b/src/overlay069/ov69_0225C700.c
@@ -22,7 +22,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "easy3d_object.h"
 #include "font.h"
@@ -39,6 +38,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -106,7 +106,7 @@ typedef struct {
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     G2dRenderer unk_08;
     SpriteResourceCollection *unk_194[4];
     GenericPointerData *unk_1A4;
@@ -180,7 +180,7 @@ typedef struct {
     s16 unk_32;
     u8 unk_34[4];
     u8 unk_38[4];
-    CellActor *unk_3C[12];
+    Sprite *unk_3C[12];
     SpriteResource *unk_6C[12][4];
 } UnkStruct_ov69_0225EB60;
 
@@ -1393,7 +1393,7 @@ static void ov69_0225D35C(UnkStruct_ov69_0225D35C *param0)
 
 static void ov69_0225D384(UnkStruct_ov69_0225D35C *param0)
 {
-    CellActorCollection_Update(param0->unk_04);
+    SpriteList_Update(param0->unk_04);
 }
 
 static void ov69_0225D390(UnkStruct_ov69_0225D35C *param0)
@@ -1495,7 +1495,7 @@ static void ov69_0225D5D8(UnkStruct_ov69_0225D35C *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_04);
+    SpriteList_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_194[v0]);
@@ -2620,16 +2620,16 @@ static void ov69_0225E910(UnkStruct_ov69_0225E7DC *param0, u32 param1, UnkStruct
 static void ov69_0225E960(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D35C *param1, UnkStruct_ov69_0225E478 *param2, u32 param3)
 {
     int v0;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
     BOOL v2;
-    CellActorInitParams v3 = { NULL };
+    SpriteListTemplate v3 = { NULL };
 
     memset(param0, 0, sizeof(UnkStruct_ov69_0225EB60));
 
     param0->unk_30 = 2;
     param0->unk_32 = 128;
 
-    v3.collection = param1->unk_04;
+    v3.list = param1->unk_04;
     v3.resourceData = &v1;
     v3.priority = 64;
     v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2651,10 +2651,10 @@ static void ov69_0225E960(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D3
         SpriteResource_ReleaseData(param0->unk_6C[v0][0]);
         SpriteResourcesHeader_Init(&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] = CellActorCollection_Add(&v3);
+        param0->unk_3C[v0] = SpriteList_Add(&v3);
 
-        CellActor_SetAnimateFlag(param0->unk_3C[v0], 1);
-        CellActor_SetAnimSpeed(param0->unk_3C[v0], FX32_ONE);
+        Sprite_SetAnimateFlag(param0->unk_3C[v0], 1);
+        Sprite_SetAnimSpeed(param0->unk_3C[v0], FX32_ONE);
     }
 
     ov69_0225EBEC(param0);
@@ -2668,7 +2668,7 @@ static void ov69_0225EAE8(UnkStruct_ov69_0225EB60 *param0, UnkStruct_ov69_0225D3
     Sound_StopEffect(1473, 0);
 
     for (v0 = 0; v0 < 12; v0++) {
-        CellActor_Delete(param0->unk_3C[v0]);
+        Sprite_Delete(param0->unk_3C[v0]);
         SpriteTransfer_ResetCharTransfer(param0->unk_6C[v0][0]);
 
         if (v0 == 0) {
@@ -2719,7 +2719,7 @@ static void ov69_0225EBEC(UnkStruct_ov69_0225EB60 *param0)
     int v0;
 
     for (v0 = 0; v0 < 12; v0++) {
-        CellActor_SetDrawFlag(param0->unk_3C[v0], 0);
+        Sprite_SetDrawFlag(param0->unk_3C[v0], 0);
     }
 }
 
@@ -2762,7 +2762,7 @@ static BOOL ov69_0225EC70(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct
     }
 
     ov69_0225ED5C(&param0->unk_00[param1], param2);
-    CellActor_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 1);
+    Sprite_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 1);
     ov69_0225EEC4(param0, param1);
 
     return 1;
@@ -2780,7 +2780,7 @@ static BOOL ov69_0225ECAC(UnkStruct_ov69_0225EB60 *param0, u32 param1, UnkStruct
     ov69_0225EEC4(param0, param1);
 
     if (v0 == 1) {
-        CellActor_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 0);
+        Sprite_SetDrawFlag(param0->unk_3C[param0->unk_38[param1]], 0);
     }
 
     return v0;
@@ -2886,12 +2886,12 @@ static void ov69_0225EE68(const UnkStruct_ov69_0225ED90 *param0, UnkStruct_ov69_
 static void ov69_0225EEC4(UnkStruct_ov69_0225EB60 *param0, u32 param1)
 {
     VecFx32 v0;
-    CellActor *v1;
+    Sprite *v1;
 
     ov69_0225ED78(&param0->unk_00[param1], &v0);
 
     v1 = param0->unk_3C[param0->unk_38[param1]];
-    CellActor_SetPosition(v1, &v0);
+    Sprite_SetPosition(v1, &v0);
 }
 
 static u16 ov69_0225EEEC(u32 param0)
diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c
index d404568b8a..13897c2242 100644
--- a/src/overlay070/ov70_0225D9A4.c
+++ b/src/overlay070/ov70_0225D9A4.c
@@ -37,7 +37,6 @@
 #include "overlay070/struct_ov70_0226C6F8_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "cell_transfer.h"
 #include "char_transfer.h"
 #include "enums.h"
@@ -58,6 +57,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -97,7 +97,7 @@ typedef struct {
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     G2dRenderer unk_08;
     SpriteResourceCollection *unk_194[4];
     NNSG2dCellTransferState *unk_1A4;
@@ -121,7 +121,7 @@ typedef struct {
     u16 unk_3A;
     BOOL unk_3C;
     SpriteResource *unk_40[4];
-    CellActor *unk_50[2];
+    Sprite *unk_50[2];
 } UnkStruct_ov70_0225EC20;
 
 typedef struct {
@@ -161,11 +161,11 @@ typedef struct {
 typedef struct {
     u32 unk_00;
     Window unk_04[5];
-    CellActor *unk_54;
+    Sprite *unk_54;
     SpriteResource *unk_58[4];
-    CellActor *unk_68;
+    Sprite *unk_68;
     SpriteResource *unk_6C[4];
-    CellActor *unk_7C[12];
+    Sprite *unk_7C[12];
     SpriteResource *unk_AC[4];
     SpriteResource *unk_BC[12];
     SpriteResource *unk_EC[4];
@@ -1337,7 +1337,7 @@ static void ov70_0225E4EC(UnkStruct_ov70_0225E4EC *param0, SaveData *param1, u32
 
 static void ov70_0225E6C0(UnkStruct_ov70_0225E4EC *param0)
 {
-    CellActorCollection_Update(param0->unk_04);
+    SpriteList_Update(param0->unk_04);
     CellTransfer_Update();
 }
 
@@ -1365,7 +1365,7 @@ static void ov70_0225E6D0(UnkStruct_ov70_0225E4EC *param0)
             SpriteResourceCollection_Delete(param0->unk_194[v1]);
         }
 
-        CellActorCollection_Delete(param0->unk_04);
+        SpriteList_Delete(param0->unk_04);
         CharTransfer_Free();
         PlttTransfer_Free();
         RenderOam_Free();
@@ -1645,8 +1645,8 @@ static void ov70_0225EBC4(UnkStruct_ov70_0225E9C8 *param0, const Strbuf *param1)
 
 static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4EC *param1, u32 param2)
 {
-    CellActorResourceData v0;
-    CellActorInitParams v1;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
     int v2;
     NARC *v3 = NARC_ctor(NARC_INDEX_GRAPHIC__SHOP_GRA, param2);
 
@@ -1660,7 +1660,7 @@ static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4
     SpriteTransfer_RequestPlttFreeSpace(param0->unk_40[1]);
     SpriteResourcesHeader_Init(&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.collection = param1->unk_04;
+    v1.list = param1->unk_04;
     v1.resourceData = &v0;
     v1.priority = 0;
     v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -1669,11 +1669,11 @@ static void ov70_0225EC20(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4
 
     for (v2 = 0; v2 < 2; v2++) {
         v1.position.y = Unk_ov70_0226D580[v2] * FX32_ONE;
-        param0->unk_50[v2] = CellActorCollection_Add(&v1);
+        param0->unk_50[v2] = SpriteList_Add(&v1);
 
-        CellActor_SetAnim(param0->unk_50[v2], v2);
-        CellActor_SetAnimateFlag(param0->unk_50[v2], 1);
-        CellActor_SetDrawFlag(param0->unk_50[v2], 0);
+        Sprite_SetAnim(param0->unk_50[v2], v2);
+        Sprite_SetAnimateFlag(param0->unk_50[v2], 1);
+        Sprite_SetDrawFlag(param0->unk_50[v2], 0);
     }
 
     param0->unk_3C = 0;
@@ -1692,7 +1692,7 @@ static void ov70_0225ED4C(UnkStruct_ov70_0225EC20 *param0, UnkStruct_ov70_0225E4
     }
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_50[v0]);
+        Sprite_Delete(param0->unk_50[v0]);
         param0->unk_50[v0] = NULL;
     }
 
@@ -1809,7 +1809,7 @@ static void ov70_0225EF14(UnkStruct_ov70_0225EC20 *param0, u16 *param1, u16 *par
     param0->unk_3C = 0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_SetDrawFlag(param0->unk_50[v0], 0);
+        Sprite_SetDrawFlag(param0->unk_50[v0], 0);
     }
 }
 
@@ -1830,23 +1830,23 @@ static void ov70_0225EF70(UnkStruct_ov70_0225EC20 *param0)
     u16 v0;
 
     if (param0->unk_3C == 0) {
-        CellActor_SetDrawFlag(param0->unk_50[0], 0);
-        CellActor_SetDrawFlag(param0->unk_50[1], 0);
+        Sprite_SetDrawFlag(param0->unk_50[0], 0);
+        Sprite_SetDrawFlag(param0->unk_50[1], 0);
         return;
     }
 
     ListMenu_GetListAndCursorPos(param0->unk_30, &v0, NULL);
 
     if (v0 <= 0) {
-        CellActor_SetDrawFlag(param0->unk_50[0], 0);
+        Sprite_SetDrawFlag(param0->unk_50[0], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_50[0], 1);
+        Sprite_SetDrawFlag(param0->unk_50[0], 1);
     }
 
     if (v0 >= (param0->unk_3A - 7)) {
-        CellActor_SetDrawFlag(param0->unk_50[1], 0);
+        Sprite_SetDrawFlag(param0->unk_50[1], 0);
     } else {
-        CellActor_SetDrawFlag(param0->unk_50[1], 1);
+        Sprite_SetDrawFlag(param0->unk_50[1], 1);
     }
 }
 
@@ -2705,28 +2705,28 @@ static void ov70_0225FEF0(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
     }
 
     {
-        CellActorResourceData v3;
-        CellActorInitParams v4 = { NULL };
+        SpriteResourcesHeader v3;
+        SpriteListTemplate v4 = { NULL };
 
         SpriteResourcesHeader_Init(&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.collection = param1->unk_04;
+        v4.list = 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 = CellActorCollection_Add(&v4);
+        param0->unk_54 = SpriteList_Add(&v4);
 
-        CellActor_SetAnim(param0->unk_54, v1);
-        CellActor_SetDrawFlag(param0->unk_54, param5);
+        Sprite_SetAnim(param0->unk_54, v1);
+        Sprite_SetDrawFlag(param0->unk_54, param5);
     }
 }
 
 static void ov70_02260048(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1)
 {
-    CellActor_Delete(param0->unk_54);
+    Sprite_Delete(param0->unk_54);
     param0->unk_54 = NULL;
 
     {
@@ -2779,12 +2779,12 @@ static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
     }
 
     {
-        CellActorResourceData v6;
-        CellActorInitParams v7 = { NULL };
+        SpriteResourcesHeader v6;
+        SpriteListTemplate v7 = { NULL };
 
         SpriteResourcesHeader_Init(&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.collection = param1->unk_04;
+        v7.list = param1->unk_04;
         v7.resourceData = &v6;
         v7.priority = 32;
         v7.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -2792,14 +2792,14 @@ static void ov70_02260080(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
         v7.position.x = FX32_CONST(v1);
         v7.position.y = FX32_CONST(v2) + (256 * FX32_ONE);
 
-        param0->unk_68 = CellActorCollection_Add(&v7);
+        param0->unk_68 = SpriteList_Add(&v7);
     }
 }
 
 static void ov70_02260228(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4EC *param1)
 {
-    CharTransfer_DeleteTask(SpriteActor_ImageProxy(param0->unk_68));
-    CellActor_Delete(param0->unk_68);
+    CharTransfer_DeleteTask(Sprite_GetImageProxy(param0->unk_68));
+    Sprite_Delete(param0->unk_68);
 
     param0->unk_68 = NULL;
 
@@ -2917,8 +2917,8 @@ static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
     u32 v5;
     u32 v6;
     u32 v7;
-    CellActorInitParams v8;
-    CellActorResourceData v9;
+    SpriteListTemplate v8;
+    SpriteResourcesHeader v9;
     const UnkStruct_ov70_0226D844 *v10;
     static const u16 v11[4][3] = {
         { 192, 0, 8 },
@@ -3000,7 +3000,7 @@ static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
             SpriteResource_ReleaseData(param0->unk_BC[v0]);
             SpriteResourcesHeader_Init(&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.collection = param1->unk_04;
+            v8.list = param1->unk_04;
             v8.resourceData = &v9;
             v8.priority = 0;
             v8.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
@@ -3009,9 +3009,9 @@ static void ov70_022603CC(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
             v8.position.x += FX32_CONST(v10->unk_04);
             v8.position.y += FX32_CONST(v10->unk_06);
 
-            param0->unk_7C[v0] = CellActorCollection_Add(&v8);
+            param0->unk_7C[v0] = SpriteList_Add(&v8);
 
-            CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_7C[v0], v10->unk_01);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_7C[v0], v10->unk_01);
         }
     }
 
@@ -3024,7 +3024,7 @@ static void ov70_0226068C(UnkStruct_ov70_0225FA84 *param0, UnkStruct_ov70_0225E4
 
     for (v0 = 0; v0 < 12; v0++) {
         if (param0->unk_BC[v0] != NULL) {
-            CellActor_Delete(param0->unk_7C[v0]);
+            Sprite_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 a6668ff1f3..14010a9928 100644
--- a/src/overlay071/ov71_0223B140.c
+++ b/src/overlay071/ov71_0223B140.c
@@ -12,7 +12,6 @@
 #include "overlay071/struct_ov71_0223C444.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -20,6 +19,7 @@
 #include "narc.h"
 #include "overlay_manager.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "system.h"
 #include "touch_screen.h"
@@ -232,9 +232,9 @@ int ov71_0223B140(OverlayManager *param0, int *param1)
                 }
 
                 if (v5 == 4 - 1) {
-                    CellActor_SetDrawFlag(v0->unk_30E4.unk_1C0[8 + v6], 1);
+                    Sprite_SetDrawFlag(v0->unk_30E4.unk_1C0[8 + v6], 1);
                 } else if (v5 == 4) {
-                    CellActor_SetDrawFlag(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
+                    Sprite_SetDrawFlag(v0->unk_30E4.unk_1C0[(8 + 8) + v6], 1);
                 }
             }
         }
@@ -273,9 +273,9 @@ int ov71_0223B388(OverlayManager *param0, int *param1)
                 v0->unk_3350 = 1;
                 v0->unk_3381 = 1;
 
-                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);
+                Sprite_SetDrawFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                Sprite_SetAnimateFlag(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 1);
+                Sprite_SetAnim(v0->unk_30E4.unk_1C0[((8 + 8) + 8)], 10);
 
                 v0->unk_337E = 0;
                 v0->unk_3380 = 0;
@@ -370,7 +370,7 @@ int ov71_0223B388(OverlayManager *param0, int *param1)
     }
 
     ov71_0223C2F4(v0);
-    CellActorCollection_Update(v0->unk_30E4.unk_00);
+    SpriteList_Update(v0->unk_30E4.unk_00);
 
     return 0;
 }
@@ -1102,10 +1102,10 @@ static void ov71_0223C1AC(UnkStruct_ov71_0223B620 *param0, const u8 param1)
                 }
 
                 if (v1 == 4 - 1) {
-                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 1);
+                    Sprite_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 1);
                 } else if (v1 == 4) {
-                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 0);
-                    CellActor_SetDrawFlag(param0->unk_30E4.unk_1C0[(8 + 8) + param1], 1);
+                    Sprite_SetDrawFlag(param0->unk_30E4.unk_1C0[8 + param1], 0);
+                    Sprite_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 ac011b9f18..af977f6378 100644
--- a/src/overlay071/ov71_0223CF0C.c
+++ b/src/overlay071/ov71_0223CF0C.c
@@ -5,13 +5,13 @@
 
 #include "overlay071/struct_ov71_0223D238.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "narc.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -100,15 +100,15 @@ void ov71_0223CF0C(UnkStruct_ov71_0223D238 *param0, NARC *param1)
 void ov71_0223D070(UnkStruct_ov71_0223D238 *param0, const u8 *param1)
 {
     int v0;
-    CellActorResourceData v1;
+    SpriteResourcesHeader v1;
 
     SpriteResourcesHeader_Init(&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;
-        CellActorInitParamsEx v3;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -124,12 +124,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] = CellActorCollection_AddEx(&v3);
-            CellActor_SetAnimateFlag(param0->unk_1C0[v0], 0);
-            CellActor_SetAnim(param0->unk_1C0[v0], v0);
+            param0->unk_1C0[v0] = SpriteList_AddEx(&v3);
+            Sprite_SetAnimateFlag(param0->unk_1C0[v0], 0);
+            Sprite_SetAnim(param0->unk_1C0[v0], v0);
 
             if (!param1[v0]) {
-                CellActor_SetDrawFlag(param0->unk_1C0[v0], 0);
+                Sprite_SetDrawFlag(param0->unk_1C0[v0], 0);
             }
         }
 
@@ -140,10 +140,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] = 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);
+                param0->unk_1C0[v2 + v0] = SpriteList_AddEx(&v3);
+                Sprite_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
+                Sprite_SetAnim(param0->unk_1C0[v2 + v0], 8);
+                Sprite_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
 
             v2 += 8;
@@ -152,10 +152,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] = 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);
+                param0->unk_1C0[v2 + v0] = SpriteList_AddEx(&v3);
+                Sprite_SetAnimateFlag(param0->unk_1C0[v2 + v0], 1);
+                Sprite_SetAnim(param0->unk_1C0[v2 + v0], 9);
+                Sprite_SetDrawFlag(param0->unk_1C0[v2 + v0], 0);
             }
         }
         v2 += 8;
@@ -165,10 +165,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] = CellActorCollection_AddEx(&v3);
-            CellActor_SetAnimateFlag(param0->unk_1C0[v2], 0);
-            CellActor_SetAnim(param0->unk_1C0[v2], 10);
-            CellActor_SetDrawFlag(param0->unk_1C0[v2], 0);
+            param0->unk_1C0[v2] = SpriteList_AddEx(&v3);
+            Sprite_SetAnimateFlag(param0->unk_1C0[v2], 0);
+            Sprite_SetAnim(param0->unk_1C0[v2], 10);
+            Sprite_SetDrawFlag(param0->unk_1C0[v2], 0);
         }
     }
 }
@@ -188,7 +188,7 @@ void ov71_0223D238(UnkStruct_ov71_0223D238 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -204,7 +204,7 @@ void ov71_0223D298(UnkStruct_ov71_0223D238 *param0, const u8 param1, const u8 pa
     GF_ASSERT(param1 < 8);
     GF_ASSERT(param2 <= 3);
 
-    v0 = CellActor_GetPaletteProxy(param0->unk_1C0[param1]);
+    v0 = Sprite_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 47e5d86c8e..c0beb5e73a 100644
--- a/src/overlay072/ov72_0223D7A0.c
+++ b/src/overlay072/ov72_0223D7A0.c
@@ -19,7 +19,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "game_options.h"
@@ -37,6 +36,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -84,8 +84,8 @@ static void ov72_0223E910(Window *param0, int param1, u32 param2, UnkStruct_ov72
 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(CellActor **param0, int param1);
-static void ov72_0223E3A8(CellActor **param0, BOOL param1);
+static void ov72_0223E388(Sprite **param0, int param1);
+static void ov72_0223E3A8(Sprite **param0, BOOL param1);
 static int ov72_0223E528(UnkStruct_ov72_0223DB98 *param0, int param1);
 static void ov72_0223E430(BgConfig *param0, UnkStruct_02015920 *param1);
 static void ov72_0223E9B4(u8 *param0, u8 *param1);
@@ -196,7 +196,7 @@ int ov72_0223D920(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_3C);
+    SpriteList_Update(v0->unk_3C);
 
     return 0;
 }
@@ -218,7 +218,7 @@ int ov72_0223D984(OverlayManager *param0, int *param1)
         SpriteResourceCollection_Delete(v0->unk_1CC[v1]);
     }
 
-    CellActorCollection_Delete(v0->unk_3C);
+    SpriteList_Delete(v0->unk_3C);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -511,9 +511,9 @@ static void ov72_0223DF58(UnkStruct_ov72_0223DB98 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_3C;
+        v1.list = param0->unk_3C;
         v1.resourceData = &param0->unk_1FC;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -529,14 +529,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_2B4[v0] = SpriteList_AddEx(&v1);
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_2B4[v0], 1);
+            Sprite_SetAnim(param0->unk_2B4[v0], Unk_ov72_0223EB3C[v0][2]);
+            Sprite_SetExplicitPalette(param0->unk_2B4[v0], 0);
 
             if (v0 == 0) {
-                CellActor_SetExplicitPriority(param0->unk_2B4[v0], 2);
+                Sprite_SetExplicitPriority(param0->unk_2B4[v0], 2);
             }
         }
     }
@@ -686,25 +686,25 @@ static void ov72_0223E2A8(UnkStruct_ov72_0223DB98 *param0)
     }
 }
 
-static void ov72_0223E388(CellActor **param0, int param1)
+static void ov72_0223E388(Sprite **param0, int param1)
 {
     int v0;
 
     for (v0 = 0; v0 < 1; v0++) {
         if (v0 == param1) {
-            CellActor_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
+            Sprite_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2] + 1);
         } else {
-            CellActor_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2]);
+            Sprite_SetAnim(param0[v0], Unk_ov72_0223EB3C[v0][2]);
         }
     }
 }
 
-static void ov72_0223E3A8(CellActor **param0, BOOL param1)
+static void ov72_0223E3A8(Sprite **param0, BOOL param1)
 {
     if (param1 == 1) {
-        CellActor_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
+        Sprite_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2] + 1);
     } else {
-        CellActor_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2]);
+        Sprite_SetAnim(param0[0], Unk_ov72_0223EB3C[0][2]);
     }
 }
 
diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c
index 6fbc1ec4fe..e12eab8ef0 100644
--- a/src/overlay075/ov75_021D0D80.c
+++ b/src/overlay075/ov75_021D0D80.c
@@ -83,7 +83,7 @@ typedef struct {
     Menu *unk_A4;
     SpriteSystem *unk_A8;
     SpriteManager *unk_AC;
-    CellActorData *unk_B0[3];
+    ManagedSprite *unk_B0[3];
 } UnkStruct_ov75_021D1184;
 
 typedef int (*UnkFuncPtr_ov75_021D1184)(UnkStruct_ov75_021D1184 *);
@@ -932,7 +932,7 @@ static void ov75_021D1ADC(UnkStruct_ov75_021D1184 *param0)
         param0->unk_B0[v0] = SpriteSystem_NewSprite(param0->unk_A8, param0->unk_AC, &v2);
 
         if (param0->unk_1C->unk_14[v0].val1_0 == 7) {
-            Sprite_SetDrawFlag2(param0->unk_B0[v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_B0[v0], 0);
         }
     }
 }
diff --git a/src/overlay076/ov76_0223B140.c b/src/overlay076/ov76_0223B140.c
index e73c9f0f26..76b90f9119 100644
--- a/src/overlay076/ov76_0223B140.c
+++ b/src/overlay076/ov76_0223B140.c
@@ -43,7 +43,7 @@ static void ov76_0223B174(TouchScreenRect *rect)
     rect->rect.right = 255;
 }
 
-void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2)
+void ov76_0223B184(TouchScreenRect *rect, ManagedSprite *param1, BOOL param2)
 {
     s16 v0, v1;
 
@@ -52,11 +52,11 @@ void ov76_0223B184(TouchScreenRect *rect, CellActorData *param1, BOOL param2)
     }
 
     if (param2 == 1) {
-        Sprite_SetPositionXY2(param1, gSystem.touchX, gSystem.touchY);
-        Sprite_GetPositionXY2(param1, &v0, &v1);
+        ManagedSprite_SetPositionXY(param1, gSystem.touchX, gSystem.touchY);
+        ManagedSprite_GetPositionXY(param1, &v0, &v1);
         ov76_0223B174(rect);
     } else {
-        Sprite_GetPositionXY2(param1, &v0, &v1);
+        ManagedSprite_GetPositionXY(param1, &v0, &v1);
         ov76_0223B15C(rect, v0, v1);
     }
 }
@@ -70,7 +70,7 @@ void ov76_0223B1E0(UnkStruct_ov76_0223DE00 *param0)
             continue;
         }
 
-        Sprite_OffsetPositionXY2(param0->unk_324[v0].unk_08, -(+7 * 8), -(-2 * 8));
+        ManagedSprite_OffsetPositionXY(param0->unk_324[v0].unk_08, -(+7 * 8), -(-2 * 8));
     }
 }
 
@@ -154,14 +154,14 @@ void ov76_0223B314(UnkStruct_ov76_0223DE00 *param0, u8 param1)
         }
 
         if (v0 == param1) {
-            Sprite_SetPriority(param0->unk_324[v0].unk_08, 0);
+            ManagedSprite_SetPriority(param0->unk_324[v0].unk_08, 0);
         } else {
-            int v1 = Sprite_GetPriority(param0->unk_324[v0].unk_08);
+            int v1 = ManagedSprite_GetPriority(param0->unk_324[v0].unk_08);
 
             if (v1 == 0) {
-                Sprite_SetPriority(param0->unk_324[v0].unk_08, v1 + 1);
+                ManagedSprite_SetPriority(param0->unk_324[v0].unk_08, v1 + 1);
             } else {
-                Sprite_SetPriority(param0->unk_324[v0].unk_08, v1 + 2);
+                ManagedSprite_SetPriority(param0->unk_324[v0].unk_08, v1 + 2);
             }
         }
     }
@@ -209,7 +209,7 @@ void ov76_0223B400(UnkStruct_ov76_0223DE00 *param0)
         v4[v0] = 0xFF;
 
         if (param0->unk_324[v0].unk_08 != NULL) {
-            v3[v0] = Sprite_GetPriority(param0->unk_324[v0].unk_08);
+            v3[v0] = ManagedSprite_GetPriority(param0->unk_324[v0].unk_08);
             v4[v0] = v0;
             v2++;
         }
@@ -261,7 +261,7 @@ void ov76_0223B400(UnkStruct_ov76_0223DE00 *param0)
                 continue;
             }
 
-            Sprite_SetPriority(param0->unk_324[v4[v0]].unk_08, v0);
+            ManagedSprite_SetPriority(param0->unk_324[v4[v0]].unk_08, v0);
         }
     }
 }
@@ -309,7 +309,7 @@ BOOL ov76_0223B52C(UnkStruct_ov76_0223DE00 *param0, u8 param1)
     v3.resources[3] = 23000 + 1;
     v2->unk_08 = SpriteSystem_NewSprite(v4, v5, &v3);
 
-    Sprite_TickOneFrame(v2->unk_08);
+    ManagedSprite_TickFrame(v2->unk_08);
 
     return 1;
 }
@@ -381,7 +381,7 @@ void ov76_0223B69C(UnkStruct_ov76_0223DE00 *param0, int param1)
             continue;
         }
 
-        Sprite_SetDrawFlag2(param0->unk_324[v0].unk_08, param1);
+        ManagedSprite_SetDrawFlag(param0->unk_324[v0].unk_08, param1);
     }
 }
 
@@ -394,7 +394,7 @@ BOOL ov76_0223B6C4(UnkStruct_ov76_0223DE00 *param0, int param1)
         return 1;
     }
 
-    Sprite_GetPositionXY2(param0->unk_324[param1].unk_08, &v1, &v2);
+    ManagedSprite_GetPositionXY(param0->unk_324[param1].unk_08, &v1, &v2);
     v0 = ov12_02237E54(v1, v2, 190, 70);
 
     if (v0 > 60) {
@@ -431,9 +431,9 @@ void ov76_0223B758(UnkStruct_ov76_0223DE00 *param0, int param1)
     v0 = ov76_0223B6C4(param0, param1);
 
     if (v0 == 0) {
-        Sprite_SetExplicitOamMode2(param0->unk_324[param1].unk_08, GX_OAM_MODE_XLU);
+        ManagedSprite_SetExplicitOamMode(param0->unk_324[param1].unk_08, GX_OAM_MODE_XLU);
     } else {
-        Sprite_SetExplicitOamMode2(param0->unk_324[param1].unk_08, GX_OAM_MODE_NORMAL);
+        ManagedSprite_SetExplicitOamMode(param0->unk_324[param1].unk_08, GX_OAM_MODE_NORMAL);
     }
 }
 
@@ -459,7 +459,7 @@ void ov76_0223B7D4(UnkStruct_ov76_0223DE00 *param0, int param1)
 {
     s16 v0, v1;
 
-    Sprite_GetPositionXY2(param0->unk_324[param1].unk_08, &v0, &v1);
+    ManagedSprite_GetPositionXY(param0->unk_324[param1].unk_08, &v0, &v1);
 
     param0->unk_324[param1].unk_05 = (u8)v0;
     param0->unk_324[param1].unk_06 = (u8)v1;
diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c
index 3e01d691fa..9aecc0520e 100644
--- a/src/overlay076/ov76_0223B870.c
+++ b/src/overlay076/ov76_0223B870.c
@@ -18,7 +18,6 @@
 #include "overlay076/struct_ov76_0223DE00.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "graphics.h"
@@ -31,6 +30,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -48,7 +48,7 @@
 
 typedef struct {
     UnkStruct_ov12_02225F6C unk_00[9];
-    CellActorData *unk_144[8];
+    ManagedSprite *unk_144[8];
     BgConfig *unk_164;
     int unk_168;
     BOOL *unk_16C;
@@ -88,11 +88,11 @@ void ov76_0223D16C(UnkStruct_ov76_0223DE00 *param0);
 void ov76_0223D318(UnkStruct_ov76_0223DE00 *param0);
 void ov76_0223D31C(UnkStruct_ov76_0223DE00 *param0);
 
-static void ov76_0223B870(TouchScreenRect *rect, CellActorData *param1, int param2, int param3)
+static void ov76_0223B870(TouchScreenRect *rect, ManagedSprite *param1, int param2, int param3)
 {
     s16 v0, v1;
 
-    Sprite_GetPositionXY2(param1, &v0, &v1);
+    ManagedSprite_GetPositionXY(param1, &v0, &v1);
 
     rect->rect.top = v1 - param3;
     rect->rect.bottom = v1 + param3;
@@ -291,9 +291,9 @@ void ov76_0223BBAC(UnkStruct_ov76_0223DE00 *param0)
         };
 
         for (v0 = 0; v0 < 8; v0++) {
-            Sprite_SetPositionXY2(param0->unk_3E4.unk_00[v0], v6[v0][0], v6[v0][1] - 1);
-            Sprite_TickOneFrame(param0->unk_3E4.unk_00[v0]);
-            Sprite_SetAnimationFrame(param0->unk_3E4.unk_00[v0], 0);
+            ManagedSprite_SetPositionXY(param0->unk_3E4.unk_00[v0], v6[v0][0], v6[v0][1] - 1);
+            ManagedSprite_TickFrame(param0->unk_3E4.unk_00[v0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_3E4.unk_00[v0], 0);
         }
     }
 }
@@ -358,7 +358,7 @@ void ov76_0223BD30(UnkStruct_ov76_0223DE00 *param0, s8 param1, int param2)
 
             v0->unk_144[v1] = param0->unk_324[v1].unk_08;
 
-            Sprite_GetPositionXY2(v0->unk_144[v1], &v2, &v3);
+            ManagedSprite_GetPositionXY(v0->unk_144[v1], &v2, &v3);
             ov12_02225BC8(&v0->unk_00[v1], v2, v2 + ((+7 * 8) * param1), v3, v3 + ((-2 * 8) * param1), param2);
             ov12_02225C50(&v0->unk_00[v1], v0->unk_144[v1]);
             ov12_02225C50(&v0->unk_00[v1], v0->unk_144[v1]);
@@ -588,8 +588,8 @@ void ov76_0223C188(UnkStruct_ov76_0223DE00 *param0)
         v4 = Pokemon_GetValue(v5, MON_DATA_FORM, NULL);
         v3 = PokeIconPaletteIndex(v2, v4, v1);
 
-        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_2FC[v0]->sprite, v3);
-        Sprite_SetAnim(param0->unk_2FC[v0], 1);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_2FC[v0]->sprite, v3);
+        ManagedSprite_SetAnim(param0->unk_2FC[v0], 1);
     }
 }
 
@@ -600,7 +600,7 @@ void ov76_0223C288(UnkStruct_ov76_0223DE00 *param0)
     s16 v2, v3;
 
     for (v0 = 0; v0 < param0->unk_00->unk_00; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_2FC[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2FC[v0], 0);
     }
 
     for (v0 = 0; v0 < 12; v0++) {
@@ -608,8 +608,8 @@ void ov76_0223C288(UnkStruct_ov76_0223DE00 *param0)
 
         if (v1 != 0xff) {
             ov76_0223C0EC(v0, &v2, &v3);
-            Sprite_SetPositionXY2(param0->unk_2FC[v1], v2 + -16, v3 + (+12));
-            Sprite_SetDrawFlag2(param0->unk_2FC[v1], 1);
+            ManagedSprite_SetPositionXY(param0->unk_2FC[v1], v2 + -16, v3 + (+12));
+            ManagedSprite_SetDrawFlag(param0->unk_2FC[v1], 1);
         }
     }
 }
@@ -619,7 +619,7 @@ void ov76_0223C304(UnkStruct_ov76_0223DE00 *param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_00->unk_00; v0++) {
-        Sprite_TickOneFrame(param0->unk_2FC[v0]);
+        ManagedSprite_TickFrame(param0->unk_2FC[v0]);
     }
 }
 
@@ -734,7 +734,7 @@ void ov76_0223C4AC(UnkStruct_ov76_0223DE00 *param0)
         v1.resources[5] = SPRITE_RESOURCE_NONE;
         param0->unk_314[v0] = SpriteSystem_NewSprite(param0->unk_D4.unk_08, param0->unk_D4.unk_0C, &v1);
 
-        Sprite_SetFlipMode2(param0->unk_314[v0], v2[v0][2]);
+        ManagedSprite_SetFlipMode(param0->unk_314[v0], v2[v0][2]);
     }
 }
 
@@ -747,7 +747,7 @@ void ov76_0223C544(UnkStruct_ov76_0223DE00 *param0)
     }
 
     for (v0 = 0; v0 < 4; v0++) {
-        Sprite_TickOneFrame(param0->unk_314[v0]);
+        ManagedSprite_TickFrame(param0->unk_314[v0]);
     }
 }
 
@@ -756,7 +756,7 @@ void ov76_0223C568(UnkStruct_ov76_0223DE00 *param0, int param1)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        Sprite_SetDrawFlag2(param0->unk_314[v0], param1);
+        ManagedSprite_SetDrawFlag(param0->unk_314[v0], param1);
     }
 }
 
@@ -807,7 +807,7 @@ void ov76_0223C61C(UnkStruct_ov76_0223DE00 *param0, NARC *param1)
                 s16 v2, v3;
 
                 ov76_0223C0EC(v0, &v2, &v3);
-                Sprite_SetPositionXY2(param0->unk_264[v0].unk_08, v2, v3);
+                ManagedSprite_SetPositionXY(param0->unk_264[v0].unk_08, v2, v3);
             }
         }
 
@@ -834,11 +834,11 @@ void ov76_0223C61C(UnkStruct_ov76_0223DE00 *param0, NARC *param1)
             s16 v4, v5;
 
             ov76_0223C0EC(param0->unk_3C4[0], &v4, &v5);
-            Sprite_SetPositionXY2(param0->unk_2F4[0], v4, v5);
-            Sprite_SetPositionXY2(param0->unk_2F4[1], v4, v5);
-            Sprite_SetPriority(param0->unk_2F4[1], 25);
-            Sprite_SetAnim(param0->unk_2F4[0], 0);
-            Sprite_SetAnim(param0->unk_2F4[1], 0);
+            ManagedSprite_SetPositionXY(param0->unk_2F4[0], v4, v5);
+            ManagedSprite_SetPositionXY(param0->unk_2F4[1], v4, v5);
+            ManagedSprite_SetPriority(param0->unk_2F4[1], 25);
+            ManagedSprite_SetAnim(param0->unk_2F4[0], 0);
+            ManagedSprite_SetAnim(param0->unk_2F4[1], 0);
         }
     }
 }
@@ -855,7 +855,7 @@ void ov76_0223C7E0(UnkStruct_ov76_0223DE00 *param0)
             continue;
         }
 
-        Sprite_SetAnim(param0->unk_264[v0].unk_08, param0->unk_264[v0].unk_04);
+        ManagedSprite_SetAnim(param0->unk_264[v0].unk_08, param0->unk_264[v0].unk_04);
     }
 }
 
@@ -896,11 +896,11 @@ void ov76_0223C88C(UnkStruct_ov76_0223DE00 *param0)
     int v0;
 
     for (v0 = 0; v0 < 12; v0++) {
-        Sprite_TickOneFrame(param0->unk_264[v0].unk_08);
+        ManagedSprite_TickFrame(param0->unk_264[v0].unk_08);
     }
 
-    Sprite_TickOneFrame(param0->unk_2F4[0]);
-    Sprite_TickOneFrame(param0->unk_2F4[1]);
+    ManagedSprite_TickFrame(param0->unk_2F4[0]);
+    ManagedSprite_TickFrame(param0->unk_2F4[1]);
 }
 
 void ov76_0223C8BC(UnkStruct_ov76_0223DE00 *param0)
@@ -1256,9 +1256,9 @@ void ov76_0223D16C(UnkStruct_ov76_0223DE00 *param0)
         };
 
         for (v0 = 8; v0 < 13; v0++) {
-            Sprite_SetPositionXY2(param0->unk_3E4.unk_00[v0], v6[v0][0], v6[v0][1]);
-            Sprite_TickOneFrame(param0->unk_3E4.unk_00[v0]);
-            Sprite_SetAnimationFrame(param0->unk_3E4.unk_00[v0], 0);
+            ManagedSprite_SetPositionXY(param0->unk_3E4.unk_00[v0], v6[v0][0], v6[v0][1]);
+            ManagedSprite_TickFrame(param0->unk_3E4.unk_00[v0]);
+            ManagedSprite_SetAnimationFrame(param0->unk_3E4.unk_00[v0], 0);
             ov76_0223B870(&param0->unk_D4.unk_FC[v0], param0->unk_3E4.unk_00[v0], v7[v0][0], v7[v0][1]);
         }
     }
@@ -1273,7 +1273,7 @@ void ov76_0223D2F4(UnkStruct_ov76_0223DE00 *param0, int param1)
             continue;
         }
 
-        Sprite_SetDrawFlag2(param0->unk_3E4.unk_00[v0], param1);
+        ManagedSprite_SetDrawFlag(param0->unk_3E4.unk_00[v0], param1);
     }
 }
 
diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c
index 936ed265a4..cab91cf387 100644
--- a/src/overlay076/ov76_0223D338.c
+++ b/src/overlay076/ov76_0223D338.c
@@ -51,7 +51,7 @@
 
 typedef struct {
     int unk_00;
-    CellActorData *unk_04;
+    ManagedSprite *unk_04;
     FontOAM *unk_08;
 } UnkStruct_ov76_0223D9AC;
 
@@ -291,12 +291,12 @@ static void ov76_0223D600(UnkStruct_ov76_0223DE00 *param0, int param1, BOOL para
     }
 
     ov76_0223C0EC(param0->unk_3C4[param1], &v0, &v1);
-    Sprite_SetPositionXY2(param0->unk_2F4[param1], v0, v1);
+    ManagedSprite_SetPositionXY(param0->unk_2F4[param1], v0, v1);
 
     if (param2 == 1) {
         param0->unk_3C4[v2] = param0->unk_3C4[param1];
         ov76_0223C0EC(param0->unk_3C4[v2], &v0, &v1);
-        Sprite_SetPositionXY2(param0->unk_2F4[v2], v0, v1);
+        ManagedSprite_SetPositionXY(param0->unk_2F4[v2], v0, v1);
     }
 }
 
@@ -446,18 +446,18 @@ static BOOL ov76_0223D674(UnkStruct_ov76_0223DE00 *param0)
     return 1;
 }
 
-void ov76_0223D94C(CellActorData *param0, int param1)
+void ov76_0223D94C(ManagedSprite *param0, int param1)
 {
     switch (param1) {
     case 0:
-        Sprite_SetAnimationFrame(param0, 1);
+        ManagedSprite_SetAnimationFrame(param0, 1);
         break;
     case 2:
-        Sprite_SetAnimationFrame(param0, 2);
+        ManagedSprite_SetAnimationFrame(param0, 2);
         break;
     case 1:
     case 3:
-        Sprite_SetAnimationFrame(param0, 0);
+        ManagedSprite_SetAnimationFrame(param0, 0);
         break;
     default:
         GF_ASSERT(0);
@@ -483,12 +483,12 @@ static void ov76_0223D9AC(SysTask *param0, void *param1)
     switch (v0->unk_00) {
     case 3:
         ov76_0223D984(v0->unk_08, 0, -1);
-        Sprite_SetAnimationFrame(v0->unk_04, 2);
+        ManagedSprite_SetAnimationFrame(v0->unk_04, 2);
         v0->unk_00++;
         break;
     case 6:
         ov76_0223D984(v0->unk_08, 0, +2);
-        Sprite_SetAnimationFrame(v0->unk_04, 0);
+        ManagedSprite_SetAnimationFrame(v0->unk_04, 0);
         SysTask_Done(param0);
         Heap_FreeToHeap(v0);
         break;
@@ -498,7 +498,7 @@ static void ov76_0223D9AC(SysTask *param0, void *param1)
     }
 }
 
-static void ov76_0223DA00(CellActorData *param0, FontOAM *param1)
+static void ov76_0223DA00(ManagedSprite *param0, FontOAM *param1)
 {
     UnkStruct_ov76_0223D9AC *v0;
 
@@ -1123,7 +1123,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0)
             break;
         }
 
-        Sprite_SetDrawFlag2(param0->unk_2F4[1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_2F4[1], 0);
         ov76_0223D494(param0, 0, 0xff, 0);
         ov76_0223CA30(&param0->unk_D4.unk_18[0], 7);
         ov76_0223CDA4(param0);
@@ -1146,7 +1146,7 @@ static BOOL ov76_0223DF94(UnkStruct_ov76_0223DE00 *param0)
 
             v15 = sub_02098164(param0->unk_324[v13].unk_04);
             ov76_0223CDC4(&param0->unk_D4.unk_18[0], v15);
-            Sprite_SetPositionXY2(param0->unk_324[v13].unk_08, v11, v12);
+            ManagedSprite_SetPositionXY(param0->unk_324[v13].unk_08, v11, v12);
             ov76_0223B758(param0, v13);
             ov76_0223B7D4(param0, v13);
         } else {
@@ -1252,11 +1252,11 @@ static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0)
 {
     switch (param0->unk_3D4) {
     case 0:
-        Sprite_SetPriority(param0->unk_2F4[0], 25);
-        Sprite_SetPriority(param0->unk_2F4[1], 20);
-        Sprite_SetAnim(param0->unk_2F4[0], 1);
+        ManagedSprite_SetPriority(param0->unk_2F4[0], 25);
+        ManagedSprite_SetPriority(param0->unk_2F4[1], 20);
+        ManagedSprite_SetAnim(param0->unk_2F4[0], 1);
         ov76_0223CA30(&param0->unk_D4.unk_18[0], 10);
-        Sprite_SetDrawFlag2(param0->unk_2F4[1], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_2F4[1], 1);
         param0->unk_3D4++;
     case 1: {
         BOOL v0;
@@ -1274,7 +1274,7 @@ static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0)
             param0->unk_3D4 = 2;
             Sound_PlayEffect(1500);
         } else if (gSystem.pressedKeys & PAD_BUTTON_B) {
-            Sprite_SetDrawFlag2(param0->unk_2F4[1], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_2F4[1], 0);
             ov76_0223D600(param0, 0, 1);
             param0->unk_3D4 = 3;
             Sound_PlayEffect(1501);
@@ -1286,10 +1286,10 @@ static BOOL ov76_0223E9C4(UnkStruct_ov76_0223DE00 *param0)
         }
         break;
     case 3:
-        Sprite_SetPriority(param0->unk_2F4[0], 20);
-        Sprite_SetPriority(param0->unk_2F4[1], 25);
+        ManagedSprite_SetPriority(param0->unk_2F4[0], 20);
+        ManagedSprite_SetPriority(param0->unk_2F4[1], 25);
         ov76_0223D494(param0, 0, 0xff, 0);
-        Sprite_SetAnim(param0->unk_2F4[0], 0);
+        ManagedSprite_SetAnim(param0->unk_2F4[0], 0);
         ov76_0223CA30(&param0->unk_D4.unk_18[0], 7);
         break;
     }
diff --git a/src/overlay077/ov77_021D54B0.c b/src/overlay077/ov77_021D54B0.c
index 6eb021ab4e..460cccc726 100644
--- a/src/overlay077/ov77_021D54B0.c
+++ b/src/overlay077/ov77_021D54B0.c
@@ -8,12 +8,12 @@
 #include "overlay077/ov77_021D6670.h"
 #include "overlay077/struct_ov77_021D6734_decl.h"
 
-#include "cell_actor.h"
 #include "cell_transfer.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -25,12 +25,12 @@ SDK_COMPILER_ASSERT(((3 + 1 + 1 + 2 + 4) + 6) == 17);
 void include_data_ov77_021D79B8(void);
 
 typedef struct UnkStruct_ov77_021D5564_t {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[11][4];
-    CellActor *unk_250[17];
-    CellActorResourceData unk_294[3];
+    Sprite *unk_250[17];
+    SpriteResourcesHeader unk_294[3];
     NNSG2dCellTransferState *unk_300;
 } UnkStruct_ov77_021D5564;
 
@@ -107,12 +107,12 @@ static void ov77_021D54B0()
     VramTransfer_New((3 * 2), v0);
 }
 
-static void ov77_021D54E8(const int param0, UnkStruct_ov77_021D5564 *param1, const int param2, CellActorInitParamsEx *param3, CellActorResourceData *param4, int param5, int param6)
+static void ov77_021D54E8(const int param0, UnkStruct_ov77_021D5564 *param1, const int param2, AffineSpriteListTemplate *param3, SpriteResourcesHeader *param4, int param5, int param6)
 {
     SpriteResourcesHeader_Init(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->collection = param1->unk_00;
+        param3->list = param1->unk_00;
         param3->resourceData = param4;
         param3->position.x = 0;
         param3->position.y = 0;
@@ -217,7 +217,7 @@ void ov77_021D5BAC(UnkStruct_ov77_021D5564 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
 
     for (v0 = 0; v0 < 3; v0++) {
         SpriteResourcesHeader_Clear(&param0->unk_294[v0]);
@@ -237,8 +237,8 @@ void ov77_021D5BAC(UnkStruct_ov77_021D5564 *param0)
 void ov77_021D5C3C(UnkStruct_ov77_021D5564 *param0)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActorInitParamsEx v2;
+    SpriteResourcesHeader v1;
+    AffineSpriteListTemplate v2;
     const int v3[6] = {
         4,
         5,
@@ -269,104 +269,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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[0] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[0], 0);
-        CellActor_SetDrawFlag(param0->unk_250[0], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[0], 0);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[1] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[1], 0);
-        CellActor_SetDrawFlag(param0->unk_250[1], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[1], 0);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[2] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[2], 0);
-        CellActor_SetDrawFlag(param0->unk_250[2], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[2], 0);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[3] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[3], 1);
-        CellActor_SetDrawFlag(param0->unk_250[3], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[3], 1);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[10] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[10], 1);
-        CellActor_SetDrawFlag(param0->unk_250[10], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[10], 1);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[11] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[11], 1);
-        CellActor_SetDrawFlag(param0->unk_250[11], 0);
-        CellActor_SetAffineOverwriteMode(param0->unk_250[11], 1);
+        Sprite_SetAnimateFlag(param0->unk_250[11], 1);
+        Sprite_SetDrawFlag(param0->unk_250[11], 0);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[12] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[12], 1);
-        CellActor_SetDrawFlag(param0->unk_250[12], 0);
-        CellActor_SetAffineOverwriteMode(param0->unk_250[12], 1);
+        Sprite_SetAnimateFlag(param0->unk_250[12], 1);
+        Sprite_SetDrawFlag(param0->unk_250[12], 0);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[13] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[13], 1);
-        CellActor_SetDrawFlag(param0->unk_250[13], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[13], 1);
+        Sprite_SetDrawFlag(param0->unk_250[13], 0);
 
-        param0->unk_250[14] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[14] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[14], 1);
-        CellActor_SetDrawFlag(param0->unk_250[14], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[14], 1);
+        Sprite_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] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[15] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[15], 1);
-        CellActor_SetDrawFlag(param0->unk_250[15], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[15], 1);
+        Sprite_SetDrawFlag(param0->unk_250[15], 0);
 
-        param0->unk_250[16] = CellActorCollection_AddEx(&v2);
+        param0->unk_250[16] = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_250[16], 1);
-        CellActor_SetDrawFlag(param0->unk_250[16], 0);
+        Sprite_SetAnimateFlag(param0->unk_250[16], 1);
+        Sprite_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]] = CellActorCollection_AddEx(&v2);
+            param0->unk_250[v3[v0]] = SpriteList_AddEx(&v2);
 
-            CellActor_SetAnimateFlag(param0->unk_250[v3[v0]], 1);
-            CellActor_SetDrawFlag(param0->unk_250[v3[v0]], 0);
+            Sprite_SetAnimateFlag(param0->unk_250[v3[v0]], 1);
+            Sprite_SetDrawFlag(param0->unk_250[v3[v0]], 0);
         }
     }
 }
@@ -374,18 +374,18 @@ void ov77_021D5C3C(UnkStruct_ov77_021D5564 *param0)
 void ov77_021D5FB4(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActorInitParamsEx v2;
-    CellActor **v3;
+    SpriteResourcesHeader v1;
+    AffineSpriteListTemplate v2;
+    Sprite **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) = CellActorCollection_AddEx(&v2);
-            CellActor_SetAnimateFlag(*v3, 0);
-            CellActor_SetDrawFlag(*v3, 0);
+            (*v3) = SpriteList_AddEx(&v2);
+            Sprite_SetAnimateFlag(*v3, 0);
+            Sprite_SetDrawFlag(*v3, 0);
         }
     }
 }
@@ -393,17 +393,17 @@ void ov77_021D5FB4(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *par
 void ov77_021D6000(UnkStruct_ov77_021D5564 *param0, UnkStruct_ov77_021D6734 *param1)
 {
     int v0;
-    CellActor **v1;
+    Sprite **v1;
 
     for (v0 = 0; v0 < 16; v0++) {
         v1 = ov77_021D6794(param1, v0);
-        CellActor_SetDrawFlag(*v1, 0);
+        Sprite_SetDrawFlag(*v1, 0);
     }
 }
 
 void ov77_021D6020(UnkStruct_ov77_021D5564 *param0)
 {
-    CellActorCollection_Update(param0->unk_00);
+    SpriteList_Update(param0->unk_00);
 
     if (param0->unk_300 != NULL) {
         CellTransfer_Update();
@@ -412,29 +412,29 @@ void ov77_021D6020(UnkStruct_ov77_021D5564 *param0)
 
 void ov77_021D603C(UnkStruct_ov77_021D5564 *param0, const u8 param1, const u8 param2)
 {
-    CellActor_SetDrawFlag(param0->unk_250[param1], param2);
+    Sprite_SetDrawFlag(param0->unk_250[param1], param2);
 }
 
 void ov77_021D6050(UnkStruct_ov77_021D5564 *param0, const u8 param1)
 {
-    CellActor_SetAnimateFlag(param0->unk_250[0], param1);
-    CellActor_SetAnimateFlag(param0->unk_250[2], param1);
-    CellActor_SetAnimateFlag(param0->unk_250[1], param1);
+    Sprite_SetAnimateFlag(param0->unk_250[0], param1);
+    Sprite_SetAnimateFlag(param0->unk_250[2], param1);
+    Sprite_SetAnimateFlag(param0->unk_250[1], param1);
 }
 
 void ov77_021D607C(UnkStruct_ov77_021D5564 *param0)
 {
     VecFx32 v0;
 
-    v0 = *CellActor_GetPosition(param0->unk_250[1]);
+    v0 = *Sprite_GetPosition(param0->unk_250[1]);
     v0.x -= 0x200;
 
-    CellActor_SetPosition(param0->unk_250[1], &v0);
+    Sprite_SetPosition(param0->unk_250[1], &v0);
 
-    v0 = *CellActor_GetPosition(param0->unk_250[2]);
+    v0 = *Sprite_GetPosition(param0->unk_250[2]);
     v0.x += 0x200;
 
-    CellActor_SetPosition(param0->unk_250[2], &v0);
+    Sprite_SetPosition(param0->unk_250[2], &v0);
 }
 
 BOOL ov77_021D60E0(UnkStruct_ov77_021D5564 *param0, int param1)
@@ -450,29 +450,29 @@ BOOL ov77_021D60E0(UnkStruct_ov77_021D5564 *param0, int param1)
     }
 
     if (param1 < (53 * 30 - 15)) {
-        v0 = *CellActor_GetPosition(param0->unk_250[3]);
+        v0 = *Sprite_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (FX32_ONE * (128 + 48))) {
             v0.x = (FX32_ONE * (128 + 48));
-            CellActor_SetPosition(param0->unk_250[3], &v0);
+            Sprite_SetPosition(param0->unk_250[3], &v0);
             return 1;
         }
 
-        CellActor_SetPosition(param0->unk_250[3], &v0);
+        Sprite_SetPosition(param0->unk_250[3], &v0);
         return 0;
     } else {
-        v0 = *CellActor_GetPosition(param0->unk_250[3]);
+        v0 = *Sprite_GetPosition(param0->unk_250[3]);
         v0.x += (FX32_ONE * 18);
 
         if (v0.x >= (256 + 64) * FX32_ONE) {
             v0.x = (256 + 64) * FX32_ONE;
-            CellActor_SetPosition(param0->unk_250[3], &v0);
+            Sprite_SetPosition(param0->unk_250[3], &v0);
             ov77_021D603C(param0, 3, 0);
             return 1;
         }
 
-        CellActor_SetPosition(param0->unk_250[3], &v0);
+        Sprite_SetPosition(param0->unk_250[3], &v0);
         return 0;
     }
 }
@@ -490,29 +490,29 @@ BOOL ov77_021D61B8(UnkStruct_ov77_021D5564 *param0, int param1)
     }
 
     if (param1 < (53 * 30 - 15)) {
-        v0 = *CellActor_GetPosition(param0->unk_250[10]);
+        v0 = *Sprite_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= (FX32_ONE * (128 - 48))) {
             v0.x = (FX32_ONE * (128 - 48));
-            CellActor_SetPosition(param0->unk_250[10], &v0);
+            Sprite_SetPosition(param0->unk_250[10], &v0);
             return 1;
         }
 
-        CellActor_SetPosition(param0->unk_250[10], &v0);
+        Sprite_SetPosition(param0->unk_250[10], &v0);
         return 0;
     } else {
-        v0 = *CellActor_GetPosition(param0->unk_250[10]);
+        v0 = *Sprite_GetPosition(param0->unk_250[10]);
         v0.x += (-(FX32_ONE * 18));
 
         if (v0.x <= -64 * FX32_ONE) {
             v0.x = -64 * FX32_ONE;
-            CellActor_SetPosition(param0->unk_250[10], &v0);
+            Sprite_SetPosition(param0->unk_250[10], &v0);
             ov77_021D603C(param0, 10, 0);
             return 1;
         }
 
-        CellActor_SetPosition(param0->unk_250[10], &v0);
+        Sprite_SetPosition(param0->unk_250[10], &v0);
         return 0;
     }
 }
@@ -531,7 +531,7 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1)
         v3 = 13;
     }
 
-    v0 = CellActor_GetPosition(param0->unk_250[v2]);
+    v0 = Sprite_GetPosition(param0->unk_250[v2]);
     v1 = *v0;
     v1.x += param1;
 
@@ -539,11 +539,11 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1)
         v1.x -= 256 * FX32_ONE;
     }
 
-    CellActor_SetPosition(param0->unk_250[v2], &v1);
+    Sprite_SetPosition(param0->unk_250[v2], &v1);
     v1.x -= 256 * FX32_ONE;
-    CellActor_SetPosition(param0->unk_250[v2 + 1], &v1);
+    Sprite_SetPosition(param0->unk_250[v2 + 1], &v1);
 
-    v0 = CellActor_GetPosition(param0->unk_250[v3]);
+    v0 = Sprite_GetPosition(param0->unk_250[v3]);
     v1 = *v0;
     v1.x -= param1;
 
@@ -551,9 +551,9 @@ void ov77_021D6290(UnkStruct_ov77_021D5564 *param0, fx32 param1)
         v1.x += 256 * FX32_ONE;
     }
 
-    CellActor_SetPosition(param0->unk_250[v3], &v1);
+    Sprite_SetPosition(param0->unk_250[v3], &v1);
     v1.x += 256 * FX32_ONE;
-    CellActor_SetPosition(param0->unk_250[v3 + 1], &v1);
+    Sprite_SetPosition(param0->unk_250[v3 + 1], &v1);
 }
 
 void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1)
@@ -563,34 +563,34 @@ void ov77_021D636C(UnkStruct_ov77_021D5564 *param0, int param1)
 
     if (param1 == 0) {
         if (gSystem.whichScreenIs3D == DS_SCREEN_MAIN) {
-            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);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 0);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 0);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 1);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 1);
         } else {
-            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);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 1);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 1);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 0);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 0);
         }
     } else {
-        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);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[13], 2);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[14], 2);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[15], 2);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_250[16], 2);
     }
 
-    v0 = CellActor_GetPosition(param0->unk_250[13]);
+    v0 = Sprite_GetPosition(param0->unk_250[13]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    CellActor_SetPosition(param0->unk_250[13], &v1);
+    Sprite_SetPosition(param0->unk_250[13], &v1);
 
-    v0 = CellActor_GetPosition(param0->unk_250[15]);
+    v0 = Sprite_GetPosition(param0->unk_250[15]);
     v1 = *v0;
     v1.x = 128 * FX32_ONE;
 
-    CellActor_SetPosition(param0->unk_250[15], &v1);
+    Sprite_SetPosition(param0->unk_250[15], &v1);
 }
 
 void ov77_021D6470(UnkStruct_ov77_021D5564 *param0, int param1)
@@ -608,24 +608,24 @@ void ov77_021D6470(UnkStruct_ov77_021D5564 *param0, int param1)
         (void)0;
     }
 
-    v0 = CellActor_GetAffineZRotation(param0->unk_250[11]);
-    CellActor_SetAffineZRotation(param0->unk_250[11], v0 + 0x1c00 + v3);
+    v0 = Sprite_GetAffineZRotation(param0->unk_250[11]);
+    Sprite_SetAffineZRotation(param0->unk_250[11], v0 + 0x1c00 + v3);
 
-    v0 = CellActor_GetAffineZRotation(param0->unk_250[12]);
-    CellActor_SetAffineZRotation(param0->unk_250[12], v0 - 0x1c00 - v3);
+    v0 = Sprite_GetAffineZRotation(param0->unk_250[12]);
+    Sprite_SetAffineZRotation(param0->unk_250[12], v0 - 0x1c00 - v3);
 
     if (param1 >= (65 * 30 - 15 - 15 - 45 - 15)) {
-        v1 = CellActor_GetPosition(param0->unk_250[11]);
+        v1 = Sprite_GetPosition(param0->unk_250[11]);
         v2 = *v1;
         v2.x += 0x1000;
 
-        CellActor_SetPosition(param0->unk_250[11], &v2);
+        Sprite_SetPosition(param0->unk_250[11], &v2);
 
-        v1 = CellActor_GetPosition(param0->unk_250[12]);
+        v1 = Sprite_GetPosition(param0->unk_250[12]);
         v2 = *v1;
         v2.x -= 0x1000;
 
-        CellActor_SetPosition(param0->unk_250[12], &v2);
+        Sprite_SetPosition(param0->unk_250[12], &v2);
     }
 }
 
@@ -654,28 +654,28 @@ void ov77_021D6530(UnkStruct_ov77_021D5564 *param0, const int param1)
 
     if (param1 >= (1460 - 15)) {
         for (v0 = 0; v0 < 3; v0++) {
-            v1 = *CellActor_GetPosition(param0->unk_250[v2[v0]]);
+            v1 = *Sprite_GetPosition(param0->unk_250[v2[v0]]);
             v1.x -= Unk_ov77_021D79AC[v0];
             v1.y -= (FX32_ONE * 4);
-            CellActor_SetPosition(param0->unk_250[v2[v0]], &v1);
+            Sprite_SetPosition(param0->unk_250[v2[v0]], &v1);
         }
     }
 
     if (param1 >= (1490 - 15 + 15)) {
         for (v0 = 0; v0 < 1; v0++) {
-            v1 = *CellActor_GetPosition(param0->unk_250[v3[v0]]);
+            v1 = *Sprite_GetPosition(param0->unk_250[v3[v0]]);
             v1.x -= Unk_ov77_021D79A0[v0];
             v1.y -= (FX32_ONE * 3);
-            CellActor_SetPosition(param0->unk_250[v3[v0]], &v1);
+            Sprite_SetPosition(param0->unk_250[v3[v0]], &v1);
         }
     }
 
     if (param1 >= (1510 - 15 + 15)) {
         for (v0 = 0; v0 < 2; v0++) {
-            v1 = *CellActor_GetPosition(param0->unk_250[v4[v0]]);
+            v1 = *Sprite_GetPosition(param0->unk_250[v4[v0]]);
             v1.x -= Unk_ov77_021D79A4[v0];
             v1.y -= (FX32_ONE * 3);
-            CellActor_SetPosition(param0->unk_250[v4[v0]], &v1);
+            Sprite_SetPosition(param0->unk_250[v4[v0]], &v1);
         }
     }
 }
diff --git a/src/overlay077/ov77_021D6670.c b/src/overlay077/ov77_021D6670.c
index c4b64c8b28..9ff8482755 100644
--- a/src/overlay077/ov77_021D6670.c
+++ b/src/overlay077/ov77_021D6670.c
@@ -3,13 +3,13 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "math.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -19,7 +19,7 @@
 typedef struct {
     u8 unk_00;
     u8 unk_01;
-    CellActor *unk_04;
+    Sprite *unk_04;
     SysTask *unk_08;
 } UnkStruct_ov77_021D6ADC;
 
@@ -45,7 +45,7 @@ typedef struct {
 } UnkStruct_ov77_021D6A0C;
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
     SpriteResourceCollection *unk_190[4];
     SpriteResource *unk_1A0[4];
@@ -92,12 +92,12 @@ static void ov77_021D6670()
     PlttTransfer_Clear();
 }
 
-static void ov77_021D66A0(UnkStruct_ov77_021D6800 *param0, CellActorInitParamsEx *param1, CellActorResourceData *param2)
+static void ov77_021D66A0(UnkStruct_ov77_021D6800 *param0, AffineSpriteListTemplate *param1, SpriteResourcesHeader *param2)
 {
     SpriteResourcesHeader_Init(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->collection = param0->unk_00;
+        param1->list = param0->unk_00;
         param1->resourceData = param2;
         param1->position.x = 0;
         param1->position.y = 0;
@@ -154,7 +154,7 @@ void ov77_021D6760(UnkStruct_ov77_021D6734 *param0)
     Heap_FreeToHeap(param0);
 }
 
-CellActor **ov77_021D6794(UnkStruct_ov77_021D6734 *param0, const int param1)
+Sprite **ov77_021D6794(UnkStruct_ov77_021D6734 *param0, const int param1)
 {
     GF_ASSERT(param1 < param0->unk_00);
     return &param0->unk_04[param1].unk_04;
@@ -223,7 +223,7 @@ static void ov77_021D691C(UnkStruct_ov77_021D6800 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -232,24 +232,24 @@ static void ov77_021D691C(UnkStruct_ov77_021D6800 *param0)
 static void ov77_021D6964(UnkStruct_ov77_021D6800 *param0)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActorInitParamsEx v2;
+    SpriteResourcesHeader v1;
+    AffineSpriteListTemplate v2;
 
     for (v0 = 0; v0 < 10; v0++) {
         ov77_021D66A0(param0, &v2, &v1);
         v2.position.x = FX32_ONE * v0 * 2;
         v2.position.y = FX32_ONE * v0 * 2;
 
-        param0->unk_1B0[v0].unk_04 = CellActorCollection_AddEx(&v2);
+        param0->unk_1B0[v0].unk_04 = SpriteList_AddEx(&v2);
 
-        CellActor_SetAnimateFlag(param0->unk_1B0[v0].unk_04, 0);
-        CellActor_SetDrawFlag(param0->unk_1B0[v0].unk_04, 0);
+        Sprite_SetAnimateFlag(param0->unk_1B0[v0].unk_04, 0);
+        Sprite_SetDrawFlag(param0->unk_1B0[v0].unk_04, 0);
     }
 }
 
 static void ov77_021D69B4(UnkStruct_ov77_021D6800 *param0)
 {
-    CellActorCollection_Update(param0->unk_00);
+    SpriteList_Update(param0->unk_00);
 }
 
 void ov77_021D69C0(UnkStruct_ov77_021D670C *param0, const int param1)
@@ -293,15 +293,15 @@ static void ov77_021D6A44(UnkStruct_ov77_021D6ADC *param0, const u8 param1, cons
         {
             VecFx32 v3;
 
-            v3 = *CellActor_GetPosition(v1->unk_04);
+            v3 = *Sprite_GetPosition(v1->unk_04);
             v3.x = FX32_ONE * (64 + (LCRNG_Next() % 128));
             v3.y = FX32_ONE * (v2 + (LCRNG_Next() % 64));
 
-            CellActor_SetPosition(v1->unk_04, &v3);
+            Sprite_SetPosition(v1->unk_04, &v3);
         }
 
-        CellActor_SetAnimateFlag(v1->unk_04, 1);
-        CellActor_SetDrawFlag(v1->unk_04, 1);
+        Sprite_SetAnimateFlag(v1->unk_04, 1);
+        Sprite_SetDrawFlag(v1->unk_04, 1);
 
         v1->unk_08 = SysTask_Start(ov77_021D6B48, v1, 20);
     }
@@ -348,10 +348,10 @@ static void ov77_021D6B48(SysTask *param0, void *param1)
     {
         VecFx32 v1;
 
-        v1 = *CellActor_GetPosition(v0->unk_04);
+        v1 = *Sprite_GetPosition(v0->unk_04);
         v1.y += (FX32_ONE * 3);
 
-        CellActor_SetPosition(v0->unk_04, &v1);
+        Sprite_SetPosition(v0->unk_04, &v1);
     }
 
     v0->unk_01++;
@@ -360,8 +360,8 @@ static void ov77_021D6B48(SysTask *param0, void *param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        CellActor_SetAnimateFlag(v0->unk_04, 0);
-        CellActor_SetDrawFlag(v0->unk_04, 0);
+        Sprite_SetAnimateFlag(v0->unk_04, 0);
+        Sprite_SetDrawFlag(v0->unk_04, 0);
     }
 }
 
@@ -384,19 +384,19 @@ static void ov77_021D6BAC(UnkStruct_ov77_021D6734 *param0, const u8 param1, int
         {
             VecFx32 v3;
 
-            v3 = *CellActor_GetPosition(v2->unk_04);
+            v3 = *Sprite_GetPosition(v2->unk_04);
             v3.x = FX32_ONE * ((16 - 6) + (LCRNG_Next() % 224));
             v3.y = FX32_ONE * (192 + (64 - 6) + (LCRNG_Next() % 56));
 
-            CellActor_SetPosition(v2->unk_04, &v3);
+            Sprite_SetPosition(v2->unk_04, &v3);
         }
 
-        CellActor_SetAnimateFlag(v2->unk_04, 1);
+        Sprite_SetAnimateFlag(v2->unk_04, 1);
 
         if (param2 == 0) {
-            CellActor_SetDrawFlag(v2->unk_04, 1);
+            Sprite_SetDrawFlag(v2->unk_04, 1);
         } else {
-            CellActor_SetDrawFlag(v2->unk_04, 0);
+            Sprite_SetDrawFlag(v2->unk_04, 0);
         }
 
         v2->unk_08 = SysTask_Start(ov77_021D6C44, v2, 20);
@@ -413,7 +413,7 @@ static void ov77_021D6C44(SysTask *param0, void *param1)
         SysTask_Done(param0);
         v0->unk_08 = NULL;
         v0->unk_00 = 0;
-        CellActor_SetAnimateFlag(v0->unk_04, 0);
-        CellActor_SetDrawFlag(v0->unk_04, 0);
+        Sprite_SetAnimateFlag(v0->unk_04, 0);
+        Sprite_SetDrawFlag(v0->unk_04, 0);
     }
 }
diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c
index 3acf1af077..a1d8e4b741 100644
--- a/src/overlay077/ov77_021D6C70.c
+++ b/src/overlay077/ov77_021D6C70.c
@@ -19,7 +19,7 @@
 
 typedef struct UnkStruct_ov77_021D6CFC_t {
     UnkStruct_02007768 *unk_00;
-    Sprite *unk_04[3];
+    PokemonSprite *unk_04[3];
     BOOL unk_10;
     void *unk_14;
     UnkStruct_02014014 *unk_18;
@@ -252,7 +252,7 @@ BOOL ov77_021D6E78(UnkStruct_ov77_021D6CFC *param0, const u8 param1, const int p
 
 static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, 6);
     sub_02008274(v0, 1, -16);
@@ -273,7 +273,7 @@ static BOOL ov77_021D7004(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 
 static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, -3);
     sub_02008274(v0, 1, -18);
@@ -291,7 +291,7 @@ static BOOL ov77_021D7074(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 
 static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, -16);
     sub_02008274(v0, 1, -16);
@@ -312,7 +312,7 @@ static BOOL ov77_021D70CC(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 
 static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, -6);
     sub_02008274(v0, 1, -16);
@@ -330,7 +330,7 @@ static BOOL ov77_021D713C(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 
 static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, 8);
     sub_02008274(v0, 1, -16);
@@ -351,7 +351,7 @@ static BOOL ov77_021D7194(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 
 static BOOL ov77_021D7204(UnkStruct_ov77_021D6CFC *param0, const u8 param1)
 {
-    Sprite *v0 = param0->unk_04[param1];
+    PokemonSprite *v0 = param0->unk_04[param1];
 
     sub_02008274(v0, 0, 6);
     sub_02008274(v0, 1, -20);
@@ -378,7 +378,7 @@ static void ov77_021D725C(void)
 
 static void ov77_021D7268(SPLEmitter *param0)
 {
-    Sprite *v0 = sub_02014764();
+    PokemonSprite *v0 = sub_02014764();
     VecFx32 v1 = { 0, 0, 0 };
 
     v1.x = 172 * (sub_020080C0(v0, 0) - 128);
diff --git a/src/overlay079/ov79_021D0D80.c b/src/overlay079/ov79_021D0D80.c
index bb9f8dfa48..27db185817 100644
--- a/src/overlay079/ov79_021D0D80.c
+++ b/src/overlay079/ov79_021D0D80.c
@@ -11,7 +11,6 @@
 #include "overlay079/struct_ov79_021D0E1C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "gx_layers.h"
@@ -22,6 +21,7 @@
 #include "narc.h"
 #include "overlay_manager.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -747,12 +747,12 @@ static void ov79_021D167C(UnkStruct_ov79_021D0E1C *param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         param0->unk_1C0[v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_1B8, param0->unk_1BC, &v1[v0]);
-        CellActor_SetDrawFlag(param0->unk_1C0[v0], 1);
+        Sprite_SetDrawFlag(param0->unk_1C0[v0], 1);
     }
 
-    CellActor_SetAnimateFlag(param0->unk_1C0[0], 0);
-    CellActor_SetAnimateFlag(param0->unk_1C0[1], 1);
-    CellActor_SetAnimateFlag(param0->unk_1C0[2], 1);
+    Sprite_SetAnimateFlag(param0->unk_1C0[0], 0);
+    Sprite_SetAnimateFlag(param0->unk_1C0[1], 1);
+    Sprite_SetAnimateFlag(param0->unk_1C0[2], 1);
 
     for (v0 = 0; v0 < 5; v0++) {
         static const struct {
@@ -767,8 +767,8 @@ static void ov79_021D167C(UnkStruct_ov79_021D0E1C *param0)
 
         param0->unk_1CC[v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_1B8, param0->unk_1BC, &v1[3]);
 
-        CellActor_SetDrawFlag(param0->unk_1CC[v0], 1);
-        CellActor_SetAnim(param0->unk_1CC[v0], v0 + 3);
+        Sprite_SetDrawFlag(param0->unk_1CC[v0], 1);
+        Sprite_SetAnim(param0->unk_1CC[v0], v0 + 3);
         Sprite_SetPositionXY(param0->unk_1CC[v0], v2[v0].unk_00, v2[v0].unk_02);
     }
 
@@ -786,17 +786,17 @@ static void ov79_021D167C(UnkStruct_ov79_021D0E1C *param0)
 
         param0->unk_1E0[v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_1B8, param0->unk_1BC, &v1[4]);
 
-        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);
+        Sprite_SetDrawFlag(param0->unk_1E0[v0], 1);
+        Sprite_SetAnim(param0->unk_1E0[v0], v0 * 3);
+        Sprite_SetAnimSpeed(param0->unk_1E0[v0], FX32_CONST(2));
+        Sprite_SetExplicitPalette(param0->unk_1E0[v0], v0 + 2);
+        Sprite_SetAnimateFlag(param0->unk_1E0[v0], 0);
         Sprite_SetPositionXY(param0->unk_1E0[v0], v3[v0].unk_00, v3[v0].unk_02);
     }
 
     param0->unk_1FC = sub_0209916C(param0->unk_1F8, 0, 231, 76, 0, 1, 0, 0);
 
-    Sprite_SetDrawFlag2(param0->unk_1FC->unk_04, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_1FC->unk_04, 0);
 }
 
 static void ov79_021D17E8(UnkStruct_ov79_021D0E1C *param0)
@@ -806,14 +806,14 @@ static void ov79_021D17E8(UnkStruct_ov79_021D0E1C *param0)
     sub_02099370(param0->unk_1F8, param0->unk_1FC);
 
     for (v0 = 0; v0 < 6; v0++) {
-        SpriteSystem_DeleteSprite(param0->unk_1E0[v0]);
+        Sprite_Delete2(param0->unk_1E0[v0]);
     }
 
     for (v0 = 0; v0 < 5; v0++) {
-        SpriteSystem_DeleteSprite(param0->unk_1CC[v0]);
+        Sprite_Delete2(param0->unk_1CC[v0]);
     }
 
     for (v0 = 0; v0 < 3; v0++) {
-        SpriteSystem_DeleteSprite(param0->unk_1C0[v0]);
+        Sprite_Delete2(param0->unk_1C0[v0]);
     }
 }
diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c
index 3955c9d905..70cf35eccd 100644
--- a/src/overlay079/ov79_021D183C.c
+++ b/src/overlay079/ov79_021D183C.c
@@ -9,12 +9,12 @@
 #include "overlay079/struct_ov79_021D0E1C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "list_menu.h"
 #include "menu.h"
 #include "render_text.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -212,30 +212,30 @@ void ov79_021D1B24(UnkStruct_ov79_021D0E1C *param0, u8 param1, u8 param2)
 {
     switch (param2) {
     case 0:
-        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3);
-        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 0);
+        Sprite_SetAnim(param0->unk_1E0[param1], param1 * 3);
+        Sprite_SetAnimateFlag(param0->unk_1E0[param1], 0);
         Window_Scroll(
             &param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         break;
     case 1:
-        CellActor_RestartAnim(param0->unk_1E0[param1]);
-        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1);
+        Sprite_RestartAnim(param0->unk_1E0[param1]);
+        Sprite_SetAnimateFlag(param0->unk_1E0[param1], 1);
         Window_Scroll(&param0->unk_E8[7 + param1], 0, 4, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 2:
-        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
+        Sprite_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
         Window_Scroll(&param0->unk_E8[7 + param1], 1, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
     case 3:
-        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2);
+        Sprite_SetAnim(param0->unk_1E0[param1], param1 * 3 + 2);
         Window_Scroll(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 1;
         break;
     case 4:
-        CellActor_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
-        CellActor_SetAnimateFlag(param0->unk_1E0[param1], 1);
+        Sprite_SetAnim(param0->unk_1E0[param1], param1 * 3 + 1);
+        Sprite_SetAnimateFlag(param0->unk_1E0[param1], 1);
         Window_Scroll(&param0->unk_E8[7 + param1], 0, 2, ((0 << 4) | 0));
         param0->unk_14 = 0;
         break;
@@ -286,16 +286,16 @@ static void ov79_021D1D20(UnkStruct_ov79_021D0E1C *param0, UnkStruct_020989DC *p
 
     if (param1 == NULL) {
         for (v0 = 0; v0 < 5; v0++) {
-            CellActor_SetDrawFlag(param0->unk_1CC[v0], 0);
+            Sprite_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
         return;
     }
 
     for (v0 = 0; v0 < 5; v0++) {
         if (param1->unk_20_val2 & v1) {
-            CellActor_SetDrawFlag(param0->unk_1CC[v0], 1);
+            Sprite_SetDrawFlag(param0->unk_1CC[v0], 1);
         } else {
-            CellActor_SetDrawFlag(param0->unk_1CC[v0], 0);
+            Sprite_SetDrawFlag(param0->unk_1CC[v0], 0);
         }
 
         v1 <<= 1;
@@ -327,15 +327,15 @@ static void ov79_021D1D94(ListMenu *param0, u32 param1, u8 param2)
     Sprite_SetPositionXY(v0->unk_1C0[0], 105, v3 * 16 + 40);
 
     if (v2 == 0) {
-        CellActor_SetDrawFlag(v0->unk_1C0[1], 0);
+        Sprite_SetDrawFlag(v0->unk_1C0[1], 0);
     } else {
-        CellActor_SetDrawFlag(v0->unk_1C0[1], 1);
+        Sprite_SetDrawFlag(v0->unk_1C0[1], 1);
     }
 
     if (v2 < (v0->unk_1C - 6)) {
-        CellActor_SetDrawFlag(v0->unk_1C0[2], 1);
+        Sprite_SetDrawFlag(v0->unk_1C0[2], 1);
     } else {
-        CellActor_SetDrawFlag(v0->unk_1C0[2], 0);
+        Sprite_SetDrawFlag(v0->unk_1C0[2], 0);
     }
 
     Window_FillRectWithColor(&(v0->unk_E8[1]), ((0 << 4) | 0), 0, 0, 10 * 8, 2 * 8);
@@ -343,7 +343,7 @@ static void ov79_021D1D94(ListMenu *param0, u32 param1, u8 param2)
     if (param1 == 0xFF) {
         ov79_021D1D20(v0, NULL);
         Window_CopyToVRAM(&v0->unk_E8[1]);
-        Sprite_SetDrawFlag2(v0->unk_1FC->unk_04, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_1FC->unk_04, 0);
         return;
     }
 
@@ -360,7 +360,7 @@ static void ov79_021D1D94(ListMenu *param0, u32 param1, u8 param2)
     StringTemplate_Format(v0->unk_30.unk_00, v0->unk_30.unk_04, v0->unk_30.unk_10);
     Text_AddPrinterWithParamsAndColor(&v0->unk_E8[1], FONT_SYSTEM, v0->unk_30.unk_04, 8, 0, TEXT_SPEED_INSTANT, v1, NULL);
     sub_0209933C(v0->unk_1F8, v0->unk_1FC, v0->unk_20->unk_1C[param1].unk_02);
-    Sprite_SetDrawFlag2(v0->unk_1FC->unk_04, 1);
+    ManagedSprite_SetDrawFlag(v0->unk_1FC->unk_04, 1);
 }
 
 void ov79_021D1ED8(UnkStruct_ov79_021D0E1C *param0)
diff --git a/src/overlay079/ov79_021D20F4.c b/src/overlay079/ov79_021D20F4.c
index 135bc792b7..24b77a1143 100644
--- a/src/overlay079/ov79_021D20F4.c
+++ b/src/overlay079/ov79_021D20F4.c
@@ -5,10 +5,10 @@
 
 #include "overlay079/struct_ov79_021D0E1C.h"
 
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "gx_layers.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "unk_020393C8.h"
 #include "unk_02098FFC.h"
@@ -92,12 +92,12 @@ void ov79_021D21F8(UnkStruct_ov79_021D0E1C *param0)
 void ov79_021D2214(UnkStruct_ov79_021D0E1C *param0, BOOL param1)
 {
     if (param1 == 0) {
-        CellActor_SetExplicitPalette(param0->unk_1C0[0], 0);
-        CellActor_SetAnimateFlag(param0->unk_1C0[1], 1);
-        CellActor_SetAnimateFlag(param0->unk_1C0[2], 1);
+        Sprite_SetExplicitPalette(param0->unk_1C0[0], 0);
+        Sprite_SetAnimateFlag(param0->unk_1C0[1], 1);
+        Sprite_SetAnimateFlag(param0->unk_1C0[2], 1);
     } else {
-        CellActor_SetExplicitPalette(param0->unk_1C0[0], 9);
-        CellActor_SetAnimateFlag(param0->unk_1C0[1], 0);
-        CellActor_SetAnimateFlag(param0->unk_1C0[2], 0);
+        Sprite_SetExplicitPalette(param0->unk_1C0[0], 9);
+        Sprite_SetAnimateFlag(param0->unk_1C0[1], 0);
+        Sprite_SetAnimateFlag(param0->unk_1C0[2], 0);
     }
 }
diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c
index 7ba27413ef..a2ac10e27a 100644
--- a/src/overlay079/ov79_021D2268.c
+++ b/src/overlay079/ov79_021D2268.c
@@ -15,7 +15,6 @@
 #include "overlay079/struct_ov79_021D38D0.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "font.h"
 #include "gx_layers.h"
@@ -27,6 +26,7 @@
 #include "pokemon.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -82,8 +82,8 @@ struct UnkStruct_ov79_021D29B4_t {
     int unk_08;
     UnkStruct_ov79_021D2C50 unk_0C;
     UnkStruct_ov79_021D2C50 unk_68;
-    CellActor *unk_C4;
-    Sprite *unk_C8;
+    Sprite *unk_C4;
+    PokemonSprite *unk_C8;
     UnkStruct_ov79_021D29E4 unk_CC[4];
 };
 
@@ -557,7 +557,7 @@ static void ov79_021D2864(UnkStruct_ov79_021D2928 *param0)
     param0->unk_5C = sub_02098FFC(param0->unk_00, 2, 2, (NNS_G2D_VRAM_TYPE_2DMAIN), 0);
     param0->unk_60[0] = sub_0209916C(param0->unk_5C, param0->unk_10->unk_08, 100, 90, 0, 1, 0, 0);
 
-    Sprite_SetDrawFlag2(param0->unk_60[0]->unk_04, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_60[0]->unk_04, 0);
 
     if (CommSys_IsInitialized()) {
         sub_02039734();
@@ -653,12 +653,12 @@ static int ov79_021D2A04(UnkStruct_ov79_021D2928 *param0, UnkStruct_ov79_021D29B
     param1->unk_0C.unk_58 = 24;
     param1->unk_0C.unk_54 = 0;
 
-    CellActor_SetPosition(param1->unk_C4, &param1->unk_0C.unk_00);
+    Sprite_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));
 
-    CellActor_SetAffineOverwriteMode(param1->unk_C4, 1);
-    CellActor_SetAffineScale(param1->unk_C4, &param1->unk_0C.unk_24);
+    Sprite_SetAffineOverwriteMode(param1->unk_C4, 1);
+    Sprite_SetAffineScale(param1->unk_C4, &param1->unk_0C.unk_24);
 
     ov79_021D29B4(param1, 0, ov79_021D2C50);
     ov79_021D29B4(param1, 1, ov79_021D2D7C);
@@ -772,9 +772,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));
-    CellActor_SetDrawFlag(v1->unk_C4, 1);
-    CellActor_SetAffineOverwriteMode(v1->unk_C4, 1);
-    CellActor_SetAffineScale(v1->unk_C4, &v2->unk_24);
+    Sprite_SetDrawFlag(v1->unk_C4, 1);
+    Sprite_SetAffineOverwriteMode(v1->unk_C4, 1);
+    Sprite_SetAffineScale(v1->unk_C4, &v2->unk_24);
     SysTask_SetCallback(param0, ov79_021D2CEC);
 }
 
@@ -788,13 +788,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);
 
-    CellActor_SetAffineScale(v1->unk_C4, &v3);
+    Sprite_SetAffineScale(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
 
     if (v0->unk_04 == 0) {
-        CellActor_SetDrawFlag(v1->unk_C4, 0);
+        Sprite_SetDrawFlag(v1->unk_C4, 0);
         ov79_021D29E4(v0);
     }
 }
@@ -819,7 +819,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));
 
-    CellActor_SetPosition(v1->unk_C4, &v2->unk_00);
+    Sprite_SetPosition(v1->unk_C4, &v2->unk_00);
     SysTask_SetCallback(param0, ov79_021D2E74);
 }
 
@@ -839,7 +839,7 @@ static void ov79_021D2E74(SysTask *param0, void *param1)
     v5 = FX32_ONE;
     v3.y += FX_Mul(v4, v5);
 
-    CellActor_SetPosition(v1->unk_C4, &v3);
+    Sprite_SetPosition(v1->unk_C4, &v3);
 
     v0->unk_0C += FX32_ONE;
     v0->unk_04--;
diff --git a/src/overlay079/ov79_021D3768.c b/src/overlay079/ov79_021D3768.c
index 6c4e2ccfa9..a27bc89599 100644
--- a/src/overlay079/ov79_021D3768.c
+++ b/src/overlay079/ov79_021D3768.c
@@ -84,7 +84,7 @@ static void ov79_021D3870(UnkStruct_ov79_021D3820 *param0, int param1)
 static void ov79_021D38D0(UnkStruct_ov79_021D3820 *param0, UnkStruct_ov79_021D38D0 *param1, int param2)
 {
     ArchivedSprite v0;
-    Sprite *v1;
+    PokemonSprite *v1;
 
     param0->unk_04 = sub_0200762C(param2);
 
diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c
index c773cfc2a0..aa9c403299 100644
--- a/src/overlay080/ov80_021D1458.c
+++ b/src/overlay080/ov80_021D1458.c
@@ -10,13 +10,13 @@
 #include "overlay080/struct_ov80_021D2C5C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "map_header_util.h"
 #include "map_matrix.h"
 #include "message.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "sys_task.h"
@@ -33,7 +33,7 @@ typedef struct {
     u16 unk_08;
     u8 unk_0A;
     u8 unk_0B;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
 } UnkStruct_ov80_021D1744;
 
 typedef struct {
@@ -69,9 +69,9 @@ typedef struct {
     UnkStruct_ov80_021D2C1C *unk_9C;
     UnkStruct_ov80_021D2AF4 *unk_A0;
     UnkStruct_ov80_021D2570 unk_A4;
-    CellActor *unk_100;
-    CellActor *unk_104;
-    CellActor *unk_108;
+    Sprite *unk_100;
+    Sprite *unk_104;
+    Sprite *unk_108;
     SysTask *unk_10C;
 } UnkStruct_ov80_021D1478;
 
@@ -618,7 +618,7 @@ static void ov80_021D1C24(UnkStruct_ov80_021D2A08 *param0)
 
     if (v1->unk_13-- == 3) {
         Sprite_SetPositionXY(v1->unk_104, v1->unk_18 * 7 + (48 - 23), v1->unk_1C * 7 + (6 - 40));
-        CellActor_UpdateAnim(v1->unk_104, FX32_ONE);
+        Sprite_UpdateAnim(v1->unk_104, FX32_ONE);
 
         ov80_021D1A30(param0);
         ov80_021D1AB0(param0, &(v1->unk_28[0]), MainMapMatrixData_GetMapHeaderIDAtCoords((const MainMapMatrixData *)param0->unk_30, v1->unk_18, v1->unk_1C), v1->unk_18, v1->unk_1C);
@@ -907,15 +907,15 @@ static void ov80_021D2398(UnkStruct_ov80_021D2A08 *param0)
 
     v0->unk_100 = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[0]);
 
-    CellActor_SetDrawFlag(v0->unk_100, 0);
-    CellActor_SetAnimSpeed(v0->unk_100, FX32_ONE);
+    Sprite_SetDrawFlag(v0->unk_100, 0);
+    Sprite_SetAnimSpeed(v0->unk_100, FX32_ONE);
     Sprite_SetPositionXY(v0->unk_100, 128, 108);
 
     v0->unk_104 = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_D8, param0->unk_DC, &Unk_ov80_021D30E8[1]);
 
-    CellActor_SetDrawFlag(v0->unk_104, 1);
-    CellActor_SetAnimSpeed(v0->unk_104, FX32_CONST(2));
-    CellActor_SetAnimateFlag(v0->unk_104, 1);
+    Sprite_SetDrawFlag(v0->unk_104, 1);
+    Sprite_SetAnimSpeed(v0->unk_104, FX32_CONST(2));
+    Sprite_SetAnimateFlag(v0->unk_104, 1);
     Sprite_SetPositionXY(v0->unk_104, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 
     if (param0->unk_2C->unk_0C == 0) {
@@ -926,8 +926,8 @@ static void ov80_021D2398(UnkStruct_ov80_021D2A08 *param0)
 
     v0->unk_108 = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_D8, param0->unk_DC, &v1);
 
-    CellActor_SetDrawFlag(v0->unk_108, 1);
-    SpriteActor_SetAnimFrame(v0->unk_108, param0->unk_2C->unk_0C);
+    Sprite_SetDrawFlag(v0->unk_108, 1);
+    Sprite_SetAnimFrame(v0->unk_108, param0->unk_2C->unk_0C);
     Sprite_SetPositionXY(v0->unk_108, v0->unk_18 * 7 + (48 - 23), v0->unk_1C * 7 + (6 - 40));
 }
 
@@ -1018,8 +1018,8 @@ static void ov80_021D259C(UnkStruct_ov80_021D2A08 *param0)
         v2->unk_0C = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_D8, param0->unk_DC, &(Unk_ov80_021D30E8));
 
         Sprite_SetPositionXY(v2->unk_0C, v2->unk_00 * 7 + 25, v2->unk_04 * 7 + -34);
-        CellActor_SetPriority(v2->unk_0C, 2);
-        CellActor_SetDrawFlag(v2->unk_0C, 0);
+        Sprite_SetPriority(v2->unk_0C, 2);
+        Sprite_SetDrawFlag(v2->unk_0C, 0);
     }
 
     if (v0->unk_A4.unk_00 == 0) {
@@ -1038,8 +1038,8 @@ static void ov80_021D26AC(SysTask *param0, void *param1)
         return;
     }
 
-    CellActor_SetDrawFlag(v0->unk_0C[v0->unk_0B].unk_0C, 0);
-    CellActor_SetDrawFlag(v0->unk_0C[v0->unk_0A].unk_0C, 1);
+    Sprite_SetDrawFlag(v0->unk_0C[v0->unk_0B].unk_0C, 0);
+    Sprite_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;
@@ -1061,7 +1061,7 @@ static void ov80_021D2700(UnkStruct_ov80_021D2A08 *param0)
 
     for (v2 = 0; v2 < v0->unk_A4.unk_00; v2++) {
         v1 = &(v0->unk_A4.unk_0C[v2]);
-        SpriteSystem_DeleteSprite(v1->unk_0C);
+        Sprite_Delete2(v1->unk_0C);
     }
 }
 
@@ -1087,9 +1087,9 @@ static void ov80_021D2774(SysTask *param0, void *param1)
 
     switch (v1->unk_04) {
     case 0:
-        CellActor_SetDrawFlag(v1->unk_100, 1);
-        CellActor_SetAnimateFlag(v1->unk_100, 1);
-        SpriteActor_SetAnimFrame(v1->unk_100, 1);
+        Sprite_SetDrawFlag(v1->unk_100, 1);
+        Sprite_SetAnimateFlag(v1->unk_100, 1);
+        Sprite_SetAnimFrame(v1->unk_100, 1);
         Sound_PlayEffect(1508);
         v1->unk_04++;
         break;
@@ -1105,8 +1105,8 @@ static void ov80_021D2774(SysTask *param0, void *param1)
 
         break;
     case 2:
-        CellActor_SetDrawFlag(v1->unk_100, 0);
-        CellActor_SetAnimateFlag(v1->unk_100, 0);
+        Sprite_SetDrawFlag(v1->unk_100, 0);
+        Sprite_SetAnimateFlag(v1->unk_100, 0);
 
         v0->unk_14 = 0;
         StartScreenTransition(4, 13, 2, 0x0, 8, 1, v0->unk_04);
diff --git a/src/overlay080/ov80_021D2AF4.c b/src/overlay080/ov80_021D2AF4.c
index 0e119d2c03..7bb414c16b 100644
--- a/src/overlay080/ov80_021D2AF4.c
+++ b/src/overlay080/ov80_021D2AF4.c
@@ -9,8 +9,8 @@
 #include "overlay080/struct_ov80_021D2C5C_sub1.h"
 #include "overlay080/struct_ov80_021D2E10.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 #include "sprite_system.h"
 
 const UnkStruct_ov80_021D2C5C_sub1 Unk_ov80_021D31D8[20] = {
@@ -66,17 +66,17 @@ UnkStruct_ov80_021D2C1C *ov80_021D2AF4(SpriteSystem *param0, SpriteManager *para
         v1->unk_14 = param2[v3];
         v1->unk_18 = SpriteSystem_NewSpriteFromResourceHeader(param0, param1, &v4);
 
-        CellActor_SetDrawFlag(v1->unk_18, 1);
+        Sprite_SetDrawFlag(v1->unk_18, 1);
 
         if (v1->unk_14) {
-            CellActor_SetExplicitPalette(v1->unk_18, 5 + v1->unk_00.unk_09 + v1->unk_14);
+            Sprite_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)) {
-                CellActor_SetDrawFlag(v1->unk_18, 0);
+                Sprite_SetDrawFlag(v1->unk_18, 0);
             }
         }
 
-        CellActor_UpdateAnim(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
+        Sprite_UpdateAnim(v1->unk_18, FX32_CONST(v1->unk_00.unk_08));
         Sprite_SetPositionXY(v1->unk_18, v1->unk_00.unk_0C + 25, v1->unk_00.unk_10 + -34);
     }
 
@@ -90,8 +90,8 @@ void ov80_021D2C1C(UnkStruct_ov80_021D2C1C *param0)
 
     for (v1 = 0; v1 < param0->unk_00; v1++) {
         v0 = &param0->unk_08[v1];
-        CellActor_SetAffineZRotationEx(v0->unk_18, 0, 0);
-        CellActor_Delete(v0->unk_18);
+        Sprite_SetAffineZRotationEx(v0->unk_18, 0, 0);
+        Sprite_Delete(v0->unk_18);
     }
 
     Heap_FreeToHeap(param0->unk_08);
@@ -149,7 +149,7 @@ int ov80_021D2CC0(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int p
 
     if ((v0 == NULL) || (v0->unk_14 == 0)) {
         if (param0->unk_04 != NULL) {
-            CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            Sprite_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
 
         param0->unk_04 = NULL;
@@ -161,7 +161,7 @@ int ov80_021D2CC0(UnkStruct_ov80_021D2C1C *param0, int param1, int param2, int p
         param0->unk_03 = 0;
     } else {
         if ((v0->unk_00.unk_0A == 2) || (v0->unk_00.unk_0A == 3)) {
-            CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+            Sprite_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
         }
     }
 
@@ -179,9 +179,9 @@ void ov80_021D2D28(UnkStruct_ov80_021D2C1C *param0, int param1)
     }
 
     if (param0->unk_03 == 0) {
-        CellActor_SetExplicitPalette(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
+        Sprite_SetExplicitPalette(param0->unk_04->unk_18, 8 + param0->unk_04->unk_00.unk_09);
     } else {
-        CellActor_SetExplicitPalette(param0->unk_04->unk_18, 5 + param0->unk_04->unk_00.unk_09 + param0->unk_04->unk_14);
+        Sprite_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 b47cdde32a..288f5e5162 100644
--- a/src/overlay083/ov83_0223B5A0.c
+++ b/src/overlay083/ov83_0223B5A0.c
@@ -21,7 +21,6 @@
 #include "savedata/save_table.h"
 
 #include "bag.h"
-#include "cell_actor.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "game_options.h"
@@ -31,6 +30,7 @@
 #include "journal.h"
 #include "overlay_manager.h"
 #include "poffin.h"
+#include "sprite.h"
 #include "system.h"
 #include "unk_020041CC.h"
 #include "unk_02005474.h"
@@ -411,7 +411,7 @@ static int ov83_0223B9EC(UnkStruct_ov83_0223C344 *param0, UnkStruct_ov83_0223B78
     case 5:
         v2 = ov83_0223E32C(&param1->unk_5E4);
         {
-            int v3 = CellActor_GetAnimFrame(param1->unk_5E4.unk_08);
+            int v3 = Sprite_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 9a9e2d815e..e4c1baab0d 100644
--- a/src/overlay083/ov83_0223C958.c
+++ b/src/overlay083/ov83_0223C958.c
@@ -12,7 +12,6 @@
 #include "overlay083/struct_ov83_0223B784.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -20,6 +19,7 @@
 #include "narc.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -131,7 +131,7 @@ void ov83_0223CBA4(UnkStruct_ov83_0223B784 *param0)
 
     if (param0->unk_31C) {
         if (param0->unk_2C.unk_00) {
-            CellActorCollection_Update(param0->unk_2C.unk_00);
+            SpriteList_Update(param0->unk_2C.unk_00);
         }
     }
 }
diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c
index 49127398be..959e9c4f1a 100644
--- a/src/overlay083/ov83_0223D6A8.c
+++ b/src/overlay083/ov83_0223D6A8.c
@@ -38,7 +38,6 @@
 #include "overlay083/struct_ov83_0223FE50.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -47,6 +46,7 @@
 #include "math.h"
 #include "narc.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -195,7 +195,7 @@ void ov83_0223D784(UnkStruct_ov83_0223D784 *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     for (v0 = 0; v0 < 4; v0++) {
@@ -266,12 +266,12 @@ void ov83_0223D95C(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *par
     }
 }
 
-CellActor *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
+Sprite *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95C *param1, fx32 param2, fx32 param3, fx32 param4, int param5, int param6)
 {
-    CellActorInitParams v0;
-    CellActor *v1;
+    SpriteListTemplate v0;
+    Sprite *v1;
 
-    v0.collection = param0->unk_00;
+    v0.list = param0->unk_00;
     v0.resourceData = &param1->unk_14;
     v0.position.x = param2;
     v0.position.y = param3;
@@ -280,7 +280,7 @@ CellActor *ov83_0223D9A8(UnkStruct_ov83_0223D784 *param0, UnkStruct_ov83_0223D95
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param6;
 
-    v1 = CellActorCollection_Add(&v0);
+    v1 = SpriteList_Add(&v0);
     GF_ASSERT(v1);
 
     return v1;
@@ -404,11 +404,11 @@ void ov83_0223DB4C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223DB4C *par
             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);
-            CellActor_SetDrawFlag(param0->unk_08[v1], 0);
+            Sprite_SetDrawFlag(param0->unk_08[v1], 0);
 
             param0->unk_18[v1] = ov83_0223D9A8(param2, &param3[0], 0, 0, 0, 0, param4);
-            CellActor_SetDrawFlag(param0->unk_18[v1], 0);
-            CellActor_SetAnim(param0->unk_18[v1], 1);
+            Sprite_SetDrawFlag(param0->unk_18[v1], 0);
+            Sprite_SetAnim(param0->unk_18[v1], 1);
             v1++;
         }
 
@@ -429,8 +429,8 @@ void ov83_0223DC1C(UnkStruct_ov83_0223DB30 *param0, UnkStruct_ov83_0223D784 *par
     GF_ASSERT(param0->unk_00 == 1);
 
     for (v0 = 0; v0 < param0->unk_108; v0++) {
-        CellActor_Delete(param0->unk_08[v0]);
-        CellActor_Delete(param0->unk_18[v0]);
+        Sprite_Delete(param0->unk_08[v0]);
+        Sprite_Delete(param0->unk_18[v0]);
         ov83_0223D95C(param1, &param0->unk_28[v0]);
     }
 
@@ -449,7 +449,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);
-        CellActor_SetPosition(param0->unk_08[v0], &v1);
+        Sprite_SetPosition(param0->unk_08[v0], &v1);
 
         param0->unk_1CC[v0] = 0;
         param0->unk_1DC[v0] = Unk_ov83_02240460[v0].unk_11;
@@ -475,7 +475,7 @@ u32 ov83_0223DD30(UnkStruct_ov83_0223DB30 *param0)
 
         if (param0->unk_1DC[param0->unk_1EC] <= 0) {
             param0->unk_1CC[param0->unk_1EC] = 1;
-            CellActor_SetDrawFlag(param0->unk_08[param0->unk_1EC], 1);
+            Sprite_SetDrawFlag(param0->unk_08[param0->unk_1EC], 1);
 
             v3 = 2 + param0->unk_1EC;
             param0->unk_1EC++;
@@ -491,20 +491,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);
-            CellActor_SetPosition(param0->unk_08[v0], &v2);
+            Sprite_SetPosition(param0->unk_08[v0], &v2);
 
             if (v1 == 1) {
-                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);
+                Sprite_SetPosition(param0->unk_18[v0], &v2);
+                Sprite_SetDrawFlag(param0->unk_18[v0], 1);
+                Sprite_SetAnimateFlag(param0->unk_18[v0], 1);
+                Sprite_SetDrawFlag(param0->unk_08[v0], 0);
                 Sound_PlayEffect(1724);
                 param0->unk_1CC[v0]++;
             }
             break;
         case 2:
-            if (CellActor_IsAnimated(param0->unk_18[v0]) == 0) {
-                CellActor_SetDrawFlag(param0->unk_18[v0], 0);
+            if (Sprite_IsAnimated(param0->unk_18[v0]) == 0) {
+                Sprite_SetDrawFlag(param0->unk_18[v0], 0);
                 param0->unk_1CC[v0]++;
             }
             break;
@@ -692,40 +692,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);
-    CellActor_SetDrawFlag(param0->unk_08, 0);
-    CellActor_SetAnim(param0->unk_08, param5);
+    Sprite_SetDrawFlag(param0->unk_08, 0);
+    Sprite_SetAnim(param0->unk_08, param5);
     param0->unk_00 = 1;
 }
 
 void ov83_0223E2C8(UnkStruct_ov83_0223E244 *param0)
 {
     GF_ASSERT(param0->unk_00 == 1);
-    CellActor_Delete(param0->unk_08);
+    Sprite_Delete(param0->unk_08);
     param0->unk_00 = 0;
 }
 
 void ov83_0223E2E4(UnkStruct_ov83_0223E244 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_08, 1);
-    CellActor_SetAnimateFlag(param0->unk_08, 1);
+    Sprite_SetDrawFlag(param0->unk_08, 1);
+    Sprite_SetAnimateFlag(param0->unk_08, 1);
 }
 
 void ov83_0223E2FC(UnkStruct_ov83_0223E244 *param0)
 {
     VecFx32 v0;
 
-    CellActor_SetDrawFlag(param0->unk_08, 1);
-    CellActor_SetAnimateFlag(param0->unk_08, 1);
+    Sprite_SetDrawFlag(param0->unk_08, 1);
+    Sprite_SetAnimateFlag(param0->unk_08, 1);
 
     v0.x = 168 * FX32_ONE;
     v0.y = 60 * FX32_ONE;
 
-    CellActor_SetPosition(param0->unk_08, &v0);
+    Sprite_SetPosition(param0->unk_08, &v0);
 }
 
 BOOL ov83_0223E32C(UnkStruct_ov83_0223E244 *param0)
 {
-    if (CellActor_IsAnimated(param0->unk_08) == 0) {
+    if (Sprite_IsAnimated(param0->unk_08) == 0) {
         return 1;
     }
 
@@ -956,9 +956,9 @@ void ov83_0223E5DC(UnkStruct_ov83_0223E5C0 *param0, UnkStruct_ov83_0223D784 *par
 
     for (v0 = 0; v0 < 4; v0++) {
         param0->unk_04[v0] = ov83_0223D9A8(param1, &param2[1], 128, 96, 0, 2, param3);
-        CellActor_SetDrawFlag(param0->unk_04[v0], 0);
-        CellActor_SetAnim(param0->unk_04[v0], 4 + v0);
-        CellActor_SetPosition(param0->unk_04[v0], &v1);
+        Sprite_SetDrawFlag(param0->unk_04[v0], 0);
+        Sprite_SetAnim(param0->unk_04[v0], 4 + v0);
+        Sprite_SetPosition(param0->unk_04[v0], &v1);
     }
 
     param0->unk_00 = 1;
@@ -969,7 +969,7 @@ void ov83_0223E63C(UnkStruct_ov83_0223E5C0 *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(param0->unk_04[v0]);
+        Sprite_Delete(param0->unk_04[v0]);
     }
 
     param0->unk_00 = 0;
@@ -986,7 +986,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;
-        CellActor_SetPosition(param0->unk_04[v0], &v2);
+        Sprite_SetPosition(param0->unk_04[v0], &v2);
     }
 }
 
@@ -999,7 +999,7 @@ void ov83_0223E69C(UnkStruct_ov83_0223E5C0 *param0, BOOL param1)
         v1 = param0->unk_14->unk_130[v0];
 
         if (ov83_0223D570(param0->unk_1C) != v1) {
-            CellActor_SetDrawFlag(param0->unk_04[v0], param1);
+            Sprite_SetDrawFlag(param0->unk_04[v0], param1);
         }
     }
 }
@@ -1434,7 +1434,7 @@ static void ov83_0223F054(UnkStruct_ov83_0223F054 *param0)
 {
     GF_ASSERT(param0->unk_78);
 
-    CellActor_Delete(param0->unk_78);
+    Sprite_Delete(param0->unk_78);
     memset(param0, 0, sizeof(UnkStruct_ov83_0223F054));
 }
 
@@ -1450,19 +1450,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;
 
-        CellActor_SetPosition(param0->unk_78, &param0->unk_14);
+        Sprite_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;
 
-            CellActor_SetAffineScale(param0->unk_78, &param0->unk_20);
+            Sprite_SetAffineScale(param0->unk_78, &param0->unk_20);
         }
     }
 
     if (param0->unk_08 == 0) {
-        if (CellActor_IsAnimated(param0->unk_78) == 0) {
+        if (Sprite_IsAnimated(param0->unk_78) == 0) {
             param0->unk_08 = 1;
         }
     }
@@ -1500,7 +1500,7 @@ static void ov83_0223F0F4(UnkStruct_ov83_0223F054 *param0, UnkStruct_ov83_0223FE
         v0.x += (128 * FX32_ONE);
         v0.y += (96 * FX32_ONE);
 
-        CellActor_SetPosition(param0->unk_78, &v0);
+        Sprite_SetPosition(param0->unk_78, &v0);
     }
 }
 
@@ -1524,12 +1524,12 @@ static void ov83_0223F1C0(UnkStruct_ov83_0223F054 *param0, int param1, fx32 para
     GF_ASSERT(param0->unk_78);
 
     if (param0->unk_0C) {
-        CellActor_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
+        Sprite_SetAffineScaleEx(param0->unk_78, &param0->unk_20, 2);
     }
 
-    CellActor_SetAnim(param0->unk_78, param14);
-    CellActor_SetAnimateFlag(param0->unk_78, 1);
-    CellActor_SetExplicitPriority(param0->unk_78, 2);
+    Sprite_SetAnim(param0->unk_78, param14);
+    Sprite_SetAnimateFlag(param0->unk_78, 1);
+    Sprite_SetExplicitPriority(param0->unk_78, 2);
 }
 
 static void ov83_0223F268(UnkStruct_ov83_0223F054 *param0)
@@ -1543,7 +1543,7 @@ static void ov83_0223F268(UnkStruct_ov83_0223F054 *param0)
     param0->unk_00 = 0;
     param0->unk_0C = 1;
 
-    CellActor_SetAffineOverwriteMode(param0->unk_78, 2);
+    Sprite_SetAffineOverwriteMode(param0->unk_78, 2);
 }
 
 void ov83_0223F29C(UnkStruct_ov83_0223F29C *param0)
@@ -1571,10 +1571,10 @@ void ov83_0223F2C4(UnkStruct_ov83_0223F29C *param0, UnkStruct_ov83_0223D784 *par
         param0->unk_3C[v0].unk_00 = ov83_0223D9A8(param1, &param0->unk_04, (128 * FX32_ONE), (96 * FX32_ONE), 0, 0, param2);
 
         if (v0 >= 2) {
-            CellActor_SetAnim(param0->unk_3C[v0].unk_00, 1);
+            Sprite_SetAnim(param0->unk_3C[v0].unk_00, 1);
         }
 
-        CellActor_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_3C[v0].unk_00, 0);
     }
 
     param0->unk_7C = 1;
@@ -1587,7 +1587,7 @@ void ov83_0223F348(UnkStruct_ov83_0223F29C *param0)
     GF_ASSERT(param0->unk_7C == 1);
 
     for (v0 = 0; v0 < 4; v0++) {
-        CellActor_Delete(param0->unk_3C[v0].unk_00);
+        Sprite_Delete(param0->unk_3C[v0].unk_00);
     }
 
     ov83_0223D95C(param0->unk_00, &param0->unk_04);
@@ -1625,7 +1625,7 @@ void ov83_0223F3D0(UnkStruct_ov83_0223F29C *param0, int param1)
 
     param0->unk_3C[param1].unk_0C = 0;
 
-    CellActor_SetDrawFlag(param0->unk_3C[param1].unk_00, 0);
+    Sprite_SetDrawFlag(param0->unk_3C[param1].unk_00, 0);
 }
 
 BOOL ov83_0223F3F0(const UnkStruct_ov83_0223F29C *param0, int param1)
@@ -1660,7 +1660,7 @@ static void ov83_0223F420(UnkStruct_ov83_0223F410 *param0)
         if (param0->unk_08 <= 0) {
             param0->unk_0C = 0;
 
-            CellActor_SetDrawFlag(param0->unk_00, 0);
+            Sprite_SetDrawFlag(param0->unk_00, 0);
         }
     }
 }
@@ -1678,9 +1678,9 @@ static void ov83_0223F458(UnkStruct_ov83_0223F410 *param0)
     }
 
     if (param0->unk_04 == 0) {
-        CellActor_SetDrawFlag(param0->unk_00, 1);
+        Sprite_SetDrawFlag(param0->unk_00, 1);
     } else if (param0->unk_04 == 8) {
-        CellActor_SetDrawFlag(param0->unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_00, 0);
     } else if (param0->unk_04 == (8 * 2)) {
         param0->unk_04 = 0;
         return;
@@ -1707,7 +1707,7 @@ void ov83_0223F4CC(UnkStruct_ov83_0223F4AC *param0, UnkStruct_ov83_0223D784 *par
 
     for (v0 = 0; v0 < 32; v0++) {
         param0->unk_0C[v0].unk_44 = ov83_0223D9A8(param1, &param2[1], 0, 0, 0, 5, param3);
-        CellActor_SetDrawFlag(param0->unk_0C[v0].unk_44, 0);
+        Sprite_SetDrawFlag(param0->unk_0C[v0].unk_44, 0);
     }
 
     param0->unk_00 = 1;
@@ -1718,7 +1718,7 @@ void ov83_0223F510(UnkStruct_ov83_0223F4AC *param0)
     int v0;
 
     for (v0 = 0; v0 < 32; v0++) {
-        CellActor_Delete(param0->unk_0C[v0].unk_44);
+        Sprite_Delete(param0->unk_0C[v0].unk_44);
     }
 
     param0->unk_00 = 0;
@@ -1787,7 +1787,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;
-        CellActor_SetPosition(param0->unk_44, &param0->unk_08);
+        Sprite_SetPosition(param0->unk_44, &param0->unk_08);
     }
 
     if (param0->unk_04 == 1) {
@@ -1801,7 +1801,7 @@ static void ov83_0223F6B4(UnkStruct_ov83_0223F670 *param0)
         return;
     }
 
-    CellActor_SetDrawFlag(param0->unk_44, 0);
+    Sprite_SetDrawFlag(param0->unk_44, 0);
     param0->unk_00 = 0;
 }
 
@@ -1813,11 +1813,11 @@ static void ov83_0223F6CC(UnkStruct_ov83_0223F670 *param0, int param1, fx32 para
     param0->unk_08.x = param2;
     param0->unk_08.y = param3;
 
-    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);
+    Sprite_SetDrawFlag(param0->unk_44, 1);
+    Sprite_SetAnim(param0->unk_44, param1);
+    Sprite_RestartAnim(param0->unk_44);
+    Sprite_SetAnimateFlag(param0->unk_44, 1);
+    Sprite_SetExplicitPriority(param0->unk_44, 2);
 
     param0->unk_00 = 1;
     param0->unk_04 = 0;
diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c
index fd28bb1d6a..2c6cee121d 100644
--- a/src/overlay084/ov84_0223B5A0.c
+++ b/src/overlay084/ov84_0223B5A0.c
@@ -1102,9 +1102,9 @@ static void ov84_0223C2AC(ListMenu *param0, u32 param1, u8 param2)
 
         v0->unk_482 = (v0->unk_482 + 1) % 3;
 
-        if ((v0->unk_492 == 0) || (Sprite_IsAnimated(v0->unk_E0[0]) == 0)) {
-            Sprite_SetAnimationFrame(v0->unk_E0[0], 0);
-            Sprite_SetAnim(
+        if ((v0->unk_492 == 0) || (ManagedSprite_IsAnimated(v0->unk_E0[0]) == 0)) {
+            ManagedSprite_SetAnimationFrame(v0->unk_E0[0], 0);
+            ManagedSprite_SetAnim(
                 v0->unk_E0[0], 8 + v0->unk_C4->unk_04[v0->unk_C4->unk_64].unk_08);
         }
     }
@@ -1239,7 +1239,7 @@ static u8 ov84_0223C5B8(UnkStruct_ov84_0223B5A0 *param0)
     ListMenu_GetListAndCursorPos(param0->unk_15C, &v2, &v3);
 
     if (v0->unk_04 != v3) {
-        Sprite_SetPositionXY2(
+        ManagedSprite_SetPositionXY(
             param0->unk_E0[4], 177, 24 + (v3 - 1) * 16);
     }
 
@@ -1373,8 +1373,8 @@ static void ov84_0223C89C(UnkStruct_ov84_0223B5A0 *param0)
     Window_FillTilemap(&param0->unk_04[1], 0);
     Window_ScheduleCopyToVRAM(&param0->unk_04[0]);
     Window_ScheduleCopyToVRAM(&param0->unk_04[1]);
-    Sprite_SetDrawFlag2(param0->unk_E0[4], 0);
-    Sprite_SetDrawFlag2(param0->unk_E0[7], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[4], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[7], 0);
     ov84_0223F3AC(param0, param0->unk_C4->unk_64, 0);
     ov84_0223CF20(param0, param0->unk_C4->unk_64, 0);
 }
@@ -1437,7 +1437,7 @@ static u8 ov84_0223C920(UnkStruct_ov84_0223B5A0 *param0)
             Bg_ScheduleTilemapTransfer(param0->unk_00, 4);
         }
 
-        Sprite_SetDrawFlag2(param0->unk_E0[7], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[7], 1);
         return 1;
     }
 
@@ -1454,7 +1454,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0)
         }
 
         Sound_PlayEffect(1738);
-        Sprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08);
+        ManagedSprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08);
         ov84_0223CF20(param0, v0->unk_00, 0);
         Bg_ScheduleTilemapTransfer(param0->unk_00, 4);
 
@@ -1487,7 +1487,7 @@ static u8 ov84_0223CA5C(UnkStruct_ov84_0223B5A0 *param0)
         }
 
         Sound_PlayEffect(1738);
-        Sprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08);
+        ManagedSprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[v0->unk_00].unk_08);
         ov84_0223CF20(param0, v0->unk_00, 0);
         Bg_ScheduleTilemapTransfer(param0->unk_00, 4);
 
@@ -1539,15 +1539,15 @@ static u8 ov84_0223CBD8(UnkStruct_ov84_0223B5A0 *param0)
 
             param0->unk_C4->unk_64 = v0->unk_00;
 
-            Sprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08);
+            ManagedSprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08);
             ov84_0223F438(param0);
             ov84_0223F3AC(param0, param0->unk_C4->unk_64, 1);
             ov84_0223BFBC(param0);
             ov84_0223C194(&param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, &param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09);
             ov84_0223C1D0(&param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, &param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09, 9);
             ov84_0223C224(param0, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04);
-            Sprite_SetPositionXY2(param0->unk_E0[4], 177, 24 + (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 - 1) * 16);
-            Sprite_SetDrawFlag2(param0->unk_E0[4], 1);
+            ManagedSprite_SetPositionXY(param0->unk_E0[4], 177, 24 + (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 - 1) * 16);
+            ManagedSprite_SetDrawFlag(param0->unk_E0[4], 1);
 
             v0->unk_02++;
             return 1;
@@ -1759,25 +1759,25 @@ static void ov84_0223D0FC(UnkStruct_ov84_0223B5A0 *param0)
         switch (param0->unk_480) {
         case 0:
         case 1:
-            Sprite_GetPositionXY2(param0->unk_E0[2], &v0, &v1);
+            ManagedSprite_GetPositionXY(param0->unk_E0[2], &v0, &v1);
 
             v0 -= 1;
-            Sprite_SetPositionXY2(param0->unk_E0[2], v0, v1);
-            Sprite_GetPositionXY2(param0->unk_E0[3], &v0, &v1);
+            ManagedSprite_SetPositionXY(param0->unk_E0[2], v0, v1);
+            ManagedSprite_GetPositionXY(param0->unk_E0[3], &v0, &v1);
 
             v0 += 1;
-            Sprite_SetPositionXY2(param0->unk_E0[3], v0, v1);
+            ManagedSprite_SetPositionXY(param0->unk_E0[3], v0, v1);
             break;
         case 2:
         case 3:
-            Sprite_GetPositionXY2(param0->unk_E0[2], &v0, &v1);
+            ManagedSprite_GetPositionXY(param0->unk_E0[2], &v0, &v1);
 
             v0 += 1;
-            Sprite_SetPositionXY2(param0->unk_E0[2], v0, v1);
-            Sprite_GetPositionXY2(param0->unk_E0[3], &v0, &v1);
+            ManagedSprite_SetPositionXY(param0->unk_E0[2], v0, v1);
+            ManagedSprite_GetPositionXY(param0->unk_E0[3], &v0, &v1);
 
             v0 -= 1;
-            Sprite_SetPositionXY2(param0->unk_E0[3], v0, v1);
+            ManagedSprite_SetPositionXY(param0->unk_E0[3], v0, v1);
             break;
         }
 
@@ -1867,7 +1867,7 @@ static u8 ov84_0223D2F8(UnkStruct_ov84_0223B5A0 *param0)
     ListMenu_GetListAndCursorPos(param0->unk_15C, &v2, &v3);
 
     if (v0->unk_04 != v3) {
-        Sprite_SetPositionXY2(param0->unk_E0[5], 177, 24 + (v3 - 1) * 16 - 8);
+        ManagedSprite_SetPositionXY(param0->unk_E0[5], 177, 24 + (v3 - 1) * 16 - 8);
     }
 
     v0->unk_06 = v2;
@@ -1940,22 +1940,22 @@ static void ov84_0223D4E8(UnkStruct_ov84_0223B5A0 *param0)
     UnkStruct_ov84_0223BE5C *v0 = &param0->unk_C4->unk_04[param0->unk_C4->unk_64];
 
     if (param0->unk_47A == 0) {
-        Sprite_SetPositionXY2(param0->unk_E0[4], 177, 24 + (v0->unk_04 - 1) * 16);
-        Sprite_SetDrawFlag2(param0->unk_E0[4], 1);
-        Sprite_SetDrawFlag2(param0->unk_E0[5], 0);
+        ManagedSprite_SetPositionXY(param0->unk_E0[4], 177, 24 + (v0->unk_04 - 1) * 16);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[4], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[5], 0);
 
         if (param0->unk_424 != 1) {
-            Sprite_SetDrawFlag2(param0->unk_E0[2], 1);
-            Sprite_SetDrawFlag2(param0->unk_E0[3], 1);
+            ManagedSprite_SetDrawFlag(param0->unk_E0[2], 1);
+            ManagedSprite_SetDrawFlag(param0->unk_E0[3], 1);
         }
     } else {
-        Sprite_SetPositionXY2(param0->unk_E0[5], 177, 24 + (v0->unk_04 - 1) * 16 - 8);
-        Sprite_SetDrawFlag2(param0->unk_E0[4], 0);
-        Sprite_SetDrawFlag2(param0->unk_E0[5], 1);
+        ManagedSprite_SetPositionXY(param0->unk_E0[5], 177, 24 + (v0->unk_04 - 1) * 16 - 8);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[4], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[5], 1);
 
         if (param0->unk_424 != 1) {
-            Sprite_SetDrawFlag2(param0->unk_E0[2], 0);
-            Sprite_SetDrawFlag2(param0->unk_E0[3], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_E0[2], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_E0[3], 0);
         }
     }
 }
@@ -2079,10 +2079,10 @@ static void ov84_0223D7E8(UnkStruct_ov84_0223B5A0 *param0, u8 param1)
 {
     if (param1 == 0) {
         Bg_LoadToTilemapRect(param0->unk_00, 1, Unk_ov84_02241064, 0, 18, 5, 5);
-        Sprite_SetDrawFlag2(param0->unk_E0[7], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[7], 1);
     } else {
         Bg_LoadToTilemapRect(param0->unk_00, 1, Unk_ov84_02241096, 0, 18, 5, 5);
-        Sprite_SetDrawFlag2(param0->unk_E0[7], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[7], 0);
     }
 
     Bg_ScheduleTilemapTransfer(param0->unk_00, 1);
@@ -3055,7 +3055,7 @@ static BOOL ov84_0223ED64(UnkStruct_ov84_0223B5A0 *param0, u16 param1)
         return 0;
     }
 
-    Sprite_SetPositionXY2(param0->unk_E0[4], 177, 24 + (v1 - 1) * 16);
+    ManagedSprite_SetPositionXY(param0->unk_E0[4], 177, 24 + (v1 - 1) * 16);
 
     param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06 = v0;
     param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 = v1;
@@ -3101,7 +3101,7 @@ static BOOL ov84_0223EE80(UnkStruct_ov84_0223B5A0 *param0, u16 param1)
         return 0;
     }
 
-    Sprite_SetPositionXY2(param0->unk_E0[5], 177, 24 + (v1 - 1) * 16 - 8);
+    ManagedSprite_SetPositionXY(param0->unk_E0[5], 177, 24 + (v1 - 1) * 16 - 8);
 
     param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_06 = v0;
     param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 = v1;
diff --git a/src/overlay084/ov84_022403F4.c b/src/overlay084/ov84_022403F4.c
index 972153e06d..db5776b501 100644
--- a/src/overlay084/ov84_022403F4.c
+++ b/src/overlay084/ov84_022403F4.c
@@ -7,10 +7,10 @@
 
 #include "overlay084/struct_ov84_0223B5A0.h"
 
-#include "cell_actor.h"
 #include "gx_layers.h"
 #include "item.h"
 #include "move_table.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "unk_0207C908.h"
 #include "vram_transfer.h"
@@ -267,29 +267,29 @@ static void ov84_02240950(UnkStruct_ov84_0223B5A0 *param0)
         param0->unk_E0[v0] = SpriteSystem_NewSprite(param0->unk_D8, param0->unk_DC, &Unk_ov84_022411B0[v0]);
     }
 
-    Sprite_SetDrawFlag2(param0->unk_E0[5], 0);
-    Sprite_SetDrawFlag2(param0->unk_E0[6], 0);
-    Sprite_SetDrawFlag2(param0->unk_E0[10], 0);
-    Sprite_SetDrawFlag2(param0->unk_E0[11], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[5], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[6], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[10], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[11], 0);
 
     if ((param0->unk_C4->unk_65 == 4) || (param0->unk_C4->unk_65 == 5)) {
-        Sprite_SetDrawFlag2(param0->unk_E0[1], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[1], 0);
     }
 
     if (param0->unk_424 == 1) {
-        Sprite_SetDrawFlag2(param0->unk_E0[2], 0);
-        Sprite_SetDrawFlag2(param0->unk_E0[3], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[2], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_E0[3], 0);
     }
 
     ov84_02240D3C(param0, 0);
 
-    Sprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08);
-    Sprite_SetPositionXY2(param0->unk_E0[1], ov84_02240C30(param0, param0->unk_C4->unk_64), 97);
-    Sprite_SetPositionXY2(param0->unk_E0[4], 177, 24 + (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 - 1) * 16);
+    ManagedSprite_SetAnim(param0->unk_E0[0], param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_08);
+    ManagedSprite_SetPositionXY(param0->unk_E0[1], ov84_02240C30(param0, param0->unk_C4->unk_64), 97);
+    ManagedSprite_SetPositionXY(param0->unk_E0[4], 177, 24 + (param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_04 - 1) * 16);
 
     {
         VecFx32 v1 = { FX32_ONE, FX32_ONE, FX32_ONE };
-        CellActor_SetAffineScaleEx(param0->unk_E0[0]->sprite, &v1, 2);
+        Sprite_SetAffineScaleEx(param0->unk_E0[0]->sprite, &v1, 2);
     }
 }
 
@@ -310,7 +310,7 @@ void ov84_02240ABC(UnkStruct_ov84_0223B5A0 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 12; v0++) {
-        Sprite_TickOneFrame(param0->unk_E0[v0]);
+        ManagedSprite_TickFrame(param0->unk_E0[v0]);
     }
 }
 
@@ -322,8 +322,8 @@ void ov84_02240AD8(UnkStruct_ov84_0223B5A0 *param0, u16 param1)
 
 void ov84_02240B34(UnkStruct_ov84_0223B5A0 *param0, u8 param1)
 {
-    Sprite_SetExplicitPalette2(param0->unk_E0[4], param1);
-    Sprite_SetExplicitPalette2(param0->unk_E0[1], param1);
+    ManagedSprite_SetExplicitPalette(param0->unk_E0[4], param1);
+    ManagedSprite_SetExplicitPalette(param0->unk_E0[1], param1);
 }
 
 u8 ov84_02240B50(UnkStruct_ov84_0223B5A0 *param0)
@@ -358,7 +358,7 @@ static void ov84_02240B98(UnkStruct_ov84_0223B5A0 *param0)
 {
     VecFx32 v0;
 
-    v0 = *(CellActor_GetPosition(param0->unk_E0[1]->sprite));
+    v0 = *(Sprite_GetPosition(param0->unk_E0[1]->sprite));
 
     if (param0->unk_454.unk_01 == 0) {
         v0.x -= param0->unk_454.unk_04[param0->unk_454.unk_03];
@@ -366,12 +366,12 @@ static void ov84_02240B98(UnkStruct_ov84_0223B5A0 *param0)
         v0.x += param0->unk_454.unk_04[param0->unk_454.unk_03];
     }
 
-    CellActor_SetPosition(param0->unk_E0[1]->sprite, &v0);
+    Sprite_SetPosition(param0->unk_E0[1]->sprite, &v0);
     param0->unk_454.unk_03++;
 
     if (param0->unk_454.unk_03 == 8) {
         v0.x = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
-        CellActor_SetPosition(param0->unk_E0[1]->sprite, &v0);
+        Sprite_SetPosition(param0->unk_E0[1]->sprite, &v0);
         param0->unk_454.unk_00 = 0;
     }
 }
@@ -386,7 +386,7 @@ static void ov84_02240C48(UnkStruct_ov84_0223B5A0 *param0)
     VecFx32 v0;
     fx32 v1;
 
-    v0 = *(CellActor_GetPosition(param0->unk_E0[1]->sprite));
+    v0 = *(Sprite_GetPosition(param0->unk_E0[1]->sprite));
     v1 = ov84_02240C30(param0, param0->unk_478) * FX32_ONE;
 
     if (v1 < v0.x) {
@@ -410,11 +410,11 @@ static void ov84_02240C48(UnkStruct_ov84_0223B5A0 *param0)
 void ov84_02240CF0(UnkStruct_ov84_0223B5A0 *param0, u8 param1)
 {
     if (param1 == 0) {
-        Sprite_SetPositionXY2(param0->unk_E0[8], 220, 156);
-        Sprite_SetPositionXY2(param0->unk_E0[9], 220, 180);
+        ManagedSprite_SetPositionXY(param0->unk_E0[8], 220, 156);
+        ManagedSprite_SetPositionXY(param0->unk_E0[9], 220, 180);
     } else {
-        Sprite_SetPositionXY2(param0->unk_E0[8], 162, 108);
-        Sprite_SetPositionXY2(param0->unk_E0[9], 162, 132);
+        ManagedSprite_SetPositionXY(param0->unk_E0[8], 162, 108);
+        ManagedSprite_SetPositionXY(param0->unk_E0[9], 162, 132);
     }
 
     ov84_02240D3C(param0, 1);
@@ -422,8 +422,8 @@ void ov84_02240CF0(UnkStruct_ov84_0223B5A0 *param0, u8 param1)
 
 void ov84_02240D3C(UnkStruct_ov84_0223B5A0 *param0, u8 param1)
 {
-    Sprite_SetDrawFlag2(param0->unk_E0[8], param1);
-    Sprite_SetDrawFlag2(param0->unk_E0[9], param1);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[8], param1);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[9], param1);
 }
 
 void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2)
@@ -432,8 +432,8 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2)
     u16 v1;
     u16 v2;
 
-    Sprite_SetDrawFlag2(param0->unk_E0[10], param2);
-    Sprite_SetDrawFlag2(param0->unk_E0[11], param2);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[10], param2);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[11], param2);
 
     if (param2 == 0) {
         return;
@@ -444,26 +444,26 @@ void ov84_02240D5C(UnkStruct_ov84_0223B5A0 *param0, u16 param1, u8 param2)
     v2 = MoveTable_LoadParam(v0, MOVEATTRIBUTE_CLASS);
 
     SpriteSystem_ReplaceCharResObj(param0->unk_D8, param0->unk_DC, sub_0207C944(), sub_0207C908(v1), 1, 49409);
-    Sprite_SetExplicitPalette2(param0->unk_E0[10], sub_0207C92C(v1) + 6);
+    ManagedSprite_SetExplicitPalette(param0->unk_E0[10], sub_0207C92C(v1) + 6);
     SpriteSystem_ReplaceCharResObj(param0->unk_D8, param0->unk_DC, sub_0207CAC0(), sub_0207CA90(v2), 1, 49410);
-    Sprite_SetExplicitPalette2(param0->unk_E0[11], sub_0207CAA8(v2) + 6);
+    ManagedSprite_SetExplicitPalette(param0->unk_E0[11], sub_0207CAA8(v2) + 6);
 }
 
 void ov84_02240E24(UnkStruct_ov84_0223B5A0 *param0, s16 param1, s16 param2)
 {
-    Sprite_SetDrawFlag2(param0->unk_E0[6], 1);
-    Sprite_SetPositionXY2(param0->unk_E0[6], param1, param2);
-    Sprite_SetAnimationFrame(param0->unk_E0[6], 0);
-    Sprite_SetAnim(param0->unk_E0[6], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_E0[6], 1);
+    ManagedSprite_SetPositionXY(param0->unk_E0[6], param1, param2);
+    ManagedSprite_SetAnimationFrame(param0->unk_E0[6], 0);
+    ManagedSprite_SetAnim(param0->unk_E0[6], 0);
 }
 
 void ov84_02240E5C(UnkStruct_ov84_0223B5A0 *param0)
 {
-    if (Sprite_GetDrawFlag2(param0->unk_E0[6]) == 1) {
-        Sprite_TickNFrames(param0->unk_E0[6], FX32_ONE);
+    if (ManagedSprite_GetDrawFlag(param0->unk_E0[6]) == 1) {
+        ManagedSprite_TickNFrames(param0->unk_E0[6], FX32_ONE);
 
-        if (Sprite_GetAnimationFrame(param0->unk_E0[6]) == 2) {
-            Sprite_SetDrawFlag2(param0->unk_E0[6], 0);
+        if (ManagedSprite_GetAnimationFrame(param0->unk_E0[6]) == 2) {
+            ManagedSprite_SetDrawFlag(param0->unk_E0[6], 0);
         }
     }
 }
diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c
index 3efe99a642..ffc1153fb6 100644
--- a/src/overlay086/ov86_0223B140.c
+++ b/src/overlay086/ov86_0223B140.c
@@ -15,7 +15,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "font.h"
 #include "graphics.h"
@@ -30,6 +29,7 @@
 #include "play_time.h"
 #include "pokemon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -59,10 +59,10 @@ typedef struct {
     UnkStruct_0203E234 *unk_0C;
     BgConfig *unk_10;
     Window unk_14;
-    CellActorCollection *unk_24;
+    SpriteList *unk_24;
     G2dRenderer unk_28;
-    CellActor *unk_1B4[6];
-    CellActor *unk_1CC;
+    Sprite *unk_1B4[6];
+    Sprite *unk_1CC;
     void *unk_1D0;
     void *unk_1D4;
     SpriteAnimationFrame unk_1D8[6][10];
@@ -112,14 +112,14 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    CellActor *unk_08;
+    Sprite *unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BDE0;
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    CellActor *unk_08;
+    Sprite *unk_08;
     VecFx32 unk_0C;
     UnkStruct_ov86_0223D264 unk_18;
 } UnkStruct_ov86_0223BEA0;
@@ -155,7 +155,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    CellActor *unk_08;
+    Sprite *unk_08;
     const SpriteAnimationFrame *unk_0C;
     UnkStruct_02008900 unk_10;
     NNSG2dImageProxy unk_24[2];
@@ -192,7 +192,7 @@ typedef struct {
 
 typedef struct {
     UnkStruct_ov86_0223BDAC unk_00;
-    CellActor **unk_08;
+    Sprite **unk_08;
     UnkStruct_ov86_0223B3C8 *unk_0C;
     int unk_10;
     int unk_14;
@@ -474,7 +474,7 @@ static BOOL ov86_0223B464(UnkStruct_ov86_0223B3C8 *param0)
         break;
     case 6:
         if (ov86_0223B6B4(param0, 0)) {
-            CellActor_SetDrawFlag(param0->unk_1B4[v0], 0);
+            Sprite_SetDrawFlag(param0->unk_1B4[v0], 0);
 
             if (++v0 < param0->unk_04) {
                 param0->unk_08 = 30;
@@ -594,7 +594,7 @@ static void ov86_0223B6CC(SysTask *param0, void *param1)
     NNS_G3dGePopMtx(1);
     G3_SwapBuffers(GX_SORTMODE_MANUAL, GX_BUFFERMODE_Z);
 
-    CellActorCollection_Update(v0->unk_24);
+    SpriteList_Update(v0->unk_24);
     RenderOam_Transfer();
 }
 
@@ -794,8 +794,8 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p
         { 0 + 10, 0, 10, 10 }
     };
     ArchivedSprite v1;
-    CellActorResourceData v2;
-    CellActorInitParams v3;
+    SpriteResourcesHeader v2;
+    SpriteListTemplate v3;
     UnkStruct_ov5_021DE5D0 v4;
     NNSG2dImageProxy v5;
     NNSG2dImagePaletteProxy v6;
@@ -816,7 +816,7 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p
     v2.imageProxy = &v5;
     v2.paletteProxy = &v6;
 
-    v3.collection = param0->unk_24;
+    v3.list = param0->unk_24;
     v3.resourceData = &v2;
 
     VEC_Set(&(v3.position), 0, 0, 0);
@@ -834,9 +834,9 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p
         NNS_G2dLoadPalette(v8, v12 * 0x20, NNS_G2D_VRAM_TYPE_2DMAIN, &v6);
 
         v3.priority = 1 + v12;
-        param0->unk_1B4[v12] = CellActorCollection_Add(&v3);
+        param0->unk_1B4[v12] = SpriteList_Add(&v3);
 
-        CellActor_SetDrawFlag(param0->unk_1B4[v12], 0);
+        Sprite_SetDrawFlag(param0->unk_1B4[v12], 0);
         v11 = Party_GetPokemonBySlotIndex(param0->unk_0C->unk_04, param0->unk_2C8[v12]);
         Pokemon_BuildArchivedSprite(&v1, (Pokemon *)v11, 2);
 
@@ -871,9 +871,9 @@ static void ov86_0223BAC8(UnkStruct_ov86_0223B3C8 *param0, NNSG2dCellDataBank *p
     Graphics_LoadPalette(v4.unk_00, v4.unk_08, 1, 192, 0x20, 63);
 
     v3.priority = 0;
-    param0->unk_1CC = CellActorCollection_Add(&v3);
+    param0->unk_1CC = SpriteList_Add(&v3);
 
-    CellActor_SetDrawFlag(param0->unk_1CC, 0);
+    Sprite_SetDrawFlag(param0->unk_1CC, 0);
     Heap_FreeToHeap(v10);
     Heap_FreeToHeap(v9);
 }
@@ -883,12 +883,12 @@ static void ov86_0223BD68(UnkStruct_ov86_0223B3C8 *param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_Delete(param0->unk_1B4[v0]);
+        Sprite_Delete(param0->unk_1B4[v0]);
     }
 
     Heap_FreeToHeap(param0->unk_1D4);
     Heap_FreeToHeap(param0->unk_1D0);
-    CellActorCollection_Delete(param0->unk_24);
+    SpriteList_Delete(param0->unk_24);
     RenderOam_Free();
 }
 
@@ -934,8 +934,8 @@ static void ov86_0223BDE0(UnkStruct_ov86_0223B3C8 *param0, int param1, int param
 
     VEC_Set(&v1->unk_0C, v0[v2].unk_00, 393216, 0);
 
-    CellActor_SetPosition(v1->unk_08, &v1->unk_0C);
-    CellActor_SetDrawFlag(v1->unk_08, 1);
+    Sprite_SetPosition(v1->unk_08, &v1->unk_0C);
+    Sprite_SetDrawFlag(v1->unk_08, 1);
 
     param0->unk_1C34[param2] = ov86_0223B744(ov86_0223BE6C, v1, 0);
 }
@@ -945,7 +945,7 @@ static void ov86_0223BE6C(SysTask *param0, void *param1)
     UnkStruct_ov86_0223BDE0 *v0 = param1;
 
     v0->unk_0C.x = ov86_0223D284(&v0->unk_18);
-    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
+    Sprite_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -965,8 +965,8 @@ static void ov86_0223BEA0(UnkStruct_ov86_0223B3C8 *param0, int param1)
 
     VEC_Set(&v0->unk_0C, FX32_CONST(128), FX32_CONST(232), 0);
 
-    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
-    CellActor_SetDrawFlag(v0->unk_08, 1);
+    Sprite_SetPosition(v0->unk_08, &v0->unk_0C);
+    Sprite_SetDrawFlag(v0->unk_08, 1);
 
     param0->unk_1C34[param1] = ov86_0223B744(ov86_0223BF10, v0, 0);
 }
@@ -976,7 +976,7 @@ static void ov86_0223BF10(SysTask *param0, void *param1)
     UnkStruct_ov86_0223BEA0 *v0 = param1;
 
     v0->unk_0C.y = ov86_0223D284(&v0->unk_18);
-    CellActor_SetPosition(v0->unk_08, &v0->unk_0C);
+    Sprite_SetPosition(v0->unk_08, &v0->unk_0C);
 
     if (ov86_0223D2A4(&v0->unk_18)) {
         ov86_0223BDCC(&v0->unk_00);
@@ -1215,7 +1215,7 @@ static void ov86_0223C2CC(UnkStruct_ov86_0223B3C8 *param0, int param1, BOOL para
     v0->unk_6C = param2;
     v0->unk_70 = param0->unk_2E0[param1];
     v0->unk_74 = param0->unk_2F8[param1];
-    v0->unk_24[0] = *SpriteActor_ImageProxy(v0->unk_08);
+    v0->unk_24[0] = *Sprite_GetImageProxy(v0->unk_08);
     v0->unk_24[1] = v0->unk_24[0];
 
     NNS_G2dInitImageProxy(&v0->unk_24[1]);
@@ -1237,7 +1237,7 @@ static void ov86_0223C398(SysTask *param0, void *param1)
     v1 = sub_02008900(&v0->unk_10);
 
     if (v1 >= 0) {
-        CellActor_SetImageProxy(v0->unk_08, &v0->unk_24[v1]);
+        Sprite_SetImageProxy(v0->unk_08, &v0->unk_24[v1]);
     } else {
         ov86_0223BDCC(&v0->unk_00);
         SysTask_Done(param0);
@@ -1460,8 +1460,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];
-        CellActor_SetPosition(v2->unk_08[v3], &v0[v3]);
-        CellActor_SetDrawFlag(v2->unk_08[v3], 1);
+        Sprite_SetPosition(v2->unk_08[v3], &v0[v3]);
+        Sprite_SetDrawFlag(v2->unk_08[v3], 1);
     }
 
     for (v3 = 0; v3 < 6; v3++) {
@@ -1480,7 +1480,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) {
-            CellActor_SetPosition(v0->unk_08[v1], &(v0->unk_94[v1]));
+            Sprite_SetPosition(v0->unk_08[v1], &(v0->unk_94[v1]));
         }
     }
 
diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c
index 9fac631226..98c9bee305 100644
--- a/src/overlay087/ov87_021D106C.c
+++ b/src/overlay087/ov87_021D106C.c
@@ -12,7 +12,6 @@
 #include "overlay087/struct_ov87_021D1640.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "font.h"
 #include "graphics.h"
@@ -22,6 +21,7 @@
 #include "pokemon.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -39,9 +39,9 @@ typedef struct UnkStruct_ov87_021D106C_t {
     int unk_0C;
     BgConfig *unk_10;
     Window unk_14[2];
-    CellActorCollection *unk_34;
+    SpriteList *unk_34;
     G2dRenderer unk_38;
-    CellActor *unk_1C4[6];
+    Sprite *unk_1C4[6];
     void *unk_1DC;
     void *unk_1E0;
     MessageLoader *unk_1E4;
@@ -120,7 +120,7 @@ void ov87_021D1140(UnkStruct_ov87_021D106C *param0)
         MessageLoader_Free(param0->unk_1EC);
         MessageLoader_Free(param0->unk_1E8);
         MessageLoader_Free(param0->unk_1E4);
-        CellActorCollection_Delete(param0->unk_34);
+        SpriteList_Delete(param0->unk_34);
         RenderOam_Free();
         Heap_FreeToHeap(param0->unk_10);
         Heap_FreeToHeap(param0);
@@ -131,7 +131,7 @@ static void ov87_021D11AC(void *param0)
 {
     UnkStruct_ov87_021D106C *v0 = param0;
 
-    CellActorCollection_Update(v0->unk_34);
+    SpriteList_Update(v0->unk_34);
     RenderOam_Transfer();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -198,14 +198,14 @@ static BOOL ov87_021D12C0(UnkStruct_ov87_021D106C *param0, int *param1)
 
     for (v1 = 0; v1 < v0->unk_14; v1++) {
         if (v1 == v0->unk_18) {
-            CellActor_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
-            CellActor_SetPriority(param0->unk_1C4[v1], 0);
+            Sprite_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_NORMAL);
+            Sprite_SetPriority(param0->unk_1C4[v1], 0);
             Sound_FlagDefaultChatotCry(1);
 
             sub_02005844(v0->unk_20[v1].unk_10, v0->unk_20[v1].unk_13);
         } else {
-            CellActor_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
-            CellActor_SetPriority(param0->unk_1C4[v1], v1 + 1);
+            Sprite_SetExplicitOAMMode(param0->unk_1C4[v1], GX_OAM_MODE_XLU);
+            Sprite_SetPriority(param0->unk_1C4[v1], v1 + 1);
         }
     }
 
@@ -457,7 +457,7 @@ static void ov87_021D186C(UnkStruct_ov87_021D106C *param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_1C4[v0]) {
-            CellActor_Delete(param0->unk_1C4[v0]);
+            Sprite_Delete(param0->unk_1C4[v0]);
         }
     }
 
@@ -478,8 +478,8 @@ static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *p
         { 216, 112 },
         { 56, 112 },
     };
-    CellActorResourceData v1;
-    CellActorInitParams v2;
+    SpriteResourcesHeader v1;
+    SpriteListTemplate v2;
     NNSG2dImageProxy v3;
     NNSG2dImagePaletteProxy v4;
     NNSG2dCharacterData *v5;
@@ -497,7 +497,7 @@ static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *p
     v1.priority = 0;
     v1.imageProxy = &v3;
     v1.paletteProxy = &v4;
-    v2.collection = param0->unk_34;
+    v2.list = param0->unk_34;
     v2.resourceData = &v1;
     v2.position.z = 0;
     v2.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
@@ -516,8 +516,8 @@ static void ov87_021D18A0(UnkStruct_ov87_021D106C *param0, NNSG2dCellDataBank *p
         v2.position.y = v0[v9].y << FX32_SHIFT;
         v2.priority = v9 + 1;
 
-        param0->unk_1C4[v9] = CellActorCollection_Add(&v2);
-        CellActor_SetDrawFlag(param0->unk_1C4[v9], 0);
+        param0->unk_1C4[v9] = SpriteList_Add(&v2);
+        Sprite_SetDrawFlag(param0->unk_1C4[v9], 0);
     }
 
     Heap_FreeToHeap(v8);
@@ -552,16 +552,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);
-            CellActor_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
+            Sprite_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_NORMAL);
         } else {
-            CellActor_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
+            Sprite_SetExplicitOAMMode(param0->unk_1C4[v3], GX_OAM_MODE_XLU);
         }
 
-        CellActor_SetDrawFlag(param0->unk_1C4[v3], 1);
+        Sprite_SetDrawFlag(param0->unk_1C4[v3], 1);
     }
 
     for (; v3 < 6; v3++) {
-        CellActor_SetDrawFlag(param0->unk_1C4[v3], 0);
+        Sprite_SetDrawFlag(param0->unk_1C4[v3], 0);
     }
 }
 
@@ -570,6 +570,6 @@ static void ov87_021D1AB8(UnkStruct_ov87_021D106C *param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_SetDrawFlag(param0->unk_1C4[v0], 0);
+        Sprite_SetDrawFlag(param0->unk_1C4[v0], 0);
     }
 }
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 98daceb3ab..580c84ebc8 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -22,7 +22,6 @@
 #include "bag.h"
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "charcode_util.h"
 #include "communication_information.h"
@@ -51,6 +50,7 @@
 #include "render_window.h"
 #include "rtc.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -85,7 +85,7 @@
 
 #include "constdata/const_020F410C.h"
 
-static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, CellActor *param5);
+static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, Sprite *param5);
 static void ov88_0223B320(UnkStruct_02095E80 *param0);
 static void ov88_0223C0E0(void *param0);
 static void ov88_0223C15C(void);
@@ -101,8 +101,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, CellActor *param1, int param2);
-static int ov88_0223CFF4(u32 *param0, int *param1, CellActor *param2, UnkStruct_ov88_0223C8AC *param3, int param4);
+static void ov88_0223CF68(int param0, Sprite *param1, int param2);
+static int ov88_0223CFF4(u32 *param0, int *param1, Sprite *param2, UnkStruct_ov88_0223C8AC *param3, int param4);
 static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, ArchivedSprite *param3);
 static void ov88_0223E7F0(JournalEntry *journalEntry, Pokemon *mon);
 static void ov88_0223D140(ChatotCry *param0);
@@ -122,7 +122,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(CellActor *param0, int param1, int param2);
+static void ov88_0223E87C(Sprite *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);
@@ -152,7 +152,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(CellActor *param0, CellActor *param1, CellActor *param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC *param5);
+static void ov88_0223DE7C(Sprite *param0, Sprite *param1, Sprite *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);
@@ -332,12 +332,12 @@ int ov88_0223B140(OverlayManager *param0, int *param1)
     return 1;
 }
 
-static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, CellActor *param5)
+static void ov88_0223B2F0(NNSG2dCharacterData *param0, int param1, int param2, int param3, int param4, Sprite *param5)
 {
     u8 *v0;
 
     GX_LoadOBJ(param0->pRawData, ((4 * 32 + 18) + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
-    CellActor_SetExplicitPaletteOffset(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
+    Sprite_SetExplicitPaletteOffset(param5, PokeIconPaletteIndex(param1, param2, param3) + 10);
 }
 
 static void ov88_0223B320(UnkStruct_02095E80 *param0)
@@ -394,8 +394,8 @@ static void ov88_0223B3C0(UnkStruct_02095E80 *param0)
     ov88_0223B7A0(param0->unk_2270, 0, param0);
     ov88_0223B7A0(param0->unk_2274, 6, param0);
 
-    CellActor_SetDrawFlag(param0->unk_39C[0], 1);
-    CellActor_SetDrawFlag(param0->unk_39C[1], 1);
+    Sprite_SetDrawFlag(param0->unk_39C[0], 1);
+    Sprite_SetDrawFlag(param0->unk_39C[1], 1);
     SetVBlankCallback(ov88_0223C0E0, param0);
     NARC_dtor(v0);
 }
@@ -486,7 +486,7 @@ int ov88_0223B57C(OverlayManager *param0, int *param1)
 
     if (!v0->unk_44) {
         ov88_0223E848(v0);
-        CellActorCollection_Update(v0->unk_194);
+        SpriteList_Update(v0->unk_194);
     }
 
     sub_02038A1C(26, v0->unk_174);
@@ -528,27 +528,27 @@ static void ov88_0223B7A0(Party *param0, int param1, UnkStruct_02095E80 *param2)
         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]);
-        CellActor_SetDrawFlag(param2->unk_3D4[v1], 1);
+        Sprite_SetDrawFlag(param2->unk_3D4[v1], 1);
 
         if (param2->unk_6F4[v1].unk_02 == 0) {
-            CellActor_SetDrawFlag(param2->unk_404[v1], 0);
+            Sprite_SetDrawFlag(param2->unk_404[v1], 0);
         } else {
-            CellActor_SetDrawFlag(param2->unk_404[v1], 1);
-            CellActor_SetAnim(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
+            Sprite_SetDrawFlag(param2->unk_404[v1], 1);
+            Sprite_SetAnim(param2->unk_404[v1], 3 + param2->unk_6F4[v1].unk_02 - 1);
         }
 
         if (param2->unk_6F4[v1].unk_0C == 0) {
-            CellActor_SetDrawFlag(param2->unk_434[v1], 0);
+            Sprite_SetDrawFlag(param2->unk_434[v1], 0);
         } else {
-            CellActor_SetDrawFlag(param2->unk_434[v1], 1);
-            CellActor_SetAnim(param2->unk_434[v1], 21);
+            Sprite_SetDrawFlag(param2->unk_434[v1], 1);
+            Sprite_SetAnim(param2->unk_434[v1], 21);
         }
     }
 
     for (; v0 < 6; v0++) {
-        CellActor_SetDrawFlag(param2->unk_3D4[v0 + param1], 0);
-        CellActor_SetDrawFlag(param2->unk_404[v0 + param1], 0);
-        CellActor_SetDrawFlag(param2->unk_434[v0 + param1], 0);
+        Sprite_SetDrawFlag(param2->unk_3D4[v0 + param1], 0);
+        Sprite_SetDrawFlag(param2->unk_404[v0 + param1], 0);
+        Sprite_SetDrawFlag(param2->unk_434[v0 + param1], 0);
     }
 }
 
@@ -697,7 +697,7 @@ static int ov88_0223B914(UnkStruct_02095E80 *param0)
                 int v9;
 
                 for (v9 = 0; v9 < 2; v9++) {
-                    CellActor_SetDrawFlag(param0->unk_39C[v9], 1);
+                    Sprite_SetDrawFlag(param0->unk_39C[v9], 1);
                 }
             }
         }
@@ -779,7 +779,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);
-    CellActor_SetAnim(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
+    Sprite_SetAnim(param0->unk_464[3], param0->unk_6F4[param1].unk_04 + 6 - 1);
 }
 
 static void ov88_0223BE28(UnkStruct_02095E80 *param0)
@@ -792,11 +792,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);
-            CellActor_SetDrawFlag(param0->unk_464[3], 0);
+            Sprite_SetDrawFlag(param0->unk_464[3], 0);
         } else {
             ov88_0223BDA4(param0, param0->unk_88[0]);
             ov88_0223CB34(param0->unk_49C, 0, param0);
-            CellActor_SetDrawFlag(param0->unk_464[2], 0);
+            Sprite_SetDrawFlag(param0->unk_464[2], 0);
         }
     }
 }
@@ -845,7 +845,7 @@ static void ov88_0223BF7C(UnkStruct_02095E80 *param0)
         SpriteResourceCollection_Delete(param0->unk_324[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_194);
+    SpriteList_Delete(param0->unk_194);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -1314,15 +1314,15 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3,
     v5 = Party_GetPokemonBySlotIndex(param2, param3);
     v4 = Pokemon_SpriteYOffset(v5, 2);
 
-    CellActor_SetDrawFlag(param4->unk_464[param1], 1);
+    Sprite_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) {
-        CellActor_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
+        Sprite_SetFlipMode(param4->unk_464[param1], param4->unk_6F4[param3].unk_0A);
     }
 
-    CellActor_SetAnim(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
-    CellActor_SetDrawFlag(param4->unk_464[2 + param1], 1);
+    Sprite_SetAnim(param4->unk_464[2 + param1], param4->unk_6F4[param3].unk_04 + 6 - 1);
+    Sprite_SetDrawFlag(param4->unk_464[2 + param1], 1);
     ov88_0223C860(&param0[26 + param1], param2, param3, 9, 6);
 
     {
@@ -1336,15 +1336,15 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3,
 
         switch (v6) {
         case 2:
-            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 0);
+            Sprite_SetDrawFlag(param4->unk_464[4 + param1], 0);
             break;
         case 0:
-            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            CellActor_SetAnim(param4->unk_464[4 + param1], 22 + 1);
+            Sprite_SetDrawFlag(param4->unk_464[4 + param1], 1);
+            Sprite_SetAnim(param4->unk_464[4 + param1], 22 + 1);
             break;
         case 1:
-            CellActor_SetDrawFlag(param4->unk_464[4 + param1], 1);
-            CellActor_SetAnim(param4->unk_464[4 + param1], 22);
+            Sprite_SetDrawFlag(param4->unk_464[4 + param1], 1);
+            Sprite_SetAnim(param4->unk_464[4 + param1], 22);
             break;
         }
     }
@@ -1376,9 +1376,9 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3,
 
 static void ov88_0223CB34(Window *param0, int param1, UnkStruct_02095E80 *param2)
 {
-    CellActor_SetDrawFlag(param2->unk_464[param1], 0);
-    CellActor_SetDrawFlag(param2->unk_464[2 + param1], 0);
-    CellActor_SetDrawFlag(param2->unk_464[4 + param1], 0);
+    Sprite_SetDrawFlag(param2->unk_464[param1], 0);
+    Sprite_SetDrawFlag(param2->unk_464[2 + param1], 0);
+    Sprite_SetDrawFlag(param2->unk_464[4 + param1], 0);
     Window_ClearAndCopyToVRAM(&param0[26 + param1]);
     Window_ClearAndCopyToVRAM(&param0[28 + param1]);
     Window_ClearAndCopyToVRAM(&param0[30 + param1]);
@@ -1391,10 +1391,10 @@ static void ov88_0223CBA0(UnkStruct_02095E80 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v0;
+        AffineSpriteListTemplate v0;
         int v1;
 
-        v0.collection = param0->unk_194;
+        v0.list = param0->unk_194;
         v0.resourceData = &param0->unk_354;
         v0.position.x = FX32_CONST(32);
         v0.position.y = FX32_CONST(96);
@@ -1410,57 +1410,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] = CellActorCollection_AddEx(&v0);
-            CellActor_SetAnimateFlag(param0->unk_39C[v1], 1);
+            param0->unk_39C[v1] = SpriteList_AddEx(&v0);
+            Sprite_SetAnimateFlag(param0->unk_39C[v1], 1);
             ov88_0223CF68(param0->unk_88[v1], param0->unk_39C[v1], v1);
-            CellActor_SetPriority(param0->unk_39C[v1], 100);
-            CellActor_SetDrawFlag(param0->unk_39C[v1], 0);
+            Sprite_SetPriority(param0->unk_39C[v1], 100);
+            Sprite_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] = 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);
+            param0->unk_3D4[v1] = SpriteList_AddEx(&v0);
+            Sprite_SetAnimateFlag(param0->unk_3D4[v1], 1);
+            Sprite_SetAnim(param0->unk_3D4[v1], 5 + v1);
+            Sprite_SetPriority(param0->unk_3D4[v1], 5);
+            Sprite_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] = CellActorCollection_AddEx(&v0);
-            CellActor_SetPriority(param0->unk_404[v1], 3);
-            CellActor_SetDrawFlag(param0->unk_404[v1], 0);
+            param0->unk_404[v1] = SpriteList_AddEx(&v0);
+            Sprite_SetPriority(param0->unk_404[v1], 3);
+            Sprite_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] = CellActorCollection_AddEx(&v0);
-            CellActor_SetPriority(param0->unk_434[v1], 3);
-            CellActor_SetDrawFlag(param0->unk_434[v1], 0);
+            param0->unk_434[v1] = SpriteList_AddEx(&v0);
+            Sprite_SetPriority(param0->unk_434[v1], 3);
+            Sprite_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 = CellActorCollection_AddEx(&v0);
-        CellActor_SetAnimateFlag(param0->unk_47C, 1);
-        CellActor_SetAnim(param0->unk_47C, 20);
-        CellActor_SetDrawFlag(param0->unk_47C, 0);
+        param0->unk_47C = SpriteList_AddEx(&v0);
+        Sprite_SetAnimateFlag(param0->unk_47C, 1);
+        Sprite_SetAnim(param0->unk_47C, 20);
+        Sprite_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] = 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]);
+            param0->unk_464[v1] = SpriteList_AddEx(&v0);
+            Sprite_SetDrawFlag(param0->unk_464[v1], 0);
+            Sprite_SetAnimateFlag(param0->unk_464[v1], 0);
+            Sprite_SetAnim(param0->unk_464[v1], Unk_ov88_0223EF54[v1][2]);
         }
     }
 }
@@ -1525,8 +1525,8 @@ static void ov88_0223CE74(UnkStruct_02095E80 *param0)
             sub_02005844(v0, v1);
         }
 
-        CellActor_SetAnimateFlag(param0->unk_464[v2], 1);
-        CellActor_SetAnim(param0->unk_464[v2], 4 + v2);
+        Sprite_SetAnimateFlag(param0->unk_464[v2], 1);
+        Sprite_SetAnim(param0->unk_464[v2], 4 + v2);
     }
 }
 
@@ -1570,7 +1570,7 @@ static const int Unk_ov88_0223EE50[][3] = {
     { 0x11, 0x12, 0x13 }
 };
 
-static void ov88_0223CF68(int param0, CellActor *param1, int param2)
+static void ov88_0223CF68(int param0, Sprite *param1, int param2)
 {
     VecFx32 v0;
 
@@ -1580,20 +1580,20 @@ static void ov88_0223CF68(int param0, CellActor *param1, int param2)
     v0.y = FX32_ONE * Unk_ov88_0223EF9C[param0][1];
 
     if (param0 == 12) {
-        CellActor_SetPosition(param1, &v0);
-        CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][2]);
+        Sprite_SetPosition(param1, &v0);
+        Sprite_SetAnim(param1, Unk_ov88_0223EE50[param2][2]);
     } else {
-        CellActor_SetPosition(param1, &v0);
+        Sprite_SetPosition(param1, &v0);
 
         if (param0 < 6) {
-            CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][0]);
+            Sprite_SetAnim(param1, Unk_ov88_0223EE50[param2][0]);
         } else {
-            CellActor_SetAnim(param1, Unk_ov88_0223EE50[param2][1]);
+            Sprite_SetAnim(param1, Unk_ov88_0223EE50[param2][1]);
         }
     }
 }
 
-static int ov88_0223CFF4(u32 *param0, int *param1, CellActor *param2, UnkStruct_ov88_0223C8AC *param3, int param4)
+static int ov88_0223CFF4(u32 *param0, int *param1, Sprite *param2, UnkStruct_ov88_0223C8AC *param3, int param4)
 {
     int v0 = *param0 - 1;
     int v1 = 0;
@@ -2167,36 +2167,36 @@ static int ov88_0223DD1C(UnkStruct_02095E80 *param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if (v0 != param0->unk_88[0]) {
-            CellActor_SetDrawFlag(param0->unk_3D4[v0], 0);
+            Sprite_SetDrawFlag(param0->unk_3D4[v0], 0);
 
             if (param0->unk_6F4[v0].unk_02) {
-                CellActor_SetDrawFlag(param0->unk_404[v0], 0);
+                Sprite_SetDrawFlag(param0->unk_404[v0], 0);
             }
 
             if (param0->unk_6F4[v0].unk_0C) {
-                CellActor_SetDrawFlag(param0->unk_434[v0], 0);
+                Sprite_SetDrawFlag(param0->unk_434[v0], 0);
             }
         }
 
         Window_ClearAndScheduleCopyToVRAM(&param0->unk_49C[7 + v0]);
 
         if (v0 != (param0->unk_88[1] - 6)) {
-            CellActor_SetDrawFlag(param0->unk_3D4[v0 + 6], 0);
+            Sprite_SetDrawFlag(param0->unk_3D4[v0 + 6], 0);
 
             if (param0->unk_6F4[v0 + 6].unk_02) {
-                CellActor_SetDrawFlag(param0->unk_404[v0 + 6], 0);
+                Sprite_SetDrawFlag(param0->unk_404[v0 + 6], 0);
             }
 
             if (param0->unk_6F4[v0 + 6].unk_0C) {
-                CellActor_SetDrawFlag(param0->unk_434[v0 + 6], 0);
+                Sprite_SetDrawFlag(param0->unk_434[v0 + 6], 0);
             }
         }
 
         Window_ClearAndScheduleCopyToVRAM(&param0->unk_49C[13 + v0]);
     }
 
-    CellActor_SetDrawFlag(param0->unk_39C[0], 0);
-    CellActor_SetDrawFlag(param0->unk_39C[1], 0);
+    Sprite_SetDrawFlag(param0->unk_39C[0], 0);
+    Sprite_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);
@@ -2215,25 +2215,25 @@ static void ov88_0223DE68(VecFx32 param0[], int param1, int param2, int param3,
     param0[1].y = FX32_ONE * param4;
 }
 
-static void ov88_0223DE7C(CellActor *param0, CellActor *param1, CellActor *param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC *param5)
+static void ov88_0223DE7C(Sprite *param0, Sprite *param1, Sprite *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;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 
     if (param5->unk_02) {
         v1.x = v0.x + 20 * FX32_ONE;
         v1.y = v0.y + (16 + 6) * FX32_ONE;
-        CellActor_SetPosition(param1, &v1);
+        Sprite_SetPosition(param1, &v1);
     }
 
     if (param5->unk_0C) {
         v2.x = v0.x + (20 + 8) * FX32_ONE;
         v2.y = v0.y + (16 + 6) * FX32_ONE;
-        CellActor_SetPosition(param2, &v2);
+        Sprite_SetPosition(param2, &v2);
     }
 }
 
@@ -2249,7 +2249,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;
-        CellActor_SetDrawFlag(param0->unk_47C, 1);
+        Sprite_SetDrawFlag(param0->unk_47C, 1);
     }
 
     return 0;
@@ -2266,27 +2266,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);
-            CellActor_SetDrawFlag(param0->unk_3D4[v0], 1);
+            Sprite_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);
-                CellActor_SetDrawFlag(param0->unk_404[v0], 1);
+                Sprite_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);
-                CellActor_SetDrawFlag(param0->unk_434[v0], 1);
+                Sprite_SetDrawFlag(param0->unk_434[v0], 1);
             }
 
             Window_ScheduleCopyToVRAM(&param0->unk_49C[7 + v0]);
         }
     }
 
-    CellActor_SetDrawFlag(param0->unk_39C[0], 1);
-    CellActor_SetDrawFlag(param0->unk_39C[1], 1);
+    Sprite_SetDrawFlag(param0->unk_39C[0], 1);
+    Sprite_SetDrawFlag(param0->unk_39C[1], 1);
     ov88_0223CB34(param0->unk_49C, 1, param0);
-    CellActor_SetDrawFlag(param0->unk_464[3], 0);
-    CellActor_SetDrawFlag(param0->unk_47C, 0);
+    Sprite_SetDrawFlag(param0->unk_464[3], 0);
+    Sprite_SetDrawFlag(param0->unk_47C, 0);
 }
 
 static int ov88_0223E110(UnkStruct_02095E80 *param0)
@@ -2542,14 +2542,14 @@ static void ov88_0223E848(UnkStruct_02095E80 *param0)
     Bg_SetOffset(param0->unk_174, 3, 0, param0->unk_2310);
 }
 
-static void ov88_0223E87C(CellActor *param0, int param1, int param2)
+static void ov88_0223E87C(Sprite *param0, int param1, int param2)
 {
     VecFx32 v0;
 
     v0.x = FX32_ONE * param1;
     v0.y = FX32_ONE * param2;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_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 16d74f3ef5..69556723ec 100644
--- a/src/overlay090/ov90_021D0D80.c
+++ b/src/overlay090/ov90_021D0D80.c
@@ -14,7 +14,6 @@
 #include "overlay090/struct_ov90_021D1750.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "gx_layers.h"
@@ -25,6 +24,7 @@
 #include "overlay_manager.h"
 #include "render_oam.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -82,7 +82,7 @@ typedef struct {
     UnkStruct_ov90_021D17F8 unk_BC[30];
     SpriteSystem *unk_29C;
     SpriteManager *unk_2A0;
-    CellActor *unk_2A4[4];
+    Sprite *unk_2A4[4];
 } UnkStruct_ov90_021D0ECC;
 
 static int ov90_021D0ECC(UnkStruct_ov90_021D0ECC *param0);
@@ -929,12 +929,12 @@ static void ov90_021D1BAC(UnkStruct_ov90_021D0ECC *param0)
         param0->unk_2A4[v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_29C, param0->unk_2A0, &v1[v0]);
     }
 
-    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);
+    Sprite_SetDrawFlag(param0->unk_2A4[2], 0);
+    Sprite_SetDrawFlag(param0->unk_2A4[1], 0);
+    Sprite_SetAnimateFlag(param0->unk_2A4[0], 1);
+    Sprite_SetAnimateFlag(param0->unk_2A4[2], 1);
+    Sprite_SetAnimateFlag(param0->unk_2A4[3], 1);
+    Sprite_SetExplicitPriority(param0->unk_2A4[1], 3);
 }
 
 static void ov90_021D1C28(UnkStruct_ov90_021D0ECC *param0)
@@ -942,7 +942,7 @@ static void ov90_021D1C28(UnkStruct_ov90_021D0ECC *param0)
     int v0;
 
     for (v0 = 0; v0 < 4; v0++) {
-        SpriteSystem_DeleteSprite(param0->unk_2A4[v0]);
+        Sprite_Delete2(param0->unk_2A4[v0]);
     }
 }
 
@@ -951,16 +951,16 @@ static void ov90_021D1C44(UnkStruct_ov90_021D0ECC *param0, BOOL param1)
     BOOL v0;
 
     if (param1 == 0) {
-        CellActor_SetExplicitPalette(param0->unk_2A4[0], 1);
+        Sprite_SetExplicitPalette(param0->unk_2A4[0], 1);
         v0 = 0;
     } else {
-        CellActor_SetExplicitPalette(param0->unk_2A4[0], 0);
+        Sprite_SetExplicitPalette(param0->unk_2A4[0], 0);
         v0 = 1;
     }
 
-    CellActor_SetAnimateFlag(param0->unk_2A4[0], v0);
-    CellActor_SetAnimateFlag(param0->unk_2A4[2], v0);
-    CellActor_SetAnimateFlag(param0->unk_2A4[3], v0);
+    Sprite_SetAnimateFlag(param0->unk_2A4[0], v0);
+    Sprite_SetAnimateFlag(param0->unk_2A4[2], v0);
+    Sprite_SetAnimateFlag(param0->unk_2A4[3], v0);
 }
 
 static void ov90_021D1C90(UnkStruct_ov90_021D0ECC *param0, u8 param1, u8 param2, u8 param3)
@@ -968,30 +968,30 @@ static void ov90_021D1C90(UnkStruct_ov90_021D0ECC *param0, u8 param1, u8 param2,
     u16 v0, v1;
 
     if (param0->unk_0E == 10 - 2) {
-        CellActor_SetDrawFlag(param0->unk_2A4[1], 1);
+        Sprite_SetDrawFlag(param0->unk_2A4[1], 1);
 
         if (param1 == 10) {
-            SpriteActor_SetAnimFrame(param0->unk_2A4[1], 1);
-            CellActor_SetDrawFlag(param0->unk_2A4[0], 0);
+            Sprite_SetAnimFrame(param0->unk_2A4[1], 1);
+            Sprite_SetDrawFlag(param0->unk_2A4[0], 0);
         } else {
-            SpriteActor_SetAnimFrame(param0->unk_2A4[1], 0);
-            CellActor_SetDrawFlag(param0->unk_2A4[0], 1);
+            Sprite_SetAnimFrame(param0->unk_2A4[1], 0);
+            Sprite_SetDrawFlag(param0->unk_2A4[0], 1);
         }
     } else {
-        CellActor_SetDrawFlag(param0->unk_2A4[0], 1);
-        CellActor_SetDrawFlag(param0->unk_2A4[1], 0);
+        Sprite_SetDrawFlag(param0->unk_2A4[0], 1);
+        Sprite_SetDrawFlag(param0->unk_2A4[1], 0);
     }
 
     switch (param0->unk_0E) {
     case 0:
-        CellActor_SetDrawFlag(param0->unk_2A4[2], 0);
+        Sprite_SetDrawFlag(param0->unk_2A4[2], 0);
         break;
     case (10 - 2):
-        CellActor_SetDrawFlag(param0->unk_2A4[3], 0);
+        Sprite_SetDrawFlag(param0->unk_2A4[3], 0);
         break;
     default:
-        CellActor_SetDrawFlag(param0->unk_2A4[2], 1);
-        CellActor_SetDrawFlag(param0->unk_2A4[3], 1);
+        Sprite_SetDrawFlag(param0->unk_2A4[2], 1);
+        Sprite_SetDrawFlag(param0->unk_2A4[3], 1);
         break;
     }
 
diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c
index f77438c9e6..545a7edb82 100644
--- a/src/overlay091/ov91_021D0D80.c
+++ b/src/overlay091/ov91_021D0D80.c
@@ -9,7 +9,6 @@
 #include "applications/pokemon_summary_screen/main.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -24,6 +23,7 @@
 #include "pokemon.h"
 #include "render_text.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -51,7 +51,7 @@ typedef struct {
     Menu *unk_10C;
     SpriteSystem *unk_110;
     SpriteManager *unk_114;
-    CellActorData *unk_118[13];
+    ManagedSprite *unk_118[13];
     PokemonSummary unk_14C;
     OverlayManager *unk_17C;
     int unk_180;
@@ -810,7 +810,7 @@ static void ov91_021D1498(UnkStruct_ov91_021D0ED8 *param0)
             ov91_021D1A68(param0, 0xfffffffe);
         }
 
-        Sprite_SetDrawFlag2(param0->unk_118[5], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_118[5], 0);
     }
 
     ov91_021D2314(param0);
@@ -958,7 +958,7 @@ static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1)
     Window_FillTilemap(&param0->unk_08[7], 0);
     Window_FillTilemap(&param0->unk_08[8], 0);
     Window_FillTilemap(&param0->unk_08[9], 0);
-    Sprite_SetDrawFlag2(param0->unk_118[5], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_118[5], 0);
 
     if (param1 != 0xfffffffe) {
         MessageLoader *v0;
@@ -993,7 +993,7 @@ static void ov91_021D18C8(UnkStruct_ov91_021D0ED8 *param0, u32 param1)
         ov91_021D1580(param0, 10, FONT_SYSTEM, TEXT_COLOR(1, 2, 0), 0);
         MessageLoader_Free(v0);
         ov91_021D24B4(param0, param1);
-        Sprite_SetDrawFlag2(param0->unk_118[5], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_118[5], 1);
         Window_ScheduleCopyToVRAM(&param0->unk_08[2]);
         Window_ScheduleCopyToVRAM(&param0->unk_08[3]);
         Window_ScheduleCopyToVRAM(&param0->unk_08[4]);
@@ -1319,7 +1319,7 @@ static void ov91_021D20E8(UnkStruct_ov91_021D0ED8 *param0)
     u16 v0;
 
     for (v0 = 0; v0 < 13; v0++) {
-        CellActor_UpdateAnim(param0->unk_118[v0]->sprite, FX32_ONE);
+        Sprite_UpdateAnim(param0->unk_118[v0]->sprite, FX32_ONE);
     }
 }
 
@@ -1358,7 +1358,7 @@ static void ov91_021D22A0(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param
     }
 
     SpriteSystem_ReplaceCharResObj(param0->unk_110, param0->unk_114, sub_0207C944(), sub_0207C908(v0), 1, 47276 + param2);
-    Sprite_SetExplicitPalette2(param0->unk_118[6 + param2], sub_0207C92C(v0) + 2);
+    ManagedSprite_SetExplicitPalette(param0->unk_118[6 + param2], sub_0207C92C(v0) + 2);
 }
 
 static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0)
@@ -1366,13 +1366,13 @@ static void ov91_021D2314(UnkStruct_ov91_021D0ED8 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 7; v0++) {
-        Sprite_SetPositionXY2(
+        ManagedSprite_SetPositionXY(
             param0->unk_118[6 + v0], 152, 32 + 16 * v0);
 
         if (param0->unk_00->unk_12 + v0 >= param0->unk_184 - 1) {
-            Sprite_SetDrawFlag2(param0->unk_118[6 + v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_118[6 + v0], 0);
         } else {
-            Sprite_SetDrawFlag2(param0->unk_118[6 + v0], 1);
+            ManagedSprite_SetDrawFlag(param0->unk_118[6 + v0], 1);
             ov91_021D22A0(param0, param0->unk_00->unk_0C[param0->unk_00->unk_12 + v0], v0);
         }
     }
@@ -1385,7 +1385,7 @@ static void ov91_021D237C(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param
 
     if (param1 < param2) {
         for (v0 = 0; v0 < 7; v0++) {
-            Sprite_GetPositionXY2(param0->unk_118[6 + v0], &v1, &v2);
+            ManagedSprite_GetPositionXY(param0->unk_118[6 + v0], &v1, &v2);
 
             if (v2 == 32) {
                 v2 = ((((((32 + 16) + 16) + 16) + 16) + 16) + 16);
@@ -1397,11 +1397,11 @@ static void ov91_021D237C(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param
                 v2 -= 16;
             }
 
-            Sprite_SetPositionXY2(param0->unk_118[6 + v0], v1, v2);
+            ManagedSprite_SetPositionXY(param0->unk_118[6 + v0], v1, v2);
         }
     } else if (param1 > param2) {
         for (v0 = 0; v0 < 7; v0++) {
-            Sprite_GetPositionXY2(param0->unk_118[6 + v0], &v1, &v2);
+            ManagedSprite_GetPositionXY(param0->unk_118[6 + v0], &v1, &v2);
 
             if (v2 == ((((((32 + 16) + 16) + 16) + 16) + 16) + 16)) {
                 v2 = 32;
@@ -1413,20 +1413,20 @@ static void ov91_021D237C(UnkStruct_ov91_021D0ED8 *param0, u16 param1, u16 param
                 v2 += 16;
             }
 
-            Sprite_SetPositionXY2(param0->unk_118[6 + v0], v1, v2);
+            ManagedSprite_SetPositionXY(param0->unk_118[6 + v0], v1, v2);
         }
     } else {
         return;
     }
 
     for (v0 = 0; v0 < 7; v0++) {
-        Sprite_GetPositionXY2(param0->unk_118[6 + v0], &v1, &v2);
+        ManagedSprite_GetPositionXY(param0->unk_118[6 + v0], &v1, &v2);
         v2 = (v2 - 32) / 16;
 
         if (param2 + v2 >= param0->unk_184 - 1) {
-            Sprite_SetDrawFlag2(param0->unk_118[6 + v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_118[6 + v0], 0);
         } else {
-            Sprite_SetDrawFlag2(param0->unk_118[6 + v0], 1);
+            ManagedSprite_SetDrawFlag(param0->unk_118[6 + v0], 1);
         }
     }
 }
@@ -1436,7 +1436,7 @@ static void ov91_021D24B4(UnkStruct_ov91_021D0ED8 *param0, u16 param1)
     u32 v0 = MoveTable_LoadParam(param1, MOVEATTRIBUTE_CLASS);
 
     SpriteSystem_ReplaceCharResObj(param0->unk_110, param0->unk_114, sub_0207CAC0(), sub_0207CA90(v0), 1, 47275);
-    Sprite_SetExplicitPalette2(param0->unk_118[5], sub_0207CAA8(v0) + 2);
+    ManagedSprite_SetExplicitPalette(param0->unk_118[5], sub_0207CAA8(v0) + 2);
 }
 
 static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1)
@@ -1453,35 +1453,35 @@ static void ov91_021D2508(UnkStruct_ov91_021D0ED8 *param0, NARC *param1)
 
 static void ov91_021D2548(UnkStruct_ov91_021D0ED8 *param0, u8 param1, u8 param2)
 {
-    Sprite_SetPositionXY2(param0->unk_118[4], 196, 32 + 16 * param1);
-    Sprite_SetExplicitPalette2(param0->unk_118[4], param2);
+    ManagedSprite_SetPositionXY(param0->unk_118[4], 196, 32 + 16 * param1);
+    ManagedSprite_SetExplicitPalette(param0->unk_118[4], param2);
 }
 
 static void ov91_021D2574(UnkStruct_ov91_021D0ED8 *param0, u8 param1)
 {
-    Sprite_SetDrawFlag2(param0->unk_118[0], param1);
-    Sprite_SetDrawFlag2(param0->unk_118[1], param1);
+    ManagedSprite_SetDrawFlag(param0->unk_118[0], param1);
+    ManagedSprite_SetDrawFlag(param0->unk_118[1], param1);
 }
 
 static void ov91_021D2594(UnkStruct_ov91_021D0ED8 *param0)
 {
     if (param0->unk_00->unk_12 != 0) {
-        Sprite_SetDrawFlag2(param0->unk_118[2], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_118[2], 1);
     } else {
-        Sprite_SetDrawFlag2(param0->unk_118[2], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_118[2], 0);
     }
 
     if (param0->unk_00->unk_12 + 7 < param0->unk_184) {
-        Sprite_SetDrawFlag2(param0->unk_118[3], 1);
+        ManagedSprite_SetDrawFlag(param0->unk_118[3], 1);
     } else {
-        Sprite_SetDrawFlag2(param0->unk_118[3], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_118[3], 0);
     }
 }
 
 static void ov91_021D25E4(UnkStruct_ov91_021D0ED8 *param0)
 {
-    Sprite_SetDrawFlag2(param0->unk_118[2], 0);
-    Sprite_SetDrawFlag2(param0->unk_118[3], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_118[2], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_118[3], 0);
 }
 
 static int ov91_021D2604(UnkStruct_ov91_021D0ED8 *param0)
diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c
index e556004acb..f907d61f5c 100644
--- a/src/overlay094/ov94_0223BCB0.c
+++ b/src/overlay094/ov94_0223BCB0.c
@@ -22,7 +22,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -37,6 +36,7 @@
 #include "pokemon_icon.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -194,7 +194,7 @@ int ov94_0223BE2C(OverlayManager *param0, int *param1)
     ov94_0223C598(v0);
 
     if (v0->unk_BE4 != NULL) {
-        CellActorCollection_Update(v0->unk_BE4);
+        SpriteList_Update(v0->unk_BE4);
     }
 
     return 0;
@@ -371,9 +371,9 @@ static void ov94_0223C0D4(UnkStruct_ov94_0223FD4C *param0)
     NARC_dtor(v1);
 }
 
-void ov94_0223C300(CellActorInitParamsEx *param0, UnkStruct_ov94_0223FD4C *param1, CellActorResourceData *param2, int param3)
+void ov94_0223C300(AffineSpriteListTemplate *param0, UnkStruct_ov94_0223FD4C *param1, SpriteResourcesHeader *param2, int param3)
 {
-    param0->collection = param1->unk_BE4;
+    param0->list = param1->unk_BE4;
     param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -422,7 +422,7 @@ void ov94_0223C3F4(UnkStruct_ov94_0223FD4C *param0, int param1, int param2)
     param0->unk_30 = param2;
 }
 
-void ov94_0223C3FC(CellActor *param0, int param1, int param2)
+void ov94_0223C3FC(Sprite *param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -430,7 +430,7 @@ void ov94_0223C3FC(CellActor *param0, int param1, int param2)
     v0.y = FX32_CONST(param2);
     v0.z = 0;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 }
 
 static void *ov94_0223C468(DWCAllocType param0, u32 param1, int param2)
@@ -513,7 +513,7 @@ static void ov94_0223C508(UnkStruct_ov94_0223FD4C *param0)
         SpriteResourceCollection_Delete(param0->unk_D74[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_BE4);
+    SpriteList_Delete(param0->unk_BE4);
     param0->unk_BE4 = NULL;
 
     RenderOam_Free();
diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c
index 093c24cd66..ed3b73ec75 100644
--- a/src/overlay094/ov94_0223C610.c
+++ b/src/overlay094/ov94_0223C610.c
@@ -10,7 +10,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -19,6 +18,7 @@
 #include "message.h"
 #include "narc.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "system.h"
 #include "text.h"
@@ -266,7 +266,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);
-    CellActor_SetDrawFlag(param0->unk_E20, 0);
+    Sprite_SetDrawFlag(param0->unk_E20, 0);
 }
 
 static void ov94_0223C888(UnkStruct_ov94_0223FD4C *param0)
@@ -297,22 +297,22 @@ static const u16 Unk_ov94_02245A48[][2] = {
 
 static void ov94_0223C950(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     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 = CellActorCollection_AddEx(&v0);
+    param0->unk_E20 = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(param0->unk_E20, 1);
-    CellActor_SetAnim(param0->unk_E20, 1);
+    Sprite_SetAnimateFlag(param0->unk_E20, 1);
+    Sprite_SetAnim(param0->unk_E20, 1);
 }
 
 static void ov94_0223C9B0(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActor_Delete(param0->unk_E20);
+    Sprite_Delete(param0->unk_E20);
 }
 
 static void ov94_0223C9C0(UnkStruct_ov94_0223FD4C *param0)
@@ -414,7 +414,7 @@ static int ov94_0223CBEC(UnkStruct_ov94_0223FD4C *param0)
 {
     ov94_0223CF80(param0, 4, TEXT_SPEED_FAST, 0, 0xf0f);
     ov94_0223C3F4(param0, 10, 6);
-    CellActor_SetAnimateFlag(param0->unk_E20, 1);
+    Sprite_SetAnimateFlag(param0->unk_E20, 1);
     ov94_0223C584(param0);
 
     return 3;
@@ -425,7 +425,7 @@ static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0)
     if (gSystem.pressedKeys & PAD_BUTTON_B) {
         ov94_0223CFD8(param0, 7, ov94_0223C4D4(param0), 0, 0xf0f);
         ov94_0223C3F4(param0, 10, 12);
-        CellActor_SetAnimateFlag(param0->unk_E20, 0);
+        Sprite_SetAnimateFlag(param0->unk_E20, 0);
     } else if (gSystem.pressedKeys & PAD_BUTTON_A) {
         switch (param0->unk_10C) {
         case 0:
@@ -441,7 +441,7 @@ static int ov94_0223CC28(UnkStruct_ov94_0223FD4C *param0)
                     param0->unk_3A = (60 * 30);
                     Sound_PlayEffect(1500);
                 } else {
-                    CellActor_SetAnimateFlag(param0->unk_E20, 0);
+                    Sprite_SetAnimateFlag(param0->unk_E20, 0);
                     ov94_0223CF80(param0, 34, TEXT_SPEED_FAST, 0, 0xf0f);
                     ov94_0223C3F4(param0, 11, 5);
                     Sound_PlayEffect(1523);
@@ -457,7 +457,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);
-            CellActor_SetAnimateFlag(param0->unk_E20, 0);
+            Sprite_SetAnimateFlag(param0->unk_E20, 0);
             Sound_PlayEffect(1500);
             break;
         }
@@ -526,7 +526,7 @@ static int ov94_0223CE7C(UnkStruct_ov94_0223FD4C *param0)
         if (v0 == 0xfffffffe) {
             Window_EraseMessageBox(&param0->unk_109C, 1);
             Window_ClearAndCopyToVRAM(&param0->unk_109C);
-            CellActor_SetAnimateFlag(param0->unk_E20, 1);
+            Sprite_SetAnimateFlag(param0->unk_E20, 1);
             param0->unk_2C = 5;
         } else {
             Window_EraseMessageBox(&param0->unk_109C, 1);
diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c
index 239458bc0a..5381efde2d 100644
--- a/src/overlay094/ov94_0223D0C4.c
+++ b/src/overlay094/ov94_0223D0C4.c
@@ -15,7 +15,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -28,6 +27,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_list.h"
 #include "string_template.h"
@@ -250,23 +250,23 @@ static void ov94_0223D2E8(UnkStruct_ov94_0223FD4C *param0)
 
 static void ov94_0223D3DC(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = CellActorCollection_AddEx(&v0);
+    param0->unk_F30 = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(param0->unk_F30, 1);
-    CellActor_SetAnim(param0->unk_F30, 37);
+    Sprite_SetAnimateFlag(param0->unk_F30, 1);
+    Sprite_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
 static void ov94_0223D428(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActor_Delete(param0->unk_F30);
+    Sprite_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 8f3ce03c2f..1f2b9b85c7 100644
--- a/src/overlay094/ov94_0223DC04.c
+++ b/src/overlay094/ov94_0223DC04.c
@@ -14,7 +14,6 @@
 #include "overlay094/struct_ov94_0223FD4C.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -23,6 +22,7 @@
 #include "message_util.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -215,23 +215,23 @@ static void ov94_0223DE04(UnkStruct_ov94_0223FD4C *param0)
 
 static void ov94_0223DE7C(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     v0.position.x = FX32_ONE * 208;
     v0.position.y = FX32_ONE * 58;
 
-    param0->unk_F30 = CellActorCollection_AddEx(&v0);
+    param0->unk_F30 = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(param0->unk_F30, 1);
-    CellActor_SetAnim(param0->unk_F30, 37);
+    Sprite_SetAnimateFlag(param0->unk_F30, 1);
+    Sprite_SetAnim(param0->unk_F30, 37);
     sub_02039734();
 }
 
 static void ov94_0223DEC8(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActor_Delete(param0->unk_F30);
+    Sprite_Delete(param0->unk_F30);
 }
 
 static const int Unk_ov94_02245CC4[][4] = {
@@ -349,7 +349,7 @@ static int ov94_0223E0A4(UnkStruct_ov94_0223FD4C *param0)
 
         if (1) {
             if ((v0 != param0->unk_11C) && (v0 >= 0)) {
-                CellActor_SetAnim(param0->unk_F34[v0 + 1], 16 + v0 * 4);
+                Sprite_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 ee0ae749f3..e58e3148b9 100644
--- a/src/overlay094/ov94_0223E46C.c
+++ b/src/overlay094/ov94_0223E46C.c
@@ -16,7 +16,6 @@
 #include "overlay094/struct_ov94_0223FD4C_sub3.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -28,6 +27,7 @@
 #include "narc.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_list.h"
 #include "system.h"
@@ -285,24 +285,24 @@ static void ov94_0223E6B8(UnkStruct_ov94_0223FD4C *param0)
 
 static void ov94_0223E770(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
 
     ov94_0223C300(&v0, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     v0.position.x = FX32_ONE;
     v0.position.y = FX32_ONE;
 
-    param0->unk_E20 = CellActorCollection_AddEx(&v0);
+    param0->unk_E20 = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(param0->unk_E20, 1);
-    CellActor_SetAnim(param0->unk_E20, 0);
-    CellActor_SetExplicitPriority(param0->unk_E20, 1);
+    Sprite_SetAnimateFlag(param0->unk_E20, 1);
+    Sprite_SetAnim(param0->unk_E20, 0);
+    Sprite_SetExplicitPriority(param0->unk_E20, 1);
     sub_02039734();
 }
 
 static void ov94_0223E7C4(UnkStruct_ov94_0223FD4C *param0)
 {
-    CellActor_Delete(param0->unk_E20);
+    Sprite_Delete(param0->unk_E20);
 }
 
 static const u16 Unk_ov94_02245D94[6][2] = {
@@ -455,7 +455,7 @@ static int ov94_0223EA84(UnkStruct_ov94_0223FD4C *param0)
 
         if (param0->unk_10F2) {
             if (v1 >= 0) {
-                CellActor_SetAnim(param0->unk_F34[v1 + 1], 16 + v1 * 4);
+                Sprite_SetAnim(param0->unk_F34[v1 + 1], 16 + v1 * 4);
                 param0->unk_2C = 2;
                 ov94_0223C4C0(param0, 3, 0);
                 param0->unk_11C = v1;
@@ -727,7 +727,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];
 
-        CellActor_SetPosition(param0->unk_E20, &v1);
+        Sprite_SetPosition(param0->unk_E20, &v1);
     }
 }
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index b7a8305f5e..15412a28b2 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -19,7 +19,6 @@
 #include "overlay094/struct_ov94_0223FD4C_sub2.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -33,6 +32,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_list.h"
 #include "string_template.h"
@@ -46,7 +46,7 @@
 typedef struct {
     int unk_00;
     int unk_04;
-    CellActor *unk_08;
+    Sprite *unk_08;
     u8 unk_0C[512];
 } UnkStruct_ov94_02240FA0;
 
@@ -67,7 +67,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, CellActor *param4, NARC *param5, UnkStruct_ov94_02240FA0 *param6);
+static void ov94_02240DF8(int param0, int param1, int param2, int param3, Sprite *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);
@@ -83,10 +83,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, CellActor *param1, CellActor *param2, u16 *param3, int param4, NARC *param5, UnkStruct_ov94_0223BA88_sub2 *param6, UnkStruct_ov94_02240FA0 *param7);
+static void ov94_02240EAC(BoxPokemon *param0, Sprite *param1, Sprite *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, CellActor **param1, UnkStruct_ov94_0223BA88_sub3 *param2, UnkStruct_ov94_02240FA0 *param3);
+static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, Sprite **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);
@@ -350,22 +350,22 @@ static const u16 Unk_ov94_02245E1C[][2] = {
 static void ov94_0223FE24(UnkStruct_ov94_0223FD4C *param0)
 {
     int v0;
-    CellActorInitParamsEx v1;
+    AffineSpriteListTemplate v1;
 
     ov94_0223C300(&v1, param0, &param0->unk_DB4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
     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 = CellActorCollection_AddEx(&v1);
+    param0->unk_E20 = SpriteList_AddEx(&v1);
 
-    CellActor_SetAnimateFlag(param0->unk_E20, 1);
-    CellActor_SetAnim(param0->unk_E20, 4);
+    Sprite_SetAnimateFlag(param0->unk_E20, 1);
+    Sprite_SetAnim(param0->unk_E20, 4);
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        CellActor_SetExplicitPriority(param0->unk_E20, 0);
+        Sprite_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        CellActor_SetExplicitPriority(param0->unk_E20, 1);
+        Sprite_SetExplicitPriority(param0->unk_E20, 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -373,10 +373,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] = CellActorCollection_AddEx(&v1);
+        param0->unk_E28[v0] = SpriteList_AddEx(&v1);
 
-        CellActor_SetAnim(param0->unk_E28[v0], 6 + v0);
-        CellActor_SetExplicitPriority(param0->unk_E28[v0], 1);
+        Sprite_SetAnim(param0->unk_E28[v0], 6 + v0);
+        Sprite_SetExplicitPriority(param0->unk_E28[v0], 1);
     }
 
     for (v0 = 0; v0 < 30; v0++) {
@@ -384,10 +384,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] = CellActorCollection_AddEx(&v1);
+        param0->unk_EA0[v0] = SpriteList_AddEx(&v1);
 
-        CellActor_SetAnim(param0->unk_EA0[v0], 40);
-        CellActor_SetExplicitPriority(param0->unk_EA0[v0], 1);
+        Sprite_SetAnim(param0->unk_EA0[v0], 40);
+        Sprite_SetExplicitPriority(param0->unk_EA0[v0], 1);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
@@ -395,21 +395,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] = CellActorCollection_AddEx(&v1);
+        param0->unk_F18[v0] = SpriteList_AddEx(&v1);
 
-        CellActor_SetAnim(param0->unk_F18[v0], 42);
-        CellActor_SetExplicitPriority(param0->unk_F18[v0], 1);
+        Sprite_SetAnim(param0->unk_F18[v0], 42);
+        Sprite_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] = CellActorCollection_AddEx(&v1);
+        param0->unk_F54[v0] = SpriteList_AddEx(&v1);
 
-        CellActor_SetAnimateFlag(param0->unk_F54[v0], 1);
-        CellActor_SetAnim(param0->unk_F54[v0], 38 + v0);
-        CellActor_SetExplicitPriority(param0->unk_F54[v0], 1);
+        Sprite_SetAnimateFlag(param0->unk_F54[v0], 1);
+        Sprite_SetAnim(param0->unk_F54[v0], 38 + v0);
+        Sprite_SetExplicitPriority(param0->unk_F54[v0], 1);
     }
 }
 
@@ -418,18 +418,18 @@ static void ov94_0223FFC8(UnkStruct_ov94_0223FD4C *param0)
     int v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        CellActor_Delete(param0->unk_F54[v0]);
+        Sprite_Delete(param0->unk_F54[v0]);
     }
 
-    CellActor_Delete(param0->unk_E20);
+    Sprite_Delete(param0->unk_E20);
 
     for (v0 = 0; v0 < 30; v0++) {
-        CellActor_Delete(param0->unk_E28[v0]);
-        CellActor_Delete(param0->unk_EA0[v0]);
+        Sprite_Delete(param0->unk_E28[v0]);
+        Sprite_Delete(param0->unk_EA0[v0]);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_Delete(param0->unk_F18[v0]);
+        Sprite_Delete(param0->unk_F18[v0]);
     }
 }
 
@@ -653,9 +653,9 @@ static void ov94_022404F0(UnkStruct_ov94_0223FD4C *param0)
     }
 
     if ((param0->unk_112 == 31) || ((param0->unk_112 >= 0) && (param0->unk_112 <= 5))) {
-        CellActor_SetExplicitPriority(param0->unk_E20, 0);
+        Sprite_SetExplicitPriority(param0->unk_E20, 0);
     } else {
-        CellActor_SetExplicitPriority(param0->unk_E20, 1);
+        Sprite_SetExplicitPriority(param0->unk_E20, 1);
     }
 }
 
@@ -1039,7 +1039,7 @@ void *ov94_02240DD0(NARC *param0, u32 param1, NNSG2dCharacterData **param2, u32
     return v0;
 }
 
-static void ov94_02240DF8(int param0, int param1, int param2, int param3, CellActor *param4, NARC *param5, UnkStruct_ov94_02240FA0 *param6)
+static void ov94_02240DF8(int param0, int param1, int param2, int param3, Sprite *param4, NARC *param5, UnkStruct_ov94_02240FA0 *param6)
 {
     u8 *v0;
     u8 *v1;
@@ -1072,14 +1072,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));
 
-            CellActor_SetExplicitPalette(v2->unk_08, v2->unk_04);
+            Sprite_SetExplicitPalette(v2->unk_08, v2->unk_04);
         }
     }
 
     Heap_FreeToHeap(v0->unk_1114);
 }
 
-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)
+static void ov94_02240EAC(BoxPokemon *param0, Sprite *param1, Sprite *param2, u16 *param3, int param4, NARC *param5, UnkStruct_ov94_0223BA88_sub2 *param6, UnkStruct_ov94_02240FA0 *param7)
 {
     int v0, v1, v2, v3;
 
@@ -1103,22 +1103,22 @@ static void ov94_02240EAC(BoxPokemon *param0, CellActor *param1, CellActor *para
 
     if (v0) {
         ov94_02240DF8(*param3, v3, v2, param4, param1, param5, param7);
-        CellActor_SetDrawFlag(param1, 1);
+        Sprite_SetDrawFlag(param1, 1);
 
         if (v1 != 0) {
-            CellActor_SetDrawFlag(param2, 1);
+            Sprite_SetDrawFlag(param2, 1);
 
             if (Item_IsMail(v1)) {
-                CellActor_SetAnim(param2, 41);
+                Sprite_SetAnim(param2, 41);
             } else {
-                CellActor_SetAnim(param2, 40);
+                Sprite_SetAnim(param2, 40);
             }
         } else {
-            CellActor_SetDrawFlag(param2, 0);
+            Sprite_SetDrawFlag(param2, 0);
         }
     } else {
-        CellActor_SetDrawFlag(param1, 0);
-        CellActor_SetDrawFlag(param2, 0);
+        Sprite_SetDrawFlag(param1, 0);
+        Sprite_SetDrawFlag(param2, 0);
 
         param7->unk_08 = NULL;
     }
@@ -1146,7 +1146,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) {
-                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
+                Sprite_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
@@ -1162,20 +1162,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)) {
-                CellActor_SetDrawFlag(param0->unk_F18[v1], 1);
+                Sprite_SetDrawFlag(param0->unk_F18[v1], 1);
             } else {
-                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
+                Sprite_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
         for (; v1 < 30; v1++) {
             param0->unk_1108->unk_00[v1].unk_00 = 0;
-            CellActor_SetDrawFlag(param0->unk_E28[v1], 0);
-            CellActor_SetDrawFlag(param0->unk_EA0[v1], 0);
+            Sprite_SetDrawFlag(param0->unk_E28[v1], 0);
+            Sprite_SetDrawFlag(param0->unk_EA0[v1], 0);
             v7[v1].unk_08 = NULL;
 
             if (v1 < 6) {
-                CellActor_SetDrawFlag(param0->unk_F18[v1], 0);
+                Sprite_SetDrawFlag(param0->unk_F18[v1], 0);
             }
         }
 
@@ -1391,7 +1391,7 @@ static void ov94_022413BC(UnkStruct_ov94_0223BA88 *param0, UnkStruct_ov94_0223FD
     param0->unk_F0 = v1;
 }
 
-static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, CellActor **param1, UnkStruct_ov94_0223BA88_sub3 *param2, UnkStruct_ov94_02240FA0 *param3)
+static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 *param0, Sprite **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 f5c7be2243..ed44023242 100644
--- a/src/overlay094/ov94_02243EF8.c
+++ b/src/overlay094/ov94_02243EF8.c
@@ -7,9 +7,9 @@
 #include "overlay094/ov94_0223BCB0.h"
 #include "overlay094/struct_ov94_0223FD4C.h"
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "heap.h"
+#include "sprite.h"
 #include "sys_task_manager.h"
 #include "touch_screen.h"
 #include "unk_02005474.h"
@@ -25,7 +25,7 @@ typedef struct {
 
 static void ov94_0224400C(SysTask *param0, void *param1);
 static void ov94_022440FC(SysTask *param0, void *param1);
-static void ov94_022441A0(CellActor *param0, int param1, int param2);
+static void ov94_022441A0(Sprite *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);
@@ -43,7 +43,7 @@ static const u16 Unk_ov94_02246322[][2] = {
 
 void ov94_02243EF8(UnkStruct_ov94_0223FD4C *param0, int param1)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
     int v1;
 
     ov94_0224432C(param0);
@@ -53,18 +53,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] = CellActorCollection_AddEx(&v0);
+    param0->unk_F34[0] = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(param0->unk_F34[0], 1);
-    CellActor_SetAnim(param0->unk_F34[0], 3 + param1 * 7);
-    CellActor_SetDrawFlag(param0->unk_F34[0], 1);
+    Sprite_SetAnimateFlag(param0->unk_F34[0], 1);
+    Sprite_SetAnim(param0->unk_F34[0], 3 + param1 * 7);
+    Sprite_SetDrawFlag(param0->unk_F34[0], 1);
 
     for (v1 = 0; v1 < 7; v1++) {
-        param0->unk_F34[v1 + 1] = CellActorCollection_AddEx(&v0);
+        param0->unk_F34[v1 + 1] = SpriteList_AddEx(&v0);
 
-        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);
+        Sprite_SetAnimateFlag(param0->unk_F34[v1 + 1], 1);
+        Sprite_SetAnim(param0->unk_F34[v1 + 1], 14 + v1 * 4);
+        Sprite_SetDrawFlag(param0->unk_F34[v1 + 1], 0);
 
         ov94_022441A0(param0->unk_F34[v1 + 1], Unk_ov94_02246322[v1][0], Unk_ov94_02246322[v1][1]);
     }
@@ -92,7 +92,7 @@ void ov94_02243FA8(UnkStruct_ov94_0223FD4C *param0, int param1)
 
 static void ov94_02243FF0(UnkStruct_ov94_02243FF0 *param0, int param1)
 {
-    CellActor_SetAnim(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
+    Sprite_SetAnim(param0->unk_0C->unk_F34[0], param1 + param0->unk_08 * 7);
 }
 
 static void ov94_0224400C(SysTask *param0, void *param1)
@@ -114,7 +114,7 @@ static void ov94_0224400C(SysTask *param0, void *param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!CellActor_IsAnimated(v2->unk_F34[0])) {
+        if (!Sprite_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 2);
             v1->unk_00 = 2;
         }
@@ -175,7 +175,7 @@ static void ov94_022440FC(SysTask *param0, void *param1)
         ov94_022441A0(v2->unk_F34[0], 128, v1->unk_04);
         break;
     case 1:
-        if (!CellActor_IsAnimated(v2->unk_F34[0])) {
+        if (!Sprite_IsAnimated(v2->unk_F34[0])) {
             ov94_02243FF0(v1, 0);
             v1->unk_00 = 2;
             Sound_PlayEffect(1584);
@@ -198,7 +198,7 @@ static void ov94_022440FC(SysTask *param0, void *param1)
     }
 }
 
-static void ov94_022441A0(CellActor *param0, int param1, int param2)
+static void ov94_022441A0(Sprite *param0, int param1, int param2)
 {
     VecFx32 v0;
 
@@ -206,7 +206,7 @@ static void ov94_022441A0(CellActor *param0, int param1, int param2)
     v0.y = FX32_CONST(param2 - 8) + (256 * FX32_ONE);
     v0.z = 0;
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
 }
 
 static const TouchScreenRect Unk_ov94_0224633E[] = {
@@ -249,14 +249,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) {
-                CellActor_SetAnim(param0->unk_F34[v0 + 1], 14 + v0 * 4);
+                Sprite_SetAnim(param0->unk_F34[v0 + 1], 14 + v0 * 4);
             } else {
-                CellActor_SetAnim(param0->unk_F34[v0 + 1], 17 + v0 * 4);
+                Sprite_SetAnim(param0->unk_F34[v0 + 1], 17 + v0 * 4);
             }
 
-            CellActor_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
+            Sprite_SetDrawFlag(param0->unk_F34[v0 + 1], 1);
         } else {
-            CellActor_SetDrawFlag(param0->unk_F34[v0 + 1], 0);
+            Sprite_SetDrawFlag(param0->unk_F34[v0 + 1], 0);
         }
     }
 }
@@ -271,9 +271,9 @@ void ov94_022442E4(UnkStruct_ov94_0223FD4C *param0)
     int v0;
 
     for (v0 = 0; v0 < 7; v0++) {
-        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);
+        if (Sprite_GetDrawFlag(param0->unk_F34[v0 + 1])) {
+            if (Sprite_GetActiveAnim(param0->unk_F34[v0 + 1]) != ov94_022442DC(v0) + 1) {
+                Sprite_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 f6d85366a0..770eea166c 100644
--- a/src/overlay095/ov95_02246C20.c
+++ b/src/overlay095/ov95_02246C20.c
@@ -20,7 +20,6 @@
 #include "overlay095/struct_ov95_02247628_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "game_options.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -29,6 +28,7 @@
 #include "overlay_manager.h"
 #include "pokemon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -48,7 +48,7 @@ struct UnkStruct_ov95_02247628_t {
     StringTemplate *unk_0C;
     MessageLoader *unk_10;
     Strbuf *unk_14;
-    CellActorCollection *unk_18;
+    SpriteList *unk_18;
     G2dRenderer unk_1C;
     SysTask *unk_1A8;
     BOOL unk_1AC;
@@ -212,7 +212,7 @@ int ov95_02246E1C(OverlayManager *param0, int *param1)
     MessageLoader_Free(v1->unk_10);
     Strbuf_Free(v1->unk_14);
     Heap_FreeToHeap(v1->unk_08);
-    CellActorCollection_Delete(v1->unk_18);
+    SpriteList_Delete(v1->unk_18);
     RenderOam_Free();
     OverlayManager_FreeData(param0);
     Heap_Destroy(57);
@@ -257,7 +257,7 @@ static void ov95_02246F0C(SysTask *param0, void *param1)
 {
     UnkStruct_ov95_02247628 *v0 = param1;
 
-    CellActorCollection_Update(v0->unk_18);
+    SpriteList_Update(v0->unk_18);
     RenderOam_Transfer();
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
@@ -630,7 +630,7 @@ void ov95_022475A0(UnkStruct_ov95_02247568 *param0)
     }
 }
 
-void ov95_022475C4(CellActorResourceData *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4)
+void ov95_022475C4(SpriteResourcesHeader *param0, UnkStruct_ov95_02247568 *param1, NNSG2dImageProxy *param2, NNSG2dImagePaletteProxy *param3, u32 param4)
 {
     param0->imageProxy = param2;
     param0->paletteProxy = param3;
@@ -643,12 +643,12 @@ void ov95_022475C4(CellActorResourceData *param0, UnkStruct_ov95_02247568 *param
     param0->isVRamTransfer = 0;
 }
 
-CellActor *ov95_022475E4(UnkStruct_ov95_02247628 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5)
+Sprite *ov95_022475E4(UnkStruct_ov95_02247628 *param0, SpriteResourcesHeader *param1, u32 param2, u32 param3, u32 param4, int param5)
 {
-    CellActor *v0;
-    CellActorInitParams v1;
+    Sprite *v0;
+    SpriteListTemplate v1;
 
-    v1.collection = param0->unk_18;
+    v1.list = param0->unk_18;
     v1.resourceData = param1;
     v1.position.x = param2 * FX32_ONE;
     v1.position.y = param3 * FX32_ONE;
@@ -657,11 +657,11 @@ CellActor *ov95_022475E4(UnkStruct_ov95_02247628 *param0, CellActorResourceData
     v1.vramType = param5;
     v1.heapID = 57;
 
-    v0 = CellActorCollection_Add(&v1);
+    v0 = SpriteList_Add(&v1);
 
     if (v0) {
-        CellActor_SetAnimateFlag(v0, 1);
-        CellActor_SetAnimSpeed(v0, FX32_ONE);
+        Sprite_SetAnimateFlag(v0, 1);
+        Sprite_SetAnimSpeed(v0, FX32_ONE);
     }
 
     return v0;
diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c
index 3e99b8b9c0..844c1655d9 100644
--- a/src/overlay095/ov95_02247B6C.c
+++ b/src/overlay095/ov95_02247B6C.c
@@ -17,7 +17,6 @@
 #include "overlay095/struct_ov95_02247958_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -25,6 +24,7 @@
 #include "narc.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "sys_task.h"
@@ -41,9 +41,9 @@ typedef struct {
     int unk_04;
     int unk_08;
     UnkStruct_02007768 *unk_0C;
-    Sprite *unk_10;
+    PokemonSprite *unk_10;
     SpriteAnimationFrame unk_14[10];
-    CellActor *unk_3C[2];
+    Sprite *unk_3C[2];
     UnkStruct_ov95_02247568 unk_44;
     BgConfig *unk_54;
     Window unk_58;
@@ -82,7 +82,7 @@ static int ov95_02247ED8(UnkStruct_ov95_02247C6C *param0, int *param1);
 static int ov95_02247F04(UnkStruct_ov95_02247C6C *param0, int *param1);
 static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1);
 static void ov95_02248174(UnkStruct_ov95_02247C6C *param0);
-static Sprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0);
+static PokemonSprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0);
 static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0);
 static void ov95_02248340(UnkStruct_ov95_02247C6C *param0);
 static void ov95_02248364(UnkStruct_ov95_02247C6C *param0, int param1, int param2, int param3);
@@ -298,8 +298,8 @@ static int ov95_02247ED8(UnkStruct_ov95_02247C6C *param0, int *param1)
     switch (*param1) {
     case 0:
         if (IsScreenTransitionDone()) {
-            CellActor_SetAnim(param0->unk_3C[0], 1);
-            CellActor_SetDrawFlag(param0->unk_3C[0], 1);
+            Sprite_SetAnim(param0->unk_3C[0], 1);
+            Sprite_SetDrawFlag(param0->unk_3C[0], 1);
             return 1;
         }
         break;
@@ -393,13 +393,13 @@ static int ov95_02248090(UnkStruct_ov95_02247C6C *param0, int *param1)
     case 1:
         if (ov95_022483B4(param0)) {
             sub_02007DC8(param0->unk_10);
-            CellActor_SetAnim(param0->unk_3C[1], 0);
-            CellActor_SetDrawFlag(param0->unk_3C[1], 1);
+            Sprite_SetAnim(param0->unk_3C[1], 0);
+            Sprite_SetDrawFlag(param0->unk_3C[1], 1);
             (*param1)++;
         }
         break;
     case 2:
-        if (CellActor_IsAnimated(param0->unk_3C[1]) == 0) {
+        if (Sprite_IsAnimated(param0->unk_3C[1]) == 0) {
             ov95_022479A8(param0->unk_74, 1);
             ov95_02248364(param0, 16, 0, 16);
             ov95_02248420(param0);
@@ -451,7 +451,7 @@ static void ov95_02248174(UnkStruct_ov95_02247C6C *param0)
     sub_02008A84(param0->unk_0C, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1));
 }
 
-static Sprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0)
+static PokemonSprite *ov95_02248240(UnkStruct_ov95_02247C6C *param0)
 {
     ArchivedSprite v0;
     BoxPokemon *v1;
@@ -471,7 +471,7 @@ static void ov95_0224829C(UnkStruct_ov95_02247C6C *param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
 
     ov95_02247568(&param0->unk_44, 93, 7, 8);
 
@@ -486,9 +486,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);
 
-    CellActor_SetExplicitPriority(param0->unk_3C[1], 1);
-    CellActor_SetDrawFlag(param0->unk_3C[0], 0);
-    CellActor_SetDrawFlag(param0->unk_3C[1], 0);
+    Sprite_SetExplicitPriority(param0->unk_3C[1], 1);
+    Sprite_SetDrawFlag(param0->unk_3C[0], 0);
+    Sprite_SetDrawFlag(param0->unk_3C[1], 0);
 }
 
 static void ov95_02248340(UnkStruct_ov95_02247C6C *param0)
@@ -497,7 +497,7 @@ static void ov95_02248340(UnkStruct_ov95_02247C6C *param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_3C[v0]) {
-            CellActor_Delete(param0->unk_3C[v0]);
+            Sprite_Delete(param0->unk_3C[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_02248590.c b/src/overlay095/ov95_02248590.c
index d5d1a9740e..9060a602f3 100644
--- a/src/overlay095/ov95_02248590.c
+++ b/src/overlay095/ov95_02248590.c
@@ -16,12 +16,12 @@
 #include "overlay115/camera_angle.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "math.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
@@ -125,7 +125,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     UnkStruct_ov95_02247568 unk_0C;
-    CellActor *unk_1C[20][2];
+    Sprite *unk_1C[20][2];
     u32 unk_BC;
     BgConfig *unk_C0;
     UnkStruct_ov95_02247004 *unk_C4;
@@ -598,7 +598,7 @@ static void ov95_02248CA8(UnkStruct_ov95_02248688 *param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
     int v3;
     fx32 v4, v5;
 
@@ -621,10 +621,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);
 
-        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);
+        Sprite_SetAnim(param0->unk_1C[v3][0], 0);
+        Sprite_SetAnim(param0->unk_1C[v3][1], 1);
+        Sprite_SetDrawFlag(param0->unk_1C[v3][0], 0);
+        Sprite_SetDrawFlag(param0->unk_1C[v3][1], 0);
     }
 }
 
@@ -634,11 +634,11 @@ static void ov95_02248DC4(UnkStruct_ov95_02248688 *param0)
 
     for (v0 = 0; v0 < 20; v0++) {
         if (param0->unk_1C[v0][0]) {
-            CellActor_Delete(param0->unk_1C[v0][0]);
+            Sprite_Delete(param0->unk_1C[v0][0]);
         }
 
         if (param0->unk_1C[v0][1]) {
-            CellActor_Delete(param0->unk_1C[v0][1]);
+            Sprite_Delete(param0->unk_1C[v0][1]);
         }
     }
 
@@ -677,7 +677,7 @@ static void ov95_02248E5C(UnkStruct_ov95_02248688 *param0, SysTask **param1, Unk
 
     for (v0 = 0; v0 < 20; v0++) {
         param2->unk_08[v0] = 0;
-        param2->unk_58[v0] = *(CellActor_GetPosition(param0->unk_1C[v0][0]));
+        param2->unk_58[v0] = *(Sprite_GetPosition(param0->unk_1C[v0][0]));
     }
 
     *(param2->unk_00) = SysTask_Start(ov95_02248EC4, param2, 0);
@@ -709,17 +709,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]) {
-                CellActor_SetDrawFlag(v0->unk_04->unk_1C[v2][0], 1);
-                CellActor_SetDrawFlag(v0->unk_04->unk_1C[v2][1], 1);
+                Sprite_SetDrawFlag(v0->unk_04->unk_1C[v2][0], 1);
+                Sprite_SetDrawFlag(v0->unk_04->unk_1C[v2][1], 1);
             }
         }
 
-        CellActor_SetPosition(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
+        Sprite_SetPosition(v0->unk_04->unk_1C[v2][0], &(v0->unk_58[v2]));
 
         v1 = v0->unk_58[v2];
         v1.y += 229376;
 
-        CellActor_SetPosition(v0->unk_04->unk_1C[v2][1], &v1);
+        Sprite_SetPosition(v0->unk_04->unk_1C[v2][1], &v1);
     }
 }
 
diff --git a/src/overlay095/ov95_02249740.c b/src/overlay095/ov95_02249740.c
index a1bf678e6b..ef83c1cc23 100644
--- a/src/overlay095/ov95_02249740.c
+++ b/src/overlay095/ov95_02249740.c
@@ -14,12 +14,12 @@
 #include "overlay115/camera_angle.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "math.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
@@ -88,7 +88,7 @@ typedef struct {
     int unk_08;
     BOOL unk_0C;
     UnkStruct_ov95_02247568 unk_10;
-    CellActor *unk_20[1];
+    Sprite *unk_20[1];
     BgConfig *unk_24;
     UnkStruct_ov95_0224773C *unk_28;
     UnkStruct_ov95_02247958 *unk_2C;
@@ -216,13 +216,13 @@ static int ov95_02249840(UnkStruct_ov95_022497D8 *param0, int *param1)
     case 2:
         if (ov95_02249CF0(&(param0->unk_34))) {
             Sound_PlayEffect(1709);
-            CellActor_SetAnim(param0->unk_20[0], 3);
-            CellActor_SetDrawFlag(param0->unk_20[0], 1);
+            Sprite_SetAnim(param0->unk_20[0], 3);
+            Sprite_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 3:
-        if (CellActor_IsAnimated(param0->unk_20[0]) == 0) {
+        if (Sprite_IsAnimated(param0->unk_20[0]) == 0) {
             StartScreenTransition(0, 0, 0, 0x7fff, 16, 1, 58);
             (*param1)++;
         }
@@ -397,7 +397,7 @@ static void ov95_02249B90(UnkStruct_ov95_022497D8 *param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
 
     ov95_02247568(&param0->unk_10, 93, 7, 8);
 
@@ -410,7 +410,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);
 
-    CellActor_SetDrawFlag(param0->unk_20[0], 0);
+    Sprite_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_02249C10(UnkStruct_ov95_022497D8 *param0)
@@ -419,7 +419,7 @@ static void ov95_02249C10(UnkStruct_ov95_022497D8 *param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            CellActor_Delete(param0->unk_20[v0]);
+            Sprite_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224A390.c b/src/overlay095/ov95_0224A390.c
index c67198d2b4..b5fd7e5e1d 100644
--- a/src/overlay095/ov95_0224A390.c
+++ b/src/overlay095/ov95_0224A390.c
@@ -14,12 +14,12 @@
 #include "overlay115/camera_angle.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "math.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "system.h"
@@ -84,7 +84,7 @@ typedef struct {
     int unk_08;
     BOOL unk_0C;
     UnkStruct_ov95_02247568 unk_10;
-    CellActor *unk_20[1];
+    Sprite *unk_20[1];
     BgConfig *unk_24;
     UnkStruct_ov95_0224773C *unk_28;
     UnkStruct_ov95_02247958 *unk_2C;
@@ -187,13 +187,13 @@ static int ov95_0224A464(UnkStruct_ov95_0224A42C *param0, int *param1)
     switch (*param1) {
     case 0:
         if (IsScreenTransitionDone()) {
-            CellActor_SetAnim(param0->unk_20[0], 3);
-            CellActor_SetDrawFlag(param0->unk_20[0], 1);
+            Sprite_SetAnim(param0->unk_20[0], 3);
+            Sprite_SetDrawFlag(param0->unk_20[0], 1);
             (*param1)++;
         }
         break;
     case 1:
-        if (CellActor_IsAnimated(param0->unk_20[0]) == 0) {
+        if (Sprite_IsAnimated(param0->unk_20[0]) == 0) {
             Sound_PlayEffect(1707);
             ov95_0224A864(param0, &(param0->unk_34));
             ov95_022479A8(param0->unk_2C, 1);
@@ -380,7 +380,7 @@ static void ov95_0224A7B0(UnkStruct_ov95_0224A42C *param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
     int v3;
 
     ov95_02247568(&param0->unk_10, 93, 7, 8);
@@ -393,7 +393,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);
-    CellActor_SetDrawFlag(param0->unk_20[0], 0);
+    Sprite_SetDrawFlag(param0->unk_20[0], 0);
 }
 
 static void ov95_0224A830(UnkStruct_ov95_0224A42C *param0)
@@ -402,7 +402,7 @@ static void ov95_0224A830(UnkStruct_ov95_0224A42C *param0)
 
     for (v0 = 0; v0 < 1; v0++) {
         if (param0->unk_20[v0]) {
-            CellActor_Delete(param0->unk_20[v0]);
+            Sprite_Delete(param0->unk_20[v0]);
         }
     }
 
diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c
index b8c7dcc0d4..6e483da38f 100644
--- a/src/overlay095/ov95_0224B3D8.c
+++ b/src/overlay095/ov95_0224B3D8.c
@@ -17,7 +17,6 @@
 #include "overlay095/struct_ov95_02247958_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -26,6 +25,7 @@
 #include "narc.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "sys_task.h"
@@ -57,9 +57,9 @@ typedef struct {
     int unk_08;
     BOOL unk_0C;
     UnkStruct_02007768 *unk_10;
-    Sprite *unk_14;
+    PokemonSprite *unk_14;
     SpriteAnimationFrame unk_18[10];
-    CellActor *unk_40[2];
+    Sprite *unk_40[2];
     UnkStruct_ov95_02247568 unk_48;
     BgConfig *unk_58;
     Window unk_5C;
@@ -106,7 +106,7 @@ static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1);
 static int ov95_0224B81C(UnkStruct_ov95_0224B4D4 *param0, int *param1);
 static BOOL ov95_0224B990(UnkStruct_ov95_0224B4D4 *param0, int param1);
 static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 *param0);
-static Sprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0);
+static PokemonSprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0);
 static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0);
 static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0);
 static void ov95_0224BBB0(UnkStruct_ov95_0224B4D4 *param0, int param1, int param2, int param3);
@@ -325,8 +325,8 @@ static int ov95_0224B6F0(UnkStruct_ov95_0224B4D4 *param0, int *param1)
     switch (*param1) {
     case 0:
         if (IsScreenTransitionDone()) {
-            CellActor_SetAnim(param0->unk_40[0], 1);
-            CellActor_SetDrawFlag(param0->unk_40[0], 1);
+            Sprite_SetAnim(param0->unk_40[0], 1);
+            Sprite_SetDrawFlag(param0->unk_40[0], 1);
             return 1;
         }
         break;
@@ -343,8 +343,8 @@ static int ov95_0224B71C(UnkStruct_ov95_0224B4D4 *param0, int *param1)
         (*param1)++;
     case 1:
         if (param0->unk_80 == NULL) {
-            CellActor_SetAnim(param0->unk_40[1], 2);
-            CellActor_SetDrawFlag(param0->unk_40[1], 1);
+            Sprite_SetAnim(param0->unk_40[1], 2);
+            Sprite_SetDrawFlag(param0->unk_40[1], 1);
             ov95_022479A8(param0->unk_78, 0);
             param0->unk_08 = 0;
             (*param1)++;
@@ -494,7 +494,7 @@ static void ov95_0224B9C0(UnkStruct_ov95_0224B4D4 *param0)
     sub_02008A84(param0->unk_10, NNS_GfdGetPlttKeyAddr(v1), NNS_GfdGetPlttKeySize(v1));
 }
 
-static Sprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0)
+static PokemonSprite *ov95_0224BA8C(UnkStruct_ov95_0224B4D4 *param0)
 {
     ArchivedSprite v0;
     BoxPokemon *v1;
@@ -513,7 +513,7 @@ static void ov95_0224BAE8(UnkStruct_ov95_0224B4D4 *param0)
 {
     NNSG2dImagePaletteProxy v0;
     NNSG2dImageProxy v1;
-    CellActorResourceData v2;
+    SpriteResourcesHeader v2;
 
     ov95_02247568(&param0->unk_48, 93, 7, 8);
 
@@ -528,9 +528,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);
 
-    CellActor_SetExplicitPriority(param0->unk_40[1], 1);
-    CellActor_SetDrawFlag(param0->unk_40[0], 0);
-    CellActor_SetDrawFlag(param0->unk_40[1], 0);
+    Sprite_SetExplicitPriority(param0->unk_40[1], 1);
+    Sprite_SetDrawFlag(param0->unk_40[0], 0);
+    Sprite_SetDrawFlag(param0->unk_40[1], 0);
 }
 
 static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0)
@@ -539,7 +539,7 @@ static void ov95_0224BB8C(UnkStruct_ov95_0224B4D4 *param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_40[v0]) {
-            CellActor_Delete(param0->unk_40[v0]);
+            Sprite_Delete(param0->unk_40[v0]);
         }
     }
 
diff --git a/src/overlay096/ov96_0223B6A0.c b/src/overlay096/ov96_0223B6A0.c
index 40076ffd44..8430c1bad4 100644
--- a/src/overlay096/ov96_0223B6A0.c
+++ b/src/overlay096/ov96_0223B6A0.c
@@ -13,7 +13,6 @@
 #include "overlay096/struct_ov96_0223BF40_t.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -24,6 +23,7 @@
 #include "overlay_manager.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -156,7 +156,7 @@ int ov96_0223B7F8(OverlayManager *param0, int *param1)
     }
 
     if (v0->unk_BF4 != NULL) {
-        CellActorCollection_Update(v0->unk_BF4);
+        SpriteList_Update(v0->unk_BF4);
     }
 
     return 0;
@@ -280,9 +280,9 @@ static const u16 Unk_ov96_0223DA80[][2] = {
     { 0xE0, 0x81 }
 };
 
-void ov96_0223BAE0(CellActorInitParamsEx *param0, UnkStruct_ov96_0223BF40 *param1, CellActorResourceData *param2, int param3)
+void ov96_0223BAE0(AffineSpriteListTemplate *param0, UnkStruct_ov96_0223BF40 *param1, SpriteResourcesHeader *param2, int param3)
 {
-    param0->collection = param1->unk_BF4;
+    param0->list = param1->unk_BF4;
     param0->resourceData = param2;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -301,17 +301,17 @@ static void ov96_0223BB0C(UnkStruct_ov96_0223BF40 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
         ov96_0223BAE0(&v1, param0, &param0->unk_DC4, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         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] = CellActorCollection_AddEx(&v1);
-            CellActor_SetAnimateFlag(param0->unk_E30[v0], 1);
-            CellActor_SetAnim(param0->unk_E30[v0], v0);
-            CellActor_SetDrawFlag(param0->unk_E30[v0], 0);
+            param0->unk_E30[v0] = SpriteList_AddEx(&v1);
+            Sprite_SetAnimateFlag(param0->unk_E30[v0], 1);
+            Sprite_SetAnim(param0->unk_E30[v0], v0);
+            Sprite_SetDrawFlag(param0->unk_E30[v0], 0);
         }
     }
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
@@ -411,7 +411,7 @@ static void ov96_0223BC8C(UnkStruct_ov96_0223BF40 *param0)
         SpriteResourceCollection_Delete(param0->unk_D84[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_BF4);
+    SpriteList_Delete(param0->unk_BF4);
 
     param0->unk_BF4 = NULL;
 
diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c
index 8f9e04279b..f4f9239348 100644
--- a/src/overlay096/ov96_0223BCE0.c
+++ b/src/overlay096/ov96_0223BCE0.c
@@ -16,7 +16,6 @@
 #include "overlay096/struct_ov96_0223BF40_t.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -27,6 +26,7 @@
 #include "narc.h"
 #include "render_window.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -1642,8 +1642,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)) {
-        CellActor_SetDrawFlag(param0->unk_E30[0], param2);
-        CellActor_SetDrawFlag(param0->unk_E30[1], param2);
+        Sprite_SetDrawFlag(param0->unk_E30[0], param2);
+        Sprite_SetDrawFlag(param0->unk_E30[1], param2);
     }
 }
 
diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c
index 950135e01e..ff95bab991 100644
--- a/src/overlay097/ov97_0222AE60.c
+++ b/src/overlay097/ov97_0222AE60.c
@@ -15,7 +15,6 @@
 
 #include "bg_window.h"
 #include "boot.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_start.h"
 #include "graphics.h"
@@ -31,6 +30,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -118,7 +118,7 @@ typedef struct {
     int unk_150;
     BOOL unk_154[1];
     Window unk_158;
-    CellActor *unk_168[2];
+    Sprite *unk_168[2];
     int unk_170;
 } UnkStruct_0222AE60;
 
@@ -478,10 +478,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);
-    CellActor_SetDrawFlag(param0->unk_168[0], 0);
+    Sprite_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);
-    CellActor_SetDrawFlag(param0->unk_168[1], 0);
+    Sprite_SetDrawFlag(param0->unk_168[1], 0);
 }
 
 static void ov97_0222B46C(UnkStruct_0222AE60 *param0)
@@ -885,8 +885,8 @@ static void ov97_0222BC1C(UnkStruct_0222AE60 *param0)
         }
     }
 
-    CellActor_SetDrawFlag(param0->unk_168[0], v1);
-    CellActor_SetDrawFlag(param0->unk_168[1], v2);
+    Sprite_SetDrawFlag(param0->unk_168[0], v1);
+    Sprite_SetDrawFlag(param0->unk_168[1], v2);
 }
 
 static void ov97_0222BC9C(OverlayManager *param0)
@@ -895,8 +895,8 @@ static void ov97_0222BC9C(OverlayManager *param0)
     UnkStruct_0222AE60 *v1 = OverlayManager_Data(param0);
 
     if (v1->unk_168[0] || v1->unk_168[1]) {
-        CellActor_Delete(v1->unk_168[0]);
-        CellActor_Delete(v1->unk_168[1]);
+        Sprite_Delete(v1->unk_168[0]);
+        Sprite_Delete(v1->unk_168[1]);
         ov97_02237DA0();
     }
 
diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c
index a50319b5c8..8f56f82072 100644
--- a/src/overlay097/ov97_0222C174.c
+++ b/src/overlay097/ov97_0222C174.c
@@ -17,7 +17,6 @@
 #include "savedata/save_table.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "enums.h"
 #include "font.h"
 #include "game_options.h"
@@ -33,6 +32,7 @@
 #include "rtc.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -370,7 +370,7 @@ typedef struct {
     int unk_168;
     u8 unk_16C[12288];
     OverlayManager *unk_316C;
-    CellActor *unk_3170;
+    Sprite *unk_3170;
     MysteryGift *unk_3174;
     int unk_3178;
     int unk_317C;
@@ -931,7 +931,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);
-        CellActor_SetDrawFlag(param0->unk_3170, 0);
+        Sprite_SetDrawFlag(param0->unk_3170, 0);
         DestroyWaitDial(param0->unk_34D8);
         param0->unk_34D8 = NULL;
         Sound_PlayEffect(1500);
@@ -968,7 +968,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);
-            CellActor_SetDrawFlag(param0->unk_3170, 1);
+            Sprite_SetDrawFlag(param0->unk_3170, 1);
             ov97_0222C578(param0);
             *v3 = UnkEnum_ov97_0222C6F8_11;
         }
@@ -1062,7 +1062,7 @@ int ov97_0222CB10(UnkStruct_ov97_0222C388 *param0)
 
             ov97_0223795C(param0->unk_04, &param0->unk_48, 2, 19, 73);
 
-            CellActor_SetDrawFlag(param0->unk_3170, 0);
+            Sprite_SetDrawFlag(param0->unk_3170, 0);
             DestroyWaitDial(param0->unk_34D8);
             Sound_PlayEffect(1500);
 
@@ -1087,7 +1087,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);
-        CellActor_SetDrawFlag(param0->unk_3170, 0);
+        Sprite_SetDrawFlag(param0->unk_3170, 0);
 
         if (param0->unk_34D8) {
             DestroyWaitDial(param0->unk_34D8);
diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c
index 2956d5e659..23b38cd53c 100644
--- a/src/overlay097/ov97_0222D30C.c
+++ b/src/overlay097/ov97_0222D30C.c
@@ -21,7 +21,6 @@
 #include "savedata/save_table.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_options.h"
@@ -39,6 +38,7 @@
 #include "rtc.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -71,7 +71,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     BOOL unk_08;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
     VecFx32 unk_10;
     fx32 unk_1C;
     fx32 unk_20;
@@ -92,7 +92,7 @@ typedef struct {
     int unk_04;
     s8 unk_08;
     UnkStruct_ov97_02237AEC *unk_0C;
-    CellActorResourceData unk_10[2];
+    SpriteResourcesHeader unk_10[2];
     SpriteResource *unk_58[2][6];
     UnkStruct_ov97_0222EEB8 unk_88[80];
     UnkStruct_ov97_0222EEB8 unk_1848[80];
@@ -274,7 +274,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 {
-        CellActor_SetDrawFlag(param0->unk_628, 0);
+        Sprite_SetDrawFlag(param0->unk_628, 0);
     }
 }
 
@@ -1159,15 +1159,15 @@ static void ov97_0222E398(UnkStruct_ov97_0222E398 *param0)
     SpriteResourcesHeader_Init(&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 CellActor *ov97_0222E538(UnkStruct_ov97_0222E398 *param0, int param1)
+static Sprite *ov97_0222E538(UnkStruct_ov97_0222E398 *param0, int param1)
 {
-    CellActor *v0;
+    Sprite *v0;
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
         int v2 = (param1 == NNS_G2D_VRAM_TYPE_2DMAIN) ? 0 : 1;
 
-        v1.collection = param0->unk_0C->unk_00;
+        v1.list = param0->unk_0C->unk_00;
         v1.resourceData = &param0->unk_10[v2];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -1184,14 +1184,14 @@ static CellActor *ov97_0222E538(UnkStruct_ov97_0222E398 *param0, int param1)
             v1.position.y += FX32_CONST(256);
         }
 
-        v0 = CellActorCollection_AddEx(&v1);
+        v0 = SpriteList_AddEx(&v1);
     }
 
     if (v0) {
-        CellActor_SetAnimateFlag(v0, 1);
-        CellActor_SetExplicitPriority(v0, 0);
-        CellActor_SetAnim(v0, 0);
-        CellActor_SetDrawFlag(v0, 1);
+        Sprite_SetAnimateFlag(v0, 1);
+        Sprite_SetExplicitPriority(v0, 0);
+        Sprite_SetAnim(v0, 0);
+        Sprite_SetDrawFlag(v0, 1);
     }
 
     return v0;
@@ -1201,16 +1201,16 @@ static void ov97_0222E5B4(UnkStruct_ov97_0222E398 *param0)
 {
     param0->unk_3008.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
-    CellActor_SetAnimNoRestart(param0->unk_3008.unk_0C, 2);
-    SpriteActor_SetAnimFrame(param0->unk_3008.unk_0C, 0);
-    CellActor_SetDrawFlag(param0->unk_3008.unk_0C, 0);
-    CellActor_SetPriority(param0->unk_3008.unk_0C, 0);
-    CellActor_SetAffineOverwriteMode(param0->unk_3008.unk_0C, 2);
+    Sprite_SetAnimNoRestart(param0->unk_3008.unk_0C, 2);
+    Sprite_SetAnimFrame(param0->unk_3008.unk_0C, 0);
+    Sprite_SetDrawFlag(param0->unk_3008.unk_0C, 0);
+    Sprite_SetPriority(param0->unk_3008.unk_0C, 0);
+    Sprite_SetAffineOverwriteMode(param0->unk_3008.unk_0C, 2);
 
     {
         VecFx32 *v0;
 
-        v0 = (VecFx32 *)CellActor_GetPosition(param0->unk_3008.unk_0C);
+        v0 = (VecFx32 *)Sprite_GetPosition(param0->unk_3008.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(96);
     }
@@ -1220,16 +1220,16 @@ static void ov97_0222E60C(UnkStruct_ov97_0222E398 *param0)
 {
     param0->unk_3054.unk_0C = ov97_0222E538(param0, NNS_G2D_VRAM_TYPE_2DSUB);
 
-    CellActor_SetAnimNoRestart(param0->unk_3054.unk_0C, 4);
-    SpriteActor_SetAnimFrame(param0->unk_3054.unk_0C, 0);
-    CellActor_SetDrawFlag(param0->unk_3054.unk_0C, 0);
-    CellActor_SetPriority(param0->unk_3054.unk_0C, 0);
-    CellActor_SetAffineOverwriteMode(param0->unk_3054.unk_0C, 2);
+    Sprite_SetAnimNoRestart(param0->unk_3054.unk_0C, 4);
+    Sprite_SetAnimFrame(param0->unk_3054.unk_0C, 0);
+    Sprite_SetDrawFlag(param0->unk_3054.unk_0C, 0);
+    Sprite_SetPriority(param0->unk_3054.unk_0C, 0);
+    Sprite_SetAffineOverwriteMode(param0->unk_3054.unk_0C, 2);
 
     {
         VecFx32 *v0;
 
-        v0 = (VecFx32 *)CellActor_GetPosition(param0->unk_3054.unk_0C);
+        v0 = (VecFx32 *)Sprite_GetPosition(param0->unk_3054.unk_0C);
         v0->x = FX32_CONST(128);
         v0->y = FX32_CONST(0) + FX32_CONST(256);
     }
@@ -1237,13 +1237,13 @@ static void ov97_0222E60C(UnkStruct_ov97_0222E398 *param0)
 
 static void ov97_0222E664(UnkStruct_ov97_0222E398 *param0)
 {
-    CellActor_Delete(param0->unk_3008.unk_0C);
+    Sprite_Delete(param0->unk_3008.unk_0C);
     param0->unk_3008.unk_0C = NULL;
 }
 
 static void ov97_0222E67C(UnkStruct_ov97_0222E398 *param0)
 {
-    CellActor_Delete(param0->unk_3054.unk_0C);
+    Sprite_Delete(param0->unk_3054.unk_0C);
     param0->unk_3054.unk_0C = NULL;
 }
 
@@ -1253,20 +1253,20 @@ static void ov97_0222E694(UnkStruct_ov97_0222E398 *param0)
 
     for (v0 = 0; v0 < 80; v0++) {
         if (param0->unk_88[v0].unk_0C) {
-            CellActor_UpdateAnim(param0->unk_88[v0].unk_0C, FX32_CONST(2));
+            Sprite_UpdateAnim(param0->unk_88[v0].unk_0C, FX32_CONST(2));
         }
 
         if (param0->unk_1848[v0].unk_0C) {
-            CellActor_UpdateAnim(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
+            Sprite_UpdateAnim(param0->unk_1848[v0].unk_0C, FX32_CONST(2));
         }
     }
 
     if (param0->unk_3008.unk_0C) {
-        CellActor_UpdateAnim(param0->unk_3008.unk_0C, FX32_CONST(2));
+        Sprite_UpdateAnim(param0->unk_3008.unk_0C, FX32_CONST(2));
     }
 
     if (param0->unk_3054.unk_0C) {
-        CellActor_UpdateAnim(param0->unk_3054.unk_0C, FX32_CONST(2));
+        Sprite_UpdateAnim(param0->unk_3054.unk_0C, FX32_CONST(2));
     }
 }
 
@@ -1276,8 +1276,8 @@ 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);
-        CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
-        SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
+        Sprite_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+        Sprite_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
     }
 }
 
@@ -1288,8 +1288,8 @@ 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);
-            CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
-            SpriteActor_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
+            Sprite_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+            Sprite_SetAnimFrame(param0->unk_88[v0].unk_0C, 0);
         } else {
             param0->unk_88[v0].unk_0C = NULL;
         }
@@ -1302,8 +1302,8 @@ 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);
-        CellActor_SetAnimNoRestart(param0->unk_1848[v0].unk_0C, 5);
-        SpriteActor_SetAnimFrame(param0->unk_1848[v0].unk_0C, 0);
+        Sprite_SetAnimNoRestart(param0->unk_1848[v0].unk_0C, 5);
+        Sprite_SetAnimFrame(param0->unk_1848[v0].unk_0C, 0);
     }
 }
 
@@ -1316,7 +1316,7 @@ static void ov97_0222E7B4(UnkStruct_ov97_0222E398 *param0)
             continue;
         }
 
-        CellActor_Delete(param0->unk_88[v0].unk_0C);
+        Sprite_Delete(param0->unk_88[v0].unk_0C);
         param0->unk_88[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_88[v0].unk_48);
     }
@@ -1327,7 +1327,7 @@ static void ov97_0222E7E4(UnkStruct_ov97_0222E398 *param0)
     int v0;
 
     for (v0 = 0; v0 < 80; v0++) {
-        CellActor_Delete(param0->unk_1848[v0].unk_0C);
+        Sprite_Delete(param0->unk_1848[v0].unk_0C);
         param0->unk_1848[v0].unk_0C = NULL;
         SysTask_Done(param0->unk_1848[v0].unk_48);
     }
@@ -1397,12 +1397,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 *)CellActor_GetPosition(param0->unk_88[v0].unk_0C);
+        v1 = *(VecFx32 *)Sprite_GetPosition(param0->unk_88[v0].unk_0C);
         v1.x = FX32_CONST(16 + (LCRNG_Next() % (256 - 32)));
         v1.y = FX32_CONST(0);
 
-        CellActor_SetPosition(param0->unk_88[v0].unk_0C, &v1);
-        CellActor_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
+        Sprite_SetPosition(param0->unk_88[v0].unk_0C, &v1);
+        Sprite_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1449,11 +1449,11 @@ static void ov97_0222EA68(UnkStruct_ov97_0222E398 *param0)
             v1.x = param0->unk_88[v0].unk_10.x + (CalcSineDegrees_Wraparound(v2) * v3);
             v1.y = param0->unk_88[v0].unk_10.y + (CalcCosineDegrees_Wraparound(v2) * v3);
 
-            CellActor_SetPosition(param0->unk_88[v0].unk_0C, &v1);
+            Sprite_SetPosition(param0->unk_88[v0].unk_0C, &v1);
         }
 
-        CellActor_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
-        CellActor_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
+        Sprite_SetAnimNoRestart(param0->unk_88[v0].unk_0C, 1);
+        Sprite_SetDrawFlag(param0->unk_88[v0].unk_0C, 0);
 
         param0->unk_88[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_88[v0], 6);
     }
@@ -1501,13 +1501,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 *)CellActor_GetPosition(param0->unk_1848[v0].unk_0C);
+        v1 = *(VecFx32 *)Sprite_GetPosition(param0->unk_1848[v0].unk_0C);
 
         v1.x = FX32_CONST(128);
         v1.y = FX32_CONST(384);
 
-        CellActor_SetPosition(param0->unk_1848[v0].unk_0C, &v1);
-        CellActor_SetDrawFlag(param0->unk_1848[v0].unk_0C, 1);
+        Sprite_SetPosition(param0->unk_1848[v0].unk_0C, &v1);
+        Sprite_SetDrawFlag(param0->unk_1848[v0].unk_0C, 1);
 
         param0->unk_1848[v0].unk_48 = SysTask_Start(ov97_0222EEB8, &param0->unk_1848[v0], 6);
     }
@@ -1555,24 +1555,24 @@ static void ov97_0222EEB8(SysTask *param0, void *param1)
     f32 v2, v3;
 
     if (v0->unk_30) {
-        SpriteActor_SetAnimFrame(v0->unk_0C, 0);
+        Sprite_SetAnimFrame(v0->unk_0C, 0);
         v0->unk_30--;
         return;
     } else {
-        CellActor_SetDrawFlag(v0->unk_0C, 1);
+        Sprite_SetDrawFlag(v0->unk_0C, 1);
     }
 
     {
         BOOL v4;
 
-        v1 = *((VecFx32 *)CellActor_GetPosition(v0->unk_0C));
+        v1 = *((VecFx32 *)Sprite_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);
 
-            CellActor_SetPosition(v0->unk_0C, &v1);
+            Sprite_SetPosition(v0->unk_0C, &v1);
         } else {
             switch (v0->unk_24) {
             case 0:
@@ -1646,14 +1646,14 @@ static void ov97_0222EEB8(SysTask *param0, void *param1)
                         v1.x += FX_F32_TO_FX32(v2);
                         v1.y += FX_F32_TO_FX32(v3);
 
-                        CellActor_SetPosition(v0->unk_0C, &v1);
+                        Sprite_SetPosition(v0->unk_0C, &v1);
                     } else {
                         v0->unk_08 = 1;
                     }
                 }
 
                 v0->unk_28 %= 360;
-                CellActor_SetPosition(v0->unk_0C, &v1);
+                Sprite_SetPosition(v0->unk_0C, &v1);
                 break;
             }
         }
@@ -1819,11 +1819,11 @@ static void ov97_0222F4BC(SysTask *param0, void *param1)
         }
 
         if (v3 > 50) {
-            CellActor_SetAnimNoRestart(v0->unk_3008.unk_0C, 4);
+            Sprite_SetAnimNoRestart(v0->unk_3008.unk_0C, 4);
         } else if (v3 > 30) {
-            CellActor_SetAnimNoRestart(v0->unk_3008.unk_0C, 3);
+            Sprite_SetAnimNoRestart(v0->unk_3008.unk_0C, 3);
         } else if (v3 > 7) {
-            CellActor_SetDrawFlag(v0->unk_3008.unk_0C, 1);
+            Sprite_SetDrawFlag(v0->unk_3008.unk_0C, 1);
         }
 
         if (v1 || (v3 == (80 - 1))) {
@@ -1887,8 +1887,8 @@ static void ov97_0222F4BC(SysTask *param0, void *param1)
             break;
         }
 
-        v6 = (VecFx32 *)CellActor_GetPosition(v0->unk_3008.unk_0C);
-        v7 = (VecFx32 *)CellActor_GetPosition(v0->unk_3054.unk_0C);
+        v6 = (VecFx32 *)Sprite_GetPosition(v0->unk_3008.unk_0C);
+        v7 = (VecFx32 *)Sprite_GetPosition(v0->unk_3054.unk_0C);
 
         if (v6->y < FX32_CONST(256 - 32)) {
             v6->y += FX32_CONST(8);
@@ -1900,8 +1900,8 @@ static void ov97_0222F4BC(SysTask *param0, void *param1)
             if (v7->y < FX32_CONST(384)) {
                 v7->y += FX32_CONST(8);
 
-                if (CellActor_GetDrawFlag(v0->unk_3054.unk_0C) == 0) {
-                    CellActor_SetDrawFlag(v0->unk_3054.unk_0C, 1);
+                if (Sprite_GetDrawFlag(v0->unk_3054.unk_0C) == 0) {
+                    Sprite_SetDrawFlag(v0->unk_3054.unk_0C, 1);
                 }
             } else {
                 v0->unk_00 = 7;
@@ -1932,11 +1932,11 @@ static void ov97_0222F4BC(SysTask *param0, void *param1)
         }
 
         if (v10 > 50) {
-            CellActor_SetDrawFlag(v0->unk_3054.unk_0C, 0);
+            Sprite_SetDrawFlag(v0->unk_3054.unk_0C, 0);
         } else if (v10 > 30) {
-            CellActor_SetAnimNoRestart(v0->unk_3054.unk_0C, 2);
+            Sprite_SetAnimNoRestart(v0->unk_3054.unk_0C, 2);
         } else if (v10 > 7) {
-            CellActor_SetAnimNoRestart(v0->unk_3054.unk_0C, 3);
+            Sprite_SetAnimNoRestart(v0->unk_3054.unk_0C, 3);
         }
 
         if (v1) {
diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c
index cdd3b7a77a..8af0152cfa 100644
--- a/src/overlay097/ov97_02230410.c
+++ b/src/overlay097/ov97_02230410.c
@@ -14,7 +14,6 @@
 
 #include "bg_window.h"
 #include "buffer_manager.h"
-#include "cell_actor.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -31,6 +30,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -93,13 +93,13 @@ typedef struct {
     void (*unk_2C98)(void *);
     int unk_2C9C;
     int unk_2CA0;
-    CellActorCollection *unk_2CA4;
+    SpriteList *unk_2CA4;
     G2dRenderer unk_2CA8;
     SpriteResourceCollection *unk_2E34[6];
     SpriteResource *unk_2E4C[6];
-    CellActorResourceData unk_2E64;
-    CellActor *unk_2E88[2];
-    CellActor *unk_2E90[3];
+    SpriteResourcesHeader unk_2E64;
+    Sprite *unk_2E88[2];
+    Sprite *unk_2E90[3];
     UnkUnion_ov97_0222D2B0 unk_2E9C;
     UnkStruct_ov97_02231318 unk_31F4;
     void (*unk_3E0C)(void *);
@@ -237,25 +237,25 @@ static void ov97_02230410(UnkStruct_ov97_02230868 *param0)
 static void ov97_02230438(UnkStruct_ov97_02230868 *param0)
 {
     if (param0->unk_2E88[0]) {
-        CellActor_Delete(param0->unk_2E88[0]);
+        Sprite_Delete(param0->unk_2E88[0]);
     }
 
     if (param0->unk_2E88[1]) {
-        CellActor_Delete(param0->unk_2E88[1]);
+        Sprite_Delete(param0->unk_2E88[1]);
     }
 
     param0->unk_2E88[0] = param0->unk_2E88[1] = NULL;
 
     if (param0->unk_2E90[0]) {
-        CellActor_Delete(param0->unk_2E90[0]);
+        Sprite_Delete(param0->unk_2E90[0]);
     }
 
     if (param0->unk_2E90[1]) {
-        CellActor_Delete(param0->unk_2E90[1]);
+        Sprite_Delete(param0->unk_2E90[1]);
     }
 
     if (param0->unk_2E90[2]) {
-        CellActor_Delete(param0->unk_2E90[2]);
+        Sprite_Delete(param0->unk_2E90[2]);
     }
 
     param0->unk_2E90[0] = param0->unk_2E90[1] = param0->unk_2E90[2] = NULL;
@@ -267,9 +267,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);
 
-    CellActor_SetExplicitPriority(param0->unk_2E88[0], 2);
+    Sprite_SetExplicitPriority(param0->unk_2E88[0], 2);
     param0->unk_2E88[1] = ov97_02237D14(0, param0->unk_2E88[1], 184, 168, 0);
-    CellActor_SetExplicitPriority(param0->unk_2E88[1], 2);
+    Sprite_SetExplicitPriority(param0->unk_2E88[1], 2);
 }
 
 static void ov97_02230500(Window *param0, u8 param1)
@@ -800,7 +800,7 @@ static void ov97_022310FC(UnkStruct_ov97_02230868 *param0)
 
         if (v2 == 0) {
             if (param0->unk_2E90[v1]) {
-                CellActor_SetDrawFlag(param0->unk_2E90[v1], 0);
+                Sprite_SetDrawFlag(param0->unk_2E90[v1], 0);
             }
 
             continue;
@@ -812,7 +812,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));
 
-        CellActor_SetExplicitPalette(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
+        Sprite_SetExplicitPalette(param0->unk_2E90[v1], PokeIconPaletteIndex(v2, 0, 0) + 3);
         Heap_FreeToHeap(v3);
     }
 }
@@ -989,8 +989,8 @@ static void ov97_022314FC(UnkStruct_ov97_02230868 *param0, int param1, int *para
     }
 
     if (v1 != param0->unk_3E10) {
-        CellActor_SetAnim(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
-        CellActor_SetAnim(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
+        Sprite_SetAnim(param0->unk_2E88[0], param0->unk_3E10 == 0 ? 1 : 0);
+        Sprite_SetAnim(param0->unk_2E88[1], param0->unk_3E10 == 0 ? 0 : 1);
     }
 
     v0 = 0;
@@ -1252,7 +1252,7 @@ static int ov97_0223161C(OverlayManager *param0, int *param1)
     }
 
     if (v4->unk_2CA4 != NULL) {
-        CellActorCollection_Update(v4->unk_2CA4);
+        SpriteList_Update(v4->unk_2CA4);
     }
 
     ov97_02237CA0();
diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c
index 6b4fb66e8f..ff3b095540 100644
--- a/src/overlay097/ov97_02233B18.c
+++ b/src/overlay097/ov97_02233B18.c
@@ -21,7 +21,6 @@
 #include "savedata/save_table.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "game_options.h"
@@ -41,6 +40,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -83,13 +83,13 @@ typedef struct {
 } UnkStruct_ov97_02233DAC;
 
 typedef struct {
-    CellActor *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_00;
+    Sprite *unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub1;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_ov97_02234A2C_sub2;
@@ -103,7 +103,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    CellActor *unk_08;
+    Sprite *unk_08;
     u8 unk_0C[512];
 } UnkStruct_ov97_0223F434;
 
@@ -118,19 +118,19 @@ typedef struct {
     int unk_1C;
     BgConfig *unk_20;
     int unk_24;
-    CellActorCollection *unk_28;
+    SpriteList *unk_28;
     G2dRenderer unk_2C;
     SpriteResourceCollection *unk_1B8[6];
     SpriteResource *unk_1D0[6];
-    CellActorResourceData unk_1E8;
+    SpriteResourcesHeader unk_1E8;
     UnkStruct_ov97_02234A2C_sub1 unk_20C[30];
     TouchScreenRect unk_374[34];
-    CellActor *unk_3FC[4];
-    CellActor *unk_40C[4];
-    CellActor *unk_41C[4];
+    Sprite *unk_3FC[4];
+    Sprite *unk_40C[4];
+    Sprite *unk_41C[4];
     UnkStruct_ov97_02234A2C_sub2 unk_42C[6];
     int unk_474;
-    CellActor *unk_478[6];
+    Sprite *unk_478[6];
     UnkStruct_ov97_02233DAC unk_490;
     Window unk_4DC;
     Window unk_4EC;
@@ -534,9 +534,9 @@ static void ov97_022340B0(UnkStruct_ov97_02234A2C *param0)
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static void ov97_022340FC(CellActorInitParamsEx *param0, UnkStruct_ov97_02234A2C *param1, CellActorResourceData *param2, int param3)
+static void ov97_022340FC(AffineSpriteListTemplate *param0, UnkStruct_ov97_02234A2C *param1, SpriteResourcesHeader *param2, int param3)
 {
-    param0->collection = param1->unk_28;
+    param0->list = param1->unk_28;
     param0->resourceData = &param1->unk_1E8;
     param0->position.z = 0;
     param0->affineScale.x = FX32_ONE;
@@ -629,7 +629,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, CellActor *param5)
+static void ov97_02234278(int param0, int param1, u32 param2, int param3, int param4, Sprite *param5)
 {
     u8 *v0;
     u8 v1;
@@ -643,11 +643,11 @@ static void ov97_02234278(int param0, int param1, u32 param2, int param3, int pa
     DC_FlushRange(v2->pRawData, ((4 * 4) * 0x20));
     GX_LoadOBJ(v2->pRawData, (0x64 + param4 * (4 * 4)) * 0x20, ((4 * 4) * 0x20));
 
-    CellActor_SetExplicitPalette(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
+    Sprite_SetExplicitPalette(param5, PokeIconPaletteIndex(param0, v1, param1) + 8);
     Heap_FreeToHeap(v0);
 }
 
-static void ov97_022342E4(int param0, int param1, int param2, int param3, CellActor *param4, void *param5, NARC *param6)
+static void ov97_022342E4(int param0, int param1, int param2, int param3, Sprite *param4, void *param5, NARC *param6)
 {
     u32 v0;
     NNSG2dCharacterData *v1;
@@ -682,7 +682,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));
-            CellActor_SetExplicitPalette(v1->unk_08, v1->unk_04);
+            Sprite_SetExplicitPalette(v1->unk_08, v1->unk_04);
         }
     }
 }
@@ -706,17 +706,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);
-            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
+            Sprite_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
 
             if (GetGBABoxMonData(&(param0->unk_E8E0->boxes[param0->unk_E8E4][v0]), 12, NULL)) {
-                CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 1);
+                Sprite_SetDrawFlag(param0->unk_20C[v0].unk_04, 1);
             } else {
-                CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+                Sprite_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
             }
         } else {
             ov97_022342E4(v1, v2, v4, v0, NULL, v6, v7);
-            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
-            CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+            Sprite_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+            Sprite_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
         }
     }
 
@@ -732,7 +732,7 @@ static void ov97_022343A8(UnkStruct_ov97_02234A2C *param0)
 static void ov97_02234508(UnkStruct_ov97_02234A2C *param0)
 {
     int v0, v1, v2;
-    CellActorInitParamsEx v3;
+    AffineSpriteListTemplate v3;
 
     ov97_022340FC(&v3, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -746,27 +746,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 = CellActorCollection_AddEx(&v3);
+                param0->unk_20C[v0].unk_00 = SpriteList_AddEx(&v3);
             }
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_20C[v0].unk_00, 1);
+            Sprite_SetAnim(param0->unk_20C[v0].unk_00, 10 + v0);
+            Sprite_SetExplicitPriority(param0->unk_20C[v0].unk_00, 1);
+            Sprite_SetDrawFlag(param0->unk_20C[v0].unk_00, 1);
+            Sprite_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 = CellActorCollection_AddEx(&v3);
+                param0->unk_20C[v0].unk_04 = SpriteList_AddEx(&v3);
             }
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_20C[v0].unk_04, 1);
+            Sprite_SetAnim(param0->unk_20C[v0].unk_04, 40);
+            Sprite_SetExplicitPriority(param0->unk_20C[v0].unk_04, 1);
+            Sprite_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+            Sprite_SetPriority(param0->unk_20C[v0].unk_04, 0 + v0);
 
             v0++;
 
@@ -777,10 +777,10 @@ static void ov97_02234508(UnkStruct_ov97_02234A2C *param0)
     }
 }
 
-static CellActor *ov97_02234638(UnkStruct_ov97_02234A2C *param0, int param1, int param2, int param3, int param4)
+static Sprite *ov97_02234638(UnkStruct_ov97_02234A2C *param0, int param1, int param2, int param3, int param4)
 {
-    CellActorInitParamsEx v0;
-    CellActor *v1;
+    AffineSpriteListTemplate v0;
+    Sprite *v1;
 
     ov97_022340FC(&v0, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -788,12 +788,12 @@ static CellActor *ov97_02234638(UnkStruct_ov97_02234A2C *param0, int param1, int
     v0.position.y = FX32_ONE * param2;
     v0.priority = 10;
 
-    v1 = CellActorCollection_AddEx(&v0);
+    v1 = SpriteList_AddEx(&v0);
 
-    CellActor_SetAnimateFlag(v1, 1);
-    CellActor_SetAnim(v1, param3);
-    CellActor_SetExplicitPriority(v1, 1);
-    CellActor_SetDrawFlag(v1, param4);
+    Sprite_SetAnimateFlag(v1, 1);
+    Sprite_SetAnim(v1, param3);
+    Sprite_SetExplicitPriority(v1, 1);
+    Sprite_SetDrawFlag(v1, param4);
 
     return v1;
 }
@@ -1027,7 +1027,7 @@ static int ov97_02234854(UnkStruct_ov97_02234A2C *param0, int param1)
 {
     int v0, v1;
 
-    if (param0->unk_20C[param1].unk_00 && (CellActor_GetDrawFlag(param0->unk_20C[param1].unk_00) == 0)) {
+    if (param0->unk_20C[param1].unk_00 && (Sprite_GetDrawFlag(param0->unk_20C[param1].unk_00) == 0)) {
         return 3;
     }
 
@@ -1063,16 +1063,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 = 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);
+                v2 = Sprite_GetPosition(param0->unk_20C[param1].unk_00);
+                Sprite_SetPosition(param0->unk_42C[v0].unk_00, v2);
+                v2 = Sprite_GetPosition(param0->unk_42C[v0].unk_00);
 
                 v3 = *v2;
                 v3.x -= FX32_ONE * 8;
                 v3.y -= FX32_ONE * 4;
 
-                CellActor_SetPosition(param0->unk_42C[v0].unk_00, &v3);
-                CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
+                Sprite_SetPosition(param0->unk_42C[v0].unk_00, &v3);
+                Sprite_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
 
                 param0->unk_42C[v0].unk_04 = param1;
                 param0->unk_42C[v0].unk_08 = param0->unk_E8E4;
@@ -1082,7 +1082,7 @@ static int ov97_02234854(UnkStruct_ov97_02234A2C *param0, int param1)
             }
         }
     } else {
-        CellActor_SetDrawFlag(param0->unk_42C[v1].unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_42C[v1].unk_00, 0);
 
         param0->unk_42C[v1].unk_04 = -1;
         param0->unk_474--;
@@ -1099,9 +1099,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)) {
-            CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
+            Sprite_SetDrawFlag(param0->unk_42C[v0].unk_00, 1);
         } else {
-            CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
+            Sprite_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
         }
     }
 }
@@ -1438,20 +1438,20 @@ static void ov97_02234F88(UnkStruct_ov97_02234A2C *param0)
 {
     int v0, v1, v2, v3;
     u32 v4;
-    CellActorInitParamsEx v5;
+    AffineSpriteListTemplate v5;
 
     for (v0 = 0; v0 < 30; v0++) {
-        CellActor_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
-        CellActor_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
+        Sprite_SetDrawFlag(param0->unk_20C[v0].unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_20C[v0].unk_04, 0);
     }
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
+        Sprite_SetDrawFlag(param0->unk_42C[v0].unk_00, 0);
     }
 
-    CellActor_SetDrawFlag(param0->unk_3FC[0], 0);
-    CellActor_SetDrawFlag(param0->unk_41C[0], 0);
-    CellActor_SetDrawFlag(param0->unk_40C[0], 0);
+    Sprite_SetDrawFlag(param0->unk_3FC[0], 0);
+    Sprite_SetDrawFlag(param0->unk_41C[0], 0);
+    Sprite_SetDrawFlag(param0->unk_40C[0], 0);
 
     ov97_022340FC(&v5, param0, &param0->unk_1E8, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -1459,12 +1459,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] = CellActorCollection_AddEx(&v5);
+        param0->unk_478[v0] = SpriteList_AddEx(&v5);
 
-        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);
+        Sprite_SetAnimateFlag(param0->unk_478[v0], 1);
+        Sprite_SetAnim(param0->unk_478[v0], 10 + v0);
+        Sprite_SetExplicitPriority(param0->unk_478[v0], 1);
+        Sprite_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);
@@ -1501,15 +1501,15 @@ static void ov97_02235178(UnkStruct_ov97_02234A2C *param0)
     int v0;
 
     for (v0 = 0; v0 < 6; v0++) {
-        CellActor_Delete(param0->unk_478[v0]);
+        Sprite_Delete(param0->unk_478[v0]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
     ov97_02235158(&param0->unk_4FC);
 
-    CellActor_SetDrawFlag(param0->unk_3FC[0], 1);
-    CellActor_SetDrawFlag(param0->unk_41C[0], 1);
-    CellActor_SetDrawFlag(param0->unk_40C[0], 1);
+    Sprite_SetDrawFlag(param0->unk_3FC[0], 1);
+    Sprite_SetDrawFlag(param0->unk_41C[0], 1);
+    Sprite_SetDrawFlag(param0->unk_40C[0], 1);
 
     for (v0 = 0; v0 < 6; v0++) {
         param0->unk_42C[v0].unk_04 = -1;
@@ -1527,30 +1527,30 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0)
 
     for (v0 = 0; v0 < 30; v0++) {
         if (param0->unk_20C[v0].unk_00) {
-            CellActor_Delete(param0->unk_20C[v0].unk_00);
+            Sprite_Delete(param0->unk_20C[v0].unk_00);
         }
 
         if (param0->unk_20C[v0].unk_04) {
-            CellActor_Delete(param0->unk_20C[v0].unk_04);
+            Sprite_Delete(param0->unk_20C[v0].unk_04);
         }
     }
 
     for (v0 = 0; v0 < 6; v0++) {
         if (param0->unk_42C[v0].unk_00) {
-            CellActor_Delete(param0->unk_42C[v0].unk_00);
+            Sprite_Delete(param0->unk_42C[v0].unk_00);
         }
     }
 
     if (param0->unk_3FC[0]) {
-        CellActor_Delete(param0->unk_3FC[0]);
+        Sprite_Delete(param0->unk_3FC[0]);
     }
 
     if (param0->unk_41C[0]) {
-        CellActor_Delete(param0->unk_41C[0]);
+        Sprite_Delete(param0->unk_41C[0]);
     }
 
     if (param0->unk_40C[0]) {
-        CellActor_Delete(param0->unk_40C[0]);
+        Sprite_Delete(param0->unk_40C[0]);
     }
 
     ov97_02235158(&param0->unk_4DC);
@@ -1565,7 +1565,7 @@ static void ov97_022351F0(UnkStruct_ov97_02234A2C *param0)
         SpriteResourceCollection_Delete(param0->unk_1B8[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_28);
+    SpriteList_Delete(param0->unk_28);
     param0->unk_28 = NULL;
 
     RenderOam_Free();
@@ -2121,7 +2121,7 @@ static int ov97_022356E8(OverlayManager *param0, int *param1)
     }
 
     if (v3->unk_28 != NULL) {
-        CellActorCollection_Update(v3->unk_28);
+        SpriteList_Update(v3->unk_28);
     }
 
     return 0;
diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c
index e99c244b1c..209b7c8c38 100644
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@@ -16,7 +16,6 @@
 
 #include "assert.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "crypto.h"
 #include "font.h"
@@ -33,6 +32,7 @@
 #include "render_oam.h"
 #include "render_window.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -58,7 +58,7 @@ typedef struct {
     int unk_20;
     BOOL unk_24[4];
     UnkStruct_ov97_02237AEC unk_34;
-    CellActor *unk_26C;
+    Sprite *unk_26C;
     int unk_270;
     fx32 unk_274;
     u8 unk_278[3200];
@@ -413,11 +413,11 @@ void ov97_02237CAC(int param0)
         VecFx32 *v1;
 
         if (v0->unk_270 == 0) {
-            if ((CellActor_GetDrawFlag(v0->unk_26C) == 0) && (param0 == 0)) {
-                CellActor_SetDrawFlag(v0->unk_26C, 1);
+            if ((Sprite_GetDrawFlag(v0->unk_26C) == 0) && (param0 == 0)) {
+                Sprite_SetDrawFlag(v0->unk_26C, 1);
             }
 
-            v1 = (VecFx32 *)CellActor_GetPosition(v0->unk_26C);
+            v1 = (VecFx32 *)Sprite_GetPosition(v0->unk_26C);
 
             if (v1->y < 384 * FX32_ONE) {
                 v1->y += FX32_ONE * 3;
@@ -428,18 +428,18 @@ void ov97_02237CAC(int param0)
     }
 
     if (v0->unk_34.unk_00 != NULL) {
-        CellActorCollection_Update(v0->unk_34.unk_00);
+        SpriteList_Update(v0->unk_34.unk_00);
     }
 }
 
-CellActor *ov97_02237D14(int param0, CellActor *param1, int param2, int param3, int param4)
+Sprite *ov97_02237D14(int param0, Sprite *param1, int param2, int param3, int param4)
 {
     UnkStruct_ov97_0223F550 *v0 = &Unk_ov97_0223F550;
 
     if (param1 == NULL) {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = v0->unk_34.unk_00;
+        v1.list = v0->unk_34.unk_00;
         v1.resourceData = &v0->unk_34.unk_1D8[param0];
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -456,13 +456,13 @@ CellActor *ov97_02237D14(int param0, CellActor *param1, int param2, int param3,
             v1.position.y += v0->unk_274;
         }
 
-        param1 = CellActorCollection_AddEx(&v1);
+        param1 = SpriteList_AddEx(&v1);
     }
 
-    CellActor_SetAnimateFlag(param1, 1);
-    CellActor_SetExplicitPriority(param1, 0);
-    CellActor_SetAnim(param1, param4);
-    CellActor_SetDrawFlag(param1, 1);
+    Sprite_SetAnimateFlag(param1, 1);
+    Sprite_SetExplicitPriority(param1, 0);
+    Sprite_SetAnim(param1, param4);
+    Sprite_SetDrawFlag(param1, 1);
 
     return param1;
 }
@@ -474,7 +474,7 @@ void ov97_02237DA0(void)
     int v2;
 
     if (v0->unk_26C) {
-        CellActor_Delete(v0->unk_26C);
+        Sprite_Delete(v0->unk_26C);
         v0->unk_26C = NULL;
     }
 
@@ -499,7 +499,7 @@ void ov97_02237DA0(void)
         v1->unk_190[v2] = NULL;
     }
 
-    CellActorCollection_Delete(v1->unk_00);
+    SpriteList_Delete(v1->unk_00);
     v1->unk_00 = NULL;
 
     RenderOam_Free();
@@ -566,7 +566,7 @@ static int ov97_02237EA8(int param0)
     return 0;
 }
 
-static void ov97_02237EF8(CellActor *param0, Pokemon *param1, int param2, int param3, u8 *param4, ArchivedSprite *param5)
+static void ov97_02237EF8(Sprite *param0, Pokemon *param1, int param2, int param3, u8 *param4, ArchivedSprite *param5)
 {
     int v0, v1;
     u32 v2;
@@ -583,14 +583,14 @@ static void ov97_02237EF8(CellActor *param0, Pokemon *param1, int param2, int pa
     DC_FlushRange(param4, 0x20 * 10 * 10);
 
     {
-        NNSG2dImageProxy *v4 = SpriteActor_ImageProxy(param0);
+        NNSG2dImageProxy *v4 = Sprite_GetImageProxy(param0);
         u32 v5 = NNS_G2dGetImageLocation(v4, NNS_G2D_VRAM_TYPE_2DSUB);
 
         GXS_LoadOBJ(param4, v5 + 1 * (0x20 * 10 * 10), (0x20 * 10 * 10));
     }
 
     {
-        NNSG2dImagePaletteProxy *v6 = CellActor_GetPaletteProxy(param0);
+        NNSG2dImagePaletteProxy *v6 = Sprite_GetPaletteProxy(param0);
         u32 v7 = NNS_G2dGetImagePaletteLocation(v6, NNS_G2D_VRAM_TYPE_2DSUB);
 
         Graphics_LoadPalette(param5->archive, param5->palette, 5, 0x20 * (2 + 1) + v7, 32, v3->unk_08);
@@ -712,7 +712,7 @@ void ov97_02238194(BgConfig *param0, UnkStruct_0202DF40 *param1)
         break;
     }
 
-    CellActor_SetDrawFlag(v2->unk_26C, 0);
+    Sprite_SetDrawFlag(v2->unk_26C, 0);
 }
 
 void ov97_0223829C(UnkStruct_ov97_0223829C *param0, UnkUnion_ov97_0222D2B0 *param1, int param2)
diff --git a/src/overlay099/ov99_021D1A54.c b/src/overlay099/ov99_021D1A54.c
index afffd1466d..d6ba592fcc 100644
--- a/src/overlay099/ov99_021D1A54.c
+++ b/src/overlay099/ov99_021D1A54.c
@@ -20,7 +20,6 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "easy3d_object.h"
 #include "font.h"
 #include "graphics.h"
@@ -28,6 +27,7 @@
 #include "heap.h"
 #include "message.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "system.h"
@@ -55,8 +55,8 @@ typedef struct {
 
 static void ov99_021D1A54(UnkStruct_ov99_021D2CB0 *param0);
 static void ov99_021D1B98(UnkStruct_ov99_021D2CB0 *param0);
-static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param1, CellActorData **param2);
-static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1, CellActorData *param2);
+static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite **param1, ManagedSprite **param2);
+static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite *param1, ManagedSprite *param2);
 static void ov99_021D1D68(UnkStruct_ov99_021D2CB0 *param0);
 static void ov99_021D1E6C(UnkStruct_ov99_021D2CB0 *param0);
 static void ov99_021D1E90(UnkStruct_ov99_021D2CB0 *param0);
@@ -352,25 +352,25 @@ static void ov99_021D1B98(UnkStruct_ov99_021D2CB0 *param0)
     SpriteManager_UnloadAnimObjById(param0->unk_1C, 10001);
 }
 
-static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param1, CellActorData **param2)
+static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite **param1, ManagedSprite **param2)
 {
-    CellActorData *v0;
-    CellActorData *v1;
+    ManagedSprite *v0;
+    ManagedSprite *v1;
     SpriteTemplate v2 = Unk_ov99_021D4900;
 
     MI_CpuClear8(&param0->unk_1114, sizeof(UnkStruct_ov99_021D2CB0_sub2));
 
     v0 = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &v2);
 
-    Sprite_SetAnimateFlag(v0, 1);
+    ManagedSprite_SetAnimateFlag(v0, 1);
     Sprite_TickFrame(v0->sprite);
 
     *param1 = v0;
     v2.priority = 60;
     v1 = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &v2);
 
-    Sprite_SetAnim(v1, 2);
-    Sprite_SetAnimateFlag(v1, 1);
+    ManagedSprite_SetAnim(v1, 2);
+    ManagedSprite_SetAnimateFlag(v1, 1);
     Sprite_TickFrame(v1->sprite);
 
     *param2 = v1;
@@ -397,7 +397,7 @@ static void ov99_021D1BC4(UnkStruct_ov99_021D2CB0 *param0, CellActorData **param
     }
 }
 
-static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1, CellActorData *param2)
+static void ov99_021D1C9C(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite *param1, ManagedSprite *param2)
 {
     Sprite_DeleteAndFreeResources(param1);
     Sprite_DeleteAndFreeResources(param2);
@@ -526,8 +526,8 @@ static void ov99_021D1F70(UnkStruct_ov99_021D2CB0 *param0)
     for (v0 = 2; v0 <= 4; v0++) {
         param0->unk_10E0[v0] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov99_021D499C);
 
-        Sprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAnimateFlag(param0->unk_10E0[v0], TRUE);
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAnimateFlag(param0->unk_10E0[v0], TRUE);
         Sprite_TickFrame(param0->unk_10E0[v0]->sprite);
     }
 }
@@ -743,7 +743,7 @@ static void ov99_021D23B0(UnkStruct_ov99_021D2CB0 *param0)
 
     for (v0 = 2; v0 <= 3; v0++) {
         param0->unk_10E0[v0] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov99_021D4968);
-        Sprite_SetAnimateFlag(param0->unk_10E0[v0], 1);
+        ManagedSprite_SetAnimateFlag(param0->unk_10E0[v0], 1);
         Sprite_TickFrame(param0->unk_10E0[v0]->sprite);
     }
 }
@@ -870,8 +870,8 @@ static void ov99_021D2714(UnkStruct_ov99_021D2CB0 *param0)
 
     param0->unk_10E0[3] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov99_021D49D0);
 
-    Sprite_SetAnimateFlag(param0->unk_10E0[3], 1);
-    Sprite_SetDrawFlag2(param0->unk_10E0[3], 0);
+    ManagedSprite_SetAnimateFlag(param0->unk_10E0[3], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_10E0[3], 0);
     Sprite_TickFrame(param0->unk_10E0[3]->sprite);
 }
 
@@ -903,14 +903,14 @@ static void ov99_021D2828(UnkStruct_ov99_021D2CB0 *param0)
 
     for (v0 = 2; v0 <= 2; v0++) {
         param0->unk_10E0[v0] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov99_021D4934);
-        Sprite_SetAnimateFlag(param0->unk_10E0[v0], 1);
+        ManagedSprite_SetAnimateFlag(param0->unk_10E0[v0], 1);
         Sprite_TickFrame(param0->unk_10E0[v0]->sprite);
     }
 
     param0->unk_10E0[4] = SpriteSystem_NewSprite(param0->unk_18, param0->unk_1C, &Unk_ov99_021D48CC);
 
-    Sprite_SetAnimateFlag(param0->unk_10E0[4], 1);
-    Sprite_SetDrawFlag2(param0->unk_10E0[4], 0);
+    ManagedSprite_SetAnimateFlag(param0->unk_10E0[4], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_10E0[4], 0);
     Sprite_TickFrame(param0->unk_10E0[4]->sprite);
 }
 
diff --git a/src/overlay099/ov99_021D2C08.c b/src/overlay099/ov99_021D2C08.c
index 82ce9af81d..c9150dfbc3 100644
--- a/src/overlay099/ov99_021D2C08.c
+++ b/src/overlay099/ov99_021D2C08.c
@@ -30,7 +30,7 @@ typedef struct {
 static void ov99_021D2CB0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1);
 static void ov99_021D2CEC(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1);
 static void ov99_021D2DF4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1);
-static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, CellActorData *param2, int param3);
+static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, ManagedSprite *param2, int param3);
 
 static const UnkStruct_ov99_021D4B70 Unk_ov99_021D4B70[] = {
     {
@@ -106,7 +106,7 @@ static void ov99_021D2CB0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C
     GF_ASSERT(NELEMS(Unk_ov99_021D4B70) == 4 - 2 + 1);
 
     for (v0 = 2; v0 <= 4; v0++, v1++) {
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_10E0[v0], Unk_ov99_021D4B70[v1].unk_04, Unk_ov99_021D4B70[v1].unk_08, ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_10E0[v0], Unk_ov99_021D4B70[v1].unk_04, Unk_ov99_021D4B70[v1].unk_08, ((192 + 80) << FX32_SHIFT));
         param1->unk_08[v1].unk_00 = Unk_ov99_021D4B70[v1].unk_04;
         param1->unk_08[v1].unk_04 = Unk_ov99_021D4B70[v1].unk_08;
     }
@@ -121,7 +121,7 @@ static void ov99_021D2CEC(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C
     }
 }
 
-static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, CellActorData *param2, int param3)
+static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C08 *param1, ManagedSprite *param2, int param3)
 {
     UnkStruct_ov99_021D2D18 *v0 = &param1->unk_08[param3];
     const UnkStruct_ov99_021D4B70 *v1 = &Unk_ov99_021D4B70[param3];
@@ -143,12 +143,12 @@ static void ov99_021D2D18(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2C
     v0->unk_00 += v1->unk_0C;
     v0->unk_04 += v1->unk_10;
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00, v0->unk_04 + v2, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00, v0->unk_04 + v2, ((192 + 80) << FX32_SHIFT));
 
     if (v0->unk_12 == 0) {
-        Sprite_OffsetAffineScale(param2, v1->unk_1C, v1->unk_1C);
+        ManagedSprite_OffsetAffineScale(param2, v1->unk_1C, v1->unk_1C);
     } else {
-        Sprite_OffsetAffineScale(param2, -v1->unk_1C, -v1->unk_1C);
+        ManagedSprite_OffsetAffineScale(param2, -v1->unk_1C, -v1->unk_1C);
     }
 
     v0->unk_10++;
diff --git a/src/overlay099/ov99_021D2E28.c b/src/overlay099/ov99_021D2E28.c
index d05a32f252..7628bba7b7 100644
--- a/src/overlay099/ov99_021D2E28.c
+++ b/src/overlay099/ov99_021D2E28.c
@@ -44,7 +44,7 @@ static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
 static void ov99_021D2FA8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1);
 static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1);
 static void ov99_021D330C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1);
-static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, CellActorData *param2, int param3);
+static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, ManagedSprite *param2, int param3);
 
 static const UnkStruct_ov99_021D4BDC Unk_ov99_021D4BDC[] = {
     {
@@ -142,8 +142,8 @@ static void ov99_021D2ED8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
         param1->unk_94[v1].unk_2C = FX_Mul(CalcCosineDegrees_FX32(Unk_ov99_021D4BDC[v1].unk_10), Unk_ov99_021D4BDC[v1].unk_08);
         param1->unk_94[v1].unk_34 = Unk_ov99_021D4BDC[v1].unk_00;
 
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_10E0[v0], param1->unk_94[v1].unk_00 + param1->unk_94[v1].unk_28, param1->unk_94[v1].unk_04 + param1->unk_94[v1].unk_2C, ((192 + 80) << FX32_SHIFT));
-        Sprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_10E0[v0], param1->unk_94[v1].unk_00 + param1->unk_94[v1].unk_28, param1->unk_94[v1].unk_04 + param1->unk_94[v1].unk_2C, ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
     }
 }
 
@@ -156,7 +156,7 @@ static void ov99_021D2FA8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
     }
 }
 
-static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, CellActorData *param2, int param3)
+static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1, ManagedSprite *param2, int param3)
 {
     UnkStruct_ov99_021D2FD4 *v0 = &param1->unk_94[param3];
     const UnkStruct_ov99_021D4BDC *v1 = &Unk_ov99_021D4BDC[param3];
@@ -243,9 +243,9 @@ static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
     }
 
     if (v0->unk_38 == 0) {
-        Sprite_OffsetAffineZRotation(param2, v1->unk_4C);
+        ManagedSprite_OffsetAffineZRotation(param2, v1->unk_4C);
     } else {
-        Sprite_OffsetAffineZRotation(param2, -v1->unk_4C);
+        ManagedSprite_OffsetAffineZRotation(param2, -v1->unk_4C);
     }
 
     v0->unk_36++;
@@ -256,7 +256,7 @@ static void ov99_021D2FD4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E
     }
 
     v0->unk_04 -= v1->unk_48;
-    Sprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00 + v0->unk_28, v0->unk_04 + v0->unk_2C, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00 + v0->unk_28, v0->unk_04 + v0->unk_2C, ((192 + 80) << FX32_SHIFT));
 }
 
 static void ov99_021D32D8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D2E28 *param1)
diff --git a/src/overlay099/ov99_021D340C.c b/src/overlay099/ov99_021D340C.c
index c46c3510c5..50af919180 100644
--- a/src/overlay099/ov99_021D340C.c
+++ b/src/overlay099/ov99_021D340C.c
@@ -33,7 +33,7 @@ typedef struct {
 
 static void ov99_021D3588(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1);
 static void ov99_021D35C8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1);
-static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, CellActorData *param2, int param3);
+static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, ManagedSprite *param2, int param3);
 static void ov99_021D3930(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1);
 static void ov99_021D36B0(UnkStruct_ov99_021D2CB0 *param0);
 static void ov99_021D36D4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1);
@@ -157,8 +157,8 @@ static void ov99_021D3588(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
     GF_ASSERT(NELEMS(Unk_ov99_021D4C90) == 2 - 2 + 1);
 
     for (v0 = 2; v0 <= 2; v0++, v1++) {
-        Sprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_10E0[v0], Unk_ov99_021D4C90[v1].unk_00, Unk_ov99_021D4C90[v1].unk_02, ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_10E0[v0], AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_10E0[v0], Unk_ov99_021D4C90[v1].unk_00, Unk_ov99_021D4C90[v1].unk_02, ((192 + 80) << FX32_SHIFT));
         param1->unk_124[v1].unk_00 = Unk_ov99_021D4C90[v1].unk_00 * FX32_ONE;
         param1->unk_124[v1].unk_04 = Unk_ov99_021D4C90[v1].unk_02 * FX32_ONE;
     }
@@ -177,7 +177,7 @@ static void ov99_021D35C8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
     }
 }
 
-static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, CellActorData *param2, int param3)
+static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1, ManagedSprite *param2, int param3)
 {
     UnkStruct_ov99_021D35E8 *v0 = &param1->unk_124[param3];
     const UnkStruct_ov99_021D4C90 *v1 = &Unk_ov99_021D4C90[param3];
@@ -198,12 +198,12 @@ static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
     v0->unk_00 += v1->unk_04;
     v0->unk_04 += v1->unk_08;
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00, v0->unk_04 + v2, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param2, v0->unk_00, v0->unk_04 + v2, ((192 + 80) << FX32_SHIFT));
 
     if (v0->unk_0E == 0) {
-        Sprite_OffsetAffineZRotation(param2, v1->unk_14);
+        ManagedSprite_OffsetAffineZRotation(param2, v1->unk_14);
     } else {
-        Sprite_OffsetAffineZRotation(param2, -v1->unk_14);
+        ManagedSprite_OffsetAffineZRotation(param2, -v1->unk_14);
     }
 
     v0->unk_0C++;
@@ -216,8 +216,8 @@ static void ov99_021D35E8(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
 
 static void ov99_021D36B0(UnkStruct_ov99_021D2CB0 *param0)
 {
-    Sprite_SetExplicitOamMode2(param0->unk_10E0[3], GX_OAM_MODE_XLU);
-    Sprite_SetExplicitOamMode2(param0->unk_10E0[4], GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(param0->unk_10E0[3], GX_OAM_MODE_XLU);
+    ManagedSprite_SetExplicitOamMode(param0->unk_10E0[4], GX_OAM_MODE_XLU);
 }
 
 static void ov99_021D36D4(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D340C *param1)
@@ -247,9 +247,9 @@ static void ov99_021D372C(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
     param1->unk_11E = 0;
     param1->unk_11F = 31;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_10E0[4], Unk_ov99_021D4C84[param2].unk_00, Unk_ov99_021D4C84[param2].unk_02, ((192 + 80) << FX32_SHIFT));
-    Sprite_SetDrawFlag2(param0->unk_10E0[4], 1);
-    Sprite_SetDrawFlag2(param0->unk_10E0[3], 0);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_10E0[4], Unk_ov99_021D4C84[param2].unk_00, Unk_ov99_021D4C84[param2].unk_02, ((192 + 80) << FX32_SHIFT));
+    ManagedSprite_SetDrawFlag(param0->unk_10E0[4], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_10E0[3], 0);
 
     G2S_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ, param1->unk_11E, param1->unk_11F);
     G2_SetBlendAlpha(0, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ, param1->unk_11F, param1->unk_11E);
@@ -277,13 +277,13 @@ static void ov99_021D37E0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
 
         G2S_ChangeBlendAlpha(param1->unk_11E, param1->unk_11F);
 
-        Sprite_OffsetPositionFxXY(param0->unk_10E0[4], -0x6000, 0xd000);
+        ManagedSprite_OffsetPositionFxXY(param0->unk_10E0[4], -0x6000, 0xd000);
         Sprite_GetPositionXYWithSubscreenOffset2(param0->unk_10E0[4], &v0, &v1, ((192 + 80) << FX32_SHIFT));
 
         if (v1 > 192 + 32) {
-            Sprite_SetDrawFlag2(param0->unk_10E0[4], 0);
-            Sprite_SetDrawFlag2(param0->unk_10E0[3], 1);
-            Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_10E0[3], v0, -32, ((192 + 80) << FX32_SHIFT));
+            ManagedSprite_SetDrawFlag(param0->unk_10E0[4], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_10E0[3], 1);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_10E0[3], v0, -32, ((192 + 80) << FX32_SHIFT));
             param1->unk_11D = 1;
         }
     } else {
@@ -300,11 +300,11 @@ static void ov99_021D37E0(UnkStruct_ov99_021D2CB0 *param0, UnkStruct_ov99_021D34
 
         G2_ChangeBlendAlpha(param1->unk_11E, param1->unk_11F);
 
-        Sprite_OffsetPositionFxXY(param0->unk_10E0[3], -0x6000, 0xd000);
+        ManagedSprite_OffsetPositionFxXY(param0->unk_10E0[3], -0x6000, 0xd000);
         Sprite_GetPositionXYWithSubscreenOffset2(param0->unk_10E0[3], &v0, &v1, ((192 + 80) << FX32_SHIFT));
 
         if (v1 > 192 + 32) {
-            Sprite_SetDrawFlag2(param0->unk_10E0[3], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_10E0[3], 0);
             param1->unk_11D = 0;
             param1->unk_11C = 0;
         }
diff --git a/src/overlay099/ov99_021D4134.c b/src/overlay099/ov99_021D4134.c
index 70a4933c7f..2840856416 100644
--- a/src/overlay099/ov99_021D4134.c
+++ b/src/overlay099/ov99_021D4134.c
@@ -7,12 +7,12 @@
 #include "overlay099/struct_ov99_021D5434.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "easy3d_object.h"
 #include "graphics.h"
 #include "heap.h"
 #include "math.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 
 typedef struct {
@@ -202,7 +202,7 @@ void ov99_021D439C(UnkStruct_ov99_021D2CB0 *param0, int param1, int param2, int
     Bg_SetOffset(v0, param2, 3, v3->unk_08);
 }
 
-void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1)
+void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, ManagedSprite *param1)
 {
     void *v0;
     u32 v1;
@@ -217,7 +217,7 @@ void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1)
             param0->unk_1114.unk_00--;
         } else {
             v0 = G2_GetOBJCharPtr();
-            v2 = SpriteActor_ImageProxy(param1->sprite);
+            v2 = Sprite_GetImageProxy(param1->sprite);
 
             if (param0->unk_00->unk_00 == 0) {
                 MI_CpuCopy32(&param0->unk_10F4[param0->unk_1114.unk_02 * ((0x20 * 8) / 2)], (void *)((u32)v0 + 0x1d * 0x20 + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), 0x20);
@@ -251,7 +251,7 @@ void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1)
         }
     }
 
-    if (Sprite_IsAnimated(param1) == 0) {
+    if (ManagedSprite_IsAnimated(param1) == 0) {
         if (param0->unk_1114.unk_04 != -1) {
             param0->unk_1114.unk_04++;
 
@@ -262,10 +262,10 @@ void ov99_021D44CC(UnkStruct_ov99_021D2CB0 *param0, CellActorData *param1)
                 v1 = 0;
             }
 
-            Sprite_SetAnim(param1, v1);
+            ManagedSprite_SetAnim(param1, v1);
         } else {
             param0->unk_1114.unk_04 = 0;
-            Sprite_SetAnim(param1, 0);
+            ManagedSprite_SetAnim(param1, 0);
         }
     }
 }
diff --git a/src/overlay100/ov100_021D13E4.c b/src/overlay100/ov100_021D13E4.c
index 77677365f0..2bda14a394 100644
--- a/src/overlay100/ov100_021D13E4.c
+++ b/src/overlay100/ov100_021D13E4.c
@@ -318,10 +318,10 @@ static void ov100_021D1A54(UnkStruct_ov100_021D1808 *param0)
     for (v0 = 0; v0 < 3; v0++) {
         param0->unk_0C.unk_D4[v0].unk_00 = SpriteSystem_NewSprite(v3, v4, &v6);
 
-        Sprite_TickOneFrame(param0->unk_0C.unk_D4[v0].unk_00);
-        Sprite_SetDrawFlag2(param0->unk_0C.unk_D4[v0].unk_00, 0);
-        Sprite_SetExplicitPaletteOffset(param0->unk_0C.unk_D4[v0].unk_00, v0);
-        Sprite_SetPositionXY2(param0->unk_0C.unk_D4[v0].unk_00, 0, 0);
+        ManagedSprite_TickFrame(param0->unk_0C.unk_D4[v0].unk_00);
+        ManagedSprite_SetDrawFlag(param0->unk_0C.unk_D4[v0].unk_00, 0);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_0C.unk_D4[v0].unk_00, v0);
+        ManagedSprite_SetPositionXY(param0->unk_0C.unk_D4[v0].unk_00, 0, 0);
 
         param0->unk_0C.unk_D4[v0].unk_0C = 1;
         param0->unk_0C.unk_D4[v0].unk_08 = v0;
@@ -350,11 +350,11 @@ static void ov100_021D1A54(UnkStruct_ov100_021D1808 *param0)
         param0->unk_0C.unk_0C[v0].unk_00 = SpriteSystem_NewSprite(v3, v4, &v6);
         param0->unk_0C.unk_0C[v0].unk_04 = param0->unk_0C.unk_D4[v0].unk_00;
 
-        Sprite_TickOneFrame(param0->unk_0C.unk_0C[v0].unk_00);
-        Sprite_SetAffineOverwriteMode(param0->unk_0C.unk_0C[v0].unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineScale(param0->unk_0C.unk_0C[v0].unk_00, v9[v0], v9[v0]);
-        Sprite_SetExplicitPaletteOffset(param0->unk_0C.unk_0C[v0].unk_00, v0);
-        Sprite_SetPositionXY2(param0->unk_0C.unk_0C[v0].unk_00, v7[v0], v8[v0]);
+        ManagedSprite_TickFrame(param0->unk_0C.unk_0C[v0].unk_00);
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_0C.unk_0C[v0].unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineScale(param0->unk_0C.unk_0C[v0].unk_00, v9[v0], v9[v0]);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_0C.unk_0C[v0].unk_00, v0);
+        ManagedSprite_SetPositionXY(param0->unk_0C.unk_0C[v0].unk_00, v7[v0], v8[v0]);
 
         param0->unk_0C.unk_0C[v0].unk_0C = 0;
         param0->unk_0C.unk_0C[v0].unk_08 = v0;
diff --git a/src/overlay100/ov100_021D1C44.c b/src/overlay100/ov100_021D1C44.c
index 955e44fda7..af4de077fa 100644
--- a/src/overlay100/ov100_021D1C44.c
+++ b/src/overlay100/ov100_021D1C44.c
@@ -219,11 +219,11 @@ static void ov100_021D2250(UnkStruct_ov100_021D1C98 *param0)
     for (v0 = 0; v0 < 3; v0++) {
         param0->unk_08.unk_0C[v0].unk_00 = SpriteSystem_NewSprite(v3, v4, &v6);
 
-        Sprite_TickOneFrame(param0->unk_08.unk_0C[v0].unk_00);
-        Sprite_SetAffineOverwriteMode(param0->unk_08.unk_0C[v0].unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineScale(param0->unk_08.unk_0C[v0].unk_00, 0.5f, 0.5f);
-        Sprite_SetExplicitPaletteOffset(param0->unk_08.unk_0C[v0].unk_00, v0);
-        Sprite_SetPositionXY2(param0->unk_08.unk_0C[v0].unk_00, 16 + (v0 * 64), 64);
+        ManagedSprite_TickFrame(param0->unk_08.unk_0C[v0].unk_00);
+        ManagedSprite_SetAffineOverwriteMode(param0->unk_08.unk_0C[v0].unk_00, AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineScale(param0->unk_08.unk_0C[v0].unk_00, 0.5f, 0.5f);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_08.unk_0C[v0].unk_00, v0);
+        ManagedSprite_SetPositionXY(param0->unk_08.unk_0C[v0].unk_00, 16 + (v0 * 64), 64);
 
         param0->unk_08.unk_0C[v0].unk_0C = 1;
         param0->unk_08.unk_0C[v0].unk_08 = v0;
diff --git a/src/overlay100/ov100_021D400C.c b/src/overlay100/ov100_021D400C.c
index 38d0c35bd1..a3247fb4c4 100644
--- a/src/overlay100/ov100_021D400C.c
+++ b/src/overlay100/ov100_021D400C.c
@@ -75,7 +75,7 @@ static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 *param0, s16 param1, s16 par
     BOOL v6;
     fx32 v7, v8;
 
-    Sprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v2, &v3, FX32_CONST(192));
+    ManagedSprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v2, &v3, FX32_CONST(192));
 
     v0 = FX_FX32_TO_F32(v2);
     v1 = FX_FX32_TO_F32(v3);
@@ -92,7 +92,7 @@ static BOOL ov100_021D4104(UnkStruct_ov100_021D4104 *param0, s16 param1, s16 par
         v7 += (CalcSineDegrees_Wraparound(param0->unk_20) * 1);
         v8 += (CalcCosineDegrees_Wraparound(param0->unk_20) * 1);
 
-        Sprite_OffsetPositionFxXY(param0->unk_00, v7, v8);
+        ManagedSprite_OffsetPositionFxXY(param0->unk_00, v7, v8);
     }
 
     return v6;
@@ -113,7 +113,7 @@ static void ov100_021D4214(UnkStruct_ov100_021D4104 *param0)
     v0 = (128 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(param0->unk_1C) * 64);
     v1 = (48 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(param0->unk_1C) * 24);
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
 
     param0->unk_14 = v1 / FX32_ONE;
 }
@@ -128,7 +128,7 @@ static void ov100_021D4264(UnkStruct_ov100_021D4104 *param0, int param1, int par
     v0 = (param1 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(param0->unk_1C) * param3);
     v1 = (param2 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(param0->unk_1C) * param4);
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
 }
 
 static void ov100_021D42B0(UnkStruct_ov100_021D4104 *param0)
@@ -157,7 +157,7 @@ static void ov100_021D42B0(UnkStruct_ov100_021D4104 *param0)
         param0->unk_0C = 3;
     }
 
-    Sprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v0, &v1, FX32_CONST(192));
+    ManagedSprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v0, &v1, FX32_CONST(192));
 
     param0->unk_14 = (v1 / FX32_ONE);
 }
@@ -177,12 +177,12 @@ static void ov100_021D4318(UnkStruct_ov100_021D4104 *param0)
         param0->unk_0C = 2;
     }
 
-    Sprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v0, &v1, FX32_CONST(192));
+    ManagedSprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v0, &v1, FX32_CONST(192));
 
     v0 += (CalcSineDegrees_Wraparound(param0->unk_20) * (3 * param0->unk_28[0]));
     v1 += (CalcCosineDegrees_Wraparound(param0->unk_20) * (3 * param0->unk_28[1]));
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v0, v1, FX32_CONST(192));
 
     param0->unk_14 = v1 / FX32_ONE;
 }
@@ -203,8 +203,8 @@ static void ov100_021D43BC(UnkStruct_ov100_021D4104 *param0)
         v0 = 0.6f;
     }
 
-    Sprite_SetAffineScale(param0->unk_00, v0, v0);
-    Sprite_SetPriority(param0->unk_00, param0->unk_14);
+    ManagedSprite_SetAffineScale(param0->unk_00, v0, v0);
+    ManagedSprite_SetPriority(param0->unk_00, param0->unk_14);
 }
 
 void ov100_021D4414(SysTask *param0, void *param1)
@@ -214,7 +214,7 @@ void ov100_021D4414(SysTask *param0, void *param1)
     Unk_ov100_021D5334[v0->unk_0C](v0);
 
     ov100_021D43BC(v0);
-    Sprite_TickTwoFrame(v0->unk_00);
+    ManagedSprite_TickTwoFrames(v0->unk_00);
 }
 
 void ov100_021D4438(SysTask *param0, void *param1)
@@ -228,23 +228,23 @@ void ov100_021D4438(SysTask *param0, void *param1)
         BOOL v3;
 
         if (v0->unk_04 && v0->unk_3C) {
-            Sprite_GetPositionXY2(v0->unk_04, &v1, &v2);
+            ManagedSprite_GetPositionXY(v0->unk_04, &v1, &v2);
 
             v3 = ov100_021D4104(v0, v1, v2, 3.0f, 1);
 
             {
                 f32 v4, v5;
 
-                Sprite_GetAffineScale(v0->unk_00, &v4, &v5);
+                ManagedSprite_GetAffineScale(v0->unk_00, &v4, &v5);
 
                 if (v4 > 0.10f) {
                     v4 = v4 - 0.002f;
                 }
 
-                Sprite_SetAffineScale(v0->unk_00, v4, v4);
+                ManagedSprite_SetAffineScale(v0->unk_00, v4, v4);
             }
         }
     }
 
-    Sprite_TickTwoFrame(v0->unk_00);
+    ManagedSprite_TickTwoFrames(v0->unk_00);
 }
diff --git a/src/overlay101/ov101_021D59AC.c b/src/overlay101/ov101_021D59AC.c
index bce60b503e..084a50065e 100644
--- a/src/overlay101/ov101_021D59AC.c
+++ b/src/overlay101/ov101_021D59AC.c
@@ -12,9 +12,9 @@
 #include "overlay101/struct_ov101_021D86B0.h"
 #include "overlay101/struct_ov101_021D93D4.h"
 
-#include "cell_actor.h"
 #include "enums.h"
 #include "math.h"
+#include "sprite.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
@@ -203,7 +203,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);
-    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    Sprite_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -228,14 +228,14 @@ 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];
-    CellActor_SetPosition(v4->unk_0C.unk_04, &v3);
+    Sprite_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 != CellActor_GetActiveAnim(v4->unk_0C.unk_04)) {
-        CellActor_SetAnim(v4->unk_0C.unk_04, v1);
-        SpriteActor_SetAnimFrame(v4->unk_0C.unk_04, 0);
+    if (v1 != Sprite_GetActiveAnim(v4->unk_0C.unk_04)) {
+        Sprite_SetAnim(v4->unk_0C.unk_04, v1);
+        Sprite_SetAnimFrame(v4->unk_0C.unk_04, 0);
     }
 }
 
@@ -273,7 +273,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);
-    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    Sprite_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -291,23 +291,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)) {
-        CellActor_SetDrawFlag(v1->unk_0C.unk_04, 0);
+        Sprite_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    CellActor_SetDrawFlag(v1->unk_0C.unk_04, 1);
+    Sprite_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->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);
+    if (v2 != Sprite_GetActiveAnim(v1->unk_0C.unk_04)) {
+        Sprite_SetAnim(v1->unk_0C.unk_04, v2);
+        Sprite_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D937C[v2];
-    CellActor_SetPosition(v1->unk_0C.unk_04, &v0);
+    Sprite_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5C24(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -346,7 +346,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);
-    CellActor_SetAnimateFlag(v1->unk_0C.unk_04, 1);
+    Sprite_SetAnimateFlag(v1->unk_0C.unk_04, 1);
 
     return 1;
 }
@@ -364,23 +364,23 @@ static void ov101_021D5CE0(UnkStruct_ov101_021D5D90 *param0, void *param1)
     u32 v2 = v1->unk_00->unk_64;
 
     if (v2 < v1->unk_04) {
-        CellActor_SetDrawFlag(v1->unk_0C.unk_04, 0);
+        Sprite_SetDrawFlag(v1->unk_0C.unk_04, 0);
         return;
     }
 
-    CellActor_SetDrawFlag(v1->unk_0C.unk_04, 1);
+    Sprite_SetDrawFlag(v1->unk_0C.unk_04, 1);
 
     v2 %= v1->unk_08;
     v2 /= v1->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);
+    if (v2 != Sprite_GetActiveAnim(v1->unk_0C.unk_04)) {
+        Sprite_SetAnim(v1->unk_0C.unk_04, v2);
+        Sprite_RestartAnim(v1->unk_0C.unk_04);
     }
 
     sub_020715E4(param0, &v0);
     v0.x += Unk_ov101_021D9354[v2];
-    CellActor_SetPosition(v1->unk_0C.unk_04, &v0);
+    Sprite_SetPosition(v1->unk_0C.unk_04, &v0);
 }
 
 static void ov101_021D5D54(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -423,9 +423,9 @@ void ov101_021D5DA4(UnkStruct_ov101_021D5D90 *param0, int param1)
     UnkStruct_ov101_021D630C *v0 = sub_02071598(param0);
 
     if (param1 == 1) {
-        CellActor_SetDrawFlag(v0->unk_3C.unk_04, 0);
+        Sprite_SetDrawFlag(v0->unk_3C.unk_04, 0);
     } else {
-        CellActor_SetDrawFlag(v0->unk_3C.unk_04, 1);
+        Sprite_SetDrawFlag(v0->unk_3C.unk_04, 1);
     }
 }
 
@@ -526,11 +526,11 @@ 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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 0);
+    Sprite_SetAnimFrame(param0->unk_3C.unk_04, 0);
     Sound_PlayEffect(1572);
 
     param0->unk_04++;
@@ -558,8 +558,8 @@ static int ov101_021D5EEC(UnkStruct_ov101_021D630C *param0)
         param0->unk_04++;
     }
 
-    CellActor_SetPosition(param0->unk_3C.unk_04, &v0);
-    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v1);
 
     return 0;
 }
@@ -583,9 +583,9 @@ static int (*const Unk_ov101_021D912C[])(UnkStruct_ov101_021D630C *) = {
 
 static int ov101_021D5F70(UnkStruct_ov101_021D630C *param0)
 {
-    CellActor_SetAnim(param0->unk_3C.unk_04, 1);
-    CellActor_RestartAnim(param0->unk_3C.unk_04);
-    CellActor_SetAnimateFlag(param0->unk_3C.unk_04, 1);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 1);
+    Sprite_RestartAnim(param0->unk_3C.unk_04);
+    Sprite_SetAnimateFlag(param0->unk_3C.unk_04, 1);
 
     Sound_PlayEffect(1744);
     param0->unk_04++;
@@ -617,11 +617,11 @@ static int ov101_021D5FB8(UnkStruct_ov101_021D630C *param0)
 
     param0->unk_14 = v1;
 
-    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);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 3);
+    Sprite_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -635,7 +635,7 @@ static int ov101_021D6020(UnkStruct_ov101_021D630C *param0)
     v0 = param0->unk_14;
     v0.y += v1[param0->unk_30 / 2];
 
-    CellActor_SetPosition(param0->unk_3C.unk_04, &v0);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v0);
 
     param0->unk_30++;
 
@@ -659,11 +659,11 @@ static int ov101_021D6084(UnkStruct_ov101_021D630C *param0)
 
     param0->unk_14 = v1;
 
-    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);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 4);
+    Sprite_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -692,8 +692,8 @@ static int ov101_021D60EC(UnkStruct_ov101_021D630C *param0)
         param0->unk_04++;
     }
 
-    CellActor_SetPosition(param0->unk_3C.unk_04, &v1);
-    CellActor_SetAffineScale(param0->unk_3C.unk_04, &v2);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v2);
 
     return 0;
 }
@@ -715,11 +715,11 @@ static int ov101_021D6158(UnkStruct_ov101_021D630C *param0)
     param0->unk_2C = 0;
     param0->unk_08 = 1;
 
-    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);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 2);
+    Sprite_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
     return 1;
@@ -745,8 +745,8 @@ static int ov101_021D61E0(UnkStruct_ov101_021D630C *param0)
         param0->unk_30 = 0;
     }
 
-    CellActor_SetPosition(param0->unk_3C.unk_04, &param0->unk_14);
-    CellActor_SetAffineZRotation(param0->unk_3C.unk_04, param0->unk_2C);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &param0->unk_14);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, param0->unk_2C);
 
     return 0;
 }
@@ -765,11 +765,11 @@ static int ov101_021D6288(UnkStruct_ov101_021D630C *param0)
     param0->unk_20 = v2;
     param0->unk_08 = 1;
 
-    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);
+    Sprite_SetPosition(param0->unk_3C.unk_04, &v1);
+    Sprite_SetAffineScale(param0->unk_3C.unk_04, &v0);
+    Sprite_SetAffineZRotation(param0->unk_3C.unk_04, 0);
+    Sprite_SetAnim(param0->unk_3C.unk_04, 2);
+    Sprite_RestartAnim(param0->unk_3C.unk_04);
 
     param0->unk_04++;
 
@@ -842,11 +842,11 @@ static void ov101_021D6410(UnkStruct_ov101_021D13C8 *param0, UnkStruct_ov101_021
 
     ov101_021D84A4(param0->unk_450, param1, param2, (NNS_G2D_VRAM_TYPE_2DSUB), 1, 2, 2, 2, 2, 2, 7);
 
-    CellActor_SetAffineOverwriteMode(param1->unk_04, 2);
-    CellActor_SetAffineTranslation(param1->unk_04, &v0);
-    CellActor_SetAffineScale(param1->unk_04, &v1);
-    CellActor_SetAffineZRotation(param1->unk_04, CalcAngleRotationIdx_Wraparound(0));
-    CellActor_SetAnimateFlag(param1->unk_04, 1);
+    Sprite_SetAffineOverwriteMode(param1->unk_04, 2);
+    Sprite_SetAffineTranslation(param1->unk_04, &v0);
+    Sprite_SetAffineScale(param1->unk_04, &v1);
+    Sprite_SetAffineZRotation(param1->unk_04, CalcAngleRotationIdx_Wraparound(0));
+    Sprite_SetAnimateFlag(param1->unk_04, 1);
 }
 
 static const UnkStruct_ov101_021D86B0 Unk_ov101_021D9150;
@@ -895,7 +895,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);
-            CellActor_SetAnimateFlag(v0->unk_14.unk_04, 1);
+            Sprite_SetAnimateFlag(v0->unk_14.unk_04, 1);
 
             v0->unk_00++;
         }
@@ -1103,9 +1103,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);
-        CellActor_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
-        CellActor_SetAffineTranslation(param0->unk_24.unk_04, &v1);
-        CellActor_SetAffineZRotation(param0->unk_24.unk_04, CalcAngleRotationIdx_Wraparound(0));
+        Sprite_SetAffineOverwriteMode(param0->unk_24.unk_04, 2);
+        Sprite_SetAffineTranslation(param0->unk_24.unk_04, &v1);
+        Sprite_SetAffineZRotation(param0->unk_24.unk_04, CalcAngleRotationIdx_Wraparound(0));
 
         param0->unk_0C = 1;
         param0->unk_08++;
@@ -1129,11 +1129,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 0);
 
     param0->unk_08++;
     return 0;
@@ -1161,14 +1161,14 @@ static int ov101_021D6908(UnkStruct_ov101_021D66D0 *param0)
         sub_02005844(35, 0);
     }
 
-    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
-    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
     return 0;
 }
 
 static int ov101_021D6968(UnkStruct_ov101_021D66D0 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_24.unk_04, (FX32_ONE * 1));
+    Sprite_UpdateAnim(param0->unk_24.unk_04, (FX32_ONE * 1));
     param0->unk_14++;
 
     if (param0->unk_14 >= 9) {
@@ -1189,11 +1189,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 0);
     Sound_PlayEffect(1745);
 
     param0->unk_08++;
@@ -1221,8 +1221,8 @@ static int ov101_021D69FC(UnkStruct_ov101_021D66D0 *param0)
         param0->unk_0C = 1;
     }
 
-    CellActor_SetAffineScale(param0->unk_24.unk_04, &v1);
-    CellActor_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
 
     return 0;
 }
@@ -1236,12 +1236,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 0);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, 0);
+    Sprite_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1258,14 +1258,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE / 2);
 
-    if (CellActor_GetActiveAnim(param0->unk_24.unk_04) != 2) {
-        CellActor_SetAnim(param0->unk_24.unk_04, 2);
-        CellActor_RestartAnim(param0->unk_24.unk_04);
+    if (Sprite_GetActiveAnim(param0->unk_24.unk_04) != 2) {
+        Sprite_SetAnim(param0->unk_24.unk_04, 2);
+        Sprite_RestartAnim(param0->unk_24.unk_04);
     }
 
     param0->unk_0C = 1;
@@ -1283,12 +1283,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 5);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    Sprite_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1305,12 +1305,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 4);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    Sprite_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1327,12 +1327,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnim(param0->unk_24.unk_04, 3);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 1);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
+    Sprite_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_0C = 1;
     param0->unk_08++;
@@ -1349,13 +1349,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 };
 
-    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);
+    Sprite_SetAffineScale(param0->unk_24.unk_04, &v1);
+    Sprite_SetPosition(param0->unk_24.unk_04, &v0);
+    Sprite_SetAnimateFlag(param0->unk_24.unk_04, 0);
+    Sprite_SetAnimSpeed(param0->unk_24.unk_04, FX32_ONE);
 
-    CellActor_SetAnim(param0->unk_24.unk_04, 5);
-    CellActor_RestartAnim(param0->unk_24.unk_04);
+    Sprite_SetAnim(param0->unk_24.unk_04, 5);
+    Sprite_RestartAnim(param0->unk_24.unk_04);
 
     param0->unk_14 = 0;
     param0->unk_0C = 1;
@@ -1366,14 +1366,14 @@ static int ov101_021D6C74(UnkStruct_ov101_021D66D0 *param0)
 
 static int ov101_021D6CE0(UnkStruct_ov101_021D66D0 *param0)
 {
-    CellActor_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
+    Sprite_UpdateAnim(param0->unk_24.unk_04, FX32_ONE);
 
-    if (CellActor_IsAnimated(param0->unk_24.unk_04) == 0) {
+    if (Sprite_IsAnimated(param0->unk_24.unk_04) == 0) {
         param0->unk_14++;
 
         if (param0->unk_14 >= 8) {
             param0->unk_14 = 0;
-            CellActor_RestartAnim(param0->unk_24.unk_04);
+            Sprite_RestartAnim(param0->unk_24.unk_04);
         }
     }
 
@@ -1470,7 +1470,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, CellActor *param5, int param6)
+static void ov101_021D6E78(UnkStruct_ov101_021D5D90 *param0, fx32 param1, fx32 param2, fx32 param3, fx32 param4, Sprite *param5, int param6)
 {
     VecFx32 v0, v1;
 
@@ -1486,7 +1486,7 @@ static void ov101_021D6E78(UnkStruct_ov101_021D5D90 *param0, fx32 param1, fx32 p
     }
 
     v1.y = param2 - v0.y;
-    CellActor_SetPosition(param5, &v1);
+    Sprite_SetPosition(param5, &v1);
 }
 
 static void ov101_021D6EC8(UnkStruct_ov101_021D5D90 *param0, void *param1)
@@ -1504,7 +1504,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);
-            CellActor_SetFlipMode(v0->unk_3C.unk_04, 1);
+            Sprite_SetFlipMode(v0->unk_3C.unk_04, 1);
             v0->unk_00++;
         }
     case 1: {
@@ -1531,12 +1531,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;
 
-        CellActor_SetPosition(v0->unk_30.unk_04, &v4);
+        Sprite_SetPosition(v0->unk_30.unk_04, &v4);
 
         v4.x = (FX32_ONE * 288) - v3.x;
         v4.y = ((FX32_ONE * 192) + (FX32_ONE * 228)) - v3.y;
 
-        CellActor_SetPosition(v0->unk_3C.unk_04, &v4);
+        Sprite_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);
-    CellActor_SetAnimateFlag(v1->unk_04.unk_04, 1);
+    Sprite_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;
     }
 
-    CellActor_SetDrawFlag(v1->unk_04.unk_04, v0);
+    Sprite_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);
 
-    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, CalcAngleRotationIdx_Wraparound(0));
-    CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
+    Sprite_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    Sprite_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    Sprite_SetAffineScale(v3->unk_08.unk_04, &v2);
+    Sprite_SetAffineZRotation(v3->unk_08.unk_04, CalcAngleRotationIdx_Wraparound(0));
+    Sprite_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);
-    CellActor_SetAnimateFlag(v1->unk_04.unk_04, 1);
+    Sprite_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;
     }
 
-    CellActor_SetDrawFlag(v1->unk_04.unk_04, v0);
+    Sprite_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);
 
-    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, CalcAngleRotationIdx_Wraparound(0));
-    CellActor_SetAnimateFlag(v3->unk_08.unk_04, 1);
+    Sprite_SetAffineOverwriteMode(v3->unk_08.unk_04, 2);
+    Sprite_SetAffineTranslation(v3->unk_08.unk_04, &v1);
+    Sprite_SetAffineScale(v3->unk_08.unk_04, &v2);
+    Sprite_SetAffineZRotation(v3->unk_08.unk_04, CalcAngleRotationIdx_Wraparound(0));
+    Sprite_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);
-        CellActor_SetDrawFlag(v2->unk_04[v0].unk_04, 0);
-        CellActor_SetAnimateFlag(v2->unk_04[v0].unk_04, 1);
+        Sprite_SetDrawFlag(v2->unk_04[v0].unk_04, 0);
+        Sprite_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;
 
-    CellActor_SetDrawFlag(v0->unk_04[0].unk_04, 0);
-    CellActor_SetDrawFlag(v0->unk_04[1].unk_04, 0);
+    Sprite_SetDrawFlag(v0->unk_04[0].unk_04, 0);
+    Sprite_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) {
-            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);
+            Sprite_SetPosition(v0->unk_04[v3].unk_04, &v2);
+            Sprite_SetAnim(v0->unk_04[v3].unk_04, v4);
+            Sprite_RestartAnim(v0->unk_04[v3].unk_04);
+            Sprite_SetDrawFlag(v0->unk_04[v3].unk_04, 1);
             v2.x += (FX32_ONE * 8);
             v3++;
         }
 
         v4 = (v5 % 10);
 
-        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);
+        Sprite_SetPosition(v0->unk_04[v3].unk_04, &v2);
+        Sprite_SetAnim(v0->unk_04[v3].unk_04, v4);
+        Sprite_RestartAnim(v0->unk_04[v3].unk_04);
+        Sprite_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; CellActor_SetDrawFlag(v1->unk_04[v0].unk_04, v3), v0++) {
+        for (v0 = 0; v0 < 5; Sprite_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;
-            CellActor_SetAnim(v1->unk_04[v5].unk_04, v6);
-            CellActor_RestartAnim(v1->unk_04[v5].unk_04);
+            Sprite_SetAnim(v1->unk_04[v5].unk_04, v6);
+            Sprite_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);
 
-        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, CalcAngleRotationIdx_Wraparound(0));
+        Sprite_SetAffineOverwriteMode(v6->unk_18[v0].unk_04, 2);
+        Sprite_SetAffineTranslation(v6->unk_18[v0].unk_04, &v4);
+        Sprite_SetAffineScale(v6->unk_18[v0].unk_04, &v5);
+        Sprite_SetAffineZRotation(v6->unk_18[v0].unk_04, CalcAngleRotationIdx_Wraparound(0));
 
         v2 = (v6->unk_04 % (v1 * 10)) / v1;
 
-        CellActor_SetAnim(v6->unk_18[v0].unk_04, v2);
-        CellActor_RestartAnim(v6->unk_18[v0].unk_04);
+        Sprite_SetAnim(v6->unk_18[v0].unk_04, v2);
+        Sprite_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;
-        CellActor_SetAnim(v5->unk_0C[v0].unk_04, v3);
+        Sprite_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);
-            CellActor_SetAnimateFlag(v3->unk_20[v0].unk_04, 1);
+            Sprite_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;
             }
 
-            CellActor_SetPosition(v3->unk_20[v0].unk_04, &v2);
+            Sprite_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++) {
-            CellActor_SetDrawFlag(v3->unk_20[v0].unk_04, v1);
+            Sprite_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 33a3755170..f3afbd043b 100644
--- a/src/overlay101/ov101_021D7E48.c
+++ b/src/overlay101/ov101_021D7E48.c
@@ -5,10 +5,10 @@
 
 #include "overlay101/struct_ov101_021D8544.h"
 
-#include "cell_actor.h"
 #include "cell_transfer.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -30,7 +30,7 @@ typedef struct UnkStruct_ov101_021D7E48_t {
     u8 unk_09;
     u8 unk_0A;
     u8 unk_0B;
-    CellActorCollection *unk_0C;
+    SpriteList *unk_0C;
     G2dRenderer unk_10;
     NNSG2dCellTransferState *unk_19C;
     SpriteResourceCollection *unk_1A0;
@@ -133,14 +133,14 @@ void ov101_021D7FB4(UnkStruct_ov101_021D7E48 *param0)
     Heap_FreeToHeap(param0->unk_1BC);
     VramTransfer_Free();
     CellTransfer_Free(param0->unk_19C);
-    CellActorCollection_DeleteAll(param0->unk_0C);
-    CellActorCollection_Delete(param0->unk_0C);
+    SpriteList_DeleteAll(param0->unk_0C);
+    SpriteList_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 }
 
 void ov101_021D80D4(UnkStruct_ov101_021D7E48 *param0)
 {
-    CellActorCollection_Update(param0->unk_0C);
+    SpriteList_Update(param0->unk_0C);
     CellTransfer_Update();
 }
 
@@ -317,9 +317,9 @@ void ov101_021D8358(UnkStruct_ov101_021D7E48 *param0, u32 param1, u32 param2, u3
 
 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;
-    CellActorInitParams v1;
-    CellActor *v2;
+    SpriteResourcesHeader v0;
+    SpriteListTemplate v1;
+    Sprite *v2;
 
     if (param8 == param0->unk_0B) {
         param8 = 0xffffffff;
@@ -335,14 +335,14 @@ void ov101_021D84A4(UnkStruct_ov101_021D7E48 *param0, UnkStruct_ov101_021D8544 *
         param1->unk_00 = 0;
     }
 
-    v1.collection = param0->unk_0C;
+    v1.list = param0->unk_0C;
     v1.resourceData = &v0;
     v1.position = *param2;
     v1.priority = param10;
     v1.vramType = param3;
     v1.heapID = param0->unk_00;
 
-    param1->unk_04 = CellActorCollection_Add(&v1);
+    param1->unk_04 = SpriteList_Add(&v1);
     GF_ASSERT(param1->unk_04 != NULL);
 }
 
@@ -352,18 +352,18 @@ void ov101_021D8544(UnkStruct_ov101_021D8544 *param0)
         SpriteTransfer_DeleteCharTransfer(param0->unk_08);
     }
 
-    CellActor_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_04);
     param0->unk_04 = NULL;
 }
 
-void ov101_021D8560(CellActor *param0, VecFx32 *param1)
+void ov101_021D8560(Sprite *param0, VecFx32 *param1)
 {
-    const VecFx32 *v0 = CellActor_GetPosition(param0);
+    const VecFx32 *v0 = Sprite_GetPosition(param0);
     *param1 = *v0;
 }
 
-void ov101_021D8574(CellActor *param0, VecFx32 *param1)
+void ov101_021D8574(Sprite *param0, VecFx32 *param1)
 {
-    const VecFx32 *v0 = CellActor_GetAffineScale(param0);
+    const VecFx32 *v0 = Sprite_GetAffineScale(param0);
     *param1 = *v0;
 }
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index 0cfe1ab0f6..0dc702f939 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -14,7 +14,6 @@
 #include "overlay104/struct_ov104_0223A348_sub1.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
-#include "cell_actor.h"
 #include "charcode_util.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -29,6 +28,7 @@
 #include "pokemon.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "trainer_info.h"
@@ -38,8 +38,8 @@
 #include "unk_02092494.h"
 
 void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2);
-void ov104_0222E1D8(CellActor *param0, u8 param1);
-void ov104_0222E204(CellActor *param0, s16 param1, s16 param2, u8 param3);
+void ov104_0222E1D8(Sprite *param0, u8 param1);
+void ov104_0222E204(Sprite *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(FieldBattleDTO *param0, UnkStruct_ov104_0223A348_sub1 *param1, int param2, int param3, int param4);
@@ -381,19 +381,19 @@ void ov104_0222E1C0(SaveData *param0, Party *param1, Pokemon *param2)
     return;
 }
 
-void ov104_0222E1D8(CellActor *param0, u8 param1)
+void ov104_0222E1D8(Sprite *param0, u8 param1)
 {
-    if (CellActor_GetActiveAnim(param0) == param1) {
+    if (Sprite_GetActiveAnim(param0) == param1) {
         return;
     }
 
-    SpriteActor_SetAnimFrame(param0, 0);
-    CellActor_SetAnim(param0, param1);
-    CellActor_UpdateAnim(param0, FX32_ONE);
+    Sprite_SetAnimFrame(param0, 0);
+    Sprite_SetAnim(param0, param1);
+    Sprite_UpdateAnim(param0, FX32_ONE);
     return;
 }
 
-void ov104_0222E204(CellActor *param0, s16 param1, s16 param2, u8 param3)
+void ov104_0222E204(Sprite *param0, s16 param1, s16 param2, u8 param3)
 {
     VecFx32 v0;
 
@@ -402,14 +402,14 @@ void ov104_0222E204(CellActor *param0, s16 param1, s16 param2, u8 param3)
     v0.z = 0;
 
     if (param3 == 1) {
-        if (CellActor_GetAnimFrame(param0) == 0) {
+        if (Sprite_GetAnimFrame(param0) == 0) {
             v0.y = (param2 - 3) * FX32_ONE;
         } else {
             v0.y = (param2 + 1) * FX32_ONE;
         }
     }
 
-    CellActor_SetPosition(param0, &v0);
+    Sprite_SetPosition(param0, &v0);
     return;
 }
 
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 1b60f45a1c..04923e43b7 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -1299,7 +1299,7 @@ static BOOL ov104_0223066C(UnkStruct_ov104_0222E930 *param0)
     const u8 *v2;
     s32 v3;
     u16 v4, v5, v6, v7, v8, v9;
-    CellActorData *v10;
+    ManagedSprite *v10;
 
     v3 = ov104_0222EA60(param0);
     v2 = param0->unk_1C;
@@ -1320,8 +1320,8 @@ static BOOL ov104_0223066C(UnkStruct_ov104_0222E930 *param0)
         v9 = (*((param0)->unk_1C++));
         v10 = ov104_0223D2FC(v1, v9, v4);
 
-        Sprite_SetPositionXY2(v10, v5, v6);
-        Sprite_SetDrawFlag2(v10, v7);
+        ManagedSprite_SetPositionXY(v10, v5, v6);
+        ManagedSprite_SetDrawFlag(v10, v7);
 
         ov104_0223D378(v1, v9, v8);
     }
@@ -1348,12 +1348,12 @@ static BOOL ov104_02230728(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00);
     u16 v2 = ov104_0222FC00(param0);
     u8 v3 = (*((param0)->unk_1C++));
-    CellActorData *v4;
+    ManagedSprite *v4;
 
     v4 = ov104_0223D370(v1, v2);
 
     GF_ASSERT(v4 != NULL);
-    Sprite_SetDrawFlag2(v4, v3);
+    ManagedSprite_SetDrawFlag(v4, v3);
 
     return 0;
 }
@@ -1363,19 +1363,19 @@ static BOOL ov104_02230760(UnkStruct_ov104_0222E930 *param0)
     UnkStruct_ov104_022320B4 *v0 = param0->unk_00;
     UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(v0->unk_00);
     u16 v2 = ov104_0222FC00(param0);
-    CellActorData *v3;
+    ManagedSprite *v3;
 
     v3 = ov104_0223D370(v1, v2);
 
     GF_ASSERT(v3 != NULL);
-    Sprite_SetFlipMode(v3->sprite, 1);
+    Sprite_SetFlipMode2(v3->sprite, 1);
 
     return 0;
 }
 
 static BOOL ov104_02230790(UnkStruct_ov104_0222E930 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     UnkStruct_ov104_022320B4 *v1 = param0->unk_00;
     UnkStruct_ov104_0223C4CC *v2 = sub_0209B974(v1->unk_00);
     u16 v3 = ov104_0222FC00(param0);
@@ -1385,9 +1385,9 @@ static BOOL ov104_02230790(UnkStruct_ov104_0222E930 *param0)
     GF_ASSERT(v0 != NULL);
 
     if (v4 == 0) {
-        Sprite_SetExplicitOamMode(v0->sprite, GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOamMode2(v0->sprite, GX_OAM_MODE_NORMAL);
     } else {
-        Sprite_SetExplicitOamMode(v0->sprite, GX_OAM_MODE_XLU);
+        Sprite_SetExplicitOamMode2(v0->sprite, GX_OAM_MODE_XLU);
     }
 
     return 0;
@@ -1397,12 +1397,12 @@ static BOOL ov104_022307D8(UnkStruct_ov104_0222E930 *param0)
 {
     u16 v0 = ov104_0222FC00(param0);
     u16 v1 = ov104_0222FC00(param0);
-    CellActorData *v2;
+    ManagedSprite *v2;
     UnkStruct_ov104_0223C4CC *v3 = sub_0209B974(param0->unk_00->unk_00);
 
     v2 = ov104_0223D370(v3, v0);
 
-    Sprite_SetAnim(v2, v1);
+    ManagedSprite_SetAnim(v2, v1);
     ov104_0223D378(v3, v0, 1);
 
     return 0;
@@ -1429,12 +1429,12 @@ static BOOL ov104_02230830(UnkStruct_ov104_0222E930 *param0)
 
 static BOOL ov104_02230850(UnkStruct_ov104_0222E930 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     UnkStruct_ov104_0223C4CC *v1 = sub_0209B974(param0->unk_00->unk_00);
 
     v0 = ov104_0223D370(v1, param0->unk_78[0]);
 
-    if ((ov104_0223D3A4(v1, param0->unk_78[0]) == 0) || (Sprite_IsAnimated(v0) == 0)) {
+    if ((ov104_0223D3A4(v1, param0->unk_78[0]) == 0) || (ManagedSprite_IsAnimated(v0) == 0)) {
         return 1;
     }
 
diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c
index 93863440e6..83d30f963b 100644
--- a/src/overlay104/ov104_02231F74.c
+++ b/src/overlay104/ov104_02231F74.c
@@ -27,7 +27,6 @@
 #include "overlay104/struct_ov104_0223C4CC.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "heap.h"
@@ -42,6 +41,7 @@
 #include "render_text.h"
 #include "render_window.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -871,7 +871,7 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
     PaletteData *v2 = param0->unk_04;
     ArchivedSprite v3;
     void *v4;
-    CellActorData *v5;
+    ManagedSprite *v5;
 
     {
         NARC *v6;
@@ -906,7 +906,7 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
         }
 
         v5 = SpriteSystem_NewSprite(v0, v1, &v8);
-        Sprite_TickOneFrame(v5);
+        ManagedSprite_TickFrame(v5);
     }
 
     {
@@ -925,11 +925,11 @@ void ov104_02232CE0(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param
         NNSG2dImagePaletteProxy *v12;
         int v13;
 
-        v11 = SpriteActor_ImageProxy(v5->sprite);
+        v11 = Sprite_GetImageProxy(v5->sprite);
         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 = CellActor_GetPaletteProxy(v5->sprite);
+        v12 = Sprite_GetPaletteProxy(v5->sprite);
         v13 = PlttTransfer_GetPlttOffset(v12, NNS_G2D_VRAM_TYPE_2DMAIN);
 
         PaletteData_LoadBufferFromFileStart(v2, v3.archive, v3.palette, param2, 2, 0x20, v13 * 16);
@@ -997,9 +997,9 @@ void ov104_02232F28(UnkStruct_ov104_0223C4CC *param0)
     SpriteManager_UnloadPlttObjById(param0->unk_34.unk_04, 2000);
 }
 
-CellActorData *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4)
+ManagedSprite *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1, int param2, int param3, int param4)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     GF_ASSERT(param2 < (2008 - 2000));
@@ -1016,13 +1016,13 @@ CellActorData *ov104_02232F4C(UnkStruct_ov104_0223C4CC *param0, Pokemon *param1,
 
     v0 = SpriteSystem_NewSprite(param0->unk_34.unk_00, param0->unk_34.unk_04, &v1);
 
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->sprite, Pokemon_IconPaletteIndex(param1));
-    Sprite_TickOneFrame(v0);
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(v0->sprite, Pokemon_IconPaletteIndex(param1));
+    ManagedSprite_TickFrame(v0);
 
     return v0;
 }
 
-void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1, int param2)
+void ov104_02232FD4(UnkStruct_ov104_0223C4CC *param0, ManagedSprite *param1, int param2)
 {
     SpriteManager_UnloadCharObjById(param0->unk_34.unk_04, 2000 + param2);
     Sprite_DeleteAndFreeResources(param1);
@@ -1049,9 +1049,9 @@ void ov104_0223307C(UnkStruct_ov104_0223C4CC *param0)
     SpriteManager_UnloadPlttObjById(param0->unk_34.unk_04, 2001);
 }
 
-CellActorData *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2)
+ManagedSprite *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = Unk_ov104_0223F9AC;
@@ -1061,12 +1061,12 @@ CellActorData *ov104_022330AC(UnkStruct_ov104_0223C4CC *param0, int param1, int
     v1.priority = 300;
 
     v0 = SpriteSystem_NewSprite(param0->unk_34.unk_00, param0->unk_34.unk_04, &v1);
-    Sprite_TickOneFrame(v0);
+    ManagedSprite_TickFrame(v0);
 
     return v0;
 }
 
-void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, CellActorData *param1)
+void ov104_022330F0(UnkStruct_ov104_0223C4CC *param0, ManagedSprite *param1)
 {
     Sprite_DeleteAndFreeResources(param1);
 }
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 3388f1e4f6..999ff3e7a3 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -25,7 +25,6 @@
 #include "overlay104/struct_ov104_0223C634.h"
 #include "overlay108/ov108_02241AE0.h"
 
-#include "cell_actor.h"
 #include "communication_information.h"
 #include "field_battle_data_transfer.h"
 #include "gx_layers.h"
@@ -35,6 +34,7 @@
 #include "pokemon.h"
 #include "save_player.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -401,27 +401,27 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
             {
                 VecFx32 v21;
                 VecFx32 v22;
-                CellActor *v23;
-                CellActor *v24;
+                Sprite *v23;
+                Sprite *v24;
 
                 for (v11 = 0; v11 < v4; v11++) {
                     v23 = v3->unk_30[v11]->sprite;
-                    v21 = *(CellActor_GetPosition((const CellActor *)v23));
+                    v21 = *(Sprite_GetPosition((const Sprite *)v23));
 
                     v24 = v3->unk_40[v11]->sprite;
-                    v22 = *(CellActor_GetPosition((const CellActor *)v24));
+                    v22 = *(Sprite_GetPosition((const Sprite *)v24));
 
-                    CellActor_SetPosition(v23, &v22);
-                    CellActor_SetPosition(v24, &v21);
+                    Sprite_SetPosition(v23, &v22);
+                    Sprite_SetPosition(v24, &v21);
 
                     v23 = v3->unk_50[v11]->sprite;
-                    v21 = *(CellActor_GetPosition((const CellActor *)v23));
+                    v21 = *(Sprite_GetPosition((const Sprite *)v23));
 
                     v24 = v3->unk_60[v11]->sprite;
-                    v22 = *(CellActor_GetPosition((const CellActor *)v24));
+                    v22 = *(Sprite_GetPosition((const Sprite *)v24));
 
-                    CellActor_SetPosition(v23, &v22);
-                    CellActor_SetPosition(v24, &v21);
+                    Sprite_SetPosition(v23, &v22);
+                    Sprite_SetPosition(v24, &v21);
                 }
             }
         }
@@ -449,11 +449,11 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
 
         if (v18 == 0) {
             for (v11 = 0; v11 < v4; v11++) {
-                CellActor_SetExplicitPriority(v3->unk_30[v11]->sprite, 2);
+                Sprite_SetExplicitPriority(v3->unk_30[v11]->sprite, 2);
             }
         } else {
             for (v11 = 0; v11 < v5; v11++) {
-                CellActor_SetExplicitPriority(v3->unk_40[v11]->sprite, 2);
+                Sprite_SetExplicitPriority(v3->unk_40[v11]->sprite, 2);
             }
         }
         break;
@@ -519,7 +519,7 @@ BOOL ov104_02237748(UnkStruct_ov104_0222E930 *param0)
             {
                 u32 v25;
                 UnkStruct_ov104_0223C634 *v26;
-                CellActor *v27;
+                Sprite *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 1c248a0d68..798e78c168 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -21,7 +21,6 @@
 #include "overlay104/struct_ov104_0223C4CC.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -31,6 +30,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "unk_02030494.h"
 #include "unk_0203061C.h"
@@ -707,13 +707,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);
-            CellActor_SetAnimateFlag(param0->unk_30[v2]->sprite, 0);
+            Sprite_SetAnimateFlag(param0->unk_30[v2]->sprite, 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);
-            CellActor_SetAnimateFlag(param0->unk_40[v2]->sprite, 0);
+            Sprite_SetAnimateFlag(param0->unk_40[v2]->sprite, 0);
         }
     }
 
@@ -752,9 +752,9 @@ void ov104_0223886C(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *
     }
 
     if (param2 == 1) {
-        CellActor_SetDrawFlag(param0->unk_30[param3]->sprite, 1);
+        Sprite_SetDrawFlag(param0->unk_30[param3]->sprite, 1);
     } else {
-        CellActor_SetDrawFlag(param0->unk_30[param3]->sprite, 0);
+        Sprite_SetDrawFlag(param0->unk_30[param3]->sprite, 0);
     }
 
     return;
@@ -771,9 +771,9 @@ void ov104_022388A4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *
     }
 
     if (param2 == 1) {
-        CellActor_SetDrawFlag(param0->unk_40[param3]->sprite, 1);
+        Sprite_SetDrawFlag(param0->unk_40[param3]->sprite, 1);
     } else {
-        CellActor_SetDrawFlag(param0->unk_40[param3]->sprite, 0);
+        Sprite_SetDrawFlag(param0->unk_40[param3]->sprite, 0);
     }
 
     return;
@@ -795,7 +795,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) {
-                CellActor_SetDrawFlag(param0->unk_50[v2]->sprite, 0);
+                Sprite_SetDrawFlag(param0->unk_50[v2]->sprite, 0);
             }
         }
     } else {
@@ -805,7 +805,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) {
-                CellActor_SetDrawFlag(param0->unk_60[v2]->sprite, 0);
+                Sprite_SetDrawFlag(param0->unk_60[v2]->sprite, 0);
             }
         }
     }
@@ -853,12 +853,12 @@ void ov104_022389F4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *
 
         if (param4 == 1) {
             if (v0 == 0) {
-                CellActor_SetDrawFlag(param0->unk_50[param3]->sprite, 0);
+                Sprite_SetDrawFlag(param0->unk_50[param3]->sprite, 0);
             } else {
-                CellActor_SetDrawFlag(param0->unk_50[param3]->sprite, 1);
+                Sprite_SetDrawFlag(param0->unk_50[param3]->sprite, 1);
             }
         } else {
-            CellActor_SetDrawFlag(param0->unk_50[param3]->sprite, 0);
+            Sprite_SetDrawFlag(param0->unk_50[param3]->sprite, 0);
         }
     } else {
         if (param3 >= v2) {
@@ -870,12 +870,12 @@ void ov104_022389F4(UnkStruct_ov104_0223BFFC *param0, UnkStruct_ov104_0223C4CC *
 
         if (param4 == 1) {
             if (v0 == 0) {
-                CellActor_SetDrawFlag(param0->unk_60[param3]->sprite, 0);
+                Sprite_SetDrawFlag(param0->unk_60[param3]->sprite, 0);
             } else {
-                CellActor_SetDrawFlag(param0->unk_60[param3]->sprite, 1);
+                Sprite_SetDrawFlag(param0->unk_60[param3]->sprite, 1);
             }
         } else {
-            CellActor_SetDrawFlag(param0->unk_60[param3]->sprite, 0);
+            Sprite_SetDrawFlag(param0->unk_60[param3]->sprite, 0);
         }
     }
 
diff --git a/src/overlay104/ov104_0223C2D4.c b/src/overlay104/ov104_0223C2D4.c
index ed03b9799c..9890374794 100644
--- a/src/overlay104/ov104_0223C2D4.c
+++ b/src/overlay104/ov104_0223C2D4.c
@@ -368,7 +368,7 @@ static void ov104_0223C738(SysTask *param0, void *param1)
 
         for (v3 = 0; v3 < 8; v3++) {
             if ((v0->unk_3C.unk_00[v3] != NULL) && (v2 & 1)) {
-                Sprite_TickOneFrame(v0->unk_3C.unk_00[v3]);
+                ManagedSprite_TickFrame(v0->unk_3C.unk_00[v3]);
             }
 
             v2 >>= 1;
@@ -1010,9 +1010,9 @@ void ov104_0223D2CC(UnkStruct_ov104_0223C4CC *param0, u16 param1)
     }
 }
 
-CellActorData *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2)
+ManagedSprite *ov104_0223D2FC(UnkStruct_ov104_0223C4CC *param0, u16 param1, u16 param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     GF_ASSERT(param1 < 8);
     GF_ASSERT(param0->unk_3C.unk_00[param1] == NULL);
@@ -1035,7 +1035,7 @@ void ov104_0223D348(UnkStruct_ov104_0223C4CC *param0, u16 param1)
     param0->unk_3C.unk_00[param1] = NULL;
 }
 
-CellActorData *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1)
+ManagedSprite *ov104_0223D370(UnkStruct_ov104_0223C4CC *param0, u16 param1)
 {
     return param0->unk_3C.unk_00[param1];
 }
@@ -1074,12 +1074,12 @@ static void ov104_0223D3B0(UnkStruct_ov104_0223C4CC *param0)
 
     for (v0 = 0; v0 < 8; v0++) {
         if (v2->unk_00[v0] != NULL) {
-            v1->unk_10[v0].unk_05 = Sprite_GetActiveAnim(v2->unk_00[v0]);
-            v1->unk_10[v0].unk_06_0 = Sprite_GetAnimationFrame(v2->unk_00[v0]);
+            v1->unk_10[v0].unk_05 = ManagedSprite_GetActiveAnim(v2->unk_00[v0]);
+            v1->unk_10[v0].unk_06_0 = ManagedSprite_GetAnimationFrame(v2->unk_00[v0]);
             v1->unk_10[v0].unk_06_13 = ov104_0223D3A4(param0, v0);
-            v1->unk_10[v0].unk_06_14 = Sprite_GetDrawFlag2(v2->unk_00[v0]);
+            v1->unk_10[v0].unk_06_14 = ManagedSprite_GetDrawFlag(v2->unk_00[v0]);
             v1->unk_10[v0].unk_04 = v2->unk_20[v0];
-            Sprite_GetPositionXY2(v2->unk_00[v0], &v1->unk_10[v0].unk_00, &v1->unk_10[v0].unk_02);
+            ManagedSprite_GetPositionXY(v2->unk_00[v0], &v1->unk_10[v0].unk_00, &v1->unk_10[v0].unk_02);
             v1->unk_10[v0].unk_06_15 = 1;
         }
     }
@@ -1090,7 +1090,7 @@ static void ov104_0223D498(UnkStruct_ov104_0223C4CC *param0)
     int v0;
     NARC *v1;
     UnkStruct_ov104_0223D3B0 *v2;
-    CellActorData *v3;
+    ManagedSprite *v3;
 
     v2 = sub_0209B9E0(param0->unk_08);
     v1 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__FRONTIER_GRAPHIC__FRONTIER_OBJ, 94);
@@ -1105,13 +1105,13 @@ static void ov104_0223D498(UnkStruct_ov104_0223C4CC *param0)
     for (v0 = 0; v0 < 8; v0++) {
         if (v2->unk_10[v0].unk_06_15 == 1) {
             v3 = ov104_0223D2FC(param0, v0, v2->unk_10[v0].unk_04);
-            Sprite_SetPositionXY2(v3, v2->unk_10[v0].unk_00, v2->unk_10[v0].unk_02);
-            Sprite_SetDrawFlag2(v3, v2->unk_10[v0].unk_06_14);
+            ManagedSprite_SetPositionXY(v3, v2->unk_10[v0].unk_00, v2->unk_10[v0].unk_02);
+            ManagedSprite_SetDrawFlag(v3, v2->unk_10[v0].unk_06_14);
 
             ov104_0223D378(param0, v0, v2->unk_10[v0].unk_06_13);
 
-            Sprite_SetAnim(v3, v2->unk_10[v0].unk_05);
-            Sprite_SetAnimationFrame(v3, v2->unk_10[v0].unk_06_0);
+            ManagedSprite_SetAnim(v3, v2->unk_10[v0].unk_05);
+            ManagedSprite_SetAnimationFrame(v3, v2->unk_10[v0].unk_06_0);
         }
     }
 
diff --git a/src/overlay104/ov104_0223D768.c b/src/overlay104/ov104_0223D768.c
index f120f0999d..f69fcb3e4e 100644
--- a/src/overlay104/ov104_0223D768.c
+++ b/src/overlay104/ov104_0223D768.c
@@ -66,10 +66,10 @@ void ov104_0223D768(SpriteSystem *param0, SpriteManager *param1, NARC *param2, P
     GF_ASSERT(param4 < NELEMS(Unk_ov104_022417D8));
     v0 = &Unk_ov104_022417D8[param4];
 
-    SpriteSystem_LoadCharResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_TILES], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, v0->resources[SPRITE_RESOURCE_TILES]);
-    SpriteSystem_LoadPaletteBufferFromOpenNarc(param3, PLTTBUF_MAIN_OBJ, param0, param1, param2, v0->resources[SPRITE_RESOURCE_PALETTE], FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v0->resources[SPRITE_RESOURCE_PALETTE]);
-    SpriteSystem_LoadCellResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_SPRITE], TRUE, v0->resources[SPRITE_RESOURCE_SPRITE]);
-    SpriteSystem_LoadAnimResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_SPRITE_ANIM], TRUE, v0->resources[SPRITE_RESOURCE_SPRITE_ANIM]);
+    SpriteSystem_LoadCharResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_CHAR], TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, v0->resources[SPRITE_RESOURCE_CHAR]);
+    SpriteSystem_LoadPaletteBufferFromOpenNarc(param3, PLTTBUF_MAIN_OBJ, param0, param1, param2, v0->resources[SPRITE_RESOURCE_PLTT], FALSE, 1, NNS_G2D_VRAM_TYPE_2DMAIN, v0->resources[SPRITE_RESOURCE_PLTT]);
+    SpriteSystem_LoadCellResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_CELL], TRUE, v0->resources[SPRITE_RESOURCE_CELL]);
+    SpriteSystem_LoadAnimResObjFromOpenNarc(param0, param1, param2, v0->resources[SPRITE_RESOURCE_ANIM], TRUE, v0->resources[SPRITE_RESOURCE_ANIM]);
 }
 
 void ov104_0223D7EC(SpriteManager *param0, u16 param1)
@@ -85,9 +85,9 @@ void ov104_0223D7EC(SpriteManager *param0, u16 param1)
     SpriteManager_UnloadAnimObjById(param0, v0->resources[3]);
 }
 
-CellActorData *ov104_0223D828(SpriteSystem *param0, SpriteManager *param1, u16 param2)
+ManagedSprite *ov104_0223D828(SpriteSystem *param0, SpriteManager *param1, u16 param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     GF_ASSERT(param2 < NELEMS(Unk_ov104_022417D8));
 
@@ -96,7 +96,7 @@ CellActorData *ov104_0223D828(SpriteSystem *param0, SpriteManager *param1, u16 p
     return v0;
 }
 
-void ov104_0223D858(CellActorData *param0)
+void ov104_0223D858(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
diff --git a/src/overlay104/ov104_0223DC7C.c b/src/overlay104/ov104_0223DC7C.c
index b1e3775caa..6bbfc9e876 100644
--- a/src/overlay104/ov104_0223DC7C.c
+++ b/src/overlay104/ov104_0223DC7C.c
@@ -7,7 +7,6 @@
 
 #include "bg_window.h"
 #include "brightness_controller.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "font.h"
 #include "graphics.h"
@@ -15,6 +14,7 @@
 #include "message.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "sys_task.h"
@@ -93,7 +93,7 @@ typedef struct {
 typedef struct {
     s16 unk_00;
     s16 unk_02;
-    CellActorData *unk_04[4];
+    ManagedSprite *unk_04[4];
     LinearInterpolationTaskFX32 unk_14[4];
 } UnkStruct_ov104_0223E48C;
 
@@ -102,7 +102,7 @@ typedef struct {
     UnkStruct_ov104_0223E48C unk_14;
     s32 unk_78;
     UnkStruct_ov104_0223E3B8 unk_7C;
-    CellActorData *unk_90;
+    ManagedSprite *unk_90;
 } UnkStruct_ov104_0223DDE4;
 
 typedef struct {
@@ -290,7 +290,7 @@ static BOOL ov104_0223DDE4(UnkStruct_ov104_0223DD30 *param0, u32 param1, const U
 
         v0->unk_90 = SpriteSystem_NewSprite(param0->unk_14, param0->unk_18, &Unk_ov104_022418B4);
 
-        Sprite_SetDrawFlag2(v0->unk_90, 0);
+        ManagedSprite_SetDrawFlag(v0->unk_90, 0);
         Sprite_TickFrame(v0->unk_90->sprite);
         ov104_0223E3FC(param0, &v0->unk_14, (FX32_CONST(72)) + FX32_CONST(param0->unk_28), (FX32_CONST(82)) + FX32_CONST(param0->unk_2A), param1);
         param0->unk_00++;
@@ -515,11 +515,11 @@ static void ov104_0223E3FC(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022
 
     for (v0 = 0; v0 < 4; v0++) {
         param1->unk_04[v0] = SpriteSystem_NewSprite(param0->unk_14, param0->unk_18, &v1);
-        Sprite_SetDrawFlag2(param1->unk_04[v0], 0);
+        ManagedSprite_SetDrawFlag(param1->unk_04[v0], 0);
 
         if (v0 != 3) {
-            CellActor_SetAffineOverwriteMode(param1->unk_04[v0]->sprite, 2);
-            CellActor_SetAnim(param1->unk_04[v0]->sprite, 1);
+            Sprite_SetAffineOverwriteMode(param1->unk_04[v0]->sprite, 2);
+            Sprite_SetAnim(param1->unk_04[v0]->sprite, 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);
@@ -557,8 +557,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);
 
-        CellActor_SetAffineScale(param0->unk_04[v0]->sprite, &v3);
-        CellActor_SetDrawFlag(param0->unk_04[v0]->sprite, 1);
+        Sprite_SetAffineScale(param0->unk_04[v0]->sprite, &v3);
+        Sprite_SetDrawFlag(param0->unk_04[v0]->sprite, 1);
 
         if (v1 == 0) {
             v2 = 0;
@@ -742,8 +742,8 @@ static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022
 
     switch (param2->unk_04) {
     case 0:
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_90, 256 + param0->unk_28, 80 + param0->unk_2A, (512 * FX32_ONE));
-        Sprite_SetDrawFlag2(param1->unk_90, 1);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_90, 256 + param0->unk_28, 80 + param0->unk_2A, (512 * FX32_ONE));
+        ManagedSprite_SetDrawFlag(param1->unk_90, 1);
         param2->unk_00 = 256 << 8;
         param2->unk_04++;
         break;
@@ -755,7 +755,7 @@ static BOOL ov104_0223E804(UnkStruct_ov104_0223DD30 *param0, UnkStruct_ov104_022
             param2->unk_04++;
         }
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_90, param2->unk_00 >> 8, 80 + param0->unk_2A, (512 * FX32_ONE));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_90, param2->unk_00 >> 8, 80 + param0->unk_2A, (512 * FX32_ONE));
         break;
     default:
         return 1;
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 6c1ee75deb..22f0d9884a 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -25,7 +25,6 @@
 #include "overlay105/struct_ov105_02246060_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "font.h"
@@ -45,6 +44,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -104,7 +104,7 @@ struct UnkStruct_ov105_02241FF4_t {
     PaletteData *unk_120;
     GenericPointerData *unk_124;
     UnkStruct_02007768 *unk_128;
-    Sprite *unk_12C[3];
+    PokemonSprite *unk_12C[3];
     Options *unk_138;
     SaveData *unk_13C;
     PokemonSummary *unk_140;
@@ -571,7 +571,7 @@ int ov105_02241BD8(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_144.unk_00);
+    SpriteList_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 b73b0f474a..ffc8c7ba52 100644
--- a/src/overlay105/ov105_02245AAC.c
+++ b/src/overlay105/ov105_02245AAC.c
@@ -5,17 +5,17 @@
 
 #include "overlay105/struct_ov105_02245AAC.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
 
 void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0);
-CellActor *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5);
+Sprite *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);
 
@@ -56,18 +56,18 @@ void ov105_02245AAC(UnkStruct_ov105_02245AAC *param0)
     return;
 }
 
-CellActor *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
+Sprite *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 param2, u32 param3, int param4, u8 param5)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActor *v2;
+    SpriteResourcesHeader v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -90,10 +90,10 @@ CellActor *ov105_02245BA4(UnkStruct_ov105_02245AAC *param0, u32 param1, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = CellActorCollection_AddEx(&v3);
+        v2 = SpriteList_AddEx(&v3);
 
-        CellActor_SetAnimateFlag(v2, 1);
-        CellActor_SetAnim(v2, param2);
+        Sprite_SetAnimateFlag(v2, 1);
+        Sprite_SetAnim(v2, param2);
     }
 
     return v2;
@@ -112,7 +112,7 @@ void ov105_02245C50(UnkStruct_ov105_02245AAC *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c
index 8ec9b434e8..5fb175592f 100644
--- a/src/overlay105/ov105_02245CD0.c
+++ b/src/overlay105/ov105_02245CD0.c
@@ -12,8 +12,8 @@
 
 void ov105_02245CD0(void);
 void ov105_02245D50(UnkStruct_02007768 *param0);
-Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5);
-void ov105_02245DB8(Sprite *param0, int param1);
+PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5);
+void ov105_02245DB8(PokemonSprite *param0, int param1);
 
 void ov105_02245CD0(void)
 {
@@ -50,10 +50,10 @@ void ov105_02245D50(UnkStruct_02007768 *param0)
     return;
 }
 
-Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5)
+PokemonSprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, int param4, int param5)
 {
     ArchivedSprite v0;
-    Sprite *v1;
+    PokemonSprite *v1;
     int v2;
     u32 v3;
 
@@ -65,7 +65,7 @@ Sprite *ov105_02245D88(UnkStruct_02007768 *param0, int param1, Pokemon *param2,
     return v1;
 }
 
-void ov105_02245DB8(Sprite *param0, int param1)
+void ov105_02245DB8(PokemonSprite *param0, int param1)
 {
     sub_02007DEC(param0, 35, param1);
     return;
diff --git a/src/overlay105/ov105_02245DC4.c b/src/overlay105/ov105_02245DC4.c
index a691e244da..35a4934dbf 100644
--- a/src/overlay105/ov105_02245DC4.c
+++ b/src/overlay105/ov105_02245DC4.c
@@ -7,13 +7,13 @@
 #include "overlay105/struct_ov105_02245AAC.h"
 #include "overlay105/struct_ov105_02245E1C_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 
 struct UnkStruct_ov105_02245E1C_t {
     int unk_00;
     int unk_04;
-    CellActor *unk_08;
+    Sprite *unk_08;
 };
 
 UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 param1, int param2, int param3, u32 param4);
@@ -39,7 +39,7 @@ UnkStruct_ov105_02245E1C *ov105_02245DC4(UnkStruct_ov105_02245AAC *param0, u32 p
 
 void *ov105_02245E1C(UnkStruct_ov105_02245E1C *param0)
 {
-    CellActor_Delete(param0->unk_08);
+    Sprite_Delete(param0->unk_08);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -52,11 +52,11 @@ void ov105_02245E30(UnkStruct_ov105_02245E1C *param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_08, &v0);
+    Sprite_SetPosition(param0->unk_08, &v0);
     return;
 }
 
 BOOL ov105_02245E48(UnkStruct_ov105_02245E1C *param0)
 {
-    return CellActor_IsAnimated(param0->unk_08);
+    return Sprite_IsAnimated(param0->unk_08);
 }
diff --git a/src/overlay105/ov105_02245E54.c b/src/overlay105/ov105_02245E54.c
index 9da39b3760..95614771ff 100644
--- a/src/overlay105/ov105_02245E54.c
+++ b/src/overlay105/ov105_02245E54.c
@@ -7,15 +7,15 @@
 #include "overlay105/struct_ov105_02245AAC.h"
 #include "overlay105/struct_ov105_02245EA8_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 
 struct UnkStruct_ov105_02245EA8_t {
     u16 unk_00;
     u16 unk_02;
     int unk_04;
     int unk_08;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
 };
 
 UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int param1, int param2, u32 param3);
@@ -47,14 +47,14 @@ UnkStruct_ov105_02245EA8 *ov105_02245E54(UnkStruct_ov105_02245AAC *param0, int p
     v0->unk_0C = ov105_02245BA4(param0, 0, 6, 0, 0, 0);
 
     ov105_02245F14(v0, param1, param2);
-    CellActor_SetExplicitPalette(v0->unk_0C, 1);
+    Sprite_SetExplicitPalette(v0->unk_0C, 1);
 
     return v0;
 }
 
 void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0)
 {
-    CellActor_Delete(param0->unk_0C);
+    Sprite_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -62,7 +62,7 @@ void *ov105_02245EA8(UnkStruct_ov105_02245EA8 *param0)
 
 void ov105_02245EBC(UnkStruct_ov105_02245EA8 *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_0C, param1);
+    Sprite_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -70,12 +70,12 @@ VecFx32 ov105_02245EC8(UnkStruct_ov105_02245EA8 *param0, int param1, int param2)
 {
     VecFx32 v0;
 
-    v0 = *(CellActor_GetPosition(param0->unk_0C));
+    v0 = *(Sprite_GetPosition(param0->unk_0C));
     v0.x += (param1 * FX32_ONE);
     v0.y += (param2 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
-    return *(CellActor_GetPosition(param0->unk_0C));
+    Sprite_SetPosition(param0->unk_0C, &v0);
+    return *(Sprite_GetPosition(param0->unk_0C));
 }
 
 void ov105_02245F14(UnkStruct_ov105_02245EA8 *param0, int param1, int param2)
@@ -85,13 +85,13 @@ void ov105_02245F14(UnkStruct_ov105_02245EA8 *param0, int param1, int param2)
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
+    Sprite_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
 const VecFx32 *ov105_02245F2C(UnkStruct_ov105_02245EA8 *param0)
 {
-    return CellActor_GetPosition(param0->unk_0C);
+    return Sprite_GetPosition(param0->unk_0C);
 }
 
 void ov105_02245F38(UnkStruct_ov105_02245EA8 *param0, u8 param1)
@@ -127,7 +127,7 @@ void ov105_02245F5C(UnkStruct_ov105_02245EA8 *param0)
     v0.x = ((v1->x / FX32_ONE) + 248) * FX32_ONE;
     v0.y = v1->y;
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
+    Sprite_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -143,14 +143,14 @@ int ov105_02245F8C(UnkStruct_ov105_02245EA8 *param0)
 
 void ov105_02245F90(UnkStruct_ov105_02245EA8 *param0, u32 param1)
 {
-    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    CellActor_SetAnim(param0->unk_0C, param1);
+    Sprite_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    Sprite_SetAnim(param0->unk_0C, param1);
 
     return;
 }
 
 void ov105_02245FAC(UnkStruct_ov105_02245EA8 *param0, u32 param1)
 {
-    CellActor_SetExplicitPalette(param0->unk_0C, param1);
+    Sprite_SetExplicitPalette(param0->unk_0C, param1);
     return;
 }
diff --git a/src/overlay105/ov105_02245FB8.c b/src/overlay105/ov105_02245FB8.c
index fe0b6d0f24..747506a9ed 100644
--- a/src/overlay105/ov105_02245FB8.c
+++ b/src/overlay105/ov105_02245FB8.c
@@ -8,8 +8,8 @@
 #include "overlay105/struct_ov105_02246060_decl.h"
 #include "overlay105/struct_ov105_02246394.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 #include "system.h"
 
 struct UnkStruct_ov105_02246060_t {
@@ -19,7 +19,7 @@ struct UnkStruct_ov105_02246060_t {
     u8 unk_03;
     const UnkStruct_ov105_02246394 *unk_04;
     const u8 *unk_08;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
     u8 unk_10;
 };
 
@@ -59,13 +59,13 @@ UnkStruct_ov105_02246060 *ov105_02245FB8(UnkStruct_ov105_02245AAC *param0, u8 pa
     v1.x = (v0->unk_04[v0->unk_02].unk_00 * FX32_ONE);
     v1.y = (v0->unk_04[v0->unk_02].unk_02 * FX32_ONE);
 
-    CellActor_SetPosition(v0->unk_0C, &v1);
+    Sprite_SetPosition(v0->unk_0C, &v1);
     return v0;
 }
 
 void *ov105_02246060(UnkStruct_ov105_02246060 *param0)
 {
-    CellActor_Delete(param0->unk_0C);
+    Sprite_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -73,7 +73,7 @@ void *ov105_02246060(UnkStruct_ov105_02246060 *param0)
 
 void ov105_02246074(UnkStruct_ov105_02246060 *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_0C, param1);
+    Sprite_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
@@ -143,14 +143,14 @@ void ov105_02246080(UnkStruct_ov105_02246060 *param0)
     }
 
     if (param0->unk_08 != NULL) {
-        CellActor_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        Sprite_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(CellActor_GetPosition(param0->unk_0C));
+    v0 = *(Sprite_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);
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
+    Sprite_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -164,9 +164,9 @@ void ov105_022461A4(UnkStruct_ov105_02246060 *param0, int param1)
     param0->unk_03 = param1;
 
     if (param1 == 0) {
-        CellActor_SetAnimNoRestart(param0->unk_0C, 8);
+        Sprite_SetAnimNoRestart(param0->unk_0C, 8);
     } else {
-        CellActor_SetAnimNoRestart(param0->unk_0C, 13);
+        Sprite_SetAnimNoRestart(param0->unk_0C, 13);
     }
 
     return;
@@ -179,14 +179,14 @@ void ov105_022461C0(UnkStruct_ov105_02246060 *param0, u8 param1)
     param0->unk_02 = param1;
 
     if (param0->unk_08 != NULL) {
-        CellActor_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
+        Sprite_SetAnimNoRestart(param0->unk_0C, param0->unk_08[param0->unk_02]);
     }
 
-    v0 = *(CellActor_GetPosition(param0->unk_0C));
+    v0 = *(Sprite_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);
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
+    Sprite_SetPosition(param0->unk_0C, &v0);
     return;
 }
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 935daf7e15..1dfacfad19 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -18,7 +18,6 @@
 #include "overlay106/struct_ov106_02243650_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_options.h"
@@ -37,6 +36,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -299,7 +299,7 @@ int ov106_02241B9C(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_C0.unk_00);
+    SpriteList_Update(v0->unk_C0.unk_00);
     return 0;
 }
 
diff --git a/src/overlay106/ov106_02243310.c b/src/overlay106/ov106_02243310.c
index 7e7782abde..7dd96c145b 100644
--- a/src/overlay106/ov106_02243310.c
+++ b/src/overlay106/ov106_02243310.c
@@ -5,7 +5,6 @@
 
 #include "overlay106/struct_ov106_02243310.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "narc.h"
@@ -13,12 +12,13 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
 
 void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1);
-CellActor *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4);
+Sprite *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);
 
@@ -68,18 +68,18 @@ void ov106_02243310(UnkStruct_ov106_02243310 *param0, Pokemon *param1)
     return;
 }
 
-CellActor *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4)
+Sprite *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u32 param3, u8 param4)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActor *v2;
+    SpriteResourcesHeader v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
 
         v3.position.x = 0;
@@ -103,11 +103,11 @@ CellActor *ov106_022434BC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = CellActorCollection_AddEx(&v3);
+        v2 = SpriteList_AddEx(&v3);
 
-        CellActor_SetAnimateFlag(v2, 1);
-        CellActor_SetAnimSpeed(v2, FX32_ONE);
-        CellActor_SetAnim(v2, param2);
+        Sprite_SetAnimateFlag(v2, 1);
+        Sprite_SetAnimSpeed(v2, FX32_ONE);
+        Sprite_SetAnim(v2, param2);
     }
 
     return v2;
@@ -126,7 +126,7 @@ void ov106_02243570(UnkStruct_ov106_02243310 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
diff --git a/src/overlay106/ov106_022435FC.c b/src/overlay106/ov106_022435FC.c
index 7b84477368..7f5df478ee 100644
--- a/src/overlay106/ov106_022435FC.c
+++ b/src/overlay106/ov106_022435FC.c
@@ -7,17 +7,17 @@
 #include "overlay106/struct_ov106_02243310.h"
 #include "overlay106/struct_ov106_02243650_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 
 struct UnkStruct_ov106_02243650_t {
     u32 unk_00;
     u32 unk_04;
     u32 unk_08;
     const u8 *unk_0C;
-    CellActor *unk_10;
+    Sprite *unk_10;
 };
 
 UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 param1, u32 param2, u16 param3, u16 param4, const u8 *param5);
@@ -46,14 +46,14 @@ UnkStruct_ov106_02243650 *ov106_022435FC(UnkStruct_ov106_02243310 *param0, u32 p
     v1.x = (param3 * FX32_ONE);
     v1.y = (param4 * FX32_ONE);
 
-    CellActor_SetPosition(v0->unk_10, &v1);
+    Sprite_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
 
 void *ov106_02243650(UnkStruct_ov106_02243650 *param0)
 {
-    CellActor_Delete(param0->unk_10);
+    Sprite_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -61,7 +61,7 @@ void *ov106_02243650(UnkStruct_ov106_02243650 *param0)
 
 void ov106_02243664(UnkStruct_ov106_02243650 *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_10, param1);
+    Sprite_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -70,28 +70,28 @@ void ov106_02243670(UnkStruct_ov106_02243650 *param0, u16 param1, u16 param2)
     VecFx32 v0;
 
     if (param0->unk_0C != NULL) {
-        CellActor_SetAnimNoRestart(param0->unk_10, param0->unk_0C[0]);
+        Sprite_SetAnimNoRestart(param0->unk_10, param0->unk_0C[0]);
     }
 
-    v0 = *(CellActor_GetPosition(param0->unk_10));
+    v0 = *(Sprite_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_10, &v0);
+    Sprite_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov106_022436B0(UnkStruct_ov106_02243650 *param0, u32 param1)
 {
-    CellActor_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    CellActor_SetAnimNoRestart(param0->unk_10, param1);
+    Sprite_SetAnimSpeed(param0->unk_10, FX32_ONE);
+    Sprite_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
 
 void ov106_022436CC(UnkStruct_ov106_02243650 *param0, Pokemon *param1)
 {
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index 8b4feb3b66..36f2a27533 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -22,7 +22,7 @@
 #include "overlay107/struct_ov107_02249B8C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "system.h"
@@ -570,7 +570,7 @@ int ov107_02241BD4 (OverlayManager * param0, int * param1)
     }
 
     ov107_02245C00(v0);
-    CellActorCollection_Update(v0->unk_1D8.unk_00);
+    SpriteList_Update(v0->unk_1D8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index b47f949400..ef1a00279a 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -22,7 +22,7 @@
 #include "overlay107/struct_ov107_02249B8C_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
+#include "sprite.h"
 #include "communication_information.h"
 #include "communication_system.h"
 #include "system.h"
@@ -364,7 +364,7 @@ int ov107_02245FD0 (OverlayManager * param0, int * param1)
     }
 
     ov107_022492A8(v0);
-    CellActorCollection_Update(v0->unk_158.unk_00);
+    SpriteList_Update(v0->unk_158.unk_00);
 
     return 0;
 }
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 9f9dd3d4fa..401029efb1 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -5,7 +5,6 @@
 
 #include "overlay107/struct_ov107_02249954.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "item.h"
@@ -15,6 +14,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -22,7 +22,7 @@
 #include "vram_transfer.h"
 
 void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2);
-CellActor *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+Sprite *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);
@@ -105,18 +105,18 @@ void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2)
     return;
 }
 
-CellActor *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+Sprite *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActor *v2;
+    SpriteResourcesHeader v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -139,11 +139,11 @@ CellActor *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = CellActorCollection_AddEx(&v3);
+        v2 = SpriteList_AddEx(&v3);
 
-        CellActor_SetAnimateFlag(v2, 1);
-        CellActor_SetAnimSpeed(v2, FX32_ONE);
-        CellActor_SetAnim(v2, param4);
+        Sprite_SetAnimateFlag(v2, 1);
+        Sprite_SetAnimSpeed(v2, FX32_ONE);
+        Sprite_SetAnim(v2, param4);
     }
 
     return v2;
@@ -165,7 +165,7 @@ void ov107_02249954(UnkStruct_ov107_02249954 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
diff --git a/src/overlay107/ov107_02249B1C.c b/src/overlay107/ov107_02249B1C.c
index 8500b2b0b4..873a70ac21 100644
--- a/src/overlay107/ov107_02249B1C.c
+++ b/src/overlay107/ov107_02249B1C.c
@@ -8,16 +8,16 @@
 #include "overlay107/struct_ov107_02249954.h"
 #include "overlay107/struct_ov107_02249B8C_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 #include "unk_02005474.h"
 
 struct UnkStruct_ov107_02249B8C_t {
     s16 unk_00;
     s16 unk_02;
-    CellActor *unk_04;
+    Sprite *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);
@@ -48,7 +48,7 @@ UnkStruct_ov107_02249B8C *ov107_02249B1C(UnkStruct_ov107_02249954 *param0, u32 p
     v1.x = (param5 * FX32_ONE);
     v1.y = (param6 * FX32_ONE);
 
-    CellActor_SetPosition(v0->unk_04, &v1);
+    Sprite_SetPosition(v0->unk_04, &v1);
     return v0;
 }
 
@@ -59,7 +59,7 @@ void *ov107_02249B8C(UnkStruct_ov107_02249B8C *param0)
         return NULL;
     }
 
-    CellActor_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_04);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -67,7 +67,7 @@ void *ov107_02249B8C(UnkStruct_ov107_02249B8C *param0)
 
 void ov107_02249BAC(UnkStruct_ov107_02249B8C *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_04, param1);
+    Sprite_SetDrawFlag(param0->unk_04, param1);
     return;
 }
 
@@ -75,25 +75,25 @@ void ov107_02249BB8(UnkStruct_ov107_02249B8C *param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(CellActor_GetPosition(param0->unk_04));
+    v0 = *(Sprite_GetPosition(param0->unk_04));
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
 
-    CellActor_SetPosition(param0->unk_04, &v0);
+    Sprite_SetPosition(param0->unk_04, &v0);
     return;
 }
 
 void ov107_02249BEC(UnkStruct_ov107_02249B8C *param0, u32 param1)
 {
-    CellActor_SetAnimSpeed(param0->unk_04, FX32_ONE);
-    CellActor_SetAnim(param0->unk_04, param1);
+    Sprite_SetAnimSpeed(param0->unk_04, FX32_ONE);
+    Sprite_SetAnim(param0->unk_04, param1);
 
     return;
 }
 
 void ov107_02249C08(UnkStruct_ov107_02249B8C *param0, Pokemon *param1)
 {
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_04, Pokemon_IconPaletteIndex(param1));
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_04, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -111,12 +111,12 @@ void ov107_02249C28(UnkStruct_ov107_02249B8C *param0, u8 param1)
 
 BOOL ov107_02249C40(UnkStruct_ov107_02249B8C *param0)
 {
-    return CellActor_IsAnimated(param0->unk_04);
+    return Sprite_IsAnimated(param0->unk_04);
 }
 
 void ov107_02249C4C(UnkStruct_ov107_02249B8C *param0, u8 param1)
 {
-    CellActor_SetExplicitPriority(param0->unk_04, param1);
+    Sprite_SetExplicitPriority(param0->unk_04, param1);
     return;
 }
 
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 3be46e085a..b2c77ef006 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -18,7 +18,6 @@
 #include "overlay108/struct_ov108_02243594_decl.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "font.h"
 #include "game_options.h"
@@ -37,6 +36,7 @@
 #include "render_oam.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_util.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -394,7 +394,7 @@ int ov108_02241C38(OverlayManager *param0, int *param1)
         v0->unk_13_0 ^= 1;
     }
 
-    CellActorCollection_Update(v0->unk_E8.unk_00);
+    SpriteList_Update(v0->unk_E8.unk_00);
 
     return 0;
 }
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 595bcfc7cf..e76e77fe01 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -5,7 +5,6 @@
 
 #include "overlay108/struct_ov108_02243030.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "narc.h"
@@ -14,6 +13,7 @@
 #include "pokemon.h"
 #include "pokemon_icon.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -28,7 +28,7 @@ static const u8 Unk_ov108_02243760[4] = {
 };
 
 void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3);
-CellActor *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
+Sprite *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);
@@ -71,18 +71,18 @@ void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *para
     return;
 }
 
-CellActor *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
+Sprite *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActor *v2;
+    SpriteResourcesHeader v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -101,11 +101,11 @@ CellActor *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 para
             v3.position.y += (192 << FX32_SHIFT);
         }
 
-        v2 = CellActorCollection_AddEx(&v3);
+        v2 = SpriteList_AddEx(&v3);
 
-        CellActor_SetAnimateFlag(v2, 1);
-        CellActor_SetAnimSpeed(v2, FX32_ONE);
-        CellActor_SetAnim(v2, param4);
+        Sprite_SetAnimateFlag(v2, 1);
+        Sprite_SetAnimSpeed(v2, FX32_ONE);
+        Sprite_SetAnim(v2, param4);
     }
 
     return v2;
@@ -127,7 +127,7 @@ void ov108_02243194(UnkStruct_ov108_02243030 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
diff --git a/src/overlay108/ov108_0224351C.c b/src/overlay108/ov108_0224351C.c
index bc1b253c10..ed011173ce 100644
--- a/src/overlay108/ov108_0224351C.c
+++ b/src/overlay108/ov108_0224351C.c
@@ -7,10 +7,10 @@
 #include "overlay108/struct_ov108_02243030.h"
 #include "overlay108/struct_ov108_02243594_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 
 struct UnkStruct_ov108_02243594_t {
     u32 unk_00;
@@ -20,7 +20,7 @@ struct UnkStruct_ov108_02243594_t {
     u8 unk_0B;
     u16 unk_0C;
     u16 unk_0E;
-    CellActor *unk_10;
+    Sprite *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);
@@ -51,14 +51,14 @@ UnkStruct_ov108_02243594 *ov108_0224351C(UnkStruct_ov108_02243030 *param0, u32 p
         v1.y += (192 << FX32_SHIFT);
     }
 
-    CellActor_SetPosition(v0->unk_10, &v1);
+    Sprite_SetPosition(v0->unk_10, &v1);
 
     return v0;
 }
 
 void *ov108_02243594(UnkStruct_ov108_02243594 *param0)
 {
-    CellActor_Delete(param0->unk_10);
+    Sprite_Delete(param0->unk_10);
     Heap_FreeToHeap(param0);
 
     return NULL;
@@ -66,7 +66,7 @@ void *ov108_02243594(UnkStruct_ov108_02243594 *param0)
 
 void ov108_022435A8(UnkStruct_ov108_02243594 *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_10, param1);
+    Sprite_SetDrawFlag(param0->unk_10, param1);
     return;
 }
 
@@ -74,7 +74,7 @@ void ov108_022435B4(UnkStruct_ov108_02243594 *param0, u16 param1, u16 param2)
 {
     VecFx32 v0;
 
-    v0 = *(CellActor_GetPosition(param0->unk_10));
+    v0 = *(Sprite_GetPosition(param0->unk_10));
 
     v0.x = (param1 * FX32_ONE);
     v0.y = (param2 * FX32_ONE);
@@ -83,21 +83,21 @@ void ov108_022435B4(UnkStruct_ov108_02243594 *param0, u16 param1, u16 param2)
         v0.y += (192 << FX32_SHIFT);
     }
 
-    CellActor_SetPosition(param0->unk_10, &v0);
+    Sprite_SetPosition(param0->unk_10, &v0);
     return;
 }
 
 void ov108_022435F4(UnkStruct_ov108_02243594 *param0, u32 param1)
 {
-    CellActor_SetAnimSpeed(param0->unk_10, FX32_ONE);
-    CellActor_SetAnimNoRestart(param0->unk_10, param1);
+    Sprite_SetAnimSpeed(param0->unk_10, FX32_ONE);
+    Sprite_SetAnimNoRestart(param0->unk_10, param1);
 
     return;
 }
 
 void ov108_02243610(UnkStruct_ov108_02243594 *param0, Pokemon *param1)
 {
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_10, Pokemon_IconPaletteIndex(param1));
     return;
 }
 
@@ -115,6 +115,6 @@ static const VecFx32 Unk_ov111_021D3834[] = {
 
 void ov108_02243624(UnkStruct_ov108_02243594 *param0, u8 param1)
 {
-    CellActor_SetAnimateFlag(param0->unk_10, param1);
+    Sprite_SetAnimateFlag(param0->unk_10, param1);
     return;
 }
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index de9da6ba73..b581b6eac0 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -311,7 +311,7 @@ typedef struct {
     int unk_08;
     int unk_0C;
     UnkStruct_ov109_021D0F70 *unk_10;
-    CellActorData *unk_14;
+    ManagedSprite *unk_14;
 } UnkStruct_ov109_021D3600;
 
 static void ov109_021D0F70(UnkStruct_ov109_021D0F70 *param0);
@@ -335,7 +335,7 @@ static void ov109_021D2344(UnkStruct_ov109_021D0F70 *param0, u32 param1);
 static void ov109_021D2368(UnkStruct_ov109_021D0F70 *param0);
 static void ov109_021D2408(UnkStruct_ov109_021D0F70 *param0);
 static void ov109_021D24C0(UnkStruct_ov109_021D0F70 *param0);
-static CellActorData *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1);
+static ManagedSprite *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1);
 static void ov109_021D24F8(UnkStruct_ov109_021D0F70 *param0);
 static void ov109_021D25E8(UnkStruct_ov109_021D0F70 *param0);
 static void ov109_021D2634(UnkStruct_ov109_021D0F70 *param0, u32 param1);
@@ -1999,9 +1999,9 @@ static void ov109_021D24C0(UnkStruct_ov109_021D0F70 *param0)
     SpriteSystem_Free(param0->unk_D94);
 }
 
-static CellActorData *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1)
+static ManagedSprite *ov109_021D24E0(UnkStruct_ov109_021D0F70 *param0, const SpriteTemplate *param1)
 {
-    CellActorData *v0 = SpriteSystem_NewSprite(param0->unk_D94, param0->unk_D98, param1);
+    ManagedSprite *v0 = SpriteSystem_NewSprite(param0->unk_D94, param0->unk_D98, param1);
     return v0;
 }
 
@@ -3087,9 +3087,9 @@ static void ov109_021D3600(SysTask *param0, void *param1)
             }
         }
 
-        Sprite_TickNFrames(v0->unk_14, FX32_ONE + (FX32_ONE / 2));
+        ManagedSprite_TickNFrames(v0->unk_14, FX32_ONE + (FX32_ONE / 2));
 
-        if (Sprite_IsAnimated(v0->unk_14) == 0) {
+        if (ManagedSprite_IsAnimated(v0->unk_14) == 0) {
             v0->unk_00++;
         }
 
@@ -3125,7 +3125,7 @@ static SysTask *ov109_021D3684(UnkStruct_ov109_021D0F70 *param0)
     v0.resources[5] = SPRITE_RESOURCE_NONE;
 
     v1->unk_14 = ov109_021D24E0(param0, &v0);
-    Sprite_TickOneFrame(v1->unk_14);
+    ManagedSprite_TickFrame(v1->unk_14);
 
     v1->unk_10 = param0;
     {
diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c
index d61a817557..7aab0bc956 100644
--- a/src/overlay109/ov109_021D3D50.c
+++ b/src/overlay109/ov109_021D3D50.c
@@ -15,7 +15,6 @@
 #include "overlay109/struct_ov109_021D5140_sub2.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -36,6 +35,7 @@
 #include "render_oam.h"
 #include "render_window.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -283,7 +283,7 @@ int ov109_021D3EB0(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_60);
+    SpriteList_Update(v0->unk_60);
     return 0;
 }
 
@@ -300,7 +300,7 @@ int ov109_021D3F9C(OverlayManager *param0, int *param1)
         SpriteResourceCollection_Delete(v1->unk_1F0[v0]);
     }
 
-    CellActorCollection_Delete(v1->unk_60);
+    SpriteList_Delete(v1->unk_60);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
@@ -633,9 +633,9 @@ static void ov109_021D4518(UnkStruct_ov109_021D5140 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_60;
+        v1.list = param0->unk_60;
         v1.resourceData = &param0->unk_278;
         v1.position.z = 0;
         v1.affineScale.x = FX32_ONE;
@@ -650,11 +650,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_29C[v0 + 1] = SpriteList_AddEx(&v1);
 
-            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);
+            Sprite_SetAnimateFlag(param0->unk_29C[v0 + 1], 1);
+            Sprite_SetAnim(param0->unk_29C[v0 + 1], 27 + (v0 - 1) * 2);
+            Sprite_SetDrawFlag(param0->unk_29C[v0 + 1], 0);
         }
 
         for (v0 = 0; v0 < 5; v0++) {
@@ -1617,13 +1617,13 @@ static void ov109_021D5668(UnkStruct_ov109_021D5140 *param0)
             v2 = TrainerInfo_Appearance(param0->unk_3D8[v0][0]);
 
             if (CommSys_CurNetId() == v0) {
-                CellActor_SetAnim(param0->unk_29C[v0 + 1], 38 + v3 * 2);
+                Sprite_SetAnim(param0->unk_29C[v0 + 1], 38 + v3 * 2);
             } else {
                 ov109_021D57E0(param0->unk_3A0, param0->unk_3B0, v0, v2, v3);
-                CellActor_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2);
+                Sprite_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2);
             }
         }
-            CellActor_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
+            Sprite_SetDrawFlag(param0->unk_29C[v0 + 1], 1);
             param0->unk_400[v0] = 2;
             v1 = 1;
             break;
@@ -1633,9 +1633,9 @@ static void ov109_021D5668(UnkStruct_ov109_021D5140 *param0)
             if (CommSys_CurNetId() == v0) {
                 int v4 = TrainerInfo_Gender(param0->unk_3D8[v0][0]);
 
-                CellActor_SetAnim(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
+                Sprite_SetAnim(param0->unk_29C[v0 + 1], 38 + v4 * 2 + 1);
             } else {
-                CellActor_SetAnim(param0->unk_29C[v0 + 1], 27 + v0 * 2 + 1);
+                Sprite_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 6565cb3803..f957f14eda 100644
--- a/src/overlay111/ov111_021D0D80.c
+++ b/src/overlay111/ov111_021D0D80.c
@@ -19,7 +19,6 @@
 #include "overlay111/struct_ov111_021D3620.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "graphics.h"
@@ -34,6 +33,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "system.h"
@@ -416,7 +416,7 @@ int ov111_021D0E34(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_16C.unk_00);
+    SpriteList_Update(v0->unk_16C.unk_00);
 
     return 0;
 }
diff --git a/src/overlay111/ov111_021D2F80.c b/src/overlay111/ov111_021D2F80.c
index e81d6bfca2..5ec9c9397d 100644
--- a/src/overlay111/ov111_021D2F80.c
+++ b/src/overlay111/ov111_021D2F80.c
@@ -5,19 +5,19 @@
 
 #include "overlay111/struct_ov111_021D2F80.h"
 
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "gx_layers.h"
 #include "narc.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
 #include "vram_transfer.h"
 
 void ov111_021D2F80(UnkStruct_ov111_021D2F80 *param0);
-CellActor *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5);
+Sprite *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);
@@ -108,18 +108,18 @@ static void ov111_021D31F4(UnkStruct_ov111_021D2F80 *param0, int param1)
     return;
 }
 
-CellActor *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
+Sprite *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u8 param5)
 {
     int v0;
-    CellActorResourceData v1;
-    CellActor *v2;
+    SpriteResourcesHeader v1;
+    Sprite *v2;
 
     SpriteResourcesHeader_Init(&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;
+        AffineSpriteListTemplate v3;
 
-        v3.collection = param0->unk_00;
+        v3.list = param0->unk_00;
         v3.resourceData = &v1;
         v3.position.x = 0;
         v3.position.y = 0;
@@ -137,11 +137,11 @@ CellActor *ov111_021D3280(UnkStruct_ov111_021D2F80 *param0, u32 param1, u32 para
             v3.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         }
 
-        v2 = CellActorCollection_AddEx(&v3);
+        v2 = SpriteList_AddEx(&v3);
 
-        CellActor_SetAnimateFlag(v2, 0);
-        CellActor_SetAnimSpeed(v2, FX32_ONE);
-        CellActor_SetAnim(v2, param2);
+        Sprite_SetAnimateFlag(v2, 0);
+        Sprite_SetAnimSpeed(v2, FX32_ONE);
+        Sprite_SetAnim(v2, param2);
     }
 
     return v2;
@@ -160,7 +160,7 @@ void ov111_021D3320(UnkStruct_ov111_021D2F80 *param0)
         SpriteResourceCollection_Delete(param0->unk_190[v0]);
     }
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     RenderOam_Free();
     CharTransfer_Free();
     PlttTransfer_Free();
diff --git a/src/overlay111/ov111_021D33F4.c b/src/overlay111/ov111_021D33F4.c
index dadb39ebce..e543714c65 100644
--- a/src/overlay111/ov111_021D33F4.c
+++ b/src/overlay111/ov111_021D33F4.c
@@ -7,8 +7,8 @@
 #include "overlay111/struct_ov111_021D2F80.h"
 #include "overlay111/struct_ov111_021D33F4_decl.h"
 
-#include "cell_actor.h"
 #include "heap.h"
+#include "sprite.h"
 
 struct UnkStruct_ov111_021D33F4_t {
     u16 unk_00;
@@ -16,7 +16,7 @@ struct UnkStruct_ov111_021D33F4_t {
     u8 unk_03;
     u32 unk_04;
     u32 unk_08;
-    CellActor *unk_0C;
+    Sprite *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);
@@ -50,20 +50,20 @@ UnkStruct_ov111_021D33F4 *ov111_021D33F4(UnkStruct_ov111_021D2F80 *param0, u32 p
 
 void *ov111_021D3448(UnkStruct_ov111_021D33F4 *param0)
 {
-    CellActor_Delete(param0->unk_0C);
+    Sprite_Delete(param0->unk_0C);
     Heap_FreeToHeap(param0);
     return NULL;
 }
 
 void ov111_021D345C(UnkStruct_ov111_021D33F4 *param0, int param1)
 {
-    CellActor_SetDrawFlag(param0->unk_0C, param1);
+    Sprite_SetDrawFlag(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D3468(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
-    CellActor_SetPriority(param0->unk_0C, param1);
+    Sprite_SetPriority(param0->unk_0C, param1);
     return;
 }
 
@@ -78,7 +78,7 @@ void ov111_021D3474(UnkStruct_ov111_021D33F4 *param0, int param1, int param2)
         v0.y += (512 * FX32_ONE);
     }
 
-    CellActor_SetPosition(param0->unk_0C, &v0);
+    Sprite_SetPosition(param0->unk_0C, &v0);
     return;
 }
 
@@ -86,7 +86,7 @@ void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2)
 {
     const VecFx32 *v0;
 
-    v0 = CellActor_GetPosition(param0->unk_0C);
+    v0 = Sprite_GetPosition(param0->unk_0C);
 
     *param1 = (v0->x / FX32_ONE);
     *param2 = (v0->y / FX32_ONE);
@@ -96,8 +96,8 @@ void ov111_021D349C(UnkStruct_ov111_021D33F4 *param0, int *param1, int *param2)
 
 void ov111_021D34C4(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
-    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    CellActor_SetAnimNoRestart(param0->unk_0C, param1);
+    Sprite_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    Sprite_SetAnimNoRestart(param0->unk_0C, param1);
 
     return;
 }
@@ -121,38 +121,38 @@ void ov111_021D34E0(UnkStruct_ov111_021D33F4 *param0, u32 param1)
     u8 v0;
     v0 = param1;
 
-    CellActor_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
+    Sprite_SetAffineScaleEx(param0->unk_0C, &Unk_ov111_021D3834[0], 1);
 
     return;
 }
 
 void ov111_021D34F4(UnkStruct_ov111_021D33F4 *param0, VecFx32 *param1)
 {
-    CellActor_SetAffineScaleEx(param0->unk_0C, param1, 2);
+    Sprite_SetAffineScaleEx(param0->unk_0C, param1, 2);
     return;
 }
 
 void ov111_021D3500(UnkStruct_ov111_021D33F4 *param0, u32 param1)
 {
-    CellActor_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
+    Sprite_SetExplicitPaletteWithOffset(param0->unk_0C, param1);
     return;
 }
 
 void ov111_021D350C(UnkStruct_ov111_021D33F4 *param0, int param1)
 {
-    CellActor_SetAnimateFlag(param0->unk_0C, param1);
-    CellActor_SetAnimSpeed(param0->unk_0C, FX32_ONE);
-    CellActor_SetAnim(param0->unk_0C, CellActor_GetActiveAnim(param0->unk_0C));
+    Sprite_SetAnimateFlag(param0->unk_0C, param1);
+    Sprite_SetAnimSpeed(param0->unk_0C, FX32_ONE);
+    Sprite_SetAnim(param0->unk_0C, Sprite_GetActiveAnim(param0->unk_0C));
     return;
 }
 
 void ov111_021D3530(UnkStruct_ov111_021D33F4 *param0, BOOL param1)
 {
-    CellActor_SetPixelated(param0->unk_0C, param1);
+    Sprite_SetPixelated(param0->unk_0C, param1);
     return;
 }
 
 BOOL ov111_021D353C(UnkStruct_ov111_021D33F4 *param0)
 {
-    return CellActor_IsAnimated(param0->unk_0C);
+    return Sprite_IsAnimated(param0->unk_0C);
 }
diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c
index aefceb0b72..5c69f63754 100644
--- a/src/overlay112/ov112_0225C700.c
+++ b/src/overlay112/ov112_0225C700.c
@@ -17,7 +17,6 @@
 #include "overlay066/struct_ov66_02232068.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "enums.h"
 #include "font.h"
@@ -30,6 +29,7 @@
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -113,7 +113,7 @@ typedef struct {
 
 typedef struct {
     BgConfig *unk_00;
-    CellActorCollection *unk_04;
+    SpriteList *unk_04;
     G2dRenderer unk_08;
     SpriteResourceCollection *unk_194[4];
     NARC *unk_1A4;
@@ -476,7 +476,7 @@ static void ov112_0225C9F4(UnkStruct_ov112_0225C9BC *param0)
 
 static void ov112_0225CA14(UnkStruct_ov112_0225C9BC *param0)
 {
-    CellActorCollection_Update(param0->unk_04);
+    SpriteList_Update(param0->unk_04);
 }
 
 static void ov112_0225CA20(UnkStruct_ov112_0225C9BC *param0)
@@ -566,7 +566,7 @@ static void ov112_0225CC38(UnkStruct_ov112_0225C9BC *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_04);
+    SpriteList_Delete(param0->unk_04);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_194[v0]);
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 3c7c6b1130..de07d0f8f5 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -32,7 +32,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "easy3d_object.h"
 #include "font.h"
@@ -51,6 +50,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sprite_util.h"
 #include "strbuf.h"
@@ -112,12 +112,12 @@ typedef struct UnkStruct_ov113_0225DBCC_t {
     UnkStruct_ov113_02260818 unk_8D8[6];
     u8 unk_920;
     u8 unk_921;
-    CellActorData *unk_924[6];
-    CellActorData *unk_93C[6];
-    CellActorData *unk_954[6];
-    CellActorData *unk_96C;
-    CellActorData *unk_970[8];
-    CellActorData *unk_990[3];
+    ManagedSprite *unk_924[6];
+    ManagedSprite *unk_93C[6];
+    ManagedSprite *unk_954[6];
+    ManagedSprite *unk_96C;
+    ManagedSprite *unk_970[8];
+    ManagedSprite *unk_990[3];
     u16 unk_99C[8];
     u16 unk_9AC[8];
     int unk_9BC;
@@ -155,7 +155,7 @@ static void ov113_0225D5D8(UnkStruct_ov113_0225DBCC *param0);
 static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC *param0);
 static void ov113_0225D7A4(UnkStruct_ov113_0225DBCC *param0);
 static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0);
-static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6);
+static BOOL ov113_0225D938(int param0, int param1, ManagedSprite *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6);
 static void ov113_0225E068(UnkStruct_ov113_0225DBCC *param0, int param1);
 static void ov113_0225E0D4(UnkStruct_ov113_0225DBCC *param0, int param1);
 static void ov113_0225E118(UnkStruct_ov113_0225DBCC *param0);
@@ -962,7 +962,7 @@ static void ov113_0225D484(UnkStruct_ov113_0225DBCC *param0)
 
         param0->unk_924[v0] = SpriteSystem_NewSprite(param0->unk_1C, param0->unk_20, &v1);
 
-        Sprite_SetAnim(param0->unk_924[v0], v0);
+        ManagedSprite_SetAnim(param0->unk_924[v0], v0);
         Sprite_TickFrame(param0->unk_924[v0]->sprite);
     }
 
@@ -974,7 +974,7 @@ static void ov113_0225D484(UnkStruct_ov113_0225DBCC *param0)
 
         param0->unk_93C[v0] = SpriteSystem_NewSprite(param0->unk_1C, param0->unk_20, &v1);
 
-        Sprite_SetAnim(param0->unk_93C[v0], v0);
+        ManagedSprite_SetAnim(param0->unk_93C[v0], v0);
         Sprite_TickFrame(param0->unk_93C[v0]->sprite);
     }
 
@@ -1043,7 +1043,7 @@ static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC *param0)
     param0->unk_96C = SpriteSystem_NewSprite(param0->unk_1C, param0->unk_20, &Unk_ov113_0226099C);
 
     Sprite_TickFrame(param0->unk_96C->sprite);
-    Sprite_SetDrawFlag2(param0->unk_96C, 0);
+    ManagedSprite_SetDrawFlag(param0->unk_96C, 0);
 
     v1 = Unk_ov113_022609D0;
 
@@ -1051,9 +1051,9 @@ static void ov113_0225D6F8(UnkStruct_ov113_0225DBCC *param0)
         v1.resources[0] = 10010 + v0;
         param0->unk_970[v0] = SpriteSystem_NewSprite(param0->unk_1C, param0->unk_20, &v1);
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_970[v0], Unk_ov113_02260934[v0][0], Unk_ov113_02260934[v0][1], ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_970[v0], Unk_ov113_02260934[v0][0], Unk_ov113_02260934[v0][1], ((192 + 80) << FX32_SHIFT));
         Sprite_TickFrame(param0->unk_970[v0]->sprite);
-        Sprite_SetDrawFlag2(param0->unk_970[v0], 0);
+        ManagedSprite_SetDrawFlag(param0->unk_970[v0], 0);
     }
 }
 
@@ -1079,9 +1079,9 @@ static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if ((param0->unk_8D8[v0].unk_02 == 0) || (param0->unk_8D8[v0].unk_02 > NATIONAL_DEX_COUNT)) {
-            Sprite_SetDrawFlag2(param0->unk_924[v0], 0);
-            Sprite_SetDrawFlag2(param0->unk_93C[v0], 0);
-            Sprite_SetDrawFlag2(param0->unk_954[v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_924[v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_93C[v0], 0);
+            ManagedSprite_SetDrawFlag(param0->unk_954[v0], 0);
 
             for (v1 = 0; v1 < 4; v1++) {
                 Bg_FillTilemapRect(param0->unk_08, 2, Unk_ov113_022608AC[v1], 0 + 4 * v0, 0x14 + v1, 4, 1, 17);
@@ -1106,7 +1106,7 @@ static void ov113_0225D7CC(UnkStruct_ov113_0225DBCC *param0)
     Bg_ScheduleTilemapTransfer(param0->unk_08, 2);
 }
 
-static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6)
+static BOOL ov113_0225D938(int param0, int param1, ManagedSprite *param2, NARC *param3, NARC *param4, NNS_G2D_VRAM_TYPE param5, BOOL param6)
 {
     void *v0;
     NNSG2dImageProxy *v1;
@@ -1138,7 +1138,7 @@ static BOOL ov113_0225D938(int param0, int param1, CellActorData *param2, NARC *
         v0 = G2S_GetOBJCharPtr();
     }
 
-    v1 = SpriteActor_ImageProxy(param2->sprite);
+    v1 = Sprite_GetImageProxy(param2->sprite);
 
     MI_CpuCopy16(v4, (void *)((u32)v0 + v1->vramLocation.baseAddrOfVram[param5]), 0x20 * 2);
     MI_CpuCopy16(v5, (void *)((u32)v0 + 0x20 * 2 + v1->vramLocation.baseAddrOfVram[param5]), 0x20 * 2);
@@ -1352,7 +1352,7 @@ BOOL ov113_0225DDC0(UnkStruct_ov113_0225DBCC *param0, const UnkStruct_ov113_0226
                 param0->unk_99C[v1] = param1->unk_02;
                 param0->unk_9AC[v1] = param1->unk_00;
                 ov113_0225D938(param1->unk_02, param1->unk_08, param0->unk_970[v1], param0->unk_160, param0->unk_164, NNS_G2D_VRAM_TYPE_2DSUB, param0->unk_19E0);
-                Sprite_SetDrawFlag2(param0->unk_970[v1], 1);
+                ManagedSprite_SetDrawFlag(param0->unk_970[v1], 1);
                 PaletteData_FillBufferRange(param0->unk_0C, 1, 2, param1->unk_00, (2 * 16 + 1) + v1, (2 * 16 + 1) + v1 + 1);
             }
         }
@@ -1398,15 +1398,15 @@ static int ov113_0225DE98(UnkStruct_ov113_0225DBCC *param0)
                 param0->unk_99C[v1] = 0;
                 param0->unk_9AC[v1] = 0;
 
-                Sprite_SetDrawFlag2(param0->unk_970[v1], 0);
+                ManagedSprite_SetDrawFlag(param0->unk_970[v1], 0);
                 Bg_FillTilemapRect(param0->unk_08, 6, 0, Unk_ov113_02260AD4[v1][0], Unk_ov113_02260AD4[v1][1], Unk_ov113_02260AD4[v1][2], Unk_ov113_02260AD4[v1][3], 16);
                 Bg_ScheduleTilemapTransfer(param0->unk_08, 6);
                 v3++;
             }
 
             if (v0.unk_04[v1] == param0->unk_168.unk_04) {
-                Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_96C, Unk_ov113_02260914[v1][0], Unk_ov113_02260914[v1][1], ((192 + 80) << FX32_SHIFT));
-                Sprite_SetDrawFlag2(param0->unk_96C, 1);
+                ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_96C, Unk_ov113_02260914[v1][0], Unk_ov113_02260914[v1][1], ((192 + 80) << FX32_SHIFT));
+                ManagedSprite_SetDrawFlag(param0->unk_96C, 1);
             }
         }
 
@@ -1482,7 +1482,7 @@ static void ov113_0225E118(UnkStruct_ov113_0225DBCC *param0)
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0->unk_990[v0] != NULL) {
-            if (Sprite_IsAnimated(param0->unk_990[v0]) == 0) {
+            if (ManagedSprite_IsAnimated(param0->unk_990[v0]) == 0) {
                 Sprite_DeleteAndFreeResources(param0->unk_990[v0]);
                 param0->unk_990[v0] = NULL;
             } else {
@@ -1591,7 +1591,7 @@ static void ov113_0225E294(UnkStruct_ov113_0225DBCC *param0)
     v0 = 32 - (param0->unk_19D8 >> 8);
 
     for (v1 = 0; v1 < 6; v1++) {
-        Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_924[v1], 16 + 32 * v1, 176 + v0, ((192 + 80) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_924[v1], 16 + 32 * v1, 176 + v0, ((192 + 80) << FX32_SHIFT));
     }
 }
 
diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c
index 525a10cc8f..d36203a0eb 100644
--- a/src/overlay114/ov114_0225C700.c
+++ b/src/overlay114/ov114_0225C700.c
@@ -19,7 +19,6 @@
 
 #include "bg_window.h"
 #include "buffer_manager.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_information.h"
 #include "communication_system.h"
@@ -37,6 +36,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -70,7 +70,7 @@ typedef struct {
 typedef struct {
     BOOL unk_00;
     SpriteResource *unk_04[4];
-    CellActorResourceData unk_14;
+    SpriteResourcesHeader unk_14;
 } UnkStruct_ov114_0225CDB4;
 
 typedef struct {
@@ -80,7 +80,7 @@ typedef struct {
 } UnkStruct_ov114_0225CCD0;
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     G2dRenderer unk_04;
 } UnkStruct_ov114_0225CFCC;
 
@@ -118,8 +118,8 @@ typedef struct {
 
 typedef struct {
     Window unk_00;
-    CellActor *unk_10;
-    CellActor *unk_14;
+    Sprite *unk_10;
+    Sprite *unk_14;
     u16 unk_18;
     u8 unk_1A;
     u8 unk_1B;
@@ -189,7 +189,7 @@ typedef struct {
 typedef struct {
     void *unk_00;
     NNSG2dScreenData *unk_04;
-    CellActor *unk_08[15];
+    Sprite *unk_08[15];
     UnkStruct_ov114_0225CDB4 *unk_44;
     u8 unk_48;
     u8 unk_49;
@@ -235,7 +235,7 @@ typedef struct UnkStruct_ov114_0225E854_t {
 } UnkStruct_ov114_0225E854;
 
 typedef struct {
-    CellActor *unk_00[2];
+    Sprite *unk_00[2];
     s16 unk_08;
     s16 unk_0A;
     u8 unk_0C[2][192];
@@ -249,12 +249,12 @@ typedef struct UnkStruct_ov114_02025CAD4_t {
     u32 unk_00;
     u16 unk_04;
     s16 unk_06;
-    CellActorCollection *unk_08;
+    SpriteList *unk_08;
     NARC *unk_0C;
     UnkStruct_ov114_0225CCD0 unk_10;
     UnkStruct_ov114_0225CDB4 *unk_28;
     SysTask *unk_2C;
-    CellActor *unk_30;
+    Sprite *unk_30;
     UnkStruct_ov114_0225FAB8 unk_34;
 } UnkStruct_ov114_0225CAD4;
 
@@ -269,7 +269,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 CellActor *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, CellActorCollection *param1, s16 param2, s16 param3, u16 param4, u32 param5);
+static Sprite *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, SpriteList *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 GraphicsModes *param1, const UnkStruct_ov114_02260284 *param2, u32 param3, u32 param4);
@@ -366,7 +366,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, CellActorCollection *param2, u32 param3);
+static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_0225CDB4 *param1, SpriteList *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);
@@ -1092,7 +1092,7 @@ BOOL ov114_0225CA98(const UnkStruct_ov114_0225C76C *param0)
     return 0;
 }
 
-UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(CellActorCollection *param0, u32 param1)
+UnkStruct_ov114_0225CAD4 *ov114_0225CAD4(SpriteList *param0, u32 param1)
 {
     UnkStruct_ov114_0225CAD4 *v0;
 
@@ -1117,7 +1117,7 @@ void ov114_0225CB38(UnkStruct_ov114_0225CAD4 *param0)
     }
 
     if (param0->unk_30 != NULL) {
-        CellActor_Delete(param0->unk_30);
+        Sprite_Delete(param0->unk_30);
     }
 
     ov114_0225FBF0(&param0->unk_34);
@@ -1268,11 +1268,11 @@ static UnkStruct_ov114_0225CDB4 *ov114_0225CD54(UnkStruct_ov114_0225CCD0 *param0
     return v1;
 }
 
-static CellActor *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, CellActorCollection *param1, s16 param2, s16 param3, u16 param4, u32 param5)
+static Sprite *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, SpriteList *param1, s16 param2, s16 param3, u16 param4, u32 param5)
 {
-    CellActorInitParams v0;
+    SpriteListTemplate v0;
 
-    v0.collection = param1;
+    v0.list = param1;
     v0.resourceData = &param0->unk_14;
     v0.position.x = param2 << FX32_SHIFT;
     v0.position.y = param3 << FX32_SHIFT;
@@ -1280,7 +1280,7 @@ static CellActor *ov114_0225CDB4(UnkStruct_ov114_0225CDB4 *param0, CellActorColl
     v0.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
     v0.heapID = param5;
 
-    return CellActorCollection_Add(&v0);
+    return SpriteList_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)
@@ -1398,7 +1398,7 @@ static void ov114_0225CFCC(UnkStruct_ov114_0225CFCC *param0, u32 param1, u32 par
 
 static void ov114_0225D058(UnkStruct_ov114_0225CFCC *param0)
 {
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     CharTransfer_Free();
     PlttTransfer_Free();
     RenderOam_Free();
@@ -1406,7 +1406,7 @@ static void ov114_0225D058(UnkStruct_ov114_0225CFCC *param0)
 
 static void ov114_0225D070(UnkStruct_ov114_0225CFCC *param0)
 {
-    CellActorCollection_Update(param0->unk_00);
+    SpriteList_Update(param0->unk_00);
 }
 
 static void ov114_0225D07C(UnkStruct_ov114_0225CFCC *param0)
@@ -1966,10 +1966,10 @@ static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 *param0, u32 param1, u32 par
 
         param0->unk_10 = ov114_0225CDB4(param8, param7->unk_00, v2, v3, 0, param9);
 
-        CellActor_SetAnim(param0->unk_10, v1);
-        CellActor_SetExplicitPaletteOffset(param0->unk_10, param5);
-        CellActor_SetDrawFlag(param0->unk_10, 0);
-        CellActor_SetAnimateFlag(param0->unk_10, 1);
+        Sprite_SetAnim(param0->unk_10, v1);
+        Sprite_SetExplicitPaletteOffset(param0->unk_10, param5);
+        Sprite_SetDrawFlag(param0->unk_10, 0);
+        Sprite_SetAnimateFlag(param0->unk_10, 1);
     }
 
     {
@@ -1980,8 +1980,8 @@ static void ov114_0225DAC0(UnkStruct_ov114_0225DAC0 *param0, u32 param1, u32 par
 
         param0->unk_14 = ov114_0225CDB4(param8, param7->unk_00, v4, v5, 0, param9);
 
-        CellActor_SetAnim(param0->unk_14, 0);
-        CellActor_SetDrawFlag(param0->unk_14, 0);
+        Sprite_SetAnim(param0->unk_14, 0);
+        Sprite_SetDrawFlag(param0->unk_14, 0);
     }
 
     param0->unk_1A = param5;
@@ -2019,9 +2019,9 @@ static void ov114_0225DCA0(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_022
 
 static void ov114_0225DD0C(UnkStruct_ov114_0225DAC0 *param0, u32 param1)
 {
-    CellActor_SetDrawFlag(param0->unk_14, 1);
-    CellActor_SetAnim(param0->unk_14, 4 + param1);
-    CellActor_SetAnimateFlag(param0->unk_14, 1);
+    Sprite_SetDrawFlag(param0->unk_14, 1);
+    Sprite_SetAnim(param0->unk_14, 4 + param1);
+    Sprite_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)
@@ -2043,18 +2043,18 @@ static void ov114_0225DD80(UnkStruct_ov114_0225DAC0 *param0, UnkStruct_ov114_022
 
 static void ov114_0225DD94(UnkStruct_ov114_0225DAC0 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_10, 1);
+    Sprite_SetDrawFlag(param0->unk_10, 1);
 }
 
 static void ov114_0225DDA0(UnkStruct_ov114_0225DAC0 *param0)
 {
     if (param0->unk_10) {
-        CellActor_Delete(param0->unk_10);
+        Sprite_Delete(param0->unk_10);
         param0->unk_10 = NULL;
     }
 
     if (param0->unk_14) {
-        CellActor_Delete(param0->unk_14);
+        Sprite_Delete(param0->unk_14);
         param0->unk_14 = NULL;
     }
 
@@ -2119,7 +2119,7 @@ static void ov114_0225DEBC(UnkStruct_ov114_0225DAC0 *param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_10, &v3);
+    Sprite_SetPosition(param0->unk_10, &v3);
 
     v1 = 24;
     v2 = (Unk_ov114_02260204[param0->unk_18 - 1].unk_00[param0->unk_1B] * 8) + 21;
@@ -2127,7 +2127,7 @@ static void ov114_0225DEBC(UnkStruct_ov114_0225DAC0 *param0, s32 param1)
     v3.x = (v1 + param1) << FX32_SHIFT;
     v3.y = v2 << FX32_SHIFT;
 
-    CellActor_SetPosition(param0->unk_14, &v3);
+    Sprite_SetPosition(param0->unk_14, &v3);
 }
 
 static u32 ov114_0225DF44(u32 param0, u32 param1, u32 param2)
@@ -3388,9 +3388,9 @@ static void ov114_0225F484(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_022
             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);
-                CellActor_SetDrawFlag(param0->unk_08[v2], 0);
-                CellActor_SetAnim(param0->unk_08[v2], v0);
-                CellActor_SetExplicitPriority(param0->unk_08[v2], 0);
+                Sprite_SetDrawFlag(param0->unk_08[v2], 0);
+                Sprite_SetAnim(param0->unk_08[v2], v0);
+                Sprite_SetExplicitPriority(param0->unk_08[v2], 0);
 
                 v3 += 24;
             }
@@ -3406,7 +3406,7 @@ static void ov114_0225F578(UnkStruct_ov114_0225F578 *param0)
         int v0;
 
         for (v0 = 0; v0 < (5 * 3); v0++) {
-            CellActor_Delete(param0->unk_08[v0]);
+            Sprite_Delete(param0->unk_08[v0]);
         }
     }
 
@@ -3440,7 +3440,7 @@ static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_022
         }
 
         Sound_PlayEffect(1404);
-        CellActor_SetDrawFlag(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
+        Sprite_SetDrawFlag(param0->unk_08[(param0->unk_4A % (5 * 3))], 1);
         param0->unk_49 = 8;
         param0->unk_48++;
         break;
@@ -3455,8 +3455,8 @@ static BOOL ov114_0225F5AC(UnkStruct_ov114_0225F578 *param0, UnkStruct_ov114_022
 
                 if (param0->unk_4A != param0->unk_4B) {
                     for (v0 = 0; v0 < (5 * 3); v0++) {
-                        CellActor_SetDrawFlag(param0->unk_08[v0], 0);
-                        CellActor_SetAnim(param0->unk_08[v0], 2);
+                        Sprite_SetDrawFlag(param0->unk_08[v0], 0);
+                        Sprite_SetAnim(param0->unk_08[v0], 2);
                     }
                 }
             }
@@ -3627,7 +3627,7 @@ static void ov114_0225F988(UnkStruct_ov114_0225E854 *param0)
     }
 }
 
-static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_0225CDB4 *param1, CellActorCollection *param2, u32 param3)
+static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_0225CDB4 *param1, SpriteList *param2, u32 param3)
 {
     int v0;
     int v1;
@@ -3641,8 +3641,8 @@ static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_022
 
     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);
-        CellActor_SetAnim(param0->unk_00[v0], 5);
-        CellActor_SetExplicitPriority(param0->unk_00[v0], 0);
+        Sprite_SetAnim(param0->unk_00[v0], 5);
+        Sprite_SetExplicitPriority(param0->unk_00[v0], 0);
     }
 
     v1 = GX_GetVisibleWnd();
@@ -3658,7 +3658,7 @@ static void ov114_0225F9B8(UnkStruct_ov114_0225FAB8 *param0, UnkStruct_ov114_022
     param0->battlerType.effect = 1;
 
     SetHBlankCallback(ov114_0225FCF0, param0);
-    CellActor_SetFlipMode(param0->unk_00[1], 2);
+    Sprite_SetFlipMode(param0->unk_00[1], 2);
 
     ov114_0225FC6C(param0);
 }
@@ -3689,8 +3689,8 @@ static BOOL ov114_0225FAD8(UnkStruct_ov114_0225FAB8 *param0)
         param0->unk_08 = 1;
         v0 = 1;
 
-        CellActor_SetDrawFlag(param0->unk_00[0], 0);
-        CellActor_SetDrawFlag(param0->unk_00[1], 0);
+        Sprite_SetDrawFlag(param0->unk_00[0], 0);
+        Sprite_SetDrawFlag(param0->unk_00[1], 0);
     }
 
     ov114_0225FB10(param0, -1);
@@ -3721,7 +3721,7 @@ static void ov114_0225FB10(UnkStruct_ov114_0225FAB8 *param0, s32 param1)
             v0.y += FX32_CONST(v2);
         }
 
-        CellActor_SetPosition(param0->unk_00[v1], &v0);
+        Sprite_SetPosition(param0->unk_00[v1], &v0);
     }
 
     ov114_0225FC6C(param0);
@@ -3738,7 +3738,7 @@ static void ov114_0225FBF0(UnkStruct_ov114_0225FAB8 *param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_00[v0] != NULL) {
-            CellActor_Delete(param0->unk_00[v0]);
+            Sprite_Delete(param0->unk_00[v0]);
             param0->unk_00[v0] = NULL;
         }
     }
@@ -3819,7 +3819,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);
-        CellActor_SetExplicitPriority(v0->unk_30, 0);
+        Sprite_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
@@ -3831,9 +3831,9 @@ static void ov114_0225FDC8(SysTask *param0, void *param1)
         }
         break;
     case 3:
-        v2 = CellActor_GetAnimFrame(v0->unk_30);
-        CellActor_UpdateAnim(v0->unk_30, FX32_CONST(2));
-        v3 = CellActor_GetAnimFrame(v0->unk_30);
+        v2 = Sprite_GetAnimFrame(v0->unk_30);
+        Sprite_UpdateAnim(v0->unk_30, FX32_CONST(2));
+        v3 = Sprite_GetAnimFrame(v0->unk_30);
 
         if (v2 != v3) {
             switch (v3) {
@@ -3859,9 +3859,9 @@ static void ov114_0225FDC8(SysTask *param0, void *param1)
 
         if (v3 == 15) {
             if (v0->unk_06 == 0) {
-                CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
+                Sprite_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
             } else if (v0->unk_06 == 4) {
-                CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 1);
+                Sprite_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 1);
             }
 
             v0->unk_06++;
@@ -3871,18 +3871,18 @@ static void ov114_0225FDC8(SysTask *param0, void *param1)
             }
         }
 
-        v1 = CellActor_IsAnimated(v0->unk_30);
+        v1 = Sprite_IsAnimated(v0->unk_30);
 
         if (v1 == 0) {
             v0->unk_04++;
-            CellActor_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
+            Sprite_SetExplicitPaletteOffsetAutoAdjust(v0->unk_30, 0);
         }
         break;
     case 4:
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            CellActor_Delete(v0->unk_30);
+            Sprite_Delete(v0->unk_30);
             v0->unk_30 = NULL;
             v0->unk_04++;
             v0->unk_06 = 0;
@@ -3917,15 +3917,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);
-        CellActor_SetAnim(v0->unk_30, 1);
-        CellActor_SetExplicitPriority(v0->unk_30, 0);
+        Sprite_SetAnim(v0->unk_30, 1);
+        Sprite_SetExplicitPriority(v0->unk_30, 0);
         v0->unk_04++;
         break;
     case 2:
         v1 = ov114_0225FAB8(&v0->unk_34);
 
         if (v1 == 1) {
-            CellActor_SetAnimateFlag(v0->unk_30, 1);
+            Sprite_SetAnimateFlag(v0->unk_30, 1);
             v0->unk_04++;
             v0->unk_06 = 0;
         }
@@ -3941,7 +3941,7 @@ static void ov114_0225FF54(SysTask *param0, void *param1)
         v1 = ov114_0225FAD8(&v0->unk_34);
 
         if (v1 == 1) {
-            CellActor_Delete(v0->unk_30);
+            Sprite_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 8b2d8dc130..4e85a1cef1 100644
--- a/src/overlay115/ov115_02260CEC.c
+++ b/src/overlay115/ov115_02260CEC.c
@@ -25,7 +25,6 @@
 #include "bg_window.h"
 #include "brightness_controller.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "easy3d_object.h"
 #include "font.h"
@@ -38,6 +37,7 @@
 #include "pltt_transfer.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -149,11 +149,11 @@ typedef struct {
     Easy3DModel unk_00[5];
     Easy3DModel unk_50;
     SpriteResource *unk_60[4];
-    CellActorResourceData unk_70;
+    SpriteResourcesHeader unk_70;
 } UnkStruct_ov115_02264A40;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     Easy3DObject unk_04;
     Easy3DObject unk_7C;
     BOOL unk_F4;
@@ -167,12 +167,12 @@ typedef struct {
 
 typedef struct {
     BOOL unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
 } UnkStruct_ov115_02264BA0;
 
 typedef struct {
     BOOL unk_00;
-    CellActor *unk_04;
+    Sprite *unk_04;
     VecFx32 unk_08;
     s32 unk_14;
     BOOL unk_18;
@@ -183,7 +183,7 @@ typedef struct {
 } UnkStruct_ov115_02264C90;
 
 typedef struct {
-    CellActor *unk_00[3];
+    Sprite *unk_00[3];
     u32 unk_0C[3];
     VecFx32 unk_18[3];
     BOOL unk_3C;
@@ -228,8 +228,8 @@ typedef struct {
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorResourceData unk_10;
-    CellActor *unk_34;
+    SpriteResourcesHeader unk_10;
+    Sprite *unk_34;
     u8 unk_38;
     u8 unk_39;
     u8 unk_3A;
@@ -245,8 +245,8 @@ typedef struct {
 
 typedef struct {
     SpriteResource *unk_00[4];
-    CellActorResourceData unk_10;
-    CellActor *unk_34;
+    SpriteResourcesHeader unk_10;
+    Sprite *unk_34;
     Window unk_38;
     FontOAM *unk_48;
     UnkStruct_02012B20 *unk_4C;
@@ -277,10 +277,10 @@ typedef struct {
     u16 unk_14;
     u16 unk_16;
     GenericPointerData *unk_18;
-    CellActorCollection *unk_1C;
+    SpriteList *unk_1C;
     G2dRenderer unk_20;
     SpriteResourceCollection *unk_1AC[4];
-    CellActorResourceData unk_1BC;
+    SpriteResourcesHeader unk_1BC;
     SpriteResource *unk_1E0[4];
     UnkStruct_02012744 *unk_1F0;
     Camera *camera;
@@ -335,7 +335,7 @@ static void ov115_02261520(UnkStruct_ov115_02261574 *param0, UnkStruct_ov115_022
 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, CellActorInitParamsEx *param1, UnkStruct_ov115_02261ADC *param2, u32 param3, u32 param4, u32 param5, u32 param6);
+static void ov115_022615B0(UnkStruct_ov115_022615B0 *param0, AffineSpriteListTemplate *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);
@@ -1236,11 +1236,11 @@ 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)
 {
-    CellActorInitParamsEx v0;
+    AffineSpriteListTemplate v0;
     int v1, v2;
     u32 v3;
 
-    v0.collection = param1->unk_1C;
+    v0.list = param1->unk_1C;
     v0.resourceData = &param1->unk_1BC;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
@@ -1280,7 +1280,7 @@ static void ov115_02261598(UnkStruct_ov115_02261574 *param0)
     }
 }
 
-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_022615B0(UnkStruct_ov115_022615B0 *param0, AffineSpriteListTemplate *param1, UnkStruct_ov115_02261ADC *param2, u32 param3, u32 param4, u32 param5, u32 param6)
 {
     int v0;
     s32 v1, v2;
@@ -1290,12 +1290,12 @@ static void ov115_022615B0(UnkStruct_ov115_022615B0 *param0, CellActorInitParams
         param1->position.x = v1 << FX32_SHIFT;
         param1->position.y = v2 << FX32_SHIFT;
         param0->unk_18[v0] = param1->position;
-        param0->unk_00[v0] = CellActorCollection_AddEx(param1);
+        param0->unk_00[v0] = SpriteList_AddEx(param1);
 
-        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));
+        Sprite_SetAnim(param0->unk_00[v0], 2);
+        Sprite_SetDrawFlag(param0->unk_00[v0], 0);
+        Sprite_SetAnimateFlag(param0->unk_00[v0], 1);
+        Sprite_SetAnimSpeed(param0->unk_00[v0], FX32_CONST(1.5));
 
         param0->unk_0C[v0] = 0;
     }
@@ -1312,7 +1312,7 @@ static void ov115_02261648(UnkStruct_ov115_022615B0 *param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        CellActor_Delete(param0->unk_00[v0]);
+        Sprite_Delete(param0->unk_00[v0]);
     }
 }
 
@@ -1331,13 +1331,13 @@ static void ov115_02261660(UnkStruct_ov115_022615B0 *param0, u32 param1, u32 par
     v1 = -1;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (CellActor_GetDrawFlag(param0->unk_00[v0]) == 0) {
+        if (Sprite_GetDrawFlag(param0->unk_00[v0]) == 0) {
             v1 = v0;
             v2 = 1;
         } else {
-            v3 = CellActor_GetPriority(param0->unk_00[v0]);
+            v3 = Sprite_GetPriority(param0->unk_00[v0]);
             v3++;
-            CellActor_SetPriority(param0->unk_00[v0], v3);
+            Sprite_SetPriority(param0->unk_00[v0], v3);
 
             if ((v2 == 0) && (v4 <= v3)) {
                 v4 = v3;
@@ -1370,12 +1370,12 @@ static void ov115_02261660(UnkStruct_ov115_022615B0 *param0, u32 param1, u32 par
         v6 = 7;
     }
 
-    CellActor_SetAnim(param0->unk_00[v1], v5);
+    Sprite_SetAnim(param0->unk_00[v1], v5);
     param0->unk_0C[v1] = 0;
-    CellActor_SetDrawFlag(param0->unk_00[v1], 1);
+    Sprite_SetDrawFlag(param0->unk_00[v1], 1);
     ov115_0226177C(param0, v1);
-    CellActor_SetPriority(param0->unk_00[v1], 0);
-    CellActor_SetExplicitPalette(param0->unk_00[v1], v6);
+    Sprite_SetPriority(param0->unk_00[v1], 0);
+    Sprite_SetExplicitPalette(param0->unk_00[v1], v6);
 }
 
 static void ov115_02261744(UnkStruct_ov115_022615B0 *param0)
@@ -1383,7 +1383,7 @@ static void ov115_02261744(UnkStruct_ov115_022615B0 *param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        if (CellActor_GetDrawFlag(param0->unk_00[v0]) == 1) {
+        if (Sprite_GetDrawFlag(param0->unk_00[v0]) == 1) {
             param0->unk_0C[v0]++;
 
             if (param0->unk_0C[v0] > 16) {
@@ -1404,18 +1404,18 @@ static void ov115_0226177C(UnkStruct_ov115_022615B0 *param0, u32 param1)
     v1 = param0->unk_18[param1];
     v1.y += v0;
 
-    CellActor_SetPosition(param0->unk_00[param1], &v1);
+    Sprite_SetPosition(param0->unk_00[param1], &v1);
 }
 
 static void ov115_022617D8(UnkStruct_ov115_022615B0 *param0, u32 param1)
 {
-    CellActor_SetDrawFlag(param0->unk_00[param1], 0);
+    Sprite_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)
 {
     Strbuf *v0;
-    CellActorInitParamsEx v1;
+    AffineSpriteListTemplate v1;
 
     memset(param0, 0, sizeof(UnkStruct_ov115_022617E8));
 
@@ -2667,9 +2667,9 @@ static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
     }
 
     {
-        CellActorInitParams v2;
+        SpriteListTemplate v2;
 
-        v2.collection = param1->unk_1C;
+        v2.list = param1->unk_1C;
         v2.resourceData = &param0->unk_10;
         v2.position.x = FX32_CONST(128);
         v2.position.y = FX32_CONST(120) + (512 << FX32_SHIFT);
@@ -2677,8 +2677,8 @@ static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
         v2.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v2.heapID = param2;
 
-        param0->unk_34 = CellActorCollection_Add(&v2);
-        CellActor_SetDrawFlag(param0->unk_34, 0);
+        param0->unk_34 = SpriteList_Add(&v2);
+        Sprite_SetDrawFlag(param0->unk_34, 0);
     }
 
     NARC_dtor(v0);
@@ -2687,7 +2687,7 @@ static void ov115_02262FB4(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
 static void ov115_022630DC(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02261ADC *param1)
 {
     {
-        CellActor_Delete(param0->unk_34);
+        Sprite_Delete(param0->unk_34);
     }
 
     {
@@ -2710,14 +2710,14 @@ static void ov115_02263130(UnkStruct_ov115_02263130 *param0)
         param0->unk_39 = 0;
     }
 
-    CellActor_SetDrawFlag(param0->unk_34, 1);
+    Sprite_SetDrawFlag(param0->unk_34, 1);
 }
 
 static BOOL ov115_02263150(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_02260D78 *param1)
 {
     switch (param0->unk_3A) {
     case 0:
-        SpriteActor_SetAnimFrame(param0->unk_34, 0);
+        Sprite_SetAnimFrame(param0->unk_34, 0);
         ov115_02264BAC(&param1->unk_1AB4.unk_6A34);
         ov115_02264BD8(&param1->unk_1AB4.unk_6A34, 128, Unk_ov115_02265B7C[0]);
 
@@ -2725,12 +2725,12 @@ static BOOL ov115_02263150(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
         param0->unk_3A++;
         break;
     case 1:
-        CellActor_UpdateAnim(param0->unk_34, FX32_CONST(2));
+        Sprite_UpdateAnim(param0->unk_34, FX32_CONST(2));
 
         {
             u32 v0;
 
-            v0 = CellActor_GetAnimFrame(param0->unk_34);
+            v0 = Sprite_GetAnimFrame(param0->unk_34);
 
             switch (v0) {
             case 10:
@@ -2768,7 +2768,7 @@ static BOOL ov115_02263150(UnkStruct_ov115_02263130 *param0, UnkStruct_ov115_022
         break;
     case 3:
         if (ov115_022625C8(param1) == 0) {
-            CellActor_SetDrawFlag(param0->unk_34, 0);
+            Sprite_SetDrawFlag(param0->unk_34, 0);
             return 1;
         }
         break;
@@ -2980,7 +2980,7 @@ static void ov115_0226369C(const UnkStruct_ov115_02260D78 *param0, UnkStruct_ov1
     NNS_G3dGePopMtx(1);
 
     G3_RequestSwapBuffers(GX_SORTMODE_AUTO, GX_BUFFERMODE_Z);
-    CellActorCollection_Update(param1->unk_1C);
+    SpriteList_Update(param1->unk_1C);
 }
 
 static void ov115_0226376C(UnkStruct_ov115_02261ADC *param0, u32 param1)
@@ -3193,7 +3193,7 @@ static void ov115_02263A3C(UnkStruct_ov115_02261ADC *param0)
     int v0;
 
     sub_020127BC(param0->unk_1F0);
-    CellActorCollection_Delete(param0->unk_1C);
+    SpriteList_Delete(param0->unk_1C);
 
     for (v0 = 0; v0 < 4; v0++) {
         SpriteResourceCollection_Delete(param0->unk_1AC[v0]);
@@ -3701,9 +3701,9 @@ static void ov115_02264684(UnkStruct_ov115_02261ADC *param0, u32 param1)
 static void ov115_022646BC(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, u32 param2)
 {
     {
-        CellActorInitParamsEx v0 = { 0 };
+        AffineSpriteListTemplate v0 = { 0 };
 
-        v0.collection = param0->unk_1C;
+        v0.list = param0->unk_1C;
         v0.resourceData = &param0->unk_760.unk_70;
         v0.affineScale.x = FX32_ONE;
         v0.affineScale.y = FX32_ONE;
@@ -3711,9 +3711,9 @@ static void ov115_022646BC(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
         v0.priority = 32;
         v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
         v0.heapID = param2;
-        param1->unk_00 = CellActorCollection_AddEx(&v0);
+        param1->unk_00 = SpriteList_AddEx(&v0);
 
-        CellActor_SetDrawFlag(param1->unk_00, 0);
+        Sprite_SetDrawFlag(param1->unk_00, 0);
     }
 
     Easy3DObject_Init(&param1->unk_7C, &param0->unk_760.unk_50);
@@ -3722,7 +3722,7 @@ static void ov115_022646BC(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
 
 static void ov115_02264728(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1)
 {
-    CellActor_Delete(param1->unk_00);
+    Sprite_Delete(param1->unk_00);
     memset(param1, 0, sizeof(UnkStruct_ov115_022647A0));
 }
 
@@ -3732,9 +3732,9 @@ static void ov115_02264740(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
     param1->unk_F4 = 1;
     param1->unk_104 = 0;
 
-    CellActor_SetExplicitPalette(param1->unk_00, param2->unk_04.unk_00);
+    Sprite_SetExplicitPalette(param1->unk_00, param2->unk_04.unk_00);
     ov115_02264980(param1, param2, param3);
-    CellActor_SetDrawFlag(param1->unk_00, 1);
+    Sprite_SetDrawFlag(param1->unk_00, 1);
 }
 
 static void ov115_0226477C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022647A0 *param1, const UnkStruct_ov115_022622F8 *param2)
@@ -3742,7 +3742,7 @@ static void ov115_0226477C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
     param1->unk_F8 = param2;
     param1->unk_104 = 0;
 
-    CellActor_SetDrawFlag(param1->unk_00, 0);
+    Sprite_SetDrawFlag(param1->unk_00, 0);
     ov115_022649F0(param1, param0);
 }
 
@@ -3825,7 +3825,7 @@ static void ov115_02264924(UnkStruct_ov115_022647A0 *param0)
     param0->unk_F8 = NULL;
     param0->unk_F4 = 0;
 
-    CellActor_SetDrawFlag(param0->unk_00, 0);
+    Sprite_SetDrawFlag(param0->unk_00, 0);
     Easy3DObject_SetVisibility(&param0->unk_7C, 0);
 }
 
@@ -3857,7 +3857,7 @@ static BOOL ov115_02264980(UnkStruct_ov115_022647A0 *param0, const UnkStruct_ov1
     v0.y = (v1.y << FX32_SHIFT) + (512 << FX32_SHIFT);
     v0.z = 0;
 
-    CellActor_SetPosition(param0->unk_00, &v0);
+    Sprite_SetPosition(param0->unk_00, &v0);
 
     if ((v1.x < 0) || (v1.y < 0)) {
         return 0;
@@ -3870,7 +3870,7 @@ static void ov115_022649F0(UnkStruct_ov115_022647A0 *param0, UnkStruct_ov115_022
 {
     Easy3DModel *v0;
 
-    CellActor_SetDrawFlag(param0->unk_00, 0);
+    Sprite_SetDrawFlag(param0->unk_00, 0);
     param0->unk_F4 = 0;
 
     v0 = ov115_02264A40(param0->unk_F8, &param1->unk_760);
@@ -3923,9 +3923,9 @@ static void ov115_02264A54(UnkStruct_ov115_022647A0 *param0)
 
 static void ov115_02264B40(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264BA0 *param1, u32 param2, u32 param3)
 {
-    CellActorInitParamsEx v0 = { 0 };
+    AffineSpriteListTemplate v0 = { 0 };
 
-    v0.collection = param0->unk_1C;
+    v0.list = param0->unk_1C;
     v0.resourceData = &param0->unk_760.unk_70;
     v0.affineScale.x = FX32_ONE;
     v0.affineScale.y = FX32_ONE;
@@ -3934,22 +3934,22 @@ static void ov115_02264B40(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
     v0.vramType = NNS_G2D_VRAM_TYPE_2DSUB;
     v0.heapID = param3;
 
-    param1->unk_04 = CellActorCollection_AddEx(&v0);
+    param1->unk_04 = SpriteList_AddEx(&v0);
 
-    CellActor_SetDrawFlag(param1->unk_04, 0);
-    CellActor_SetExplicitPalette(param1->unk_04, param2);
+    Sprite_SetDrawFlag(param1->unk_04, 0);
+    Sprite_SetExplicitPalette(param1->unk_04, param2);
 
     param1->unk_00 = 0;
 }
 
 static void ov115_02264BA0(UnkStruct_ov115_02264BA0 *param0)
 {
-    CellActor_Delete(param0->unk_04);
+    Sprite_Delete(param0->unk_04);
 }
 
 static void ov115_02264BAC(UnkStruct_ov115_02264BA0 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_04, 1);
+    Sprite_SetDrawFlag(param0->unk_04, 1);
     param0->unk_00 = 1;
 }
 
@@ -3971,21 +3971,21 @@ static void ov115_02264BD8(UnkStruct_ov115_02264BA0 *param0, s32 param1, s32 par
     v0.x = param1 << FX32_SHIFT;
     v0.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    CellActor_SetPosition(param0->unk_04, &v0);
+    Sprite_SetPosition(param0->unk_04, &v0);
 }
 
 static void ov115_02264BF8(UnkStruct_ov115_02264BA0 *param0)
 {
-    CellActor_SetDrawFlag(param0->unk_04, 0);
+    Sprite_SetDrawFlag(param0->unk_04, 0);
     param0->unk_00 = 0;
 }
 
 static void ov115_02264C0C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_02264C90 *param1, u32 param2, u32 param3)
 {
     int v0;
-    CellActorInitParamsEx v1 = { 0 };
+    AffineSpriteListTemplate v1 = { 0 };
 
-    v1.collection = param0->unk_1C;
+    v1.list = param0->unk_1C;
     v1.resourceData = &param0->unk_760.unk_70;
     v1.affineScale.x = 9;
     v1.affineScale.y = 9;
@@ -3995,10 +3995,10 @@ static void ov115_02264C0C(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
     v1.heapID = param3;
 
     for (v0 = 0; v0 < 8; v0++) {
-        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_04 = SpriteList_AddEx(&v1);
+        Sprite_SetDrawFlag(param1->unk_00[v0].unk_04, 0);
+        Sprite_SetAffineOverwriteMode(param1->unk_00[v0].unk_04, 1);
+        Sprite_SetExplicitPalette(param1->unk_00[v0].unk_04, param2);
         param1->unk_00[v0].unk_00 = 0;
     }
 }
@@ -4008,7 +4008,7 @@ static void ov115_02264C78(UnkStruct_ov115_02261ADC *param0, UnkStruct_ov115_022
     int v0;
 
     for (v0 = 0; v0 < 8; v0++) {
-        CellActor_Delete(param1->unk_00[v0].unk_04);
+        Sprite_Delete(param1->unk_00[v0].unk_04);
     }
 }
 
@@ -4040,7 +4040,7 @@ static void ov115_02264C90(UnkStruct_ov115_02264C90 *param0)
             v5.x = v4;
             v5.y = v4;
 
-            CellActor_SetAffineScale(param0->unk_00[v0].unk_04, &v5);
+            Sprite_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;
@@ -4049,11 +4049,11 @@ static void ov115_02264C90(UnkStruct_ov115_02264C90 *param0)
             }
 
             param0->unk_00[v0].unk_08.y += v3 << FX32_SHIFT;
-            CellActor_SetPosition(param0->unk_00[v0].unk_04, &param0->unk_00[v0].unk_08);
+            Sprite_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;
-                CellActor_SetDrawFlag(param0->unk_00[v0].unk_04, 0);
+                Sprite_SetDrawFlag(param0->unk_00[v0].unk_04, 0);
             }
         }
     }
@@ -4084,10 +4084,10 @@ static void ov115_02264D80(UnkStruct_ov115_02264C90 *param0, s32 param1, s32 par
     v1->unk_08.x = param1 << FX32_SHIFT;
     v1->unk_08.y = (param2 << FX32_SHIFT) + (512 << FX32_SHIFT);
 
-    CellActor_SetPosition(v1->unk_04, &v1->unk_08);
+    Sprite_SetPosition(v1->unk_04, &v1->unk_08);
 
     v1->unk_00 = 1;
-    CellActor_SetDrawFlag(v1->unk_04, 1);
+    Sprite_SetDrawFlag(v1->unk_04, 1);
     v1->unk_14 = 0;
 }
 
@@ -4404,9 +4404,9 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
     }
 
     {
-        CellActorInitParams v1;
+        SpriteListTemplate v1;
 
-        v1.collection = param1->unk_1C;
+        v1.list = param1->unk_1C;
         v1.resourceData = &param0->unk_10;
         v1.position.x = (-FX32_CONST(64));
         v1.position.y = (FX32_CONST(48));
@@ -4414,8 +4414,8 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
         v1.vramType = NNS_G2D_VRAM_TYPE_2DMAIN;
         v1.heapID = param3;
 
-        param0->unk_34 = CellActorCollection_Add(&v1);
-        CellActor_SetDrawFlag(param0->unk_34, 0);
+        param0->unk_34 = SpriteList_Add(&v1);
+        Sprite_SetDrawFlag(param0->unk_34, 0);
     }
 
     {
@@ -4474,7 +4474,7 @@ static void ov115_02265688(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
         Strbuf_Free(param0->unk_5C);
     }
 
-    CellActor_Delete(param0->unk_34);
+    Sprite_Delete(param0->unk_34);
 
     {
         SpriteTransfer_ResetCharTransfer(param0->unk_00[0]);
@@ -4497,7 +4497,7 @@ static void ov115_02265700(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022
     }
 
     sub_020129D0(param0->unk_48, 1);
-    CellActor_SetDrawFlag(param0->unk_34, 1);
+    Sprite_SetDrawFlag(param0->unk_34, 1);
 
     param0->unk_98 = 1;
     param0->unk_9A = 0;
@@ -4554,7 +4554,7 @@ static void ov115_02265820(UnkStruct_ov115_02265788 *param0)
         } else {
             param0->unk_98 = 0;
             sub_020129D0(param0->unk_48, 0);
-            CellActor_SetDrawFlag(param0->unk_34, 0);
+            Sprite_SetDrawFlag(param0->unk_34, 0);
         }
         break;
     }
@@ -4576,7 +4576,7 @@ static void ov115_02265820(UnkStruct_ov115_02265788 *param0)
         v0.x = param0->unk_64.unk_00;
         v0.y = param0->unk_7C.unk_00;
 
-        CellActor_SetPosition(param0->unk_34, &v0);
+        Sprite_SetPosition(param0->unk_34, &v0);
         sub_02012938(param0->unk_48);
     }
 }
diff --git a/src/overlay116/ov116_022604C4.c b/src/overlay116/ov116_022604C4.c
index 5e3023d21c..076c27e9bd 100644
--- a/src/overlay116/ov116_022604C4.c
+++ b/src/overlay116/ov116_022604C4.c
@@ -369,7 +369,7 @@ static BOOL ov116_02260B6C(UnkStruct_ov116_02262A8C *param0)
         { 0, 0 },
     };
 
-    v0 = Sprite_GetAnimationFrame(param0->unk_D8);
+    v0 = ManagedSprite_GetAnimationFrame(param0->unk_D8);
     v1 = (param0->unk_0C * 12) + v0;
     v2 = v4[v1][0];
     v3 = v4[v1][1];
@@ -395,9 +395,9 @@ static BOOL ov116_02260B6C(UnkStruct_ov116_02262A8C *param0)
     param0->unk_08 = v0;
 
     if (param0->unk_0C == 2) {
-        if (Sprite_GetActiveAnim(param0->unk_D8) != 2) {
-            Sprite_SetPositionXY2(param0->unk_D8, 128, 100);
-            Sprite_SetAnimNoRestart(param0->unk_D8, 2);
+        if (ManagedSprite_GetActiveAnim(param0->unk_D8) != 2) {
+            ManagedSprite_SetPositionXY(param0->unk_D8, 128, 100);
+            ManagedSprite_SetAnimNoRestart(param0->unk_D8, 2);
 
             ov116_02266FEC(&param0->unk_FC.unk_190);
             ov116_02266FEC(&param0->unk_FC.unk_1A0);
@@ -410,7 +410,7 @@ static BOOL ov116_02260B6C(UnkStruct_ov116_02262A8C *param0)
         param0->unk_08 = 0;
         param0->unk_0C = 0;
 
-        Sprite_SetDrawFlag2(param0->unk_D8, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_D8, 0);
 
         ov116_02266FEC(&param0->unk_FC.unk_190);
         ov116_02266FEC(&param0->unk_FC.unk_1A0);
@@ -420,7 +420,7 @@ static BOOL ov116_02260B6C(UnkStruct_ov116_02262A8C *param0)
         return 1;
     }
 
-    Sprite_TickTwoFrame(param0->unk_D8);
+    ManagedSprite_TickTwoFrames(param0->unk_D8);
 
     return 0;
 }
diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c
index dabba3f8c7..e8f75ffde9 100644
--- a/src/overlay116/ov116_02261870.c
+++ b/src/overlay116/ov116_02261870.c
@@ -227,8 +227,8 @@ void ov116_02261D08(UnkStruct_ov116_02262A8C *param0)
     for (v4 = 0; v4 < (3 * 12); v4++) {
         ov116_02261CD8(&v0, v4 * 8, 20, 1, 3, 9006);
         param0->unk_28[v4] = SpriteSystem_NewSprite(v1, v2, &v0);
-        Sprite_SetExplicitPaletteOffset(param0->unk_28[v4], 3);
-        Sprite_SetAnim(param0->unk_28[v4], (v4 % 11) + 1);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_28[v4], 3);
+        ManagedSprite_SetAnim(param0->unk_28[v4], (v4 % 11) + 1);
     }
 
     ov116_02261E0C(param0, 0, 0);
@@ -250,8 +250,8 @@ void ov116_02261D70(UnkStruct_ov116_02262A8C *param0)
         v0.priority = 1;
         param0->unk_B8[v4] = SpriteSystem_NewSprite(v1, v2, &v0);
 
-        Sprite_TickTwoFrame(param0->unk_B8[v4]);
-        Sprite_SetExplicitPaletteOffset(param0->unk_B8[v4], 1);
+        ManagedSprite_TickTwoFrames(param0->unk_B8[v4]);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_B8[v4], 1);
     }
 }
 
@@ -269,7 +269,7 @@ void ov116_02261E0C(UnkStruct_ov116_02262A8C *param0, BOOL param1, int param2)
     int v0;
 
     for (v0 = 0; v0 < (3 * 12); v0++) {
-        Sprite_SetDrawFlag2(param0->unk_28[v0], param1);
+        ManagedSprite_SetDrawFlag(param0->unk_28[v0], param1);
     }
 }
 
@@ -278,7 +278,7 @@ void ov116_02261E28(UnkStruct_ov116_02262A8C *param0)
     int v0;
 
     for (v0 = 0; v0 < (3 * 12); v0++) {
-        Sprite_TickTwoFrame(param0->unk_28[v0]);
+        ManagedSprite_TickTwoFrames(param0->unk_28[v0]);
     }
 }
 
@@ -314,8 +314,8 @@ void ov116_02261E58(UnkStruct_ov116_02262A8C *param0, int param1, int param2)
 
     int v1 = param0->unk_DC[param1];
 
-    Sprite_SetAnim(param0->unk_1C[v1], v0[param2][0]);
-    Sprite_SetAnim(param0->unk_20[v1], v0[param2][1]);
+    ManagedSprite_SetAnim(param0->unk_1C[v1], v0[param2][0]);
+    ManagedSprite_SetAnim(param0->unk_20[v1], v0[param2][1]);
 }
 
 int ov116_02261EA4(UnkStruct_ov116_02262A8C *param0, int param1)
@@ -331,8 +331,8 @@ int ov116_02261EA4(UnkStruct_ov116_02262A8C *param0, int param1)
     int v2[2];
 
     v1 = param0->unk_DC[param1];
-    v2[0] = Sprite_GetActiveAnim(param0->unk_1C[v1]);
-    v2[1] = Sprite_GetActiveAnim(param0->unk_20[v1]);
+    v2[0] = ManagedSprite_GetActiveAnim(param0->unk_1C[v1]);
+    v2[1] = ManagedSprite_GetActiveAnim(param0->unk_20[v1]);
 
     {
         int v3;
@@ -359,9 +359,9 @@ void ov116_02261F08(UnkStruct_ov116_02262A8C *param0)
             continue;
         }
 
-        Sprite_TickTwoFrame(param0->unk_1C[v1]);
-        Sprite_TickTwoFrame(param0->unk_20[v1]);
-        Sprite_TickTwoFrame(param0->unk_24[v1]);
+        ManagedSprite_TickTwoFrames(param0->unk_1C[v1]);
+        ManagedSprite_TickTwoFrames(param0->unk_20[v1]);
+        ManagedSprite_TickTwoFrames(param0->unk_24[v1]);
 
         v1++;
     }
@@ -699,25 +699,25 @@ void ov116_022625A8(UnkStruct_ov116_0226139C *param0, UnkStruct_ov116_02262A8C *
         v0.priority = 2;
 
         param1->unk_20[v5] = SpriteSystem_NewSprite(v1, v2, &v0);
-        Sprite_SetExplicitPaletteOffset(param1->unk_20[v5], 0 + ov116_02264680(param0, v4));
+        ManagedSprite_SetExplicitPaletteOffset(param1->unk_20[v5], 0 + ov116_02264680(param0, v4));
         ov116_02261CD8(&v0, Unk_ov116_02267A78[param1->unk_04 - 1][v5] + 0, ((176 + 64) + 0), 2, 0, 9000);
         v0.priority = 3;
 
         param1->unk_24[v5] = SpriteSystem_NewSprite(v1, v2, &v0);
-        Sprite_SetExplicitPaletteOffset(param1->unk_24[v5], 0 + ov116_02264680(param0, v4));
-        Sprite_SetAnim(param1->unk_24[v5], 5);
-        Sprite_TickTwoFrame(param1->unk_1C[v5]);
-        Sprite_TickTwoFrame(param1->unk_20[v5]);
-        Sprite_TickTwoFrame(param1->unk_24[v5]);
+        ManagedSprite_SetExplicitPaletteOffset(param1->unk_24[v5], 0 + ov116_02264680(param0, v4));
+        ManagedSprite_SetAnim(param1->unk_24[v5], 5);
+        ManagedSprite_TickTwoFrames(param1->unk_1C[v5]);
+        ManagedSprite_TickTwoFrames(param1->unk_20[v5]);
+        ManagedSprite_TickTwoFrames(param1->unk_24[v5]);
         ov116_02261E58(param1, v4, 0);
 
         v5++;
     }
 }
 
-CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2)
+ManagedSprite *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
     SpriteSystem *v2 = param0->unk_14->unk_08;
     SpriteManager *v3 = param0->unk_14->unk_0C;
@@ -729,7 +729,7 @@ CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16
     v1.priority = 0;
     v0 = SpriteSystem_NewSprite(v2, v3, &v1);
 
-    Sprite_TickTwoFrame(v0);
+    ManagedSprite_TickTwoFrames(v0);
 
     return v0;
 }
@@ -737,7 +737,7 @@ CellActorData *ov116_022626E8(UnkStruct_ov116_02262A8C *param0, s16 param1, s16
 void ov116_02262724(UnkStruct_ov116_02262A8C *param0)
 {
     int v0;
-    CellActorData *v1;
+    ManagedSprite *v1;
     SpriteTemplate v2;
     SpriteSystem *v3 = param0->unk_14->unk_08;
     SpriteManager *v4 = param0->unk_14->unk_0C;
@@ -750,11 +750,11 @@ void ov116_02262724(UnkStruct_ov116_02262A8C *param0)
         v2.priority = 20;
         param0->unk_D0[v0] = SpriteSystem_NewSprite(v3, v4, &v2);
 
-        Sprite_SetAnim(param0->unk_D0[v0], 0);
-        Sprite_TickOneFrame(param0->unk_D0[v0]);
-        Sprite_SetExplicitPaletteOffset(param0->unk_D0[v0], 4);
-        Sprite_SetExplicitOamMode2(param0->unk_D0[v0], GX_OAM_MODE_XLU);
-        Sprite_SetDrawFlag2(param0->unk_D0[v0], 0);
+        ManagedSprite_SetAnim(param0->unk_D0[v0], 0);
+        ManagedSprite_TickFrame(param0->unk_D0[v0]);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_D0[v0], 4);
+        ManagedSprite_SetExplicitOamMode(param0->unk_D0[v0], GX_OAM_MODE_XLU);
+        ManagedSprite_SetDrawFlag(param0->unk_D0[v0], 0);
 
         ov116_02261CD8(&v2, 0, 0, 2, 0, 9000);
 
@@ -762,11 +762,11 @@ void ov116_02262724(UnkStruct_ov116_02262A8C *param0)
         v2.priority = 20;
         param0->unk_C8[v0] = SpriteSystem_NewSprite(v3, v4, &v2);
 
-        Sprite_SetAnim(param0->unk_C8[v0], 6);
-        Sprite_TickOneFrame(param0->unk_C8[v0]);
-        Sprite_SetExplicitPaletteOffset(param0->unk_C8[v0], 0);
-        Sprite_SetExplicitOamMode2(param0->unk_C8[v0], GX_OAM_MODE_XLU);
-        Sprite_SetDrawFlag2(param0->unk_C8[v0], 0);
+        ManagedSprite_SetAnim(param0->unk_C8[v0], 6);
+        ManagedSprite_TickFrame(param0->unk_C8[v0]);
+        ManagedSprite_SetExplicitPaletteOffset(param0->unk_C8[v0], 0);
+        ManagedSprite_SetExplicitOamMode(param0->unk_C8[v0], GX_OAM_MODE_XLU);
+        ManagedSprite_SetDrawFlag(param0->unk_C8[v0], 0);
     }
 }
 
@@ -783,7 +783,7 @@ void ov116_0226281C(UnkStruct_ov116_02262A8C *param0)
 void ov116_02262840(UnkStruct_ov116_02262A8C *param0)
 {
     int v0;
-    CellActorData *v1;
+    ManagedSprite *v1;
     SpriteTemplate v2;
     SpriteSystem *v3 = param0->unk_14->unk_08;
     SpriteManager *v4 = param0->unk_14->unk_0C;
@@ -795,10 +795,10 @@ void ov116_02262840(UnkStruct_ov116_02262A8C *param0)
     v2.priority = 0;
     param0->unk_D8 = SpriteSystem_NewSprite(v3, v4, &v2);
 
-    Sprite_SetAnim(param0->unk_D8, 1);
-    Sprite_SetDrawFlag2(param0->unk_D8, 1);
-    Sprite_TickOneFrame(param0->unk_D8);
-    Sprite_SetExplicitPaletteOffset(param0->unk_D8, 7);
+    ManagedSprite_SetAnim(param0->unk_D8, 1);
+    ManagedSprite_SetDrawFlag(param0->unk_D8, 1);
+    ManagedSprite_TickFrame(param0->unk_D8);
+    ManagedSprite_SetExplicitPaletteOffset(param0->unk_D8, 7);
 }
 
 void ov116_022628AC(UnkStruct_ov116_02262A8C *param0)
diff --git a/src/overlay116/ov116_02262A8C.c b/src/overlay116/ov116_02262A8C.c
index 21d2ea2f65..3bf6ddeae7 100644
--- a/src/overlay116/ov116_02262A8C.c
+++ b/src/overlay116/ov116_02262A8C.c
@@ -14,12 +14,12 @@
 #include "overlay116/struct_ov116_022649E4.h"
 #include "overlay116/struct_ov116_0226501C.h"
 
-#include "cell_actor.h"
 #include "communication_system.h"
 #include "easy3d_object.h"
 #include "heap.h"
 #include "inlines.h"
 #include "math.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
@@ -515,7 +515,7 @@ void ov116_02262E50(SysTask *param0, void *param1)
 void ov116_02263158(SysTask *param0, void *param1)
 {
     UnkStruct_ov116_02262CB8 *v0 = param1;
-    int v1 = Sprite_GetAnimationFrame(v0->unk_0C);
+    int v1 = ManagedSprite_GetAnimationFrame(v0->unk_0C);
 
     if ((IsScreenTransitionDone() == 0) || (v0->unk_2C->unk_2C.unk_00 == 1)) {
         SysTask_Done(param0);
@@ -529,7 +529,7 @@ void ov116_02263158(SysTask *param0, void *param1)
         fx32 v4;
 
         v0->unk_08 = 0;
-        Sprite_GetPositionFxXY(v0->unk_0C, &v2, &v3);
+        ManagedSprite_GetPositionFxXY(v0->unk_0C, &v2, &v3);
 
         if (v0->unk_04 == 0) {
             ov116_02264764(&v0->unk_14, v3, v3 + FX32_CONST(32), 16);
@@ -544,8 +544,8 @@ void ov116_02263158(SysTask *param0, void *param1)
         BOOL v7;
 
         v7 = ov116_02264774(&v0->unk_14);
-        Sprite_GetPositionFxXY(v0->unk_0C, &v5, &v6);
-        Sprite_SetPositionFxXY(v0->unk_0C, v5, v0->unk_14.unk_00);
+        ManagedSprite_GetPositionFxXY(v0->unk_0C, &v5, &v6);
+        ManagedSprite_SetPositionFxXY(v0->unk_0C, v5, v0->unk_14.unk_00);
 
         if (v7) {
             v0->unk_00++;
@@ -582,15 +582,15 @@ static void ov116_0226323C(SysTask *param0, void *param1)
     case 0: {
         f32 v1, v2;
 
-        Sprite_SetAnim(v0->unk_0C, 7);
-        Sprite_SetPriority(v0->unk_0C, 0);
-        Sprite_SetAffineOverwriteMode(v0->unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_GetAffineScale(v0->unk_0C, &v1, &v2);
+        ManagedSprite_SetAnim(v0->unk_0C, 7);
+        ManagedSprite_SetPriority(v0->unk_0C, 0);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_GetAffineScale(v0->unk_0C, &v1, &v2);
         ov116_02264764(&v0->unk_10, FX_F32_TO_FX32(v2), FX_F32_TO_FX32(2.0f), 2);
 
         {
             int v3 = (*v0->unk_2C) - 1;
-            Sprite_SetExplicitPaletteOffset(v0->unk_0C, v3);
+            ManagedSprite_SetExplicitPaletteOffset(v0->unk_0C, v3);
         }
 
         v0->unk_00++;
@@ -600,7 +600,7 @@ static void ov116_0226323C(SysTask *param0, void *param1)
         BOOL v6;
 
         v6 = ov116_02264774(&v0->unk_10);
-        Sprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
+        ManagedSprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
 
         if (v6) {
             v0->unk_00++;
@@ -614,7 +614,7 @@ static void ov116_0226323C(SysTask *param0, void *param1)
         BOOL v9;
 
         v9 = ov116_02264774(&v0->unk_10);
-        Sprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
+        ManagedSprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
 
         if (v9) {
             v0->unk_00++;
@@ -641,7 +641,7 @@ static void ov116_0226323C(SysTask *param0, void *param1)
         break;
     case 5: {
         BOOL v10 = ov116_02264774(&v0->unk_10);
-        Sprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
+        ManagedSprite_SetAffineScale(v0->unk_0C, 1.0f, FX_FX32_TO_F32(v0->unk_10.unk_00));
 
         if (v10) {
             v0->unk_00 = 4;
@@ -649,10 +649,10 @@ static void ov116_0226323C(SysTask *param0, void *param1)
         }
     } break;
     default:
-        Sprite_SetAffineScale(v0->unk_0C, 1.0f, 1.0f);
-        Sprite_SetAnim(v0->unk_0C, 5);
-        Sprite_SetPriority(v0->unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
-        Sprite_SetAffineOverwriteMode(v0->unk_0C, 0);
+        ManagedSprite_SetAffineScale(v0->unk_0C, 1.0f, 1.0f);
+        ManagedSprite_SetAnim(v0->unk_0C, 5);
+        ManagedSprite_SetPriority(v0->unk_0C, AFFINE_OVERWRITE_MODE_DOUBLE);
+        ManagedSprite_SetAffineOverwriteMode(v0->unk_0C, 0);
 
         v0->unk_30 = 0;
 
diff --git a/src/overlay116/ov116_0226432C.c b/src/overlay116/ov116_0226432C.c
index d77382a60c..0b82e481c7 100644
--- a/src/overlay116/ov116_0226432C.c
+++ b/src/overlay116/ov116_0226432C.c
@@ -31,7 +31,7 @@
 #include "unk_0200F174.h"
 
 typedef struct {
-    CellActorData *unk_00;
+    ManagedSprite *unk_00;
     fx32 unk_04;
     fx32 unk_08;
     fx32 unk_0C;
@@ -342,7 +342,7 @@ static void ov116_022647BC(SysTask *param0, void *param1)
     switch (v0->unk_04) {
     case 0:
         for (v1 = 0; v1 < 3; v1++) {
-            Sprite_GetPositionFxXY(v0->unk_08[v1], &v2, &v3);
+            ManagedSprite_GetPositionFxXY(v0->unk_08[v1], &v2, &v3);
             ov116_0226469C(&v0->unk_14[v1][0], v2, v2 + v6[v1], FX_F32_TO_FX32(0.3f), 8);
             ov116_0226469C(&v0->unk_14[v1][1], v3, v3 + v7[v1], FX_F32_TO_FX32(0.2f), 8);
         }
@@ -354,13 +354,13 @@ static void ov116_022647BC(SysTask *param0, void *param1)
             v4[v1][0] = ov116_022646FC(&v0->unk_14[v1][0]);
             v4[v1][1] = ov116_022646FC(&v0->unk_14[v1][1]);
 
-            Sprite_SetPositionFxXY(v0->unk_08[v1], v0->unk_14[v1][0].unk_00, v0->unk_14[v1][1].unk_00);
+            ManagedSprite_SetPositionFxXY(v0->unk_08[v1], v0->unk_14[v1][0].unk_00, v0->unk_14[v1][1].unk_00);
 
             if ((v4[v1][0] == 0) || (v4[v1][1] == 0)) {
                 v5 = 0;
             }
 
-            Sprite_TickOneFrame(v0->unk_08[v1]);
+            ManagedSprite_TickFrame(v0->unk_08[v1]);
         }
         if (v5) {
             v0->unk_04++;
@@ -395,7 +395,7 @@ void ov116_0226493C(UnkStruct_ov116_02262A8C *param0, s16 param1, s16 param2)
 
         for (v1 = 0; v1 < 3; v1++) {
             param0->unk_214C[v0].unk_08[v1] = ov116_022626E8(param0, param1, param2);
-            Sprite_SetAnim(param0->unk_214C[v0].unk_08[v1], ((param1 * (v0 + 1)) + (param2 * (v1 + 1))) % 3);
+            ManagedSprite_SetAnim(param0->unk_214C[v0].unk_08[v1], ((param1 * (v0 + 1)) + (param2 * (v1 + 1))) % 3);
         }
 
         SysTask_Start(ov116_022647BC, &param0->unk_214C[v0], 4096);
@@ -414,7 +414,7 @@ static inline void inline_ov116_022649E4_1(UnkStruct_ov116_02264FEC_sub1 *wk, fx
     wk->unk_04 += x;
     wk->unk_08 += y;
 
-    Sprite_SetPositionFxXYWithSubscreenOffset(wk->unk_00, wk->unk_14 + wk->unk_0C + wk->unk_1C + wk->unk_04, wk->unk_18 + wk->unk_10 + wk->unk_20 + wk->unk_08, FX32_CONST(192 + 32));
+    ManagedSprite_SetPositionFxXYWithSubscreenOffset(wk->unk_00, wk->unk_14 + wk->unk_0C + wk->unk_1C + wk->unk_04, wk->unk_18 + wk->unk_10 + wk->unk_20 + wk->unk_08, FX32_CONST(192 + 32));
 }
 
 static void ov116_022649E4(SysTask *param0, void *param1)
@@ -505,7 +505,7 @@ static void ov116_022649E4(SysTask *param0, void *param1)
 
                 if (v0->unk_14[v6].unk_32 >= (10 + v0->unk_14[v6].unk_26)) {
                     if (v0->unk_14[v6].unk_32 == (10 + v0->unk_14[v6].unk_26)) {
-                        Sprite_SetAnim(v0->unk_14[v6].unk_00, 0);
+                        ManagedSprite_SetAnim(v0->unk_14[v6].unk_00, 0);
                     }
 
                     if (v0->unk_14[v6].unk_32 == (18 + v0->unk_14[v6].unk_26)) {
@@ -516,7 +516,7 @@ static void ov116_022649E4(SysTask *param0, void *param1)
                         }
                     }
 
-                    Sprite_SetDrawFlag2(v0->unk_14[v6].unk_00, v0->unk_14[v6].unk_25);
+                    ManagedSprite_SetDrawFlag(v0->unk_14[v6].unk_00, v0->unk_14[v6].unk_25);
 
                     switch (v0->unk_14[v6].unk_27) {
                     case 0:
@@ -674,7 +674,7 @@ static void ov116_0226510C(UnkStruct_ov116_02265470 *param0)
     s16 v1, v2;
     s16 v3[] = { 188, 188, 180, 180 };
     BOOL v4[4] = { 1, 1, 1, 1 };
-    CellActorData *v5;
+    ManagedSprite *v5;
 
     if (param0->unk_04 == 0) {
         return;
@@ -688,10 +688,10 @@ static void ov116_0226510C(UnkStruct_ov116_02265470 *param0)
                 continue;
             }
 
-            Sprite_GetPositionXY2(v5, &v1, &v2);
+            ManagedSprite_GetPositionXY(v5, &v1, &v2);
             if (v2 > v3[v0]) {
                 v2 -= 6;
-                Sprite_SetPositionXY2(v5, v1, v2);
+                ManagedSprite_SetPositionXY(v5, v1, v2);
                 v4[v0] = 0;
             }
         }
@@ -719,10 +719,10 @@ static void ov116_0226510C(UnkStruct_ov116_02265470 *param0)
                 continue;
             }
 
-            Sprite_GetPositionXY2(v5, &v1, &v2);
+            ManagedSprite_GetPositionXY(v5, &v1, &v2);
             if (v2 < (192 + 32)) {
                 v2 += 6;
-                Sprite_SetPositionXY2(v5, v1, v2);
+                ManagedSprite_SetPositionXY(v5, v1, v2);
                 v4[v0] = 0;
             }
         }
@@ -746,7 +746,7 @@ static void ov116_0226510C(UnkStruct_ov116_02265470 *param0)
             continue;
         }
 
-        Sprite_TickTwoFrame(v5);
+        ManagedSprite_TickTwoFrames(v5);
     }
 }
 
@@ -912,10 +912,10 @@ void ov116_02265470(UnkStruct_ov116_02262A8C *param0)
             {
                 s16 v2, v3;
 
-                Sprite_GetPositionXY2(param0->unk_B8[0], &v2, &v3);
-                Sprite_SetPositionXY2(param0->unk_B8[0], v2, (192 + 32));
-                Sprite_GetPositionXY2(param0->unk_B8[1], &v2, &v3);
-                Sprite_SetPositionXY2(param0->unk_B8[1], v2, (192 + 32));
+                ManagedSprite_GetPositionXY(param0->unk_B8[0], &v2, &v3);
+                ManagedSprite_SetPositionXY(param0->unk_B8[0], v2, (192 + 32));
+                ManagedSprite_GetPositionXY(param0->unk_B8[1], &v2, &v3);
+                ManagedSprite_SetPositionXY(param0->unk_B8[1], v2, (192 + 32));
             }
             break;
         case 2: {
@@ -933,10 +933,10 @@ void ov116_02265470(UnkStruct_ov116_02262A8C *param0)
             {
                 s16 v5, v6;
 
-                Sprite_GetPositionXY2(param0->unk_B8[2], &v5, &v6);
-                Sprite_SetPositionXY2(param0->unk_B8[2], v5, (192 + 32));
-                Sprite_GetPositionXY2(param0->unk_B8[3], &v5, &v6);
-                Sprite_SetPositionXY2(param0->unk_B8[3], v5, (192 + 32));
+                ManagedSprite_GetPositionXY(param0->unk_B8[2], &v5, &v6);
+                ManagedSprite_SetPositionXY(param0->unk_B8[2], v5, (192 + 32));
+                ManagedSprite_GetPositionXY(param0->unk_B8[3], &v5, &v6);
+                ManagedSprite_SetPositionXY(param0->unk_B8[3], v5, (192 + 32));
             }
             break;
         case 4:
@@ -1175,9 +1175,9 @@ static void ov116_0226591C(SysTask *param0, void *param1)
                 for (v0 = 0; v0 < 2; v0++) {
                     int v5 = Unk_ov116_02267DA4[v2].unk_0C[v0];
 
-                    Sprite_SetExplicitPaletteOffset(v4->unk_00[v0].unk_00, 4 + v5);
+                    ManagedSprite_SetExplicitPaletteOffset(v4->unk_00[v0].unk_00, 4 + v5);
                     v5 = Unk_ov116_02267DA4[v2].unk_18[v0];
-                    Sprite_SetExplicitPaletteOffset(v4->unk_A0[v0].unk_00, 0 + v5);
+                    ManagedSprite_SetExplicitPaletteOffset(v4->unk_A0[v0].unk_00, 0 + v5);
                 }
 
                 SysTask_Start(Unk_ov116_02267DA4[v2].unk_24, v3, 4097);
@@ -1237,7 +1237,7 @@ static void ov116_02265AA4(SysTask *param0, void *param1)
         v1->unk_00[0].unk_18 = 64;
         v1->unk_00[0].unk_1C = 24;
 
-        Sprite_SetDrawFlag2(v1->unk_00[0].unk_00, 1);
+        ManagedSprite_SetDrawFlag(v1->unk_00[0].unk_00, 1);
 
         v1->unk_A0[0].unk_08 = 0;
         v1->unk_A0[0].unk_14 = 128;
@@ -1245,23 +1245,23 @@ static void ov116_02265AA4(SysTask *param0, void *param1)
         v1->unk_A0[0].unk_18 = 64;
         v1->unk_A0[0].unk_1C = 24;
 
-        Sprite_SetDrawFlag2(v1->unk_A0[0].unk_00, 1);
+        ManagedSprite_SetDrawFlag(v1->unk_A0[0].unk_00, 1);
 
         {
-            Sprite_GetPositionFxXYWithSubscreenOffset(v1->unk_00[0].unk_00, &v5, &v6, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v1->unk_00[0].unk_00, &v5, &v6, ((192 + 64) << FX32_SHIFT));
 
             v3 = (v1->unk_00[0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v1->unk_00[0].unk_08) * v1->unk_00[0].unk_18);
             v4 = (v1->unk_00[0].unk_16 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v1->unk_00[0].unk_08) * v1->unk_00[0].unk_1C);
 
-            Sprite_SetPositionFxXYWithSubscreenOffset(v1->unk_00[0].unk_00, v3, v4, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v1->unk_00[0].unk_00, v3, v4, ((192 + 64) << FX32_SHIFT));
             ov116_02264764(&v1->unk_00[0].unk_20, v3, v3 + FX32_CONST(180), ov116_022658C8(v1->unk_148));
             ov116_02264764(&v1->unk_00[0].unk_38, v4, v4 - FX32_CONST(24), ov116_022658C8(v1->unk_148));
-            Sprite_GetPositionFxXYWithSubscreenOffset(v1->unk_A0[0].unk_00, &v5, &v6, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v1->unk_A0[0].unk_00, &v5, &v6, ((192 + 64) << FX32_SHIFT));
 
             v3 = (v1->unk_A0[0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v1->unk_A0[0].unk_08) * v1->unk_A0[0].unk_18);
             v4 = (v1->unk_A0[0].unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(v1->unk_A0[0].unk_08) * v1->unk_A0[0].unk_1C);
 
-            Sprite_SetPositionFxXYWithSubscreenOffset(v1->unk_A0[0].unk_00, v3, v4, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v1->unk_A0[0].unk_00, v3, v4, ((192 + 64) << FX32_SHIFT));
             ov116_02264764(&v1->unk_A0[0].unk_20, v3, v3 - FX32_CONST(180), ov116_022658C8(v1->unk_144));
             ov116_02264764(&v1->unk_A0[0].unk_38, v4, v4 + FX32_CONST(24), ov116_022658C8(v1->unk_144));
         }
@@ -1328,7 +1328,7 @@ static BOOL ov116_02265D8C(UnkStruct_ov116_02265D84 *param0, int param1, int par
 
     switch (param0->unk_04) {
     case 0:
-        Sprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v1, &v2, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v1, &v2, ((192 + 64) << FX32_SHIFT));
         if (param2 == 0) {
             ov116_02264764(&param0->unk_20, v1, v1 - FX32_CONST(180), ov116_022658C8(param1));
         } else {
@@ -1345,7 +1345,7 @@ static BOOL ov116_02265D8C(UnkStruct_ov116_02265D84 *param0, int param1, int par
     case 1:
         v0[0] = ov116_02264774(&param0->unk_20);
         ov116_02264774(&param0->unk_38);
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
 
         if (v0[0]) {
             return 1;
@@ -1382,7 +1382,7 @@ static BOOL ov116_02265E64(UnkStruct_ov116_02265D84 *param0, int param1, int par
     case 1:
         v0[0] = ov116_02264774(&param0->unk_20);
         ov116_02264774(&param0->unk_38);
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
 
         if (v0[0]) {
             return 1;
@@ -1419,7 +1419,7 @@ static BOOL ov116_02265F1C(UnkStruct_ov116_02265D84 *param0, int param1, int par
     case 1:
         v0[0] = ov116_02264774(&param0->unk_20);
         ov116_02264774(&param0->unk_38);
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, param0->unk_20.unk_00, param0->unk_38.unk_00, ((192 + 64) << FX32_SHIFT));
 
         if (v0[0]) {
             return 1;
@@ -1450,7 +1450,7 @@ static BOOL ov116_02265FD4(UnkStruct_ov116_02265D84 *param0, int param1, int par
             param0->unk_08 = 0;
         }
 
-        Sprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v3, &v4, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_GetPositionFxXYWithSubscreenOffset(param0->unk_00, &v3, &v4, ((192 + 64) << FX32_SHIFT));
 
         if (param2 == 0) {
             v1 = (param0->unk_14 << FX32_SHIFT) - (CalcSineDegrees_Wraparound(param0->unk_08) * param0->unk_18);
@@ -1460,7 +1460,7 @@ static BOOL ov116_02265FD4(UnkStruct_ov116_02265D84 *param0, int param1, int par
             v2 = (param0->unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(param0->unk_08) * param0->unk_1C);
         }
 
-        Sprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v1, v2, ((192 + 64) << FX32_SHIFT));
+        ManagedSprite_SetPositionFxXYWithSubscreenOffset(param0->unk_00, v1, v2, ((192 + 64) << FX32_SHIFT));
 
         if (param0->unk_08 == 0) {
             param0->unk_10++;
@@ -1503,7 +1503,7 @@ static void ov116_022660A8(SysTask *param0, void *param1)
             v2->unk_00[v0].unk_18 = 64;
             v2->unk_00[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_00[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[v0].unk_00, 1);
 
             v2->unk_A0[v0].unk_08 = 0;
             v2->unk_A0[v0].unk_14 = 128;
@@ -1511,24 +1511,24 @@ static void ov116_022660A8(SysTask *param0, void *param1)
             v2->unk_A0[v0].unk_18 = 64;
             v2->unk_A0[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_A0[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_A0[v0].unk_00, 1);
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_00[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_18);
             v5 = (v2->unk_00[v0].unk_16 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_A0[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_18);
             v5 = (v2->unk_A0[v0].unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
         }
 
         ov116_02265D84(&v2->unk_A0[0]);
         ov116_02265D84(&v2->unk_A0[1]);
         ov116_02265D84(&v2->unk_00[0]);
         ov116_02265D84(&v2->unk_00[1]);
-        Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 0);
+        ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 0);
         v1->unk_1C++;
     case 1:
         v3[0] = ov116_02265D8C(&v2->unk_A0[0], v2->unk_144, 0, 3);
@@ -1541,7 +1541,7 @@ static void ov116_022660A8(SysTask *param0, void *param1)
             ov116_02265D84(&v2->unk_A0[1]);
             ov116_02265D84(&v2->unk_00[0]);
             ov116_02265D84(&v2->unk_00[1]);
-            Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 1);
             v1->unk_1C++;
         } else {
             break;
@@ -1630,7 +1630,7 @@ static void ov116_0226644C(SysTask *param0, void *param1)
             v2->unk_00[v0].unk_18 = 64;
             v2->unk_00[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_00[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[v0].unk_00, 1);
 
             v2->unk_A0[v0].unk_08 = 0;
             v2->unk_A0[v0].unk_14 = 128;
@@ -1638,24 +1638,24 @@ static void ov116_0226644C(SysTask *param0, void *param1)
             v2->unk_A0[v0].unk_18 = 64;
             v2->unk_A0[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_A0[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_A0[v0].unk_00, 1);
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_00[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_18);
             v5 = (v2->unk_00[v0].unk_16 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_A0[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_18);
             v5 = (v2->unk_A0[v0].unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
         }
 
         ov116_02265D84(&v2->unk_A0[0]);
         ov116_02265D84(&v2->unk_A0[1]);
         ov116_02265D84(&v2->unk_00[0]);
         ov116_02265D84(&v2->unk_00[1]);
-        Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 0);
+        ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 0);
         v1->unk_1C++;
     case 1:
         v3[0] = ov116_02265D8C(&v2->unk_A0[0], v2->unk_144, 0, 3);
@@ -1667,7 +1667,7 @@ static void ov116_0226644C(SysTask *param0, void *param1)
             ov116_02265D84(&v2->unk_A0[1]);
             ov116_02265D84(&v2->unk_00[0]);
             ov116_02265D84(&v2->unk_00[1]);
-            Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 1);
             v1->unk_1C++;
         } else {
             break;
@@ -1748,7 +1748,7 @@ static void ov116_022667F4(SysTask *param0, void *param1)
             v2->unk_00[v0].unk_18 = 64;
             v2->unk_00[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_00[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[v0].unk_00, 1);
 
             v2->unk_A0[v0].unk_08 = 0;
             v2->unk_A0[v0].unk_14 = 128;
@@ -1756,24 +1756,24 @@ static void ov116_022667F4(SysTask *param0, void *param1)
             v2->unk_A0[v0].unk_18 = 64;
             v2->unk_A0[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_A0[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_A0[v0].unk_00, 1);
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_00[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_18);
             v5 = (v2->unk_00[v0].unk_16 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_A0[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_18);
             v5 = (v2->unk_A0[v0].unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
         }
 
         ov116_02265D84(&v2->unk_A0[0]);
         ov116_02265D84(&v2->unk_A0[1]);
         ov116_02265D84(&v2->unk_00[0]);
         ov116_02265D84(&v2->unk_00[1]);
-        Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 0);
+        ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 0);
         v1->unk_1C++;
 
     case 1:
@@ -1787,7 +1787,7 @@ static void ov116_022667F4(SysTask *param0, void *param1)
             ov116_02265D84(&v2->unk_A0[1]);
             ov116_02265D84(&v2->unk_00[0]);
             ov116_02265D84(&v2->unk_00[1]);
-            Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 1);
             v1->unk_1C++;
         } else {
             break;
@@ -1894,7 +1894,7 @@ static void ov116_02266BF0(SysTask *param0, void *param1)
             v2->unk_00[v0].unk_18 = 64;
             v2->unk_00[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_00[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[v0].unk_00, 1);
 
             v2->unk_A0[v0].unk_08 = 0;
             v2->unk_A0[v0].unk_14 = 128;
@@ -1902,24 +1902,24 @@ static void ov116_02266BF0(SysTask *param0, void *param1)
             v2->unk_A0[v0].unk_18 = 64;
             v2->unk_A0[v0].unk_1C = 24;
 
-            Sprite_SetDrawFlag2(v2->unk_A0[v0].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_A0[v0].unk_00, 1);
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_00[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_18);
             v5 = (v2->unk_00[v0].unk_16 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v2->unk_00[v0].unk_08) * v2->unk_00[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_00[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, &v6, &v7, ((192 + 64) << FX32_SHIFT));
             v4 = (v2->unk_A0[v0].unk_14 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_18);
             v5 = (v2->unk_A0[v0].unk_16 << FX32_SHIFT) - (CalcCosineDegrees_Wraparound(v2->unk_A0[v0].unk_08) * v2->unk_A0[v0].unk_1C);
-            Sprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
+            ManagedSprite_SetPositionFxXYWithSubscreenOffset(v2->unk_A0[v0].unk_00, v4, v5, ((192 + 64) << FX32_SHIFT));
         }
 
         ov116_02265D84(&v2->unk_A0[0]);
         ov116_02265D84(&v2->unk_A0[1]);
         ov116_02265D84(&v2->unk_00[0]);
         ov116_02265D84(&v2->unk_00[1]);
-        Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 0);
+        ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 0);
         v1->unk_1C++;
     case 1:
         v3[0] = ov116_02265D8C(&v2->unk_A0[0], v2->unk_144, 0, 3);
@@ -1932,7 +1932,7 @@ static void ov116_02266BF0(SysTask *param0, void *param1)
             ov116_02265D84(&v2->unk_A0[1]);
             ov116_02265D84(&v2->unk_00[0]);
             ov116_02265D84(&v2->unk_00[1]);
-            Sprite_SetDrawFlag2(v2->unk_00[1].unk_00, 1);
+            ManagedSprite_SetDrawFlag(v2->unk_00[1].unk_00, 1);
             v1->unk_1C++;
         } else {
             break;
diff --git a/src/overlay117/ov117_022626B0.c b/src/overlay117/ov117_022626B0.c
index f5103f915e..e9f930d418 100644
--- a/src/overlay117/ov117_022626B0.c
+++ b/src/overlay117/ov117_022626B0.c
@@ -52,7 +52,7 @@ typedef struct UnkStruct_ov117_022626B0_t {
     int unk_228;
     int unk_22C;
     fx32 unk_230;
-    CellActorData *unk_234;
+    ManagedSprite *unk_234;
     int unk_238;
     int unk_23C;
     int unk_240;
@@ -100,9 +100,9 @@ void ov117_02262D4C(BOOL param0, BOOL param1);
 void ov117_02262D98();
 static void ov117_022638D8(UnkStruct_ov117_02261280 *param0);
 static void ov117_022639BC(UnkStruct_ov117_02261280 *param0);
-static CellActorData *ov117_02263A00(UnkStruct_ov117_02261280 *param0);
-static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, CellActorData *param1);
-static void ov117_02263AE4(CellActorData *param0);
+static ManagedSprite *ov117_02263A00(UnkStruct_ov117_02261280 *param0);
+static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, ManagedSprite *param1);
+static void ov117_02263AE4(ManagedSprite *param0);
 
 static const fx16 Unk_ov117_02266B12[3 * 6] = {
     0x0,
@@ -931,21 +931,21 @@ static void ov117_022639BC(UnkStruct_ov117_02261280 *param0)
     SpriteManager_UnloadPlttObjById(param0->unk_28, 10005);
 }
 
-static CellActorData *ov117_02263A00(UnkStruct_ov117_02261280 *param0)
+static ManagedSprite *ov117_02263A00(UnkStruct_ov117_02261280 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = Unk_ov117_02266B38;
     v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v1);
 
-    Sprite_SetDrawFlag2(v0, 0);
+    ManagedSprite_SetDrawFlag(v0, 0);
     Sprite_TickFrame(v0->sprite);
 
     return v0;
 }
 
-static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, CellActorData *param1)
+static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, ManagedSprite *param1)
 {
     int v0;
 
@@ -955,12 +955,12 @@ static void ov117_02263A6C(UnkStruct_ov117_022626B0 *param0, CellActorData *para
         v0 = ov117_022637AC(param0, 0) + 1;
     }
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param1, param0->unk_21C, (param0->unk_230 >> FX32_SHIFT) + Unk_ov117_02266B05[param0->unk_270].unk_02, ((192 + 160) << FX32_SHIFT));
-    Sprite_SetAnim(param1, v0);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param1, param0->unk_21C, (param0->unk_230 >> FX32_SHIFT) + Unk_ov117_02266B05[param0->unk_270].unk_02, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetAnim(param1, v0);
     Sprite_TickFrame(param1->sprite);
 }
 
-static void ov117_02263AE4(CellActorData *param0)
+static void ov117_02263AE4(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
diff --git a/src/overlay117/ov117_02263AF0.c b/src/overlay117/ov117_02263AF0.c
index 2a1d3560ef..6f59cf9c1f 100644
--- a/src/overlay117/ov117_02263AF0.c
+++ b/src/overlay117/ov117_02263AF0.c
@@ -28,7 +28,6 @@
 #include "overlay117/struct_ov117_02266F10.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "communication_system.h"
 #include "error_handling.h"
@@ -38,6 +37,7 @@
 #include "message.h"
 #include "narc.h"
 #include "palette.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "text.h"
@@ -67,10 +67,10 @@ static void ov117_02263C8C(int param0, int param1, int param2, fx32 *param3, fx3
 static int ov117_02263D08(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263DAC *param1, int param2, int param3, int param4);
 static int ov117_02263E1C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02264E84 *param1, UnkStruct_ov117_02263EF8 *param2);
 static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02263EF8 *param1);
-static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1);
+static ManagedSprite *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1);
 static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264808 *param1, UnkStruct_ov117_02263DAC *param2);
 static void ov117_02263B8C(BgConfig *param0, UnkStruct_ov117_02263DAC *param1);
-static CellActorData *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2);
+static ManagedSprite *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2);
 void ov117_022648E0(UnkStruct_ov117_02261280 *param0);
 BOOL ov117_02264930(UnkStruct_ov117_02261280 *param0);
 static BOOL ov117_02264958(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264930 *param1, int param2, int param3);
@@ -587,7 +587,7 @@ static int ov117_02263E1C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov11
     if (param1->unk_00 == CommSys_CurNetId()) {
         ov117_02261E38(param0, param1->unk_04);
         param2->unk_0C = 25;
-        Sprite_SetDrawFlag2(param2->unk_10, 0);
+        ManagedSprite_SetDrawFlag(param2->unk_10, 0);
     }
 
     param2->unk_00 = 1;
@@ -631,7 +631,7 @@ void ov117_02263EF8(UnkStruct_ov117_02261280 *param0)
                 v1->unk_0C--;
 
                 if (v1->unk_0C == 0) {
-                    Sprite_SetDrawFlag2(v1->unk_10, 1);
+                    ManagedSprite_SetDrawFlag(v1->unk_10, 1);
                 }
             } else if (ov117_02263F80(param0, v1) == 1) {
                 if ((param0->unk_2FCC == 1) && (param0->unk_2FBC == 0)) {
@@ -661,7 +661,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     case 0:
         v6 = Unk_ov117_02266BB4[1].unk_02 - v3;
 
-        Sprite_OffsetPositionFxXY(param1->unk_10, 0, (FX32_CONST(5.0)));
+        ManagedSprite_OffsetPositionFxXY(param1->unk_10, 0, (FX32_CONST(5.0)));
         Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_10, &v0, &v1, ((192 + 160) << FX32_SHIFT));
 
         v5 = Unk_ov117_02266BB4[1].unk_02 - v1;
@@ -673,7 +673,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     case 1:
         v6 = v2 - Unk_ov117_02266BB4[3].unk_00;
 
-        Sprite_OffsetPositionFxXY(param1->unk_10, -(FX32_CONST(5.0)), 0);
+        ManagedSprite_OffsetPositionFxXY(param1->unk_10, -(FX32_CONST(5.0)), 0);
         Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_10, &v0, &v1, ((192 + 160) << FX32_SHIFT));
 
         v5 = v0 - Unk_ov117_02266BB4[3].unk_00;
@@ -685,7 +685,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     case 2:
         v6 = v3 - Unk_ov117_02266BB4[0].unk_02;
 
-        Sprite_OffsetPositionFxXY(param1->unk_10, 0, -(FX32_CONST(5.0)));
+        ManagedSprite_OffsetPositionFxXY(param1->unk_10, 0, -(FX32_CONST(5.0)));
         Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_10, &v0, &v1, ((192 + 160) << FX32_SHIFT));
 
         v5 = v1 - Unk_ov117_02266BB4[0].unk_02;
@@ -697,7 +697,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     case 3:
         v6 = Unk_ov117_02266BB4[2].unk_00 - v2;
 
-        Sprite_OffsetPositionFxXY(param1->unk_10, (FX32_CONST(5.0)), 0);
+        ManagedSprite_OffsetPositionFxXY(param1->unk_10, (FX32_CONST(5.0)), 0);
         Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_10, &v0, &v1, ((192 + 160) << FX32_SHIFT));
 
         v5 = Unk_ov117_02266BB4[2].unk_00 - v0;
@@ -716,7 +716,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
             }
 
             v7 = FX_FX32_TO_F32(v8);
-            Sprite_SetAffineScale(param1->unk_10, v7, v7);
+            ManagedSprite_SetAffineScale(param1->unk_10, v7, v7);
         }
     } else {
         if (v5 > -(24 / 2 + 2)) {
@@ -727,7 +727,7 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
             }
 
             v7 = FX_FX32_TO_F32(v8);
-            Sprite_SetAffineScale(param1->unk_10, v7, v7);
+            ManagedSprite_SetAffineScale(param1->unk_10, v7, v7);
         }
     }
     if ((param1->unk_04 == CommSys_CurNetId()) && (v6 >= 0) && (v5 <= 0)) {
@@ -773,9 +773,9 @@ static BOOL ov117_02263F80(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     return 0;
 }
 
-static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1)
+static ManagedSprite *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const UnkStruct_ov117_02266F10 *param1)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = Unk_ov117_02266CCC;
@@ -784,9 +784,9 @@ static CellActorData *ov117_0226417C(UnkStruct_ov117_02261280 *param0, const Unk
     v1.plttIdx = param1->unk_06;
     v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v1);
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, param1->unk_00, param1->unk_02, ((192 + 160) << FX32_SHIFT));
-    Sprite_SetAnim(v0, param1->unk_04);
-    Sprite_SetAffineOverwriteMode(v0, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, param1->unk_00, param1->unk_02, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetAnim(v0, param1->unk_04);
+    ManagedSprite_SetAffineOverwriteMode(v0, AFFINE_OVERWRITE_MODE_DOUBLE);
     Sprite_TickFrame(v0->sprite);
 
     return v0;
@@ -807,7 +807,7 @@ void ov117_022641E4(UnkStruct_ov117_02261280 *param0)
 static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02264808 *param1, UnkStruct_ov117_02263DAC *param2)
 {
     SpriteTemplate v0;
-    CellActorData *v1;
+    ManagedSprite *v1;
     int v2;
     int v3[4];
     int v4, v5, v6;
@@ -831,8 +831,8 @@ static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
                 break;
             }
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
-            Sprite_SetAnim(v1, v6);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetAnim(v1, v6);
             Sprite_TickFrame(v1->sprite);
 
             v10->unk_04 = LCRNG_Next() % 0x2000 + 0x2000;
@@ -859,8 +859,8 @@ static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
             break;
         }
 
-        Sprite_SetPositionXYWithSubscreenOffset2(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(v1, 28 + LCRNG_Next() % 3);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(v1, 28 + LCRNG_Next() % 3);
         Sprite_TickFrame(v1->sprite);
 
         v11->unk_04 = LCRNG_Next() % 0x2000 + 0x2000;
@@ -884,8 +884,8 @@ static void ov117_02264214(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
             break;
         }
 
-        Sprite_SetPositionXYWithSubscreenOffset2(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(v1, 11);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(v1, 128, 96, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(v1, 11);
         Sprite_TickFrame(v1->sprite);
 
         v12->unk_04 = LCRNG_Next() % 0x2000 + 0x2000;
@@ -960,7 +960,7 @@ BOOL ov117_02264560(UnkStruct_ov117_02261280 *param0)
             v4 = 128 + (FX_Mul(CalcSineDegrees_FX32(v1->unk_0C), v1->unk_04)) / FX32_ONE;
             v5 = 96 + (-FX_Mul(CalcCosineDegrees_FX32(v1->unk_0C), v1->unk_04)) / FX32_ONE;
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v1->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v1->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
 
             v1->unk_14--;
             v6++;
@@ -987,7 +987,7 @@ BOOL ov117_02264560(UnkStruct_ov117_02261280 *param0)
             v4 = 128 + (FX_Mul(CalcSineDegrees_FX32(v2->unk_0C), v2->unk_04)) / FX32_ONE;
             v5 = 96 + (-FX_Mul(CalcCosineDegrees_FX32(v2->unk_0C), v2->unk_04)) / FX32_ONE;
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v2->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v2->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
 
             v2->unk_14--;
             v6++;
@@ -1014,7 +1014,7 @@ BOOL ov117_02264560(UnkStruct_ov117_02261280 *param0)
             v4 = 128 + (FX_Mul(CalcSineDegrees_FX32(v3->unk_0C), v3->unk_04)) / FX32_ONE;
             v5 = 96 + (-FX_Mul(CalcCosineDegrees_FX32(v3->unk_0C), v3->unk_04)) / FX32_ONE;
 
-            Sprite_SetPositionXYWithSubscreenOffset2(v3->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(v3->unk_00, v4, v5, ((192 + 160) << FX32_SHIFT));
 
             v3->unk_14--;
             v6++;
@@ -1056,18 +1056,18 @@ BOOL ov117_02264808(UnkStruct_ov117_02261280 *param0)
     return 1;
 }
 
-static CellActorData *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2)
+static ManagedSprite *ov117_02264884(UnkStruct_ov117_02261280 *param0, int param1, int param2)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = Unk_ov117_02266D34;
     v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v1);
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v0, (9 * 8) - param2 * 16, (4 * 8), ((192 + 160) << FX32_SHIFT));
-    Sprite_SetAnim(v0, 0 + param1);
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v0, (9 * 8) - param2 * 16, (4 * 8), ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetAnim(v0, 0 + param1);
     Sprite_TickFrame(v0->sprite);
-    Sprite_SetAnimateFlag(v0, 1);
+    ManagedSprite_SetAnimateFlag(v0, 1);
 
     return v0;
 }
@@ -1080,7 +1080,7 @@ void ov117_022648E0(UnkStruct_ov117_02261280 *param0)
     for (v0 = 0; v0 < 5; v0++) {
         v1 = &param0->unk_3D10[v0];
         ov117_02264958(param0, v1, v0, v0);
-        Sprite_TickNFrames(v1->unk_00, FX32_ONE * 4 * v0);
+        ManagedSprite_TickNFrames(v1->unk_00, FX32_ONE * 4 * v0);
     }
 }
 
@@ -1136,7 +1136,7 @@ static void ov117_0226498C(UnkStruct_ov117_02264930 *param0)
             v1 = v0;
         }
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_00, v1, v2, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_00, v1, v2, ((192 + 160) << FX32_SHIFT));
     }
 }
 
@@ -1151,13 +1151,13 @@ static void ov117_022649D8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
 
     switch (param1->unk_05) {
     case 3:
-        if (Sprite_IsAnimated(param1->unk_00) == 0) {
+        if (ManagedSprite_IsAnimated(param1->unk_00) == 0) {
             param1->unk_08 += 5;
             param1->unk_04 = ov117_02264A70(param1->unk_08);
             param1->unk_05 = 1;
 
-            Sprite_SetAnim(param1->unk_00, 0 + param1->unk_04);
-            Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00, (9 * 8) - 5 * 16, (4 * 8), ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetAnim(param1->unk_00, 0 + param1->unk_04);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00, (9 * 8) - 5 * 16, (4 * 8), ((192 + 160) << FX32_SHIFT));
 
             for (v1 = 0; v1 < 5; v1++) {
                 v2 = &param0->unk_3D10[v1];
@@ -1176,7 +1176,7 @@ static void ov117_022649D8(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
 
         if ((param1->unk_05 == 1) && (v0 > 75)) {
             param1->unk_05 = 2;
-            Sprite_SetAnim(param1->unk_00, 3 + param1->unk_04);
+            ManagedSprite_SetAnim(param1->unk_00, 3 + param1->unk_04);
             Sound_PlayEffect(1406);
         }
 
@@ -1207,7 +1207,7 @@ static void ov117_02264A84(UnkStruct_ov117_02261280 *param0)
 
         if (v1->unk_06 == 0) {
             v1->unk_05 = 3;
-            Sprite_SetAnim(v1->unk_00, 6);
+            ManagedSprite_SetAnim(v1->unk_00, 6);
             return;
         }
     }
@@ -1445,7 +1445,7 @@ BOOL ov117_02264EB8(UnkStruct_ov117_02261280 *param0, int param1)
 
 void ov117_02264FB0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *param1)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
     int v2;
 
@@ -1453,18 +1453,18 @@ void ov117_02264FB0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226504C *
 
     for (v2 = 0; v2 < 4; v2++) {
         param1->unk_00[v2] = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v1);
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v2], Unk_ov117_02266BB4[v2].unk_00, Unk_ov117_02266BB4[v2].unk_02, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param1->unk_00[v2], 31 + v2 / 2);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v2], Unk_ov117_02266BB4[v2].unk_00, Unk_ov117_02266BB4[v2].unk_02, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param1->unk_00[v2], 31 + v2 / 2);
         Sprite_TickFrame(param1->unk_00[v2]->sprite);
     }
 
     switch (param0->unk_00->unk_30) {
     case 2:
-        Sprite_SetDrawFlag2(param1->unk_00[2], 0);
-        Sprite_SetDrawFlag2(param1->unk_00[3], 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[2], 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[3], 0);
         break;
     case 3:
-        Sprite_SetDrawFlag2(param1->unk_00[1], 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[1], 0);
         break;
     }
 }
@@ -1491,31 +1491,31 @@ void ov117_02265064(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *
         v4 = 196 / 2 + (-FX_Mul(CalcCosineDegrees_FX32(param1->unk_E4 + param1->unk_00[v1].unk_0C), (64 + 4)));
 
         param1->unk_00[v1].unk_00 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v0);
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v1].unk_00, v3, v4 + -24, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param1->unk_00[v1].unk_00, Unk_ov117_02266B7A[v1 + 1]);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v1].unk_00, v3, v4 + -24, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param1->unk_00[v1].unk_00, Unk_ov117_02266B7A[v1 + 1]);
         Sprite_TickFrame(param1->unk_00[v1].unk_00->sprite);
-        Sprite_SetDrawFlag2(param1->unk_00[v1].unk_00, 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[v1].unk_00, 0);
 
         param1->unk_00[v1].unk_04 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266DD0);
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v1].unk_04, 0, 0, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param1->unk_00[v1].unk_04, 33);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v1].unk_04, 0, 0, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param1->unk_00[v1].unk_04, 33);
         Sprite_TickFrame(param1->unk_00[v1].unk_04->sprite);
-        Sprite_SetDrawFlag2(param1->unk_00[v1].unk_04, 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[v1].unk_04, 0);
 
         param1->unk_00[v1].unk_08 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266E04);
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v1].unk_08, v3, v4 + -24 + 24, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetExplicitOamMode2(param1->unk_00[v1].unk_08, GX_OAM_MODE_XLU);
-        Sprite_SetAffineOverwriteMode(param1->unk_00[v1].unk_08, AFFINE_OVERWRITE_MODE_NORMAL);
-        Sprite_SetAffineScale(param1->unk_00[v1].unk_08, 1.0f, 1.0f);
-        Sprite_SetAnim(param1->unk_00[v1].unk_08, 34 + v1);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v1].unk_08, v3, v4 + -24 + 24, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetExplicitOamMode(param1->unk_00[v1].unk_08, GX_OAM_MODE_XLU);
+        ManagedSprite_SetAffineOverwriteMode(param1->unk_00[v1].unk_08, AFFINE_OVERWRITE_MODE_NORMAL);
+        ManagedSprite_SetAffineScale(param1->unk_00[v1].unk_08, 1.0f, 1.0f);
+        ManagedSprite_SetAnim(param1->unk_00[v1].unk_08, 34 + v1);
         Sprite_TickFrame(param1->unk_00[v1].unk_08->sprite);
-        Sprite_SetDrawFlag2(param1->unk_00[v1].unk_08, 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[v1].unk_08, 0);
 
         ov117_02266344(param0, &param1->unk_00[v1].unk_30);
     }
 
-    Sprite_SetDrawFlag2(param1->unk_00[0].unk_00, 1);
-    Sprite_SetDrawFlag2(param1->unk_00[0].unk_08, 1);
+    ManagedSprite_SetDrawFlag(param1->unk_00[0].unk_00, 1);
+    ManagedSprite_SetDrawFlag(param1->unk_00[0].unk_08, 1);
 }
 
 void ov117_022651E0(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022653F4 *param1)
@@ -1657,8 +1657,8 @@ static int ov117_02265454(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
 
     switch (param2->unk_11) {
     case 0:
-        Sprite_SetDrawFlag2(param2->unk_00, 1);
-        Sprite_SetDrawFlag2(param2->unk_08, 1);
+        ManagedSprite_SetDrawFlag(param2->unk_00, 1);
+        ManagedSprite_SetDrawFlag(param2->unk_08, 1);
         Sprite_GetPositionXYWithSubscreenOffset2(param2->unk_00, &v0, &v1, ((192 + 160) << FX32_SHIFT));
         param2->unk_1C = v0;
         param2->unk_1E = v1;
@@ -1691,8 +1691,8 @@ static int ov117_02265454(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
             break;
         }
         if (param2->unk_12 >= 15) {
-            Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_00, param2->unk_1C, param2->unk_1E, ((192 + 160) << FX32_SHIFT));
-            Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_08, param2->unk_1C, param2->unk_1E + 24, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_00, param2->unk_1C, param2->unk_1E, ((192 + 160) << FX32_SHIFT));
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_08, param2->unk_1C, param2->unk_1E + 24, ((192 + 160) << FX32_SHIFT));
             ov117_02265428(param2, 2);
             ov117_0226639C(param0, param2, &param2->unk_30);
 
@@ -1702,13 +1702,13 @@ static int ov117_02265454(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
         v6 = ((180 * param2->unk_12) << FX32_SHIFT) / 15;
         v7 = -(FX_Mul(CalcSineDegrees_FX32(v6), (24 << FX32_SHIFT))) / FX32_ONE;
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_00, v0, v1 + v7, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_08, v0, v1 + 24, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_00, v0, v1 + v7, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_08, v0, v1 + 24, ((192 + 160) << FX32_SHIFT));
 
         v8 = FX32_ONE - (FX32_ONE * (-v7 / 3) / ((24 << FX32_SHIFT) >> FX32_SHIFT));
         v9 = FX_FX32_TO_F32(v8);
 
-        Sprite_SetAffineScale(param2->unk_08, v9, v9);
+        ManagedSprite_SetAffineScale(param2->unk_08, v9, v9);
         break;
     }
 
@@ -1725,9 +1725,9 @@ static int ov117_02265644(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
     f32 v5;
 
     if (param1->unk_F3 > 0) {
-        Sprite_TickNFrames(param2->unk_00, ((8 + 8 + 12 + 8 + 8) << FX32_SHIFT) / Unk_ov117_02266BC4[param1->unk_F4].unk_00);
+        ManagedSprite_TickNFrames(param2->unk_00, ((8 + 8 + 12 + 8 + 8) << FX32_SHIFT) / Unk_ov117_02266BC4[param1->unk_F4].unk_00);
     } else {
-        Sprite_SetAnimationFrame(param2->unk_00, 0);
+        ManagedSprite_SetAnimationFrame(param2->unk_00, 0);
     }
 
     v2 = ((180 * param1->unk_F3) << FX32_SHIFT) / Unk_ov117_02266BC4[param1->unk_F4].unk_00;
@@ -1735,13 +1735,13 @@ static int ov117_02265644(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
     v0 = 256 / 2 + FX_Mul(CalcSineDegrees_FX32(param1->unk_E4 + param2->unk_0C), 76);
     v1 = 196 / 2 + (-FX_Mul(CalcCosineDegrees_FX32(param1->unk_E4 + param2->unk_0C), (64 + 4)));
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_00, v0, v1 + -24 + v3, ((192 + 160) << FX32_SHIFT));
-    Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_08, v0, v1 + -24 + 24, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_00, v0, v1 + -24 + v3, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_08, v0, v1 + -24 + 24, ((192 + 160) << FX32_SHIFT));
 
     v4 = FX32_ONE - (FX32_ONE * (-v3 / 3) / ((12 << FX32_SHIFT) >> FX32_SHIFT));
     v5 = FX_FX32_TO_F32(v4);
 
-    Sprite_SetAffineScale(param2->unk_08, v5, v5);
+    ManagedSprite_SetAffineScale(param2->unk_08, v5, v5);
 
     if (param1->unk_F3 == Unk_ov117_02266BC4[param1->unk_F4].unk_00 - 1) {
         ov117_0226639C(param0, param2, &param2->unk_30);
@@ -1768,10 +1768,10 @@ static int ov117_022657C4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
     case 0:
         Sound_PlayEffect(1403);
         Sprite_GetPositionXYWithSubscreenOffset2(param2->unk_00, &v0, &v1, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_04, v0, v1 + -32, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param2->unk_04, 33);
-        Sprite_SetDrawFlag2(param2->unk_04, 1);
-        Sprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 2);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_04, v0, v1 + -32, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param2->unk_04, 33);
+        ManagedSprite_SetDrawFlag(param2->unk_04, 1);
+        ManagedSprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 2);
 
         param2->unk_12 = Unk_ov117_02266BC4[param1->unk_F4].unk_02;
         param2->unk_13 = Unk_ov117_02266BC4[param1->unk_F4].unk_02 / 2;
@@ -1779,14 +1779,14 @@ static int ov117_022657C4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
         break;
     case 1:
         if (param2->unk_12 == param2->unk_13) {
-            Sprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 1);
-            Sprite_SetDrawFlag2(param2->unk_04, 0);
-            Sprite_TickNFrames(param2->unk_04, (4 * FX32_ONE));
+            ManagedSprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 1);
+            ManagedSprite_SetDrawFlag(param2->unk_04, 0);
+            ManagedSprite_TickNFrames(param2->unk_04, (4 * FX32_ONE));
         }
 
         if (param2->unk_12 == 0) {
-            Sprite_SetDrawFlag2(param2->unk_04, 0);
-            Sprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 0);
+            ManagedSprite_SetDrawFlag(param2->unk_04, 0);
+            ManagedSprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 0);
             param2->unk_11++;
             break;
         }
@@ -1840,15 +1840,15 @@ static int ov117_022657C4(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_0226
         v8 = ((180 * param2->unk_12) << FX32_SHIFT) / param2->unk_18;
         v9 = -(FX_Mul(CalcSineDegrees_FX32(v8), (12 << FX32_SHIFT))) / FX32_ONE;
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_00, param2->unk_28 / FX32_ONE, param2->unk_2C / FX32_ONE + -24 + v9, ((192 + 160) << FX32_SHIFT));
-        Sprite_TickNFrames(param2->unk_00, ((8 + 8 + 12 + 8 + 8) << FX32_SHIFT) / param2->unk_18);
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_08, param2->unk_28 / FX32_ONE, param2->unk_2C / FX32_ONE + -24 + 24, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_00, param2->unk_28 / FX32_ONE, param2->unk_2C / FX32_ONE + -24 + v9, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_TickNFrames(param2->unk_00, ((8 + 8 + 12 + 8 + 8) << FX32_SHIFT) / param2->unk_18);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_08, param2->unk_28 / FX32_ONE, param2->unk_2C / FX32_ONE + -24 + 24, ((192 + 160) << FX32_SHIFT));
 
         param2->unk_12--;
 
         if (param2->unk_12 <= 0) {
-            Sprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 0);
-            Sprite_SetAnimationFrame(param2->unk_00, 0);
+            ManagedSprite_SetAnim(param2->unk_00, Unk_ov117_02266B7A[param2->unk_14] + 0);
+            ManagedSprite_SetAnimationFrame(param2->unk_00, 0);
             ov117_02265428(param2, 2);
             return 1;
         }
@@ -1869,15 +1869,15 @@ void ov117_02265ABC(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *
     for (v1 = 0; v1 < 3; v1++) {
         param1->unk_00[v1].unk_00 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &v0);
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v1].unk_00, 0, 0, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetDrawFlag2(param1->unk_00[v1].unk_00, 0);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v1].unk_00, 0, 0, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetDrawFlag(param1->unk_00[v1].unk_00, 0);
 
         param1->unk_00[v1].unk_04 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266DD0);
 
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00[v1].unk_04, 0, 0, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param1->unk_00[v1].unk_04, 33);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00[v1].unk_04, 0, 0, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param1->unk_00[v1].unk_04, 33);
         Sprite_TickFrame(param1->unk_00[v1].unk_04->sprite);
-        Sprite_SetDrawFlag2(param1->unk_00[v1].unk_04, 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00[v1].unk_04, 0);
     }
 }
 
@@ -1914,13 +1914,13 @@ void ov117_02265B58(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02265C3C *
     v2 = ov117_022622C4(param0, param3);
     v1 = Unk_ov117_02266C2C[param0->unk_00->unk_30][v2];
 
-    Sprite_SetExplicitPalette2(v4->unk_00, v1);
-    Sprite_SetAnim(v4->unk_00, Unk_ov117_02266B7A[param2] + 0);
+    ManagedSprite_SetExplicitPalette(v4->unk_00, v1);
+    ManagedSprite_SetAnim(v4->unk_00, Unk_ov117_02266B7A[param2] + 0);
 
     v3 = Unk_ov117_02266BD8[param0->unk_00->unk_30][v2];
     v4->unk_10 = Unk_ov117_02266BB4[v3].unk_02 + -24;
 
-    Sprite_SetPositionXYWithSubscreenOffset2(v4->unk_00, Unk_ov117_02266BB4[v3].unk_00, v4->unk_10 + -96, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(v4->unk_00, Unk_ov117_02266BB4[v3].unk_00, v4->unk_10 + -96, ((192 + 160) << FX32_SHIFT));
     Sprite_TickFrame(v4->unk_00->sprite);
 
     v4->unk_12 = param2;
@@ -1958,7 +1958,7 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022
             break;
         }
 
-        Sprite_SetDrawFlag2(param1->unk_00, 1);
+        ManagedSprite_SetDrawFlag(param1->unk_00, 1);
         param1->unk_0C += 0x8000;
 
         if ((param1->unk_0C / FX32_ONE) >= param1->unk_10) {
@@ -1968,11 +1968,11 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022
         break;
     case 2:
         Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_00, &v0, &v1, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_04, v0, v1 + -32, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param1->unk_04, 33);
-        Sprite_SetDrawFlag2(param1->unk_04, 1);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_04, v0, v1 + -32, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param1->unk_04, 33);
+        ManagedSprite_SetDrawFlag(param1->unk_04, 1);
         Sound_PlayEffect(1403);
-        Sprite_SetAnim(param1->unk_00, Unk_ov117_02266B7A[param1->unk_12] + 2);
+        ManagedSprite_SetAnim(param1->unk_00, Unk_ov117_02266B7A[param1->unk_12] + 2);
 
         param1->unk_14 = 8;
         param1->unk_13++;
@@ -1981,12 +1981,12 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022
         param1->unk_14--;
 
         if (param1->unk_14 == 3) {
-            Sprite_TickNFrames(param1->unk_04, (4 * FX32_ONE));
+            ManagedSprite_TickNFrames(param1->unk_04, (4 * FX32_ONE));
         }
 
         if (param1->unk_14 == 0) {
-            Sprite_SetDrawFlag2(param1->unk_04, 0);
-            Sprite_SetAnim(param1->unk_00, Unk_ov117_02266B7A[param1->unk_12] + 0);
+            ManagedSprite_SetDrawFlag(param1->unk_04, 0);
+            ManagedSprite_SetAnim(param1->unk_00, Unk_ov117_02266B7A[param1->unk_12] + 0);
             param1->unk_13++;
         }
         break;
@@ -1994,7 +1994,7 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022
         param1->unk_0C -= 0x8000;
 
         if ((param1->unk_0C / FX32_ONE) <= param1->unk_10 + -96) {
-            Sprite_SetDrawFlag2(param1->unk_00, 0);
+            ManagedSprite_SetDrawFlag(param1->unk_00, 0);
             param1->unk_13 = 0;
             param1->unk_15 = 0;
             return 0;
@@ -2002,7 +2002,7 @@ static BOOL ov117_02265C3C(UnkStruct_ov117_02265C3C *param0, UnkStruct_ov117_022
         break;
     }
 
-    Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00, param1->unk_08 / FX32_ONE, param1->unk_0C / FX32_ONE, ((192 + 160) << FX32_SHIFT));
+    ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00, param1->unk_08 / FX32_ONE, param1->unk_0C / FX32_ONE, ((192 + 160) << FX32_SHIFT));
     return 1;
 }
 
@@ -2224,9 +2224,9 @@ static BOOL ov117_02266030(UnkStruct_ov117_02265EC8 *param0)
     return 0;
 }
 
-CellActorData *ov117_02266130(UnkStruct_ov117_02261280 *param0)
+ManagedSprite *ov117_02266130(UnkStruct_ov117_02261280 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266E6C);
     Sprite_TickFrame(v0->sprite);
@@ -2261,24 +2261,24 @@ void ov117_02266210(UnkStruct_ov117_02261280 *param0)
     }
 }
 
-void ov117_02266238(UnkStruct_ov117_02261280 *param0, CellActorData *param1)
+void ov117_02266238(UnkStruct_ov117_02261280 *param0, ManagedSprite *param1)
 {
     Sprite_DeleteAndFreeResources(param1);
 }
 
-CellActorData *ov117_02266244(UnkStruct_ov117_02261280 *param0)
+ManagedSprite *ov117_02266244(UnkStruct_ov117_02261280 *param0)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
 
     v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266EA0);
 
-    Sprite_SetDrawFlag2(v0, 0);
+    ManagedSprite_SetDrawFlag(v0, 0);
     Sprite_TickFrame(v0->sprite);
 
     return v0;
 }
 
-void ov117_02266268(UnkStruct_ov117_02261280 *param0, CellActorData *param1)
+void ov117_02266268(UnkStruct_ov117_02261280 *param0, ManagedSprite *param1)
 {
     Sprite_DeleteAndFreeResources(param1);
 }
@@ -2288,8 +2288,8 @@ BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *
     switch (param1->unk_04) {
     case 0:
     case 5:
-        Sprite_SetPositionXYWithSubscreenOffset2(param1->unk_00, 128, 16, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetDrawFlag2(param1->unk_00, 1);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param1->unk_00, 128, 16, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetDrawFlag(param1->unk_00, 1);
         param1->unk_04++;
         break;
     case 1:
@@ -2311,7 +2311,7 @@ BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *
         param1->unk_18 = 0;
         param1->unk_10 += 6;
 
-        Sprite_OffsetPositionXY2(param1->unk_00, 0, 6);
+        ManagedSprite_OffsetPositionXY(param1->unk_00, 0, 6);
 
         if (param1->unk_10 > 192 - 96) {
             param1->unk_04++;
@@ -2321,7 +2321,7 @@ BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *
     case 3:
     case 8:
         param1->unk_14 = 0;
-        Sprite_SetDrawFlag2(param1->unk_00, 0);
+        ManagedSprite_SetDrawFlag(param1->unk_00, 0);
         param1->unk_04++;
 
     case 4:
@@ -2343,15 +2343,15 @@ BOOL ov117_02266274(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266274 *
 
 static void ov117_02266344(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_02266344 *param1)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     int v1;
 
     for (v1 = 0; v1 < 2; v1++) {
         v0 = SpriteSystem_NewSprite(param0->unk_24, param0->unk_28, &Unk_ov117_02266E38);
 
-        Sprite_SetAnim(v0, 27);
-        Sprite_SetExplicitOamMode2(v0, GX_OAM_MODE_XLU);
-        Sprite_SetDrawFlag2(v0, 0);
+        ManagedSprite_SetAnim(v0, 27);
+        ManagedSprite_SetExplicitOamMode(v0, GX_OAM_MODE_XLU);
+        ManagedSprite_SetDrawFlag(v0, 0);
         Sprite_TickFrame(v0->sprite);
 
         param1->unk_00[v1] = v0;
@@ -2375,10 +2375,10 @@ static void ov117_0226639C(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
     Sprite_GetPositionXYWithSubscreenOffset2(param1->unk_00, &v0, &v1, ((192 + 160) << FX32_SHIFT));
 
     for (v2 = 0; v2 < 2; v2++) {
-        Sprite_SetPositionXYWithSubscreenOffset2(param2->unk_00[v2], v0, v1 + 28, ((192 + 160) << FX32_SHIFT));
-        Sprite_SetAnim(param2->unk_00[v2], 27);
-        Sprite_SetExplicitOamMode2(param2->unk_00[v2], GX_OAM_MODE_XLU);
-        Sprite_SetDrawFlag2(param2->unk_00[v2], 1);
+        ManagedSprite_SetPositionXYWithSubscreenOffset(param2->unk_00[v2], v0, v1 + 28, ((192 + 160) << FX32_SHIFT));
+        ManagedSprite_SetAnim(param2->unk_00[v2], 27);
+        ManagedSprite_SetExplicitOamMode(param2->unk_00[v2], GX_OAM_MODE_XLU);
+        ManagedSprite_SetDrawFlag(param2->unk_00[v2], 1);
 
         param2->unk_08[v2] = LCRNG_Next() % 0x1000 + 0x1000;
         param2->unk_10[v2] = LCRNG_Next() % 0x400 + 0x400;
@@ -2401,7 +2401,7 @@ static void ov117_02266440(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
         break;
     case 1:
         for (v0 = 0; v0 < 2; v0++) {
-            Sprite_OffsetPositionFxXY(param2->unk_00[v0], param2->unk_08[v0], -param2->unk_10[v0]);
+            ManagedSprite_OffsetPositionFxXY(param2->unk_00[v0], param2->unk_08[v0], -param2->unk_10[v0]);
             Sprite_TickFrame(param2->unk_00[v0]->sprite);
         }
 
@@ -2409,7 +2409,7 @@ static void ov117_02266440(UnkStruct_ov117_02261280 *param0, UnkStruct_ov117_022
 
         if (param2->unk_19 > 8) {
             for (v0 = 0; v0 < 2; v0++) {
-                Sprite_SetDrawFlag2(param2->unk_00[v0], 0);
+                ManagedSprite_SetDrawFlag(param2->unk_00[v0], 0);
             }
 
             param2->unk_18 = 0;
diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c
index b66a1beb2f..a7ce692cd8 100644
--- a/src/overlay119/ov119_021D0D80.c
+++ b/src/overlay119/ov119_021D0D80.c
@@ -17,7 +17,6 @@
 
 #include "bg_window.h"
 #include "camera.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "graphics.h"
 #include "gx_layers.h"
@@ -28,6 +27,7 @@
 #include "pokemon.h"
 #include "render_window.h"
 #include "spl.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -570,8 +570,8 @@ void ov119_021D161C(UnkStruct_ov119_021D0FD0 *param0)
 
     param0->unk_74 = SpriteSystem_NewSprite(param0->unk_04.unk_50, param0->unk_04.unk_4C, &v0);
 
-    Sprite_TickOneFrame(param0->unk_74);
-    Sprite_SetAffineOverwriteMode(param0->unk_74, AFFINE_OVERWRITE_MODE_DOUBLE);
+    ManagedSprite_TickFrame(param0->unk_74);
+    ManagedSprite_SetAffineOverwriteMode(param0->unk_74, AFFINE_OVERWRITE_MODE_DOUBLE);
 
     v0.x = 0;
     v0.y = 0 - (2 * 8);
@@ -582,12 +582,12 @@ void ov119_021D161C(UnkStruct_ov119_021D0FD0 *param0)
     v0.resources[3] = 25003;
 
     param0->unk_78 = SpriteSystem_NewSprite(param0->unk_04.unk_50, param0->unk_04.unk_4C, &v0);
-    Sprite_TickOneFrame(param0->unk_78);
+    ManagedSprite_TickFrame(param0->unk_78);
 
     v0.y = 192 - (6 * 8);
 
     param0->unk_7C = SpriteSystem_NewSprite(param0->unk_04.unk_50, param0->unk_04.unk_4C, &v0);
-    Sprite_TickOneFrame(param0->unk_7C);
+    ManagedSprite_TickFrame(param0->unk_7C);
 }
 
 static const s16 Unk_ov119_021D2478[][10] = {
@@ -648,10 +648,10 @@ BOOL ov119_021D16C0(UnkStruct_ov119_021D0FD0 *param0, int param1)
                 v5++;
             }
 
-            Sprite_OffsetPositionXY2(param0->unk_74, v1, v2);
+            ManagedSprite_OffsetPositionXY(param0->unk_74, v1, v2);
 
             if (v3 != 0.0f) {
-                Sprite_SetAffineScale(param0->unk_74, v3, v4);
+                ManagedSprite_SetAffineScale(param0->unk_74, v3, v4);
             } else {
                 v5++;
             }
diff --git a/src/overlay119/ov119_021D191C.c b/src/overlay119/ov119_021D191C.c
index db44c0145f..8b962dafb1 100644
--- a/src/overlay119/ov119_021D191C.c
+++ b/src/overlay119/ov119_021D191C.c
@@ -7,12 +7,12 @@
 #include "overlay119/struct_ov119_021D0FD0.h"
 #include "overlay119/struct_ov119_021D1930.h"
 
-#include "cell_actor.h"
 #include "gx_layers.h"
 #include "menu.h"
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "pokemon.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "text.h"
 #include "unk_020041CC.h"
@@ -240,7 +240,7 @@ static BOOL ov119_021D1BD0(UnkStruct_ov119_021D0FD0 *param0)
         ov119_021D1514(param0);
         ov119_021D161C(param0);
 
-        Sprite_SetDrawFlag2(param0->unk_74, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_74, 0);
 
         ov119_021D1858(param0);
         ov119_021D190C(param0, 1);
@@ -382,7 +382,7 @@ static BOOL ov119_021D1E38(UnkStruct_ov119_021D0FD0 *param0)
 {
     switch (param0->unk_68) {
     case 0:
-        Sprite_SetAnimationFrame(param0->unk_74, 0);
+        ManagedSprite_SetAnimationFrame(param0->unk_74, 0);
         param0->unk_68++;
         break;
     case 1:
@@ -409,7 +409,7 @@ static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 *param0)
             break;
         }
 
-        Sprite_SetAnimationFrame(param0->unk_74, 1);
+        ManagedSprite_SetAnimationFrame(param0->unk_74, 1);
         param0->unk_68++;
         break;
     case 1: {
@@ -420,7 +420,7 @@ static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 *param0)
         if (v0 == 2) {
             Sound_PlayEffect(1812);
 
-            Sprite_SetAnimationFrame(param0->unk_74, 2);
+            ManagedSprite_SetAnimationFrame(param0->unk_74, 2);
             param0->unk_68++;
             param0->unk_64 = 0;
         }
@@ -431,7 +431,7 @@ static BOOL ov119_021D1E80(UnkStruct_ov119_021D0FD0 *param0)
         v1 = ov119_021D176C(param0, 0);
 
         if (v1 == 2) {
-            Sprite_SetAnimationFrame(param0->unk_74, 2);
+            ManagedSprite_SetAnimationFrame(param0->unk_74, 2);
             param0->unk_68 = 0;
             param0->unk_64 = 0;
             return 0;
@@ -455,7 +455,7 @@ static BOOL ov119_021D1EF0(UnkStruct_ov119_021D0FD0 *param0)
 
         if (v0 == 1) {
             Sound_PlayEffect(1812);
-            Sprite_SetAnimationFrame(param0->unk_74, 3);
+            ManagedSprite_SetAnimationFrame(param0->unk_74, 3);
             ov119_021D14DC(param0->unk_04.unk_40, 0);
         }
 
@@ -491,7 +491,7 @@ static BOOL ov119_021D1F48(UnkStruct_ov119_021D0FD0 *param0)
         if (v0 == 1) {
             Sound_PlayEffect(1812);
 
-            Sprite_SetAnimationFrame(param0->unk_74, 4);
+            ManagedSprite_SetAnimationFrame(param0->unk_74, 4);
             ov119_021D14DC(param0->unk_04.unk_40, 1);
         }
 
@@ -517,7 +517,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0)
             break;
         }
 
-        Sprite_SetAnimationFrame(param0->unk_74, 4);
+        ManagedSprite_SetAnimationFrame(param0->unk_74, 4);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
         param0->unk_68++;
         break;
@@ -527,14 +527,14 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0)
         v0 = ov119_021D176C(param0, 3);
 
         if (v0 == 1) {
-            Sprite_SetAnimationFrame(param0->unk_74, 5);
+            ManagedSprite_SetAnimationFrame(param0->unk_74, 5);
             Sound_PlayEffect(1799);
             ov119_021D14DC(param0->unk_04.unk_40, 2);
             ov119_021D14DC(param0->unk_04.unk_40, 3);
         }
 
         if (v0 == 2) {
-            Sprite_SetDrawFlag2(param0->unk_74, 0);
+            ManagedSprite_SetDrawFlag(param0->unk_74, 0);
             param0->unk_64 = 0;
             param0->unk_68++;
         }
@@ -549,7 +549,7 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0)
                 NNSG2dImagePaletteProxy *v1;
                 int v2;
 
-                v1 = CellActor_GetPaletteProxy(param0->unk_78->sprite);
+                v1 = Sprite_GetPaletteProxy(param0->unk_78->sprite);
                 v2 = PlttTransfer_GetPlttOffset(v1, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v2), 0, 0, 16, 0xFFFF);
@@ -563,18 +563,18 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0)
         s16 v3, v4;
         int v5 = 0;
 
-        Sprite_GetPositionXY2(param0->unk_78, &v3, &v4);
+        ManagedSprite_GetPositionXY(param0->unk_78, &v3, &v4);
 
         if (v4 > -48) {
-            Sprite_OffsetPositionXY2(param0->unk_78, 0, -4);
+            ManagedSprite_OffsetPositionXY(param0->unk_78, 0, -4);
         } else {
             v5++;
         }
 
-        Sprite_GetPositionXY2(param0->unk_7C, &v3, &v4);
+        ManagedSprite_GetPositionXY(param0->unk_7C, &v3, &v4);
 
         if (v4 < 192) {
-            Sprite_OffsetPositionXY2(param0->unk_7C, 0, +4);
+            ManagedSprite_OffsetPositionXY(param0->unk_7C, 0, +4);
         } else {
             v5++;
         }
@@ -585,9 +585,9 @@ static BOOL ov119_021D1FAC(UnkStruct_ov119_021D0FD0 *param0)
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
         ov119_021D190C(param0, 0);
-        Sprite_SetDrawFlag2(param0->unk_74, 0);
-        Sprite_SetDrawFlag2(param0->unk_78, 0);
-        Sprite_SetDrawFlag2(param0->unk_7C, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_74, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_78, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_7C, 0);
 
         param0->unk_68++;
     } break;
@@ -655,7 +655,7 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0)
                 NNSG2dImagePaletteProxy *v0;
                 int v1;
 
-                v0 = CellActor_GetPaletteProxy(param0->unk_78->sprite);
+                v0 = Sprite_GetPaletteProxy(param0->unk_78->sprite);
                 v1 = PlttTransfer_GetPlttOffset(v0, NNS_G2D_VRAM_TYPE_2DMAIN);
 
                 PaletteData_StartFade(param0->unk_04.unk_04, 0x4, 0xFFFF ^ (1 << v1), 0, 0, 16, 0xFFFF);
@@ -669,18 +669,18 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0)
         s16 v2, v3;
         int v4 = 0;
 
-        Sprite_GetPositionXY2(param0->unk_78, &v2, &v3);
+        ManagedSprite_GetPositionXY(param0->unk_78, &v2, &v3);
 
         if (v3 > -48) {
-            Sprite_OffsetPositionXY2(param0->unk_78, 0, -4);
+            ManagedSprite_OffsetPositionXY(param0->unk_78, 0, -4);
         } else {
             v4++;
         }
 
-        Sprite_GetPositionXY2(param0->unk_7C, &v2, &v3);
+        ManagedSprite_GetPositionXY(param0->unk_7C, &v2, &v3);
 
         if (v3 < 192) {
-            Sprite_OffsetPositionXY2(param0->unk_7C, 0, +4);
+            ManagedSprite_OffsetPositionXY(param0->unk_7C, 0, +4);
         } else {
             v4++;
         }
@@ -692,9 +692,9 @@ static BOOL ov119_021D21BC(UnkStruct_ov119_021D0FD0 *param0)
         ov119_021D190C(param0, 0);
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
-        Sprite_SetDrawFlag2(param0->unk_74, 0);
-        Sprite_SetDrawFlag2(param0->unk_78, 0);
-        Sprite_SetDrawFlag2(param0->unk_7C, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_74, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_78, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_7C, 0);
 
         param0->unk_68++;
     } break;
diff --git a/src/pokemon.c b/src/pokemon.c
index 8060fc8055..10dee969f9 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -31,7 +31,6 @@
 
 #include "overlay005/struct_ov5_021DE5D0.h"
 
-#include "cell_actor.h"
 #include "charcode_util.h"
 #include "flags.h"
 #include "heap.h"
@@ -46,6 +45,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "rtc.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "trainer_data.h"
@@ -3121,10 +3121,10 @@ static const int Unk_020F0588[] = {
     0x1
 };
 
-CellActorData *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID)
+ManagedSprite *sub_02076994(SpriteSystem *param0, SpriteManager *param1, PaletteData *param2, int param3, int param4, int param5, int param6, int param7, int heapID)
 {
     SpriteTemplate v0;
-    CellActorData *v1;
+    ManagedSprite *v1;
     NARC *narc;
     UnkStruct_ov5_021DE5D0 v3;
     int v4 = 1;
@@ -3155,10 +3155,10 @@ CellActorData *sub_02076994(SpriteSystem *param0, SpriteManager *param1, Palette
 
     v1 = SpriteSystem_NewSprite(param0, param1, &v0);
 
-    CellActor_SetExplicitPaletteOffsetAutoAdjust(v1->sprite, 0);
-    Sprite_SetPositionXY2(v1, param3, param4);
-    Sprite_TickOneFrame(v1);
-    Sprite_SetAnimateFlag(v1, 1);
+    Sprite_SetExplicitPaletteOffsetAutoAdjust(v1->sprite, 0);
+    ManagedSprite_SetPositionXY(v1, param3, param4);
+    ManagedSprite_TickFrame(v1);
+    ManagedSprite_SetAnimateFlag(v1, 1);
 
     return v1;
 }
@@ -4868,7 +4868,7 @@ void PokeSprite_LoadAnimationFrames(NARC *narc, SpriteAnimationFrame *frames, u1
     MI_CpuCopy8(data.faces[face].frames, frames, sizeof(SpriteAnimationFrame) * MAX_ANIMATION_FRAMES);
 }
 
-void PokeSprite_LoadAnimation(NARC *narc, PokemonAnimationSys *animationSys, Sprite *sprite, u16 species, int face, int reverse, int frame)
+void PokeSprite_LoadAnimation(NARC *narc, PokemonAnimationSys *animationSys, PokemonSprite *sprite, u16 species, int face, int reverse, int frame)
 {
     int faceType = (face == FACE_FRONT) ? 0 : 1;
 
diff --git a/src/render_oam.c b/src/render_oam.c
index d07fe8392d..b9f0d19573 100644
--- a/src/render_oam.c
+++ b/src/render_oam.c
@@ -5,9 +5,9 @@
 #include "constants/heap.h"
 #include "constants/screen.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "render_view.h"
+#include "sprite.h"
 
 #define NUM_HW_OAM_ATTR            128
 #define NUM_HW_OAM_ATTR_RESERVED   4
diff --git a/src/render_window.c b/src/render_window.c
index 49b3b1f580..a5805bd371 100644
--- a/src/render_window.c
+++ b/src/render_window.c
@@ -14,7 +14,6 @@
 #include "overlay005/struct_ov5_021D30A8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -22,6 +21,7 @@
 #include "palette.h"
 #include "pokemon.h"
 #include "render_text.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "sprite_transfer.h"
@@ -78,7 +78,7 @@ typedef struct WaitDial {
 
 typedef struct PokemonPreview {
     UnkStruct_ov5_021D30A8 unk_00;
-    CellActorData *cellActorData;
+    ManagedSprite *managedSprite;
     BgConfig *bgConfig;
     u8 bgLayer;
     u8 x;
@@ -772,25 +772,25 @@ static void SysTask_HandlePokemonPreview(SysTask *task, void *data)
     switch (preview->state) {
     case 1:
         ErasePokemonPreviewWindow(preview);
-        Sprite_DeleteAndFreeResources(preview->cellActorData);
+        Sprite_DeleteAndFreeResources(preview->managedSprite);
         ov5_021D375C(&preview->unk_00);
         SysTask_FinishAndFreeParam(task);
         return;
 
     case 2:
         preview->state = 3;
-        CellActor_SetAnim(preview->cellActorData->sprite, 1);
+        Sprite_SetAnim(preview->managedSprite->sprite, 1);
         break;
 
     case 3:
-        if (CellActor_GetAnimFrame(preview->cellActorData->sprite) == 6) {
+        if (Sprite_GetAnimFrame(preview->managedSprite->sprite) == 6) {
             preview->state = 0;
         }
         break;
     }
 
-    CellActor_UpdateAnim(preview->cellActorData->sprite, FX32_ONE);
-    CellActorCollection_Update(preview->unk_00.unk_00);
+    Sprite_UpdateAnim(preview->managedSprite->sprite, FX32_ONE);
+    SpriteList_Update(preview->unk_00.unk_00);
 }
 
 static PokemonPreview *CreatePokemonPreviewTask(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u32 heapID)
@@ -845,9 +845,9 @@ static void CreatePokemonPreviewSprite(PokemonPreview *preview, u8 x, u8 y)
     template.x = (x + 5) * 8;
     template.y = (y + 5) * 8;
 
-    preview->cellActorData = ov5_021D3584(&preview->unk_00, &template);
+    preview->managedSprite = ov5_021D3584(&preview->unk_00, &template);
 
-    CellActorCollection_Update(preview->unk_00.unk_00);
+    SpriteList_Update(preview->unk_00.unk_00);
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, TRUE);
 }
 
@@ -895,7 +895,7 @@ static void DrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, ArchivedSpr
     UnkStruct_02013610 v7 = { 10, 0, 10, 10 };
     sub_020135F0(sprite->archive, sprite->character, param0->unk_1C6, &v7, buf + POKEMON_SPRITE_FRAME_SIZE_BYTES);
 
-    charResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_TILES], POKEMON_PREVIEW_RESOURCE_ID);
+    charResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_CHAR], POKEMON_PREVIEW_RESOURCE_ID);
     imageProxy = SpriteTransfer_GetImageProxy(charResource);
     offset = NNS_G2dGetImageLocation(imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN);
 
@@ -905,7 +905,7 @@ static void DrawPokemonPreviewSprite(UnkStruct_ov5_021D30A8 *param0, ArchivedSpr
     Heap_FreeToHeap(buf);
 
     buf = sub_02013660(sprite->archive, sprite->palette, param0->unk_1C6);
-    plttResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_PALETTE], POKEMON_PREVIEW_RESOURCE_ID);
+    plttResource = SpriteResourceCollection_Find(param0->unk_194[SPRITE_RESOURCE_PLTT], POKEMON_PREVIEW_RESOURCE_ID);
     paletteProxy = SpriteTransfer_GetPaletteProxy(plttResource, imageProxy);
     offset = NNS_G2dGetImagePaletteLocation(paletteProxy, NNS_G2D_VRAM_TYPE_2DMAIN);
 
diff --git a/src/sprite.c b/src/sprite.c
new file mode 100644
index 0000000000..f39e25c27a
--- /dev/null
+++ b/src/sprite.c
@@ -0,0 +1,929 @@
+#include "sprite.h"
+
+#include <nitro.h>
+#include <string.h>
+
+#include "heap.h"
+#include "system.h"
+
+typedef void (*SpriteDrawFunc)(const SpriteList *, Sprite *);
+typedef void (*SpriteAnimUpdateFunc)(Sprite *);
+
+static void SpriteList_Reset(SpriteList *list);
+static enum CellAnimType SpriteResourcesHeader_GetCellType(const SpriteResourcesHeader *resourceData);
+static void Sprite_SetCellBank(const NNSG2dCellDataBank *cellBank, Sprite *sprite);
+static void Sprite_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, Sprite *sprite);
+static void Sprite_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, Sprite *sprite);
+static void Sprite_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, Sprite *sprite);
+static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapId heapID);
+static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapId heapID);
+static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapId heapID);
+static BOOL SpriteList_InitSprite(const SpriteList *list,
+    const SpriteResourcesHeader *resourceData,
+    Sprite *sprite,
+    enum HeapId heapID);
+static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType);
+static void SpriteList_DrawSprite(const SpriteList *list, Sprite *sprite);
+static void SpriteList_DrawSprite_Stub(const SpriteList *list, Sprite *sprite);
+static void Sprite_UpdateAnimInternal(Sprite *list);
+static void Sprite_UpdateAnimInternal_Stub(Sprite *list);
+static void SpriteList_Insert(SpriteList *list, Sprite *sprite);
+static void SpriteList_Remove(Sprite *sprite);
+static void SpriteList_InitSprites(SpriteList *list);
+static Sprite *SpriteList_AllocSprite(SpriteList *list);
+static BOOL SpriteList_FreeSprite(SpriteList *list, Sprite *sprite);
+
+SpriteList *SpriteList_New(const SpriteListParams *params)
+{
+    GF_ASSERT(params);
+    GF_ASSERT(params->renderer);
+
+    SpriteList *list = Heap_AllocFromHeap(params->heapID, sizeof(SpriteList));
+    GF_ASSERT(list);
+
+    SpriteList_Reset(list);
+
+    list->sprites = Heap_AllocFromHeap(params->heapID, sizeof(Sprite) * params->maxElements);
+    GF_ASSERT(list->sprites);
+    list->capacity = params->maxElements;
+
+    list->freeSprites = Heap_AllocFromHeap(params->heapID, sizeof(Sprite *) * params->maxElements);
+    GF_ASSERT(list->freeSprites);
+
+    SpriteList_InitSprites(list);
+    Sprite_Reset(&list->sentinelData);
+
+    list->sentinelData.prev = &list->sentinelData;
+    list->sentinelData.next = &list->sentinelData;
+    list->renderer = params->renderer;
+    list->rawAnimData = ReadFileToHeap(params->heapID, "data/clact_default.NANR");
+
+    NNS_G2dGetUnpackedAnimBank(list->rawAnimData, &list->defaultAnimBank);
+    list->active = TRUE;
+
+    return list;
+}
+
+BOOL SpriteList_Delete(SpriteList *list)
+{
+    if (list == NULL) {
+        return FALSE;
+    }
+
+    if (list->sprites == NULL) {
+        return TRUE;
+    }
+
+    SpriteList_DeleteAll(list);
+
+    Heap_FreeToHeap(list->rawAnimData);
+    Heap_FreeToHeap(list->freeSprites);
+    Heap_FreeToHeap(list->sprites);
+
+    SpriteList_Reset(list);
+    Heap_FreeToHeap(list);
+
+    list = NULL;
+
+    return TRUE;
+}
+
+BOOL SpriteList_SetActive(SpriteList *list, u8 active)
+{
+    if (list == NULL) {
+        return FALSE;
+    }
+
+    if (list->sprites == NULL) {
+        return FALSE;
+    }
+
+    list->active = active;
+
+    return TRUE;
+}
+
+BOOL SpriteList_DeleteAll(SpriteList *list)
+{
+    if (list == NULL) {
+        return FALSE;
+    }
+
+    if (list->sprites == NULL) {
+        return TRUE;
+    }
+
+    Sprite *sprite = list->sentinelData.next;
+    while (sprite != &list->sentinelData) {
+        Sprite *next = sprite->next;
+        Sprite_Delete(sprite);
+        sprite = next;
+    }
+
+    return TRUE;
+}
+
+void SpriteList_Update(const SpriteList *list)
+{
+    static const SpriteDrawFunc sDrawFuncs[] = {
+        SpriteList_DrawSprite_Stub,
+        SpriteList_DrawSprite
+    };
+    static const SpriteAnimUpdateFunc sAnimUpdateFuncs[] = {
+        Sprite_UpdateAnimInternal_Stub,
+        Sprite_UpdateAnimInternal
+    };
+
+    GF_ASSERT(list);
+
+    if (list->active == FALSE) {
+        return;
+    }
+
+    Sprite *sprite = list->sentinelData.next;
+
+    while (sprite != &list->sentinelData) {
+        sDrawFuncs[sprite->draw](list, sprite);
+        sAnimUpdateFuncs[sprite->animate](sprite);
+        sprite = sprite->next;
+    }
+}
+
+static void SpriteList_Reset(SpriteList *list)
+{
+    list->sprites = NULL;
+    list->capacity = 0;
+    list->freeSprites = NULL;
+    list->freeSpriteHead = 0;
+    list->renderer = NULL;
+
+    Sprite_Reset(&list->sentinelData);
+    list->active = FALSE;
+}
+
+void Sprite_Reset(Sprite *sprite)
+{
+    sprite->list = NULL;
+    memset(sprite, 0, sizeof(Sprite));
+
+    NNS_G2dInitImageProxy(&sprite->imageProxy);
+    NNS_G2dInitImagePaletteProxy(&sprite->paletteProxy);
+
+    sprite->explicitOamMode = GX_OAM_MODE_NORMAL;
+}
+
+Sprite *SpriteList_AddEx(const AffineSpriteListTemplate *params)
+{
+    Sprite *sprite = SpriteList_AllocSprite(params->list);
+    if (sprite == NULL) {
+        return NULL;
+    }
+
+    sprite->list = params->list;
+    sprite->activeAnimID = 0;
+    sprite->position = params->position;
+    sprite->affineScale = params->affineScale;
+    sprite->affineZRotation = params->affineZRotation;
+    sprite->vramType = params->vramType;
+    sprite->priority = params->priority;
+    sprite->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+    sprite->flip = SPRITE_FLIP_NONE;
+    sprite->explicitMosaic = FALSE;
+    sprite->explicitOamMode = GX_OAM_MODE_NORMAL;
+    sprite->overwriteFlags = NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS | NNS_G2D_RND_OVERWRITE_PRIORITY;
+
+    NNS_G2dSetRndCoreAffineOverwriteMode(
+        &params->list->renderer->rendererCore,
+        sprite->affineOverwriteMode);
+    NNS_G2dSetRndCoreFlipMode(
+        &params->list->renderer->rendererCore,
+        sprite->flip & SPRITE_FLIP_H,
+        sprite->flip & SPRITE_FLIP_V);
+
+    sprite->draw = TRUE;
+    sprite->animate = FALSE;
+    sprite->animSpeed = (FX32_ONE * 2);
+
+    if (SpriteList_InitSprite(params->list, params->resourceData, sprite, params->heapID) == FALSE) {
+        Sprite_Delete(sprite);
+        return NULL;
+    }
+
+    sprite->explicitPaletteOffset = GetPaletteIndexForProxy(&sprite->paletteProxy, sprite->vramType);
+    sprite->explicitPalette = sprite->explicitPaletteOffset;
+
+    SpriteList_Insert(params->list, sprite);
+
+    return sprite;
+}
+
+Sprite *SpriteList_Add(const SpriteListTemplate *params)
+{
+    AffineSpriteListTemplate paramsEx;
+
+    paramsEx.list = params->list;
+    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 SpriteList_AddEx(&paramsEx);
+}
+
+void Sprite_Delete(Sprite *sprite)
+{
+    if (sprite->type == CELL_ANIM_TYPE_NONE) {
+        return;
+    }
+
+    if (sprite->prev != NULL) {
+        SpriteList_Remove(sprite);
+    }
+
+    if (sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&sprite->animData;
+
+        if (NNS_G2dGetImageLocation(&sprite->imageProxy, sprite->vramType) != NNS_G2D_VRAM_ADDR_NONE) {
+            NNS_G2dFreeCellTransferStateHandle(vramCellAnim->transferHandle);
+        }
+    }
+
+    if (sprite->type == CELL_ANIM_TYPE_MULTI_CELL) {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+
+        if (multiCellAnim->nodes != NULL) {
+            Heap_FreeToHeap(multiCellAnim->nodes);
+        }
+
+        if (multiCellAnim->cellAnims != NULL) {
+            Heap_FreeToHeap(multiCellAnim->cellAnims);
+        }
+    }
+
+    sprite->type = CELL_ANIM_TYPE_NONE;
+
+    SpriteList_FreeSprite(sprite->list, sprite);
+}
+
+void Sprite_SetPosition(Sprite *sprite, const VecFx32 *position)
+{
+    sprite->position = *position;
+}
+
+void Sprite_SetAffineTranslation(Sprite *sprite, const VecFx32 *translation)
+{
+    sprite->affineTranslation = *translation;
+}
+
+void Sprite_SetAffineScale(Sprite *sprite, const VecFx32 *scale)
+{
+    sprite->affineScale = *scale;
+}
+
+void Sprite_SetAffineScaleEx(Sprite *sprite, const VecFx32 *scale, enum AffineOverwriteMode mode)
+{
+    Sprite_SetAffineScale(sprite, scale);
+    Sprite_SetAffineOverwriteMode(sprite, mode);
+}
+
+void Sprite_SetAffineZRotation(Sprite *sprite, u16 angle)
+{
+    sprite->affineZRotation = angle;
+}
+
+void Sprite_SetAffineZRotationEx(Sprite *sprite, u16 angle, enum AffineOverwriteMode mode)
+{
+    Sprite_SetAffineZRotation(sprite, angle);
+    Sprite_SetAffineOverwriteMode(sprite, mode);
+}
+
+void Sprite_SetDrawFlag(Sprite *sprite, BOOL draw)
+{
+    GF_ASSERT(sprite);
+    GF_ASSERT(draw < 2); // This value is used as an index into an array of size 2 inside SpriteList_Update
+
+    sprite->draw = draw;
+}
+
+void Sprite_SetAnimateFlag(Sprite *sprite, BOOL animate)
+{
+    GF_ASSERT(sprite);
+    GF_ASSERT(animate < 2); // This value is used as an index into an array of size 2 inside SpriteList_Update
+
+    sprite->animate = animate;
+}
+
+void Sprite_SetAnimSpeed(Sprite *sprite, fx32 speed)
+{
+    GF_ASSERT(sprite);
+    sprite->animSpeed = speed;
+}
+
+void Sprite_SetAffineOverwriteMode(Sprite *sprite, enum AffineOverwriteMode mode)
+{
+    GF_ASSERT(sprite);
+    sprite->affineOverwriteMode = mode;
+}
+
+void Sprite_SetFlipMode(Sprite *sprite, u32 mode)
+{
+    GF_ASSERT(sprite);
+    sprite->flip = mode;
+    sprite->affineOverwriteMode = NNS_G2D_RND_AFFINE_OVERWRITE_NONE;
+}
+
+const VecFx32 *Sprite_GetPosition(const Sprite *sprite)
+{
+    return &sprite->position;
+}
+
+const VecFx32 *Sprite_GetAffineScale(const Sprite *sprite)
+{
+    return &sprite->affineScale;
+}
+
+u16 Sprite_GetAffineZRotation(const Sprite *sprite)
+{
+    return sprite->affineZRotation;
+}
+
+BOOL Sprite_GetDrawFlag(const Sprite *sprite)
+{
+    return sprite->draw;
+}
+
+BOOL Sprite_GetAnimateFlag(const Sprite *sprite)
+{
+    return sprite->animate;
+}
+
+u32 Sprite_GetAnimCount(const Sprite *sprite)
+{
+    GF_ASSERT(sprite);
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        return cellAnim->animBank->numSequences;
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        return multiCellAnim->animBank->numSequences;
+    }
+}
+
+void Sprite_SetAnim(Sprite *sprite, u32 animID)
+{
+    GF_ASSERT(Sprite_GetAnimCount(sprite) > animID);
+    sprite->activeAnimID = animID;
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+
+        const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, animID);
+        NNS_G2dSetCellAnimationSequence(&cellAnim->anim, animSequence);
+        NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+
+        const NNSG2dAnimSequence *animSequence = NNS_G2dGetAnimSequenceByIdx(multiCellAnim->animBank, animID);
+        NNS_G2dSetAnimSequenceToMCAnimation(&multiCellAnim->anim, animSequence);
+        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
+    }
+}
+
+void Sprite_SetAnimNoRestart(Sprite *sprite, u32 animID)
+{
+    if (sprite->activeAnimID != animID) {
+        Sprite_SetAnim(sprite, animID);
+    }
+}
+
+void Sprite_RestartAnim(Sprite *sprite)
+{
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+
+        NNS_G2dResetAnimCtrlState(&cellAnim->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&cellAnim->anim.animCtrl);
+        Sprite_SetAnimFrame(sprite, 0);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+
+        NNS_G2dResetAnimCtrlState(&multiCellAnim->anim.animCtrl);
+        NNS_G2dStartAnimCtrl(&multiCellAnim->anim.animCtrl);
+        Sprite_SetAnimFrame(sprite, 0);
+    }
+}
+
+u32 Sprite_GetActiveAnim(const Sprite *sprite)
+{
+    return sprite->activeAnimID;
+}
+
+void Sprite_UpdateAnim(Sprite *sprite, fx32 frames)
+{
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        NNS_G2dTickCellAnimation(&cellAnim->anim, frames);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        NNS_G2dTickMCAnimation(&multiCellAnim->anim, frames);
+    }
+}
+
+void Sprite_SetAnimFrame(Sprite *sprite, u16 frame)
+{
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        NNS_G2dSetCellAnimationCurrentFrame(&cellAnim->anim, frame);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        NNS_G2dSetMCAnimationCurrentFrame(&multiCellAnim->anim, frame);
+    }
+}
+
+u16 Sprite_GetAnimFrame(const Sprite *sprite)
+{
+    NNSG2dAnimController *controller;
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        controller = NNS_G2dGetCellAnimationAnimCtrl(&cellAnim->anim);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        controller = NNS_G2dGetMCAnimAnimCtrl(&multiCellAnim->anim);
+    }
+
+    return NNS_G2dGetAnimCtrlCurrentFrame(controller);
+}
+
+void Sprite_SetExplicitPriority(Sprite *sprite, u8 priority)
+{
+    sprite->explicitPriority = priority;
+}
+
+u8 Sprite_GetExplicitPriority(const Sprite *sprite)
+{
+    return sprite->explicitPriority;
+}
+
+void Sprite_SetExplicitPalette(Sprite *sprite, u32 palette)
+{
+    GF_ASSERT(sprite);
+
+    sprite->explicitPalette = palette;
+    sprite->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO;
+    sprite->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+}
+
+void Sprite_SetExplicitPaletteWithOffset(Sprite *sprite, u32 palette)
+{
+    Sprite_SetExplicitPalette(sprite, palette);
+    sprite->explicitPalette += GetPaletteIndexForProxy(&sprite->paletteProxy, sprite->vramType);
+}
+
+u32 Sprite_GetExplicitPalette(const Sprite *sprite)
+{
+    return sprite->explicitPalette;
+}
+
+void Sprite_SetExplicitPaletteOffset(Sprite *sprite, u32 paletteOffset)
+{
+    GF_ASSERT(sprite);
+
+    sprite->explicitPaletteOffset = paletteOffset;
+    sprite->overwriteFlags |= NNS_G2D_RND_OVERWRITE_PLTTNO_OFFS;
+    sprite->overwriteFlags &= ~NNS_G2D_RND_OVERWRITE_PLTTNO;
+}
+
+void Sprite_SetExplicitPaletteOffsetAutoAdjust(Sprite *sprite, u32 paletteOffset)
+{
+    Sprite_SetExplicitPaletteOffset(sprite, paletteOffset);
+    sprite->explicitPaletteOffset += GetPaletteIndexForProxy(&sprite->paletteProxy, sprite->vramType);
+}
+
+u32 Sprite_GetExplicitPaletteOffset(const Sprite *sprite)
+{
+    GF_ASSERT(sprite);
+    return sprite->explicitPaletteOffset;
+}
+
+void Sprite_SetPriority(Sprite *sprite, u32 priority)
+{
+    SpriteList *list = sprite->list; // Required to match
+    sprite->priority = priority;
+
+    SpriteList_Remove(sprite);
+    SpriteList_Insert(list, sprite);
+}
+
+u32 Sprite_GetPriority(const Sprite *sprite)
+{
+    return sprite->priority;
+}
+
+void Sprite_SetImageProxy(Sprite *sprite, const NNSG2dImageProxy *imageProxy)
+{
+    sprite->imageProxy = *imageProxy;
+}
+
+NNSG2dImageProxy *Sprite_GetImageProxy(Sprite *sprite)
+{
+    return &sprite->imageProxy;
+}
+
+NNSG2dImagePaletteProxy *Sprite_GetPaletteProxy(Sprite *paletteProxy)
+{
+    return &paletteProxy->paletteProxy;
+}
+
+void Sprite_SetPixelated(Sprite *sprite, BOOL pixelated)
+{
+    sprite->explicitMosaic = pixelated;
+
+    if (pixelated == TRUE) {
+        sprite->overwriteFlags |= NNS_G2D_RND_OVERWRITE_MOSAIC;
+    } else {
+        sprite->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_MOSAIC;
+    }
+}
+
+NNS_G2D_VRAM_TYPE Sprite_GetVRamType(const Sprite *sprite)
+{
+    return sprite->vramType;
+}
+
+BOOL Sprite_IsAnimated(Sprite *sprite)
+{
+    GF_ASSERT(sprite);
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        return NNS_G2dIsAnimCtrlActive(&cellAnim->anim.animCtrl);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        return NNS_G2dIsAnimCtrlActive(&multiCellAnim->anim.animCtrl);
+    }
+}
+
+void Sprite_SetExplicitOAMMode(Sprite *sprite, GXOamMode mode)
+{
+    GF_ASSERT(sprite);
+
+    sprite->explicitOamMode = mode;
+
+    if (mode == GX_OAM_MODE_NORMAL) {
+        sprite->overwriteFlags ^= NNS_G2D_RND_OVERWRITE_OBJMODE;
+    } else {
+        sprite->overwriteFlags |= NNS_G2D_RND_OVERWRITE_OBJMODE;
+    }
+}
+
+void Utility_Clear2DMainOAM(enum HeapId heapID)
+{
+    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
+
+    MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SPRITES);
+    DC_FlushRange(oam, sizeof(GXOamAttr) * MAX_SPRITES);
+    GX_LoadOAM(oam, 0, sizeof(GXOamAttr) * MAX_SPRITES);
+
+    Heap_FreeToHeap(oam);
+}
+
+void Utility_Clear2DSubOAM(enum HeapId heapID)
+{
+    GXOamAttr *oam = Heap_AllocFromHeap(heapID, sizeof(GXOamAttr) * MAX_SPRITES);
+
+    MI_CpuFill16(oam, 0x2C0, sizeof(GXOamAttr) * MAX_SPRITES);
+    // According to the NitroSDK docs there should be a call to DC_FlushRange here.
+    GXS_LoadOAM(oam, 0, sizeof(GXOamAttr) * MAX_SPRITES);
+
+    Heap_FreeToHeap(oam);
+}
+
+u32 Sprite_GetUserAttrForAnimFrame(const Sprite *sprite, u32 animID, u32 frame)
+{
+    const NNSG2dAnimBankData *animBank;
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        animBank = cellAnim->animBank;
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        animBank = multiCellAnim->animBank;
+    }
+
+    const NNSG2dUserExAnimAttrBank *animAttrBank = NNS_G2dGetUserExAnimAttrBank(animBank);
+
+    // Guard clauses don't match here so the nested if's are required
+    if (animAttrBank) {
+        const NNSG2dUserExAnimSequenceAttr *animAttr = NNS_G2dGetUserExAnimSequenceAttr(animAttrBank, animID);
+
+        if (animAttr) {
+            const NNSG2dUserExAnimFrameAttr *frameAttr = NNS_G2dGetUserExAnimFrameAttr(animAttr, frame);
+
+            if (frameAttr) {
+                return NNS_G2dGetUserExAnimFrmAttrValue(frameAttr);
+            }
+        }
+    }
+
+    return 0;
+}
+
+u32 Sprite_GetUserAttrForCurrentAnimFrame(const Sprite *sprite)
+{
+    u32 animID = Sprite_GetActiveAnim(sprite);
+    u32 frame = Sprite_GetAnimFrame(sprite);
+
+    return Sprite_GetUserAttrForAnimFrame(sprite, animID, frame);
+}
+
+static BOOL SpriteList_InitSprite(const SpriteList *list,
+    const SpriteResourcesHeader *resourceData,
+    Sprite *sprite,
+    enum HeapId heapID)
+{
+    sprite->type = SpriteResourcesHeader_GetCellType(resourceData);
+    sprite->imageProxy = *resourceData->imageProxy;
+    sprite->paletteProxy = *resourceData->paletteProxy;
+
+    Sprite_SetCellBank(resourceData->cellBank, sprite);
+
+    if (resourceData->cellAnimBank) {
+        Sprite_SetCellAnimBank(resourceData->cellAnimBank, sprite);
+    } else {
+        Sprite_SetCellAnimBank(list->defaultAnimBank, sprite);
+    }
+
+    if (sprite->type == CELL_ANIM_TYPE_MULTI_CELL) {
+        Sprite_SetMultiCellBank(resourceData->multiCellBank, sprite);
+        Sprite_SetMultiCellAnimBank(resourceData->multiCellAnimBank, sprite);
+        Sprite_CreateMultiCellAnim(sprite, heapID);
+    } else if (sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        Sprite_CreateVRamCellAnim(resourceData, sprite, heapID);
+    } else {
+        Sprite_CreateCellAnim(sprite, heapID);
+    }
+
+    sprite->explicitPriority = resourceData->priority;
+
+    return TRUE;
+}
+
+static enum CellAnimType SpriteResourcesHeader_GetCellType(const SpriteResourcesHeader *resourceData)
+{
+    if (resourceData->multiCellBank != NULL) {
+        return CELL_ANIM_TYPE_MULTI_CELL;
+    }
+
+    if (resourceData->isVRamTransfer == TRUE) {
+        return CELL_ANIM_TYPE_VRAM_CELL;
+    }
+
+    return CELL_ANIM_TYPE_CELL;
+}
+
+static void Sprite_SetCellBank(const NNSG2dCellDataBank *cellBank, Sprite *sprite)
+{
+    CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+    cellAnim->cellBank = cellBank;
+}
+
+static void Sprite_SetCellAnimBank(const NNSG2dCellAnimBankData *cellAnimBank, Sprite *sprite)
+{
+    CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+    cellAnim->animBank = cellAnimBank;
+}
+
+static void Sprite_SetMultiCellBank(const NNSG2dMultiCellDataBank *multiCellBank, Sprite *sprite)
+{
+    MultiCellAnimationData *multiCell = (MultiCellAnimationData *)&sprite->animData;
+    multiCell->cellBank = multiCellBank;
+}
+
+static void Sprite_SetMultiCellAnimBank(const NNSG2dMultiCellAnimBankData *multiCellAnimBank, Sprite *sprite)
+{
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+    multiCellAnim->animBank = multiCellAnimBank;
+}
+
+static void Sprite_CreateCellAnim(Sprite *sprite, enum HeapId heapID)
+{
+    CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+    NNS_G2dInitCellAnimation(
+        &cellAnim->anim,
+        NNS_G2dGetAnimSequenceByIdx(cellAnim->animBank, 0),
+        cellAnim->cellBank);
+}
+
+static void Sprite_CreateVRamCellAnim(const SpriteResourcesHeader *resourceData, Sprite *sprite, enum HeapId heapID)
+{
+    VRamCellAnimationData *vramCellAnim = (VRamCellAnimationData *)&sprite->animData;
+    vramCellAnim->transferHandle = NNS_G2dGetNewCellTransferStateHandle();
+    const NNSG2dCharacterData *charData = resourceData->charData;
+
+    NNS_G2dInitCellAnimationVramTransfered(
+        &vramCellAnim->anim,
+        NNS_G2dGetAnimSequenceByIdx(vramCellAnim->animBank, 0),
+        vramCellAnim->cellBank,
+        vramCellAnim->transferHandle,
+        NNS_G2D_VRAM_ADDR_NONE,
+        NNS_G2dGetImageLocation(&sprite->imageProxy, NNS_G2D_VRAM_TYPE_2DMAIN),
+        NNS_G2dGetImageLocation(&sprite->imageProxy, NNS_G2D_VRAM_TYPE_2DSUB),
+        charData->pRawData,
+        NULL,
+        charData->szByte);
+}
+
+static void Sprite_CreateMultiCellAnim(Sprite *sprite, enum HeapId heapID)
+{
+    MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->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);
+
+    NNS_G2dInitMCAnimation(
+        &multiCellAnim->anim,
+        multiCellAnim->nodes,
+        multiCellAnim->cellAnims,
+        maxNodes,
+        multiCellAnim->individualAnimBank,
+        multiCellAnim->individualCellBank,
+        multiCellAnim->cellBank);
+
+    NNS_G2dSetAnimSequenceToMCAnimation(
+        &multiCellAnim->anim,
+        animSequence);
+}
+
+static u32 GetPaletteIndexForProxy(const NNSG2dImagePaletteProxy *paletteProxy, u32 vramType)
+{
+    u32 paletteSize;
+
+    if (paletteProxy->bExtendedPlt) {
+        paletteSize = 32 * 16;
+    } else {
+        if (paletteProxy->fmt == GX_TEXFMT_PLTT256) {
+            paletteSize = 0;
+        } else {
+            paletteSize = 32;
+        }
+    }
+
+    return paletteSize != 0
+        ? NNS_G2dGetImagePaletteLocation(paletteProxy, vramType) / paletteSize
+        : 0;
+}
+
+static void SpriteList_DrawSprite(const SpriteList *list, Sprite *sprite)
+{
+    VecFx32 pos = sprite->position;
+
+    NNS_G2dSetRendererImageProxy(list->renderer, &sprite->imageProxy, &sprite->paletteProxy);
+    NNS_G2dBeginRendering(list->renderer);
+    NNS_G2dPushMtx();
+
+    NNS_G2dSetRndCoreAffineOverwriteMode(&list->renderer->rendererCore, sprite->affineOverwriteMode);
+
+    if (sprite->affineOverwriteMode == NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+        NNS_G2dSetRndCoreFlipMode(
+            &list->renderer->rendererCore,
+            sprite->flip & SPRITE_FLIP_H,
+            sprite->flip & SPRITE_FLIP_V);
+    } else {
+        NNS_G2dSetRndCoreFlipMode(&list->renderer->rendererCore, FALSE, FALSE);
+    }
+
+    NNS_G2dTranslate(pos.x, pos.y, pos.z);
+
+    if (sprite->affineOverwriteMode != NNS_G2D_RND_AFFINE_OVERWRITE_NONE) {
+        NNS_G2dTranslate(sprite->affineTranslation.x, sprite->affineTranslation.y, sprite->affineTranslation.z);
+        NNS_G2dScale(sprite->affineScale.x, sprite->affineScale.y, sprite->affineScale.z);
+        NNS_G2dRotZ(FX_SinIdx(sprite->affineZRotation), FX_CosIdx(sprite->affineZRotation));
+
+        // affineTranslation only serves as a pivot point for rotation and scaling
+        // so we undo this translation after applying these transformations.
+        NNS_G2dTranslate(-sprite->affineTranslation.x, -sprite->affineTranslation.y, -sprite->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(list->renderer, sprite->overwriteFlags);
+    NNS_G2dSetRendererOverwriteDisable(list->renderer, ~sprite->overwriteFlags);
+
+    NNS_G2dSetRendererOverwritePlttNo(list->renderer, sprite->explicitPalette);
+    NNS_G2dSetRendererOverwritePlttNoOffset(list->renderer, sprite->explicitPaletteOffset);
+    NNS_G2dSetRendererOverwriteMosaicFlag(list->renderer, sprite->explicitMosaic);
+    NNS_G2dSetRendererOverwriteOBJMode(list->renderer, sprite->explicitOamMode);
+    NNS_G2dSetRendererOverwritePriority(list->renderer, sprite->explicitPriority);
+
+    if (sprite->type == CELL_ANIM_TYPE_CELL || sprite->type == CELL_ANIM_TYPE_VRAM_CELL) {
+        CellAnimationData *cellAnim = (CellAnimationData *)&sprite->animData;
+        NNS_G2dDrawCellAnimation(&cellAnim->anim);
+    } else {
+        MultiCellAnimationData *multiCellAnim = (MultiCellAnimationData *)&sprite->animData;
+        NNS_G2dDrawMultiCellAnimation(&multiCellAnim->anim);
+    }
+
+    NNS_G2dPopMtx();
+    NNS_G2dEndRendering();
+}
+
+static void SpriteList_DrawSprite_Stub(const SpriteList *list, Sprite *sprite)
+{
+    return;
+}
+
+static void Sprite_UpdateAnimInternal(Sprite *sprite)
+{
+    Sprite_UpdateAnim(sprite, sprite->animSpeed);
+}
+
+static void Sprite_UpdateAnimInternal_Stub(Sprite *sprite)
+{
+    return;
+}
+
+static void SpriteList_Insert(SpriteList *list, Sprite *sprite)
+{
+    // If the list is empty, insert the sprite as the only sprite
+    if (list->sentinelData.next == &list->sentinelData) {
+        list->sentinelData.next = sprite;
+        list->sentinelData.prev = sprite;
+        sprite->prev = &list->sentinelData;
+        sprite->next = &list->sentinelData;
+        return;
+    }
+
+    // Check if the sprite should be inserted at the end of the list (lowest priority)
+    if (list->sentinelData.prev->priority <= sprite->priority) {
+        sprite->prev = list->sentinelData.prev;
+        list->sentinelData.prev->next = sprite;
+        sprite->next = &list->sentinelData;
+        list->sentinelData.prev = sprite;
+        return;
+    }
+
+    // Insert the sprite in the correct position according to its priority
+    Sprite *cur = list->sentinelData.next;
+    while (cur != &list->sentinelData) {
+        if (cur->priority > sprite->priority) {
+            cur->prev->next = sprite;
+            sprite->prev = cur->prev;
+            cur->prev = sprite;
+            sprite->next = cur;
+            break;
+        }
+
+        cur = cur->next;
+    }
+}
+
+static void SpriteList_Remove(Sprite *sprite)
+{
+    sprite->prev->next = sprite->next;
+    sprite->next->prev = sprite->prev;
+}
+
+static void SpriteList_InitSprites(SpriteList *list)
+{
+    for (int i = 0; i < list->capacity; i++) {
+        Sprite_Reset(&list->sprites[i]);
+        list->freeSprites[i] = list->sprites + i;
+    }
+
+    list->freeSpriteHead = 0;
+}
+
+static Sprite *SpriteList_AllocSprite(SpriteList *list)
+{
+    if (list->freeSpriteHead >= list->capacity) {
+        return NULL;
+    }
+
+    Sprite *sprite = list->freeSprites[list->freeSpriteHead];
+    list->freeSpriteHead++;
+
+    return sprite;
+}
+
+static BOOL SpriteList_FreeSprite(SpriteList *list, Sprite *sprite)
+{
+    if (list->freeSpriteHead <= 0) {
+        return FALSE;
+    }
+
+    Sprite_Reset(sprite);
+
+    list->freeSpriteHead--;
+    list->freeSprites[list->freeSpriteHead] = sprite;
+
+    return TRUE;
+}
diff --git a/src/sprite_resource.c b/src/sprite_resource.c
index 0e3aa2418e..e45a00f05a 100644
--- a/src/sprite_resource.c
+++ b/src/sprite_resource.c
@@ -145,7 +145,7 @@ SpriteResource *SpriteResourceCollection_AddFromTable(SpriteResourceCollection *
 SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -159,7 +159,7 @@ SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spri
         id,
         vramType,
         0,
-        SPRITE_RESOURCE_TILES,
+        SPRITE_RESOURCE_CHAR,
         heapID,
         FALSE);
 
@@ -170,7 +170,7 @@ SpriteResource *SpriteResourceCollection_AddTiles(SpriteResourceCollection *spri
 SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *spriteResources, int narcIdx, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -184,7 +184,7 @@ SpriteResource *SpriteResourceCollection_AddPalette(SpriteResourceCollection *sp
         id,
         vramType,
         paletteIdx,
-        SPRITE_RESOURCE_PALETTE,
+        SPRITE_RESOURCE_PLTT,
         heapID,
         FALSE);
 
@@ -208,24 +208,24 @@ SpriteResource *SpriteResourceCollection_Add(SpriteResourceCollection *spriteRes
 void SpriteResourceCollection_ModifyTiles(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
     GF_ASSERT(spriteRes);
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
 
     int id = SpriteResource_GetID(spriteRes);
     NNS_G2D_VRAM_TYPE vramType = SpriteResource_GetVRAMType(spriteRes);
 
     SpriteResourceCollection_Remove(spriteResources, spriteRes);
-    SpriteResourceCollection_InitRes(spriteResources, spriteRes, narcIdx, memberIdx, compressed, id, vramType, 0, SPRITE_RESOURCE_TILES, heapID, FALSE);
+    SpriteResourceCollection_InitRes(spriteResources, spriteRes, narcIdx, memberIdx, compressed, id, vramType, 0, SPRITE_RESOURCE_CHAR, heapID, FALSE);
 }
 
 void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, int narcIdx, int memberIdx, BOOL compressed, enum HeapId heapID)
 {
 
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
     GF_ASSERT(spriteRes);
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_PLTT);
 
     int id = SpriteResource_GetID(spriteRes);
     NNS_G2D_VRAM_TYPE vramType = SpriteResource_GetVRAMType(spriteRes);
@@ -241,7 +241,7 @@ void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteReso
         id,
         vramType,
         paletteIdx,
-        SPRITE_RESOURCE_PALETTE,
+        SPRITE_RESOURCE_PLTT,
         heapID,
         FALSE);
 }
@@ -249,7 +249,7 @@ void SpriteResourceCollection_ModifyPalette(SpriteResourceCollection *spriteReso
 SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -263,7 +263,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *
         id,
         vramType,
         0,
-        SPRITE_RESOURCE_TILES,
+        SPRITE_RESOURCE_CHAR,
         heapID,
         FALSE);
 
@@ -274,7 +274,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFrom(SpriteResourceCollection *
 SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, enum HeapId heapID, BOOL allocAtEnd)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -288,7 +288,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection
         id,
         vramType,
         0,
-        SPRITE_RESOURCE_TILES,
+        SPRITE_RESOURCE_CHAR,
         heapID,
         allocAtEnd);
 
@@ -299,7 +299,7 @@ SpriteResource *SpriteResourceCollection_AddTilesFromEx(SpriteResourceCollection
 SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -313,7 +313,7 @@ SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection
         id,
         vramType,
         paletteIdx,
-        SPRITE_RESOURCE_PALETTE,
+        SPRITE_RESOURCE_PLTT,
         heapID,
         FALSE);
 
@@ -324,7 +324,7 @@ SpriteResource *SpriteResourceCollection_AddPaletteFrom(SpriteResourceCollection
 SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollection *spriteResources, NARC *narc, int memberIdx, BOOL compressed, int id, NNS_G2D_VRAM_TYPE vramType, int paletteIdx, enum HeapId heapID, BOOL allocAtEnd)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_PLTT);
 
     SpriteResource *spriteRes = SpriteResourceCollection_AllocResource(spriteResources);
     GF_ASSERT(spriteRes);
@@ -338,7 +338,7 @@ SpriteResource *SpriteResourceCollection_AddPaletteFromEx(SpriteResourceCollecti
         id,
         vramType,
         paletteIdx,
-        SPRITE_RESOURCE_PALETTE,
+        SPRITE_RESOURCE_PLTT,
         heapID,
         allocAtEnd);
 
@@ -373,9 +373,9 @@ SpriteResource *SpriteResourceCollection_AddFrom(SpriteResourceCollection *sprit
 void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteResources, SpriteResource *spriteRes, NARC *narc, int memberIdx, BOOL compressed, enum HeapId heapID)
 {
     GF_ASSERT(spriteResources);
-    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteResources->type == SPRITE_RESOURCE_CHAR);
     GF_ASSERT(spriteRes);
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
 
     int id = SpriteResource_GetID(spriteRes);
     NNS_G2D_VRAM_TYPE vramType = SpriteResource_GetVRAMType(spriteRes);
@@ -390,7 +390,7 @@ void SpriteResourceCollection_ModifyTilesFrom(SpriteResourceCollection *spriteRe
         id,
         vramType,
         0,
-        SPRITE_RESOURCE_TILES,
+        SPRITE_RESOURCE_CHAR,
         heapID,
         FALSE);
 }
@@ -494,7 +494,7 @@ int SpriteResource_GetID(const SpriteResource *spriteRes)
 
 NNSG2dCharacterData *SpriteResource_GetTileData(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CHAR);
 
     TileResourceData *tileData = SpriteResource_GetData(spriteRes);
     return tileData->tileData;
@@ -502,7 +502,7 @@ NNSG2dCharacterData *SpriteResource_GetTileData(const SpriteResource *spriteRes)
 
 NNSG2dPaletteData *SpriteResource_GetPaletteFade(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_PLTT);
 
     PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
     return paletteData->paletteData;
@@ -510,7 +510,7 @@ NNSG2dPaletteData *SpriteResource_GetPaletteFade(const SpriteResource *spriteRes
 
 NNSG2dCellDataBank *SpriteResource_GetSpriteData(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_SPRITE);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_CELL);
 
     SpriteResourceData *spriteData = SpriteResource_GetData(spriteRes);
     return spriteData->spriteBank;
@@ -518,7 +518,7 @@ NNSG2dCellDataBank *SpriteResource_GetSpriteData(const SpriteResource *spriteRes
 
 NNSG2dCellAnimBankData *SpriteResource_GetSpriteAnimData(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_SPRITE_ANIM);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_ANIM);
 
     SpriteAnimResourceData *spriteAnimData = SpriteResource_GetData(spriteRes);
     return spriteAnimData->animBank;
@@ -526,7 +526,7 @@ NNSG2dCellAnimBankData *SpriteResource_GetSpriteAnimData(const SpriteResource *s
 
 NNSG2dMultiCellDataBank *SpriteResource_GetMultiSpriteData(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_SPRITE);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_CELL);
 
     MultiSpriteResourceData *multiSpriteData = SpriteResource_GetData(spriteRes);
     return multiSpriteData->multiSpriteBank;
@@ -534,7 +534,7 @@ NNSG2dMultiCellDataBank *SpriteResource_GetMultiSpriteData(const SpriteResource
 
 NNSG2dMultiCellAnimBankData *SpriteResource_GetMultiSpriteAnimData(const SpriteResource *spriteRes)
 {
-    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_SPRITE_ANIM);
+    GF_ASSERT(spriteRes->type == SPRITE_RESOURCE_MULTI_ANIM);
 
     MultiSpriteAnimResourceData *multiSpriteAnimData = SpriteResource_GetData(spriteRes);
     return multiSpriteAnimData->multiSpriteAnimBank;
@@ -550,12 +550,12 @@ NNS_G2D_VRAM_TYPE SpriteResource_GetVRAMType(const SpriteResource *spriteRes)
 {
     GF_ASSERT(spriteRes);
 
-    if (spriteRes->type == SPRITE_RESOURCE_TILES) {
+    if (spriteRes->type == SPRITE_RESOURCE_CHAR) {
         TileResourceData *tileData = SpriteResource_GetData(spriteRes);
         return tileData->vramType;
     }
 
-    if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
+    if (spriteRes->type == SPRITE_RESOURCE_PLTT) {
         PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
         return paletteData->vramType;
     }
@@ -567,7 +567,7 @@ int SpriteResource_GetPaletteIndex(const SpriteResource *spriteRes)
 {
     GF_ASSERT(spriteRes);
 
-    if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
+    if (spriteRes->type == SPRITE_RESOURCE_PLTT) {
         PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
         return paletteData->paletteIndex;
     }
@@ -579,12 +579,12 @@ void SpriteResource_SetVRAMType(SpriteResource *spriteRes, NNS_G2D_VRAM_TYPE vra
 {
     GF_ASSERT(spriteRes);
 
-    if (spriteRes->type == SPRITE_RESOURCE_TILES) {
+    if (spriteRes->type == SPRITE_RESOURCE_CHAR) {
         TileResourceData *tileData = SpriteResource_GetData(spriteRes);
         tileData->vramType = vramType;
     }
 
-    if (spriteRes->type == SPRITE_RESOURCE_PALETTE) {
+    if (spriteRes->type == SPRITE_RESOURCE_PLTT) {
         PaletteResourceData *paletteData = SpriteResource_GetData(spriteRes);
         paletteData->vramType = vramType;
     }
@@ -724,22 +724,22 @@ static void SpriteResource_UnpackData(SpriteResource *spriteRes, enum SpriteReso
     void *rawData = Resource_GetData(spriteRes->rawResource);
 
     switch (type) {
-    case SPRITE_RESOURCE_TILES:
+    case SPRITE_RESOURCE_CHAR:
         spriteRes->data = SpriteUtil_UnpackTileResource(rawData, vramType, heapID);
         break;
-    case SPRITE_RESOURCE_PALETTE:
+    case SPRITE_RESOURCE_PLTT:
         spriteRes->data = SpriteUtil_UnpackPaletteResource(rawData, vramType, paletteIdx, heapID);
         break;
-    case SPRITE_RESOURCE_SPRITE:
+    case SPRITE_RESOURCE_CELL:
         spriteRes->data = SpriteUtil_UnpackSpriteResource(rawData, heapID);
         break;
-    case SPRITE_RESOURCE_SPRITE_ANIM:
+    case SPRITE_RESOURCE_ANIM:
         spriteRes->data = SpriteUtil_UnpackSpriteAnimResource(rawData, heapID);
         break;
-    case SPRITE_RESOURCE_MULTI_SPRITE:
+    case SPRITE_RESOURCE_MULTI_CELL:
         spriteRes->data = SpriteUtil_UnpackMultiSpriteResource(rawData, heapID);
         break;
-    case SPRITE_RESOURCE_MULTI_SPRITE_ANIM:
+    case SPRITE_RESOURCE_MULTI_ANIM:
         spriteRes->data = SpriteUtil_UnpackMultiSpriteAnimResource(rawData, heapID);
         break;
     }
diff --git a/src/sprite_system.c b/src/sprite_system.c
index e61e57d716..f4d0aef719 100644
--- a/src/sprite_system.c
+++ b/src/sprite_system.c
@@ -7,7 +7,6 @@
 
 #include "nnsys/g2d/g2d_Image.h"
 
-#include "cell_actor.h"
 #include "cell_transfer.h"
 #include "char_transfer.h"
 #include "heap.h"
@@ -15,33 +14,34 @@
 #include "palette.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
 #include "system.h"
 
-static CellActor *CreateSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, int resourceHeaderID, s16 x, s16 y, s16 z, u16 animIdx, int priority, int plttIdx, enum NNS_G2D_VRAM_TYPE vramType, int param10, int param11, int param12, int param13);
+static Sprite *CreateSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, int resourceHeaderID, s16 x, s16 y, s16 z, u16 animIdx, int priority, int plttIdx, enum NNS_G2D_VRAM_TYPE vramType, int param10, int param11, int param12, int param13);
 static BOOL LoadResObjInternal(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, int compressed, int type, int resourceID);
 static BOOL LoadResObjFromNarcInternal(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int type, int resourceID);
 static BOOL RegisterLoadedResource(SpriteResourceList *resourceList, SpriteResource *resource);
 static BOOL UnregisterLoadedResource(SpriteResourceCollection *ownedResources, SpriteResourceList *unownedResources, int toUnload);
 static BOOL UnregisterLoadedCharResource(SpriteResourceCollection *ownedResources, SpriteResourceList *unownedResources, int toUnload);
 static BOOL UnregisterLoadedPlttResource(SpriteResourceCollection *ownedResources, SpriteResourceList *unownedResources, int toUnload);
-static void SetSpriteAnimateFlag(CellActor *sprite, BOOL animate);
-static void SetSpriteAnimationSpeed(CellActor *sprite, fx32 speed);
-static BOOL IsSpriteAnimated(CellActor *sprite);
-static void SetSpriteAnimationFrame(CellActor *sprite, u16 frame);
-static u16 GetSpriteAnimationFrame(CellActor *sprite);
-static void SetSpriteExplicitPaletteOffset(CellActor *sprite, int paletteOffset);
-static void SetSpriteExplicitPriority(CellActor *sprite, int priority);
-static void SetSpritePriority(CellActor *sprite, int priority);
-static u32 GetSpritePriority(CellActor *sprite);
-static void SetSpriteAffineOverwriteMode(CellActor *sprite, enum AffineOverwriteMode mode);
-static void SetSpriteAffineScale(CellActor *sprite, f32 xScale, f32 yScale);
-static void OffsetSpriteAffineScale(CellActor *sprite, f32 xOffset, f32 yOffset);
-static void GetSpriteAffineScale(CellActor *sprite, f32 *outXScale, f32 *outYOffset);
-static void SetSpriteAffineZRotation(CellActor *sprite, u16 angle);
-static void OffsetSpriteAffineZRotation(CellActor *sprite, s32 offset);
+static void SetSpriteAnimateFlag(Sprite *sprite, BOOL animate);
+static void SetSpriteAnimationSpeed(Sprite *sprite, fx32 speed);
+static BOOL IsSpriteAnimated(Sprite *sprite);
+static void SetSpriteAnimationFrame(Sprite *sprite, u16 frame);
+static u16 GetSpriteAnimationFrame(Sprite *sprite);
+static void SetSpriteExplicitPaletteOffset(Sprite *sprite, int paletteOffset);
+static void SetSpriteExplicitPriority(Sprite *sprite, int priority);
+static void SetSpritePriority(Sprite *sprite, int priority);
+static u32 GetSpritePriority(Sprite *sprite);
+static void SetSpriteAffineOverwriteMode(Sprite *sprite, enum AffineOverwriteMode mode);
+static void SetSpriteAffineScale(Sprite *sprite, f32 xScale, f32 yScale);
+static void OffsetSpriteAffineScale(Sprite *sprite, f32 xOffset, f32 yOffset);
+static void GetSpriteAffineScale(Sprite *sprite, f32 *outXScale, f32 *outYOffset);
+static void SetSpriteAffineZRotation(Sprite *sprite, u16 angle);
+static void OffsetSpriteAffineZRotation(Sprite *sprite, s32 offset);
 
 SpriteSystem *SpriteSystem_Alloc(enum HeapId heapID)
 {
@@ -67,7 +67,7 @@ SpriteManager *SpriteManager_New(SpriteSystem *spriteSys)
     }
 
     spriteSys->spriteManagerCount++;
-    for (int i = 0; i < 6; i++) {
+    for (int i = 0; i < SPRITE_RESOURCE_MAX; i++) {
         spriteMan->ownedResources[i] = NULL;
     }
 
@@ -116,15 +116,15 @@ BOOL SpriteSystem_InitSprites(SpriteSystem *spriteSys, SpriteManager *spriteMan,
     return TRUE;
 }
 
-void SpriteSystem_DeleteSprite(CellActor *sprite)
+void Sprite_Delete2(Sprite *sprite)
 {
-    CellActor_Delete(sprite);
+    Sprite_Delete(sprite);
 }
 
 void SpriteSystem_DrawSprites(SpriteManager *spriteMan)
 {
     GF_ASSERT(spriteMan != NULL);
-    CellActorCollection_Update(spriteMan->sprites);
+    SpriteList_Update(spriteMan->sprites);
 }
 
 void SpriteSystem_TransferOam(void)
@@ -139,7 +139,7 @@ void SpriteSystem_UpdateTransfer(void)
 
 void SpriteManager_DeleteAllSprites(SpriteManager *spriteMan)
 {
-    CellActorCollection_Delete(spriteMan->sprites);
+    SpriteList_Delete(spriteMan->sprites);
 }
 
 void SpriteManager_FreeResourceHeaders(SpriteManager *spriteMan)
@@ -159,8 +159,8 @@ void SpriteManager_FreeResources(SpriteManager *spriteMan)
     }
 
     Heap_FreeToHeap(spriteMan->resourcePaths);
-    SpriteTransfer_ResetCharTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_TILES]);
-    SpriteTransfer_ResetPlttTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_ResetCharTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR]);
+    SpriteTransfer_ResetPlttTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_PLTT]);
 
     for (int i = 0; i < spriteMan->numResourceTypes; i++) {
         SpriteResourceList_Delete(spriteMan->unownedResources[i]);
@@ -236,24 +236,24 @@ BOOL SpriteSystem_LoadResourceDataFromFilepaths(SpriteSystem *spriteSys, SpriteM
         spriteMan->loadedResourceCount[i] = SpriteResourceCollection_Extend(spriteMan->ownedResources[i], resourceTable, spriteMan->unownedResources[i], spriteSys->heapId);
     }
 
-    SpriteTransfer_RequestCharList(spriteMan->unownedResources[SPRITE_RESOURCE_TILES]);
-    SpriteTransfer_RequestPlttWholeRangeList(spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_RequestCharList(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR]);
+    SpriteTransfer_RequestPlttWholeRangeList(spriteMan->unownedResources[SPRITE_RESOURCE_PLTT]);
 
     void *buf = ReadFileToHeap(spriteSys->heapId, paths->asStruct.spriteTable);
     spriteMan->resourceHeaders = SpriteResourcesHeaderList_NewFromResdat(buf,
         spriteSys->heapId,
-        spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
-        spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE_ANIM],
-        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE_ANIM]);
+        spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
+        spriteMan->ownedResources[SPRITE_RESOURCE_PLTT],
+        spriteMan->ownedResources[SPRITE_RESOURCE_CELL],
+        spriteMan->ownedResources[SPRITE_RESOURCE_ANIM],
+        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_CELL],
+        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_ANIM]);
 
     Heap_FreeToHeap(buf);
     return TRUE;
 }
 
-CellActor *SpriteSystem_NewSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplateFromResourceHeader *template)
+Sprite *SpriteSystem_NewSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplateFromResourceHeader *template)
 {
     return CreateSpriteFromResourceHeader(spriteSys,
         spriteMan,
@@ -271,11 +271,11 @@ CellActor *SpriteSystem_NewSpriteFromResourceHeader(SpriteSystem *spriteSys, Spr
         template->dummy24);
 }
 
-static CellActor *CreateSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, int resourceHeaderID, s16 x, s16 y, s16 z, u16 animIdx, int priority, int plttIdx, enum NNS_G2D_VRAM_TYPE vramType, int param10, int param11, int param12, int param13)
+static Sprite *CreateSpriteFromResourceHeader(SpriteSystem *spriteSys, SpriteManager *spriteMan, int resourceHeaderID, s16 x, s16 y, s16 z, u16 animIdx, int priority, int plttIdx, enum NNS_G2D_VRAM_TYPE vramType, int param10, int param11, int param12, int param13)
 {
-    CellActorInitParamsEx template;
+    AffineSpriteListTemplate template;
 
-    template.collection = spriteMan->sprites;
+    template.list = spriteMan->sprites;
     template.resourceData = &spriteMan->resourceHeaders->headers[resourceHeaderID];
     template.position.x = FX32_CONST(x);
     template.position.y = FX32_CONST(y);
@@ -293,10 +293,10 @@ static CellActor *CreateSpriteFromResourceHeader(SpriteSystem *spriteSys, Sprite
     template.vramType = vramType;
     template.heapID = spriteSys->heapId;
 
-    CellActor *sprite = CellActorCollection_AddEx(&template);
+    Sprite *sprite = SpriteList_AddEx(&template);
     if (sprite != NULL) {
-        CellActor_SetAnim(sprite, animIdx);
-        CellActor_SetExplicitPalette(sprite, plttIdx);
+        Sprite_SetAnim(sprite, animIdx);
+        Sprite_SetExplicitPalette(sprite, plttIdx);
     }
 
     return sprite;
@@ -339,11 +339,11 @@ BOOL SpriteSystem_InitManagerWithCapacities(SpriteSystem *spriteSys, SpriteManag
 
 BOOL SpriteSystem_LoadCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID) == FALSE) {
         return FALSE;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         narcID,
         memberIdx,
         compressed,
@@ -352,7 +352,7 @@ BOOL SpriteSystem_LoadCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteM
         spriteSys->heapId);
     if (resource != NULL) {
         SpriteTransfer_RequestCharAtEnd(resource);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resource);
         return TRUE;
     }
 
@@ -362,11 +362,11 @@ BOOL SpriteSystem_LoadCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteM
 
 BOOL SpriteSystem_LoadCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID) == FALSE) {
         return FALSE;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddTilesFrom(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_AddTilesFrom(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         narc,
         memberIdx,
         compressed,
@@ -375,7 +375,7 @@ BOOL SpriteSystem_LoadCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteMana
         spriteSys->heapId);
     if (resource != NULL) {
         SpriteTransfer_RequestCharAtEnd(resource);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resource);
         return TRUE;
     }
 
@@ -385,11 +385,11 @@ BOOL SpriteSystem_LoadCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteMana
 
 s8 SpriteSystem_LoadPlttResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int paletteIdx, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], resourceID) == FALSE) {
         return -1;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddPalette(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE],
+    SpriteResource *resource = SpriteResourceCollection_AddPalette(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT],
         narcID,
         memberIdx,
         compressed,
@@ -400,7 +400,7 @@ s8 SpriteSystem_LoadPlttResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan
     if (resource != NULL) {
         BOOL success = SpriteTransfer_RequestPlttFreeSpace(resource);
         GF_ASSERT(success == TRUE);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_PLTT], resource);
         return SpriteTransfer_GetPlttOffset(resource, vramType);
     }
 
@@ -410,11 +410,11 @@ s8 SpriteSystem_LoadPlttResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan
 
 s8 SpriteSystem_LoadPlttResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int paletteIdx, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], resourceID) == FALSE) {
         return -1;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddPaletteFrom(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE],
+    SpriteResource *resource = SpriteResourceCollection_AddPaletteFrom(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT],
         narc,
         memberIdx,
         compressed,
@@ -425,7 +425,7 @@ s8 SpriteSystem_LoadPlttResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManage
     if (resource != NULL) {
         BOOL success = SpriteTransfer_RequestPlttFreeSpace(resource);
         GF_ASSERT(success == TRUE);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_PLTT], resource);
 
         return SpriteTransfer_GetPlttOffset(resource, vramType);
     }
@@ -456,33 +456,33 @@ u8 SpriteSystem_LoadPaletteBufferFromOpenNarc(PaletteData *paletteData, enum Pal
 
 BOOL SpriteSystem_LoadCellResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, int compressed, int resourceID)
 {
-    return LoadResObjInternal(spriteSys, spriteMan, narcID, memberIdx, compressed, SPRITE_RESOURCE_SPRITE, resourceID);
+    return LoadResObjInternal(spriteSys, spriteMan, narcID, memberIdx, compressed, SPRITE_RESOURCE_CELL, resourceID);
 }
 
 BOOL SpriteSystem_LoadCellResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID)
 {
-    return LoadResObjFromNarcInternal(spriteSys, spriteMan, narc, memberIdx, compressed, SPRITE_RESOURCE_SPRITE, resourceID);
+    return LoadResObjFromNarcInternal(spriteSys, spriteMan, narc, memberIdx, compressed, SPRITE_RESOURCE_CELL, resourceID);
 }
 
 BOOL SpriteSystem_LoadAnimResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, int compressed, int resourceID)
 {
-    return LoadResObjInternal(spriteSys, spriteMan, narcID, memberIdx, compressed, SPRITE_RESOURCE_SPRITE_ANIM, resourceID);
+    return LoadResObjInternal(spriteSys, spriteMan, narcID, memberIdx, compressed, SPRITE_RESOURCE_ANIM, resourceID);
 }
 
 BOOL SpriteSystem_LoadAnimResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID)
 {
-    return LoadResObjFromNarcInternal(spriteSys, spriteMan, narc, memberIdx, compressed, SPRITE_RESOURCE_SPRITE_ANIM, resourceID);
+    return LoadResObjFromNarcInternal(spriteSys, spriteMan, narc, memberIdx, compressed, SPRITE_RESOURCE_ANIM, resourceID);
 }
 
-CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplate *template)
+ManagedSprite *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *spriteMan, const SpriteTemplate *template)
 {
     int i;
     int spritePalette;
-    CellActorData *managedSprite = NULL;
-    CellActorInitParamsEx innerTemplate;
-    int resourceIDs[6];
+    ManagedSprite *managedSprite = NULL;
+    AffineSpriteListTemplate innerTemplate;
+    int resourceIDs[SPRITE_RESOURCE_MAX];
 
-    managedSprite = Heap_AllocFromHeap(spriteSys->heapId, sizeof(CellActorData));
+    managedSprite = Heap_AllocFromHeap(spriteSys->heapId, sizeof(ManagedSprite));
     if (managedSprite == NULL) {
         return NULL;
     }
@@ -492,7 +492,7 @@ CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *sp
         return NULL;
     }
 
-    managedSprite->resourceHeaderList->headers = Heap_AllocFromHeap(spriteSys->heapId, sizeof(CellActorResourceData));
+    managedSprite->resourceHeaderList->headers = Heap_AllocFromHeap(spriteSys->heapId, sizeof(SpriteResourcesHeader));
     managedSprite->resourceHeader = managedSprite->resourceHeaderList->headers;
     if (managedSprite->resourceHeaderList->headers == NULL) {
         if (managedSprite->resourceHeaderList) {
@@ -505,38 +505,38 @@ CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *sp
         resourceIDs[i] = template->resources[i];
     }
 
-    if (spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE] == NULL || spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE_ANIM] == NULL) {
-        resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE] = SPRITE_RESOURCE_NONE;
-        resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE_ANIM] = SPRITE_RESOURCE_NONE;
+    if (spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_CELL] == NULL || spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_ANIM] == NULL) {
+        resourceIDs[SPRITE_RESOURCE_MULTI_CELL] = SPRITE_RESOURCE_NONE;
+        resourceIDs[SPRITE_RESOURCE_MULTI_ANIM] = SPRITE_RESOURCE_NONE;
     } else {
-        if (resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE] != SPRITE_RESOURCE_NONE
-            && SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE], resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE]) == FALSE) {
-            resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE] = SPRITE_RESOURCE_NONE;
+        if (resourceIDs[SPRITE_RESOURCE_MULTI_CELL] != SPRITE_RESOURCE_NONE
+            && SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_CELL], resourceIDs[SPRITE_RESOURCE_MULTI_CELL]) == FALSE) {
+            resourceIDs[SPRITE_RESOURCE_MULTI_CELL] = SPRITE_RESOURCE_NONE;
         }
 
-        if (resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE_ANIM] != SPRITE_RESOURCE_NONE
-            && SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE_ANIM], resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE_ANIM]) == 0) {
-            resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE_ANIM] = SPRITE_RESOURCE_NONE;
+        if (resourceIDs[SPRITE_RESOURCE_MULTI_ANIM] != SPRITE_RESOURCE_NONE
+            && SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_ANIM], resourceIDs[SPRITE_RESOURCE_MULTI_ANIM]) == 0) {
+            resourceIDs[SPRITE_RESOURCE_MULTI_ANIM] = SPRITE_RESOURCE_NONE;
         }
     }
 
     SpriteResourcesHeader_Init(managedSprite->resourceHeader,
-        resourceIDs[SPRITE_RESOURCE_TILES],
-        resourceIDs[SPRITE_RESOURCE_PALETTE],
-        resourceIDs[SPRITE_RESOURCE_SPRITE],
-        resourceIDs[SPRITE_RESOURCE_SPRITE_ANIM],
-        resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE],
-        resourceIDs[SPRITE_RESOURCE_MULTI_SPRITE_ANIM],
+        resourceIDs[SPRITE_RESOURCE_CHAR],
+        resourceIDs[SPRITE_RESOURCE_PLTT],
+        resourceIDs[SPRITE_RESOURCE_CELL],
+        resourceIDs[SPRITE_RESOURCE_ANIM],
+        resourceIDs[SPRITE_RESOURCE_MULTI_CELL],
+        resourceIDs[SPRITE_RESOURCE_MULTI_ANIM],
         template->vramTransfer,
         template->bgPriority,
-        spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
-        spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE_ANIM],
-        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE],
-        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_SPRITE_ANIM]);
+        spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
+        spriteMan->ownedResources[SPRITE_RESOURCE_PLTT],
+        spriteMan->ownedResources[SPRITE_RESOURCE_CELL],
+        spriteMan->ownedResources[SPRITE_RESOURCE_ANIM],
+        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_CELL],
+        spriteMan->ownedResources[SPRITE_RESOURCE_MULTI_ANIM]);
 
-    innerTemplate.collection = spriteMan->sprites;
+    innerTemplate.list = spriteMan->sprites;
     innerTemplate.resourceData = managedSprite->resourceHeader;
     innerTemplate.position.x = FX32_CONST(template->x);
     innerTemplate.position.y = FX32_CONST(template->y);
@@ -554,12 +554,12 @@ CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *sp
     innerTemplate.vramType = template->vramType;
     innerTemplate.heapID = spriteSys->heapId;
 
-    managedSprite->sprite = CellActorCollection_AddEx(&innerTemplate);
+    managedSprite->sprite = SpriteList_AddEx(&innerTemplate);
     managedSprite->vramTransfer = template->vramTransfer;
     if (managedSprite->sprite != NULL) {
-        spritePalette = CellActor_GetExplicitPalette(managedSprite->sprite);
-        CellActor_SetAnim(managedSprite->sprite, template->animIdx);
-        CellActor_SetExplicitPalette(managedSprite->sprite, spritePalette + template->plttIdx);
+        spritePalette = Sprite_GetExplicitPalette(managedSprite->sprite);
+        Sprite_SetAnim(managedSprite->sprite, template->animIdx);
+        Sprite_SetExplicitPalette(managedSprite->sprite, spritePalette + template->plttIdx);
     } else {
         GF_ASSERT(FALSE);
     }
@@ -569,41 +569,41 @@ CellActorData *SpriteSystem_NewSprite(SpriteSystem *spriteSys, SpriteManager *sp
 
 const NNSG2dImagePaletteProxy *SpriteManager_FindPlttResourceProxy(SpriteManager *spriteMan, int resourceID)
 {
-    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], resourceID);
+    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], resourceID);
     return SpriteTransfer_GetPaletteProxy(resource, NULL);
 }
 
 u32 SpriteManager_FindPlttResourceOffset(SpriteManager *spriteMan, int resourceID, enum NNS_G2D_VRAM_TYPE vramType)
 {
-    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], resourceID);
+    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], resourceID);
     return SpriteTransfer_GetPlttOffset(resource, vramType);
 }
 
 BOOL SpriteManager_UnloadCharObjById(SpriteManager *spriteMan, int resourceID)
 {
-    return UnregisterLoadedCharResource(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resourceID);
+    return UnregisterLoadedCharResource(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resourceID);
 }
 
 BOOL SpriteManager_UnloadPlttObjById(SpriteManager *spriteMan, int resourceID)
 {
-    return UnregisterLoadedPlttResource(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE], resourceID);
+    return UnregisterLoadedPlttResource(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], spriteMan->unownedResources[SPRITE_RESOURCE_PLTT], resourceID);
 }
 
 BOOL SpriteManager_UnloadCellObjById(SpriteManager *spriteMan, int resourceID)
 {
-    return UnregisterLoadedResource(spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE], spriteMan->unownedResources[SPRITE_RESOURCE_SPRITE], resourceID);
+    return UnregisterLoadedResource(spriteMan->ownedResources[SPRITE_RESOURCE_CELL], spriteMan->unownedResources[SPRITE_RESOURCE_CELL], resourceID);
 }
 
 BOOL SpriteManager_UnloadAnimObjById(SpriteManager *spriteMan, int resourceID)
 {
-    return UnregisterLoadedResource(spriteMan->ownedResources[SPRITE_RESOURCE_SPRITE_ANIM], spriteMan->unownedResources[SPRITE_RESOURCE_SPRITE_ANIM], resourceID);
+    return UnregisterLoadedResource(spriteMan->ownedResources[SPRITE_RESOURCE_ANIM], spriteMan->unownedResources[SPRITE_RESOURCE_ANIM], resourceID);
 }
 
 void SpriteSystem_FreeResourcesAndManager(SpriteSystem *spriteSys, SpriteManager *spriteMan)
 {
     SpriteManager_DeleteAllSprites(spriteMan);
-    SpriteTransfer_ResetCharTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_TILES]);
-    SpriteTransfer_ResetPlttTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_PALETTE]);
+    SpriteTransfer_ResetCharTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR]);
+    SpriteTransfer_ResetPlttTransferList(spriteMan->unownedResources[SPRITE_RESOURCE_PLTT]);
 
     for (int i = 0; i < spriteMan->numResourceTypes; i++) {
         SpriteResourceList_Delete(spriteMan->unownedResources[i]);
@@ -613,13 +613,13 @@ void SpriteSystem_FreeResourcesAndManager(SpriteSystem *spriteSys, SpriteManager
     SpriteSystem_FreeSpriteManager(spriteSys, spriteMan);
 }
 
-void Sprite_DeleteAndFreeResources(CellActorData *sprite)
+void Sprite_DeleteAndFreeResources(ManagedSprite *sprite)
 {
     if (sprite->vramTransfer) {
         SpriteTransfer_DeleteCharTransfer(sprite->resourceHeader->imageProxy);
     }
 
-    CellActor_Delete(sprite->sprite);
+    Sprite_Delete(sprite->sprite);
     SpriteResourcesHeaderList_Free(sprite->resourceHeaderList);
     Heap_FreeToHeap(sprite);
 }
@@ -732,419 +732,419 @@ static BOOL UnregisterLoadedPlttResource(SpriteResourceCollection *ownedResource
     return FALSE;
 }
 
-void Sprite_TickFrame(CellActor *sprite)
+void Sprite_TickFrame(Sprite *sprite)
 {
-    CellActor_UpdateAnim(sprite, FX32_ONE);
+    Sprite_UpdateAnim(sprite, FX32_ONE);
 }
 
-void Sprite_TickOneFrame(CellActorData *managedSprite)
+void ManagedSprite_TickFrame(ManagedSprite *managedSprite)
 {
     Sprite_TickFrame(managedSprite->sprite);
 }
 
-void Sprite_TickTwoFrame(CellActorData *managedSprite)
+void ManagedSprite_TickTwoFrames(ManagedSprite *managedSprite)
 {
-    CellActor_UpdateAnim(managedSprite->sprite, FX32_CONST(2));
+    Sprite_UpdateAnim(managedSprite->sprite, FX32_CONST(2));
 }
 
-void Sprite_TickNFrames(CellActorData *managedSprite, fx32 frames)
+void ManagedSprite_TickNFrames(ManagedSprite *managedSprite, fx32 frames)
 {
-    CellActor_UpdateAnim(managedSprite->sprite, frames);
+    Sprite_UpdateAnim(managedSprite->sprite, frames);
 }
 
-u32 Sprite_GetNumFrames(CellActorData *managedSprite)
+u32 ManagedSprite_GetNumFrames(ManagedSprite *managedSprite)
 {
-    return CellActor_GetAnimCount(managedSprite->sprite);
+    return Sprite_GetAnimCount(managedSprite->sprite);
 }
 
-void Sprite_SetAnim(CellActorData *managedSprite, u32 animID)
+void ManagedSprite_SetAnim(ManagedSprite *managedSprite, u32 animID)
 {
-    CellActor_SetAnim(managedSprite->sprite, animID);
+    Sprite_SetAnim(managedSprite->sprite, animID);
 }
 
-void Sprite_SetAnimNoRestart(CellActorData *managedSprite, u32 animID)
+void ManagedSprite_SetAnimNoRestart(ManagedSprite *managedSprite, u32 animID)
 {
-    CellActor_SetAnimNoRestart(managedSprite->sprite, animID);
+    Sprite_SetAnimNoRestart(managedSprite->sprite, animID);
 }
 
-u32 Sprite_GetActiveAnim(CellActorData *managedSprite)
+u32 ManagedSprite_GetActiveAnim(ManagedSprite *managedSprite)
 {
-    return CellActor_GetActiveAnim(managedSprite->sprite);
+    return Sprite_GetActiveAnim(managedSprite->sprite);
 }
 
-static void SetSpriteAnimateFlag(CellActor *sprite, BOOL animate)
+static void SetSpriteAnimateFlag(Sprite *sprite, BOOL animate)
 {
-    CellActor_SetAnimateFlag(sprite, animate);
+    Sprite_SetAnimateFlag(sprite, animate);
 }
 
-void Sprite_SetAnimateFlag(CellActorData *managedSprite, BOOL animate)
+void ManagedSprite_SetAnimateFlag(ManagedSprite *managedSprite, BOOL animate)
 {
     SetSpriteAnimateFlag(managedSprite->sprite, animate);
 }
 
-static void SetSpriteAnimationSpeed(CellActor *sprite, fx32 speed)
+static void SetSpriteAnimationSpeed(Sprite *sprite, fx32 speed)
 {
-    CellActor_SetAnimSpeed(sprite, speed);
+    Sprite_SetAnimSpeed(sprite, speed);
 }
 
-void Sprite_SetAnimationSpeed(CellActorData *managedSprite, fx32 animSpeed)
+void ManagedSprite_SetAnimationSpeed(ManagedSprite *managedSprite, fx32 animSpeed)
 {
     SetSpriteAnimationSpeed(managedSprite->sprite, animSpeed);
 }
 
-static BOOL IsSpriteAnimated(CellActor *sprite)
+static BOOL IsSpriteAnimated(Sprite *sprite)
 {
-    return CellActor_IsAnimated(sprite);
+    return Sprite_IsAnimated(sprite);
 }
 
-BOOL Sprite_IsAnimated(CellActorData *managedSprite)
+BOOL ManagedSprite_IsAnimated(ManagedSprite *managedSprite)
 {
     return IsSpriteAnimated(managedSprite->sprite);
 }
 
-void SetSpriteAnimationFrame(CellActor *sprite, u16 frame)
+void SetSpriteAnimationFrame(Sprite *sprite, u16 frame)
 {
-    SpriteActor_SetAnimFrame(sprite, frame);
+    Sprite_SetAnimFrame(sprite, frame);
 }
 
-void Sprite_SetAnimationFrame(CellActorData *managedSprite, u16 frame)
+void ManagedSprite_SetAnimationFrame(ManagedSprite *managedSprite, u16 frame)
 {
     SetSpriteAnimationFrame(managedSprite->sprite, frame);
 }
 
-static u16 GetSpriteAnimationFrame(CellActor *sprite)
+static u16 GetSpriteAnimationFrame(Sprite *sprite)
 {
-    return CellActor_GetAnimFrame(sprite);
+    return Sprite_GetAnimFrame(sprite);
 }
 
-u16 Sprite_GetAnimationFrame(CellActorData *managedSprite)
+u16 ManagedSprite_GetAnimationFrame(ManagedSprite *managedSprite)
 {
     return GetSpriteAnimationFrame(managedSprite->sprite);
 }
 
-void Sprite_SetDrawFlag(CellActor *sprite, BOOL draw)
+void Sprite_SetDrawFlag2(Sprite *sprite, BOOL draw)
 {
-    CellActor_SetDrawFlag(sprite, draw);
+    Sprite_SetDrawFlag(sprite, draw);
 }
 
-void Sprite_SetDrawFlag2(CellActorData *managedSprite, BOOL draw)
+void ManagedSprite_SetDrawFlag(ManagedSprite *managedSprite, BOOL draw)
 {
-    Sprite_SetDrawFlag(managedSprite->sprite, draw);
+    Sprite_SetDrawFlag2(managedSprite->sprite, draw);
 }
 
-int Sprite_GetDrawFlag(CellActor *sprite)
+int Sprite_GetDrawFlag2(Sprite *sprite)
 {
-    return CellActor_GetDrawFlag(sprite);
+    return Sprite_GetDrawFlag(sprite);
 }
 
-int Sprite_GetDrawFlag2(CellActorData *managedSprite)
+int ManagedSprite_GetDrawFlag(ManagedSprite *managedSprite)
 {
-    return Sprite_GetDrawFlag(managedSprite->sprite);
+    return Sprite_GetDrawFlag2(managedSprite->sprite);
 }
 
-void Sprite_SetExplicitPalette(CellActor *sprite, int palette)
+void Sprite_SetExplicitPalette2(Sprite *sprite, int palette)
 {
-    CellActor_SetExplicitPalette(sprite, palette);
+    Sprite_SetExplicitPalette(sprite, palette);
 }
 
-void Sprite_SetExplicitPalette2(CellActorData *managedSprite, int paletteIdx)
+void ManagedSprite_SetExplicitPalette(ManagedSprite *managedSprite, int paletteIdx)
 {
-    Sprite_SetExplicitPalette(managedSprite->sprite, paletteIdx);
+    Sprite_SetExplicitPalette2(managedSprite->sprite, paletteIdx);
 }
 
-static void SetSpriteExplicitPaletteOffset(CellActor *sprite, int paletteOffset)
+static void SetSpriteExplicitPaletteOffset(Sprite *sprite, int paletteOffset)
 {
-    CellActor_SetExplicitPaletteOffset(sprite, paletteOffset);
+    Sprite_SetExplicitPaletteOffset(sprite, paletteOffset);
 }
 
-void Sprite_SetExplicitPaletteOffset(CellActorData *managedSprite, int paletteOffset)
+void ManagedSprite_SetExplicitPaletteOffset(ManagedSprite *managedSprite, int paletteOffset)
 {
     SetSpriteExplicitPaletteOffset(managedSprite->sprite, paletteOffset);
 }
 
-int Sprite_GetExplicitPaletteOffset(CellActorData *managedSprite)
+int ManagedSprite_GetExplicitPaletteOffset(ManagedSprite *managedSprite)
 {
-    return CellActor_GetExplicitPaletteOffset(managedSprite->sprite);
+    return Sprite_GetExplicitPaletteOffset(managedSprite->sprite);
 }
 
-static void SetSpriteExplicitPriority(CellActor *sprite, int explicitPriority)
+static void SetSpriteExplicitPriority(Sprite *sprite, int explicitPriority)
 {
-    CellActor_SetExplicitPriority(sprite, explicitPriority);
+    Sprite_SetExplicitPriority(sprite, explicitPriority);
 }
 
-int Sprite_GetExplicitPriority(CellActorData *managedSprite)
+int ManagedSprite_GetExplicitPriority(ManagedSprite *managedSprite)
 {
-    return CellActor_GetExplicitPriority(managedSprite->sprite);
+    return Sprite_GetExplicitPriority(managedSprite->sprite);
 }
 
-void Sprite_SetExplicitPriority(CellActorData *managedSprite, int explicitPriority)
+void ManagedSprite_SetExplicitPriority(ManagedSprite *managedSprite, int explicitPriority)
 {
     SetSpriteExplicitPriority(managedSprite->sprite, explicitPriority);
 }
 
-static void SetSpritePriority(CellActor *sprite, int priority)
+static void SetSpritePriority(Sprite *sprite, int priority)
 {
-    CellActor_SetPriority(sprite, priority);
+    Sprite_SetPriority(sprite, priority);
 }
 
-void Sprite_SetPriority(CellActorData *managedSprite, int priority)
+void ManagedSprite_SetPriority(ManagedSprite *managedSprite, int priority)
 {
     SetSpritePriority(managedSprite->sprite, priority);
 }
 
-u32 GetSpritePriority(CellActor *sprite)
+u32 GetSpritePriority(Sprite *sprite)
 {
-    return CellActor_GetPriority(sprite);
+    return Sprite_GetPriority(sprite);
 }
 
-u32 Sprite_GetPriority(CellActorData *managedSprite)
+u32 ManagedSprite_GetPriority(ManagedSprite *managedSprite)
 {
     return GetSpritePriority(managedSprite->sprite);
 }
 
-void Sprite_SetPositionXY(CellActor *sprite, s16 x, s16 y)
+void Sprite_SetPositionXY(Sprite *sprite, s16 x, s16 y)
 {
     VecFx32 position;
     position.x = x * FX32_ONE;
     position.y = y * FX32_ONE;
-    if (CellActor_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (Sprite_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
         position.y += (192 << FX32_SHIFT);
     }
     position.z = 0;
 
-    CellActor_SetPosition(sprite, &position);
+    Sprite_SetPosition(sprite, &position);
 }
 
-void Sprite_SetPositionXY2(CellActorData *managedSprite, s16 x, s16 y)
+void ManagedSprite_SetPositionXY(ManagedSprite *managedSprite, s16 x, s16 y)
 {
     Sprite_SetPositionXY(managedSprite->sprite, x, y);
 }
 
-void Sprite_SetPositionXYWithSubscreenOffset(CellActor *sprite, s16 x, s16 y, fx32 offset)
+void Sprite_SetPositionXYWithSubscreenOffset(Sprite *sprite, s16 x, s16 y, fx32 offset)
 {
     VecFx32 position;
     position.x = x * FX32_ONE;
     position.y = y * FX32_ONE;
-    if (CellActor_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (Sprite_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
         position.y += offset;
     }
     position.z = 0;
 
-    CellActor_SetPosition(sprite, &position);
+    Sprite_SetPosition(sprite, &position);
 }
 
-void Sprite_SetPositionXYWithSubscreenOffset2(CellActorData *managedSprite, s16 x, s16 y, fx32 offset)
+void ManagedSprite_SetPositionXYWithSubscreenOffset(ManagedSprite *managedSprite, s16 x, s16 y, fx32 offset)
 {
     Sprite_SetPositionXYWithSubscreenOffset(managedSprite->sprite, x, y, offset);
 }
 
-void Sprite_GetPositionXY(CellActor *sprite, s16 *outX, s16 *outY)
+void Sprite_GetPositionXY(Sprite *sprite, s16 *outX, s16 *outY)
 {
-    const VecFx32 *position = CellActor_GetPosition(sprite);
+    const VecFx32 *position = Sprite_GetPosition(sprite);
     *outX = position->x / FX32_ONE;
-    if (CellActor_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (Sprite_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *outY = (position->y - (192 << FX32_SHIFT)) / FX32_ONE;
     } else {
         *outY = position->y / FX32_ONE;
     }
 }
 
-void Sprite_GetPositionXY2(CellActorData *managedSprite, s16 *outX, s16 *outY)
+void ManagedSprite_GetPositionXY(ManagedSprite *managedSprite, s16 *outX, s16 *outY)
 {
     Sprite_GetPositionXY(managedSprite->sprite, outX, outY);
 }
 
-void Sprite_GetPositionXYWithSubscreenOffset(CellActor *sprite, s16 *outX, s16 *outY, fx32 offset)
+void ManagedSprite_GetPositionXYWithSubscreenOffset(Sprite *sprite, s16 *outX, s16 *outY, fx32 offset)
 {
-    const VecFx32 *position = CellActor_GetPosition(sprite);
+    const VecFx32 *position = Sprite_GetPosition(sprite);
     *outX = position->x / FX32_ONE;
-    if (CellActor_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    if (Sprite_GetVRamType(sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *outY = (position->y - offset) / FX32_ONE;
     } else {
         *outY = position->y / FX32_ONE;
     }
 }
 
-void Sprite_GetPositionXYWithSubscreenOffset2(CellActorData *managedSprite, s16 *outX, s16 *outY, fx32 offset)
+void Sprite_GetPositionXYWithSubscreenOffset2(ManagedSprite *managedSprite, s16 *outX, s16 *outY, fx32 offset)
 {
-    Sprite_GetPositionXYWithSubscreenOffset(managedSprite->sprite, outX, outY, offset);
+    ManagedSprite_GetPositionXYWithSubscreenOffset(managedSprite->sprite, outX, outY, offset);
 }
 
-void Sprite_OffsetPositionXY(CellActor *sprite, s16 x, s16 y)
+void Sprite_OffsetPositionXY(Sprite *sprite, s16 x, s16 y)
 {
-    const VecFx32 *oldPosition = CellActor_GetPosition(sprite);
+    const VecFx32 *oldPosition = Sprite_GetPosition(sprite);
     VecFx32 newPosition;
     newPosition.x = oldPosition->x + (x * FX32_ONE);
     newPosition.y = oldPosition->y + (y * FX32_ONE);
     newPosition.z = oldPosition->z;
-    CellActor_SetPosition(sprite, &newPosition);
+    Sprite_SetPosition(sprite, &newPosition);
 }
 
-void Sprite_OffsetPositionXY2(CellActorData *managedSprite, s16 x, s16 y)
+void ManagedSprite_OffsetPositionXY(ManagedSprite *managedSprite, s16 x, s16 y)
 {
     Sprite_OffsetPositionXY(managedSprite->sprite, x, y);
 }
 
-void Sprite_OffsetPositionFxXY(CellActorData *managedSprite, fx32 x, fx32 y)
+void ManagedSprite_OffsetPositionFxXY(ManagedSprite *managedSprite, fx32 x, fx32 y)
 {
-    const VecFx32 *oldPosition = CellActor_GetPosition(managedSprite->sprite);
+    const VecFx32 *oldPosition = Sprite_GetPosition(managedSprite->sprite);
     VecFx32 newPosition;
     newPosition.x = oldPosition->x + x;
     newPosition.y = oldPosition->y + y;
     newPosition.z = oldPosition->z;
-    CellActor_SetPosition(managedSprite->sprite, &newPosition);
+    Sprite_SetPosition(managedSprite->sprite, &newPosition);
 }
 
-void Sprite_SetPositionFxXY(CellActorData *managedSprite, fx32 x, fx32 y)
+void ManagedSprite_SetPositionFxXY(ManagedSprite *managedSprite, fx32 x, fx32 y)
 {
-    const VecFx32 *oldPosition = CellActor_GetPosition(managedSprite->sprite);
+    const VecFx32 *oldPosition = Sprite_GetPosition(managedSprite->sprite);
     VecFx32 newPosition;
     newPosition.x = x;
     newPosition.y = y;
     newPosition.z = oldPosition->z;
-    CellActor_SetPosition(managedSprite->sprite, &newPosition);
+    Sprite_SetPosition(managedSprite->sprite, &newPosition);
 }
 
-void Sprite_GetPositionFxXY(CellActorData *managedSprite, fx32 *outX, fx32 *outY)
+void ManagedSprite_GetPositionFxXY(ManagedSprite *managedSprite, fx32 *outX, fx32 *outY)
 {
-    const VecFx32 *position = CellActor_GetPosition(managedSprite->sprite);
+    const VecFx32 *position = Sprite_GetPosition(managedSprite->sprite);
     *outX = position->x;
     *outY = position->y;
 }
 
-void Sprite_SetPositionFxXYWithSubscreenOffset(CellActorData *managedSprite, fx32 x, fx32 y, fx32 offset)
+void ManagedSprite_SetPositionFxXYWithSubscreenOffset(ManagedSprite *managedSprite, fx32 x, fx32 y, fx32 offset)
 {
-    if (CellActor_GetVRamType(managedSprite->sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
-        Sprite_SetPositionFxXY(managedSprite, x, y + offset);
+    if (Sprite_GetVRamType(managedSprite->sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+        ManagedSprite_SetPositionFxXY(managedSprite, x, y + offset);
     } else {
-        Sprite_SetPositionFxXY(managedSprite, x, y);
+        ManagedSprite_SetPositionFxXY(managedSprite, x, y);
     }
 }
 
-void Sprite_GetPositionFxXYWithSubscreenOffset(CellActorData *managedSprite, fx32 *outX, fx32 *outY, fx32 offset)
+void ManagedSprite_GetPositionFxXYWithSubscreenOffset(ManagedSprite *managedSprite, fx32 *outX, fx32 *outY, fx32 offset)
 {
-    Sprite_GetPositionFxXY(managedSprite, outX, outY);
-    if (CellActor_GetVRamType(managedSprite->sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
+    ManagedSprite_GetPositionFxXY(managedSprite, outX, outY);
+    if (Sprite_GetVRamType(managedSprite->sprite) == NNS_G2D_VRAM_TYPE_2DSUB) {
         *outY = *outY - offset;
     }
 }
 
-static void SetSpriteAffineOverwriteMode(CellActor *sprite, enum AffineOverwriteMode mode)
+static void SetSpriteAffineOverwriteMode(Sprite *sprite, enum AffineOverwriteMode mode)
 {
-    CellActor_SetAffineOverwriteMode(sprite, mode);
+    Sprite_SetAffineOverwriteMode(sprite, mode);
 }
 
-void Sprite_SetAffineOverwriteMode(CellActorData *managedSprite, enum AffineOverwriteMode mode)
+void ManagedSprite_SetAffineOverwriteMode(ManagedSprite *managedSprite, enum AffineOverwriteMode mode)
 {
     SetSpriteAffineOverwriteMode(managedSprite->sprite, mode);
 }
 
-static void SetSpriteAffineScale(CellActor *sprite, f32 xScale, f32 yScale)
+static void SetSpriteAffineScale(Sprite *sprite, f32 xScale, f32 yScale)
 {
-    VecFx32 *scale = (VecFx32 *)CellActor_GetAffineScale(sprite);
+    VecFx32 *scale = (VecFx32 *)Sprite_GetAffineScale(sprite);
     scale->x = (xScale * FX32_ONE);
     scale->y = (yScale * FX32_ONE);
-    CellActor_SetAffineScale(sprite, scale);
+    Sprite_SetAffineScale(sprite, scale);
 }
 
-void Sprite_SetAffineScale(CellActorData *managedSprite, f32 xScale, f32 yScale)
+void ManagedSprite_SetAffineScale(ManagedSprite *managedSprite, f32 xScale, f32 yScale)
 {
     SetSpriteAffineScale(managedSprite->sprite, xScale, yScale);
 }
 
-static void OffsetSpriteAffineScale(CellActor *sprite, f32 xOffset, f32 yOffset)
+static void OffsetSpriteAffineScale(Sprite *sprite, f32 xOffset, f32 yOffset)
 {
-    VecFx32 *scale = (VecFx32 *)CellActor_GetAffineScale(sprite);
+    VecFx32 *scale = (VecFx32 *)Sprite_GetAffineScale(sprite);
     scale->x += (xOffset * FX32_ONE);
     scale->y += (yOffset * FX32_ONE);
-    CellActor_SetAffineScale(sprite, scale);
+    Sprite_SetAffineScale(sprite, scale);
 }
 
-void Sprite_OffsetAffineScale(CellActorData *managedSprite, f32 xOffset, f32 yOffset)
+void ManagedSprite_OffsetAffineScale(ManagedSprite *managedSprite, f32 xOffset, f32 yOffset)
 {
     OffsetSpriteAffineScale(managedSprite->sprite, xOffset, yOffset);
 }
 
-void GetSpriteAffineScale(CellActor *sprite, f32 *outXScale, f32 *outYScale)
+void GetSpriteAffineScale(Sprite *sprite, f32 *outXScale, f32 *outYScale)
 {
-    const VecFx32 *scale = CellActor_GetAffineScale(sprite);
+    const VecFx32 *scale = Sprite_GetAffineScale(sprite);
     *outXScale = FX_FX32_TO_F32(scale->x);
     *outYScale = FX_FX32_TO_F32(scale->y);
 }
 
-void Sprite_GetAffineScale(CellActorData *managedSprite, f32 *outXScale, f32 *outYScale)
+void ManagedSprite_GetAffineScale(ManagedSprite *managedSprite, f32 *outXScale, f32 *outYScale)
 {
     GetSpriteAffineScale(managedSprite->sprite, outXScale, outYScale);
 }
 
-static void SetSpriteAffineZRotation(CellActor *sprite, u16 angle)
+static void SetSpriteAffineZRotation(Sprite *sprite, u16 angle)
 {
-    CellActor_SetAffineZRotation(sprite, angle);
+    Sprite_SetAffineZRotation(sprite, angle);
 }
 
-void Sprite_SetAffineZRotation(CellActorData *managedSprite, u16 angle)
+void ManagedSprite_SetAffineZRotation(ManagedSprite *managedSprite, u16 angle)
 {
     SetSpriteAffineZRotation(managedSprite->sprite, angle);
 }
 
-void OffsetSpriteAffineZRotation(CellActor *sprite, s32 offset)
+void OffsetSpriteAffineZRotation(Sprite *sprite, s32 offset)
 {
-    u16 angle = CellActor_GetAffineZRotation(sprite);
+    u16 angle = Sprite_GetAffineZRotation(sprite);
     angle += offset;
-    CellActor_SetAffineZRotation(sprite, angle);
+    Sprite_SetAffineZRotation(sprite, angle);
 }
 
-void Sprite_OffsetAffineZRotation(CellActorData *managedSprite, s32 offset)
+void ManagedSprite_OffsetAffineZRotation(ManagedSprite *managedSprite, s32 offset)
 {
     OffsetSpriteAffineZRotation(managedSprite->sprite, offset);
 }
 
-void Sprite_SetFlipMode(CellActor *sprite, int mode)
+void Sprite_SetFlipMode2(Sprite *sprite, int mode)
 {
-    CellActor_SetFlipMode(sprite, mode);
+    Sprite_SetFlipMode(sprite, mode);
 }
 
-void Sprite_SetFlipMode2(CellActorData *managedSprite, int mode)
+void ManagedSprite_SetFlipMode(ManagedSprite *managedSprite, int mode)
 {
-    Sprite_SetFlipMode(managedSprite->sprite, mode);
+    Sprite_SetFlipMode2(managedSprite->sprite, mode);
 }
 
-void Sprite_SetAffineTranslation(CellActorData *managedSprite, s16 x, s16 y)
+void ManagedSprite_SetAffineTranslation(ManagedSprite *managedSprite, s16 x, s16 y)
 {
     VecFx32 translation;
     translation.x = x << FX32_SHIFT;
     translation.y = y << FX32_SHIFT;
     translation.z = 0;
-    CellActor_SetAffineTranslation(managedSprite->sprite, &translation);
+    Sprite_SetAffineTranslation(managedSprite->sprite, &translation);
 }
 
-void Sprite_SetPixelated(CellActorData *managedSprite, BOOL pixelated)
+void ManagedSprite_SetPixelated(ManagedSprite *managedSprite, BOOL pixelated)
 {
-    CellActor_SetPixelated(managedSprite->sprite, pixelated);
+    Sprite_SetPixelated(managedSprite->sprite, pixelated);
 }
 
-void Sprite_SetExplicitOamMode(CellActor *sprite, GXOamMode mode)
+void Sprite_SetExplicitOamMode2(Sprite *sprite, GXOamMode mode)
 {
-    CellActor_SetExplicitOAMMode(sprite, mode);
+    Sprite_SetExplicitOAMMode(sprite, mode);
 }
 
-void Sprite_SetExplicitOamMode2(CellActorData *managedSprite, GXOamMode mode)
+void ManagedSprite_SetExplicitOamMode(ManagedSprite *managedSprite, GXOamMode mode)
 {
-    Sprite_SetExplicitOamMode(managedSprite->sprite, mode);
+    Sprite_SetExplicitOamMode2(managedSprite->sprite, mode);
 }
 
-u32 Sprite_SetUserAttrForCurrentAnimFrame(CellActorData *managedSprite)
+u32 ManagedSprite_SetUserAttrForCurrentAnimFrame(ManagedSprite *managedSprite)
 {
-    return CellActor_GetUserAttrForCurrentAnimFrame(managedSprite->sprite);
+    return Sprite_GetUserAttrForCurrentAnimFrame(managedSprite->sprite);
 }
 
 BOOL SpriteSystem_LoadCharResObjWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID) == FALSE) {
         return FALSE;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         narcID,
         memberIdx,
         compressed,
@@ -1153,7 +1153,7 @@ BOOL SpriteSystem_LoadCharResObjWithHardwareMappingType(SpriteSystem *spriteSys,
         spriteSys->heapId);
     if (resource != NULL) {
         SpriteTransfer_RequestCharWithHardwareMappingType(resource);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resource);
         return TRUE;
     }
 
@@ -1163,11 +1163,11 @@ BOOL SpriteSystem_LoadCharResObjWithHardwareMappingType(SpriteSystem *spriteSys,
 
 BOOL SpriteSystem_LoadCharResObjAtEndWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID) == FALSE) {
         return FALSE;
     }
 
-    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_AddTiles(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         narcID,
         memberIdx,
         compressed,
@@ -1176,7 +1176,7 @@ BOOL SpriteSystem_LoadCharResObjAtEndWithHardwareMappingType(SpriteSystem *sprit
         spriteSys->heapId);
     if (resource != NULL) {
         SpriteTransfer_RequestCharAtEndWithHardwareMappingType(resource);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resource);
         return TRUE;
     }
 
@@ -1186,7 +1186,7 @@ BOOL SpriteSystem_LoadCharResObjAtEndWithHardwareMappingType(SpriteSystem *sprit
 
 BOOL SpriteSystem_LoadCharResObjFromOpenNarcWithHardwareMappingType(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, enum NNS_G2D_VRAM_TYPE vramType, int resourceID)
 {
-    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID) == FALSE) {
+    if (SpriteResourceCollection_IsIDUnused(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID) == FALSE) {
         return FALSE;
     }
 
@@ -1199,7 +1199,7 @@ BOOL SpriteSystem_LoadCharResObjFromOpenNarcWithHardwareMappingType(SpriteSystem
         spriteSys->heapId);
     if (resource != NULL) {
         SpriteTransfer_RequestCharAtEndWithHardwareMappingType(resource);
-        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_TILES], resource);
+        RegisterLoadedResource(spriteMan->unownedResources[SPRITE_RESOURCE_CHAR], resource);
         return TRUE;
     }
 
@@ -1209,8 +1209,8 @@ BOOL SpriteSystem_LoadCharResObjFromOpenNarcWithHardwareMappingType(SpriteSystem
 
 void SpriteSystem_ReplaceCharResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int resourceID)
 {
-    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID);
-    SpriteResourceCollection_ModifyTiles(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID);
+    SpriteResourceCollection_ModifyTiles(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         resource,
         narcID,
         memberIdx,
@@ -1221,8 +1221,8 @@ void SpriteSystem_ReplaceCharResObj(SpriteSystem *spriteSys, SpriteManager *spri
 
 void SpriteSystem_ReplacePlttResObj(SpriteSystem *spriteSys, SpriteManager *spriteMan, int narcID, int memberIdx, BOOL compressed, int resourceID)
 {
-    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE], resourceID);
-    SpriteResourceCollection_ModifyPalette(spriteMan->ownedResources[SPRITE_RESOURCE_PALETTE],
+    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT], resourceID);
+    SpriteResourceCollection_ModifyPalette(spriteMan->ownedResources[SPRITE_RESOURCE_PLTT],
         resource,
         narcID,
         memberIdx,
@@ -1231,15 +1231,15 @@ void SpriteSystem_ReplacePlttResObj(SpriteSystem *spriteSys, SpriteManager *spri
     SpriteTransfer_ReplacePlttData(resource);
 }
 
-CellActorCollection *SpriteManager_GetSpriteList(SpriteManager *spriteMan)
+SpriteList *SpriteManager_GetSpriteList(SpriteManager *spriteMan)
 {
     return spriteMan->sprites;
 }
 
 void SpriteSystem_ReplaceCharResObjFromOpenNarc(SpriteSystem *spriteSys, SpriteManager *spriteMan, NARC *narc, int memberIdx, BOOL compressed, int resourceID)
 {
-    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_TILES], resourceID);
-    SpriteResourceCollection_ModifyTilesFrom(spriteMan->ownedResources[SPRITE_RESOURCE_TILES],
+    SpriteResource *resource = SpriteResourceCollection_Find(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR], resourceID);
+    SpriteResourceCollection_ModifyTilesFrom(spriteMan->ownedResources[SPRITE_RESOURCE_CHAR],
         resource,
         narc,
         memberIdx,
diff --git a/src/sprite_transfer.c b/src/sprite_transfer.c
index 862228a5f0..1c5f9a6680 100644
--- a/src/sprite_transfer.c
+++ b/src/sprite_transfer.c
@@ -10,7 +10,7 @@
 BOOL SpriteTransfer_RequestChar(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
 
     CharTransferTaskTemplate template;
     template.data = SpriteResource_GetTileData(resource);
@@ -33,7 +33,7 @@ void SpriteTransfer_RequestCharList(const SpriteResourceList *resourceList)
 BOOL SpriteTransfer_RequestCharWithHardwareMappingType(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
 
     CharTransferTaskTemplate template;
     template.data = SpriteResource_GetTileData(resource);
@@ -46,7 +46,7 @@ BOOL SpriteTransfer_RequestCharWithHardwareMappingType(const SpriteResource *res
 BOOL SpriteTransfer_RequestCharAtEnd(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
 
     CharTransferTaskTemplate template;
     template.data = SpriteResource_GetTileData(resource);
@@ -69,7 +69,7 @@ void SpriteTransfer_RequestCharListAtEnd(const SpriteResourceList *resourceList)
 BOOL SpriteTransfer_RequestCharAtEndWithHardwareMappingType(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
 
     CharTransferTaskTemplate template;
     template.data = SpriteResource_GetTileData(resource);
@@ -95,7 +95,7 @@ void SpriteTransfer_RetransferCharData(const SpriteResource *resource)
 void SpriteTransfer_ResetCharTransfer(SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
     CharTransfer_ResetTask(SpriteResource_GetID(resource));
 }
 
@@ -112,16 +112,16 @@ void SpriteTransfer_ResetCharTransferList(SpriteResourceList *resourceList)
 NNSG2dImageProxy *SpriteTransfer_GetImageProxy(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_CHAR);
     return CharTransfer_GetImageProxy(SpriteResource_GetID(resource));
 }
 
 NNSG2dImageProxy *SpriteTransfer_GetCellTransferProxy(const SpriteResource *charResource, const SpriteResource *cellResource)
 {
     GF_ASSERT(charResource);
-    GF_ASSERT(SpriteResource_GetType(charResource) == SPRITE_RESOURCE_TILES);
+    GF_ASSERT(SpriteResource_GetType(charResource) == SPRITE_RESOURCE_CHAR);
     GF_ASSERT(cellResource);
-    GF_ASSERT(SpriteResource_GetType(cellResource) == SPRITE_RESOURCE_SPRITE);
+    GF_ASSERT(SpriteResource_GetType(cellResource) == SPRITE_RESOURCE_CELL);
 
     int resourceID = SpriteResource_GetID(charResource);
     NNSG2dCellDataBank *cellData = SpriteResource_GetSpriteData(cellResource);
@@ -143,7 +143,7 @@ void SpriteTransfer_DeleteCharTransfer(const NNSG2dImageProxy *imageProxy)
 BOOL SpriteTransfer_RequestPlttWholeRange(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PLTT);
 
     PlttTransferTaskTemplate template;
     template.data = SpriteResource_GetPaletteFade(resource);
@@ -166,7 +166,7 @@ void SpriteTransfer_RequestPlttWholeRangeList(const SpriteResourceList *resource
 BOOL SpriteTransfer_RequestPlttFreeSpace(const SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PLTT);
 
     PlttTransferTaskTemplate template;
     template.data = SpriteResource_GetPaletteFade(resource);
@@ -195,7 +195,7 @@ void SpriteTransfer_ReplacePlttData(const SpriteResource *resource)
 void SpriteTransfer_ResetPlttTransfer(SpriteResource *resource)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PLTT);
     PlttTransfer_ResetTask(SpriteResource_GetID(resource));
 }
 
@@ -212,7 +212,7 @@ void SpriteTransfer_ResetPlttTransferList(SpriteResourceList *resourceList)
 const NNSG2dImagePaletteProxy *SpriteTransfer_GetPaletteProxy(const SpriteResource *resource, NNSG2dImageProxy *imageProxy)
 {
     GF_ASSERT(resource);
-    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PALETTE);
+    GF_ASSERT(SpriteResource_GetType(resource) == SPRITE_RESOURCE_PLTT);
 
     int resourceID = SpriteResource_GetID(resource);
     if (imageProxy) {
diff --git a/src/sprite_util.c b/src/sprite_util.c
index f1d57d28c7..d6f8adb631 100644
--- a/src/sprite_util.c
+++ b/src/sprite_util.c
@@ -3,19 +3,19 @@
 #include "constants/heap.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "heap.h"
 #include "pltt_transfer.h"
 #include "render_oam.h"
 #include "render_view.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
 
 #define RESDAT_TABLE_TERMINATOR 0xFFFFFFFE
 
-void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, BOOL vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
+void SpriteResourcesHeader_Init(SpriteResourcesHeader *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, BOOL vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
 {
     SpriteResource *charResource;
     SpriteResource *plttResource;
@@ -84,10 +84,10 @@ void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charR
     resourceHeader->priority = priority;
 }
 
-void SpriteResourcesHeader_Clear(CellActorResourceData *resourceHeader)
+void SpriteResourcesHeader_Clear(SpriteResourcesHeader *resourceHeader)
 {
     SpriteTransfer_DeleteCharTransfer(resourceHeader->imageProxy);
-    memset(resourceHeader, 0, sizeof(CellActorResourceData));
+    memset(resourceHeader, 0, sizeof(SpriteResourcesHeader));
 }
 
 SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatTableEntry *resdatEntries, enum HeapId heapID, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
@@ -98,7 +98,7 @@ SpriteResourcesHeaderList *SpriteResourcesHeaderList_NewFromResdat(const ResdatT
     }
 
     SpriteResourcesHeaderList *headerList = Heap_AllocFromHeap(heapID, sizeof(SpriteResourcesHeaderList));
-    headerList->headers = Heap_AllocFromHeap(heapID, sizeof(CellActorResourceData) * resdatLength);
+    headerList->headers = Heap_AllocFromHeap(heapID, sizeof(SpriteResourcesHeader) * resdatLength);
     headerList->length = resdatLength;
 
     for (int i = 0; i < headerList->length; i++) {
@@ -132,9 +132,9 @@ void SpriteResourcesHeaderList_Free(SpriteResourcesHeaderList *headerList)
     Heap_FreeToHeap(headerList);
 }
 
-CellActorCollection *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID)
+SpriteList *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dRenderer, enum HeapId heapID)
 {
-    CellActorCollectionParams template;
+    SpriteListParams template;
     NNSG2dViewRect viewRect;
 
     InitRenderer(&g2dRenderer->renderer, -FX32_ONE);
@@ -154,7 +154,7 @@ CellActorCollection *SpriteList_InitRendering(int maxElements, G2dRenderer *g2dR
     template.maxElements = maxElements;
     template.renderer = &g2dRenderer->renderer;
     template.heapID = heapID;
-    return CellActorCollection_New(&template);
+    return SpriteList_New(&template);
 }
 
 void SetMainScreenViewRect(G2dRenderer *g2dRenderer, fx32 x, fx32 y)
diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c
index 79e7f729fb..9a514b9d84 100644
--- a/src/unk_0200762C.c
+++ b/src/unk_0200762C.c
@@ -276,40 +276,40 @@ static const UnkStruct_020E4E62 *Unk_021007A4[] = {
 void *sub_0200762C(int param0);
 void sub_02007768(UnkStruct_02007768 *param0);
 void sub_02007B6C(UnkStruct_02007768 *param0);
-Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7);
-Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8);
-void sub_02007DC8(Sprite *param0);
+PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7);
+PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8);
+void sub_02007DC8(PokemonSprite *param0);
 void sub_02007DD4(UnkStruct_02007768 *param0);
-void sub_02007B98(Sprite *param0, int param1);
-void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1);
-BOOL sub_02007C24(Sprite *param0);
-void sub_02007DEC(Sprite *param0, int param1, int param2);
-int sub_020080C0(Sprite *param0, int param1);
-void sub_02008274(Sprite *param0, int param1, int param2);
-void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4);
-void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4);
+void sub_02007B98(PokemonSprite *param0, int param1);
+void sub_02007C10(PokemonSprite *param0, SpriteAnimationFrame *param1);
+BOOL sub_02007C24(PokemonSprite *param0);
+void sub_02007DEC(PokemonSprite *param0, int param1, int param2);
+int sub_020080C0(PokemonSprite *param0, int param1);
+void sub_02008274(PokemonSprite *param0, int param1, int param2);
+void sub_020086D4(PokemonSprite *param0, int param1, int param2, int param3, int param4);
+void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param4);
 void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3, int param4);
-void sub_02008780(Sprite *param0);
-BOOL sub_020087B4(Sprite *param0);
-void sub_020087C8(Sprite *param0, int param1);
-void sub_020089A0(Sprite *param0);
-void sub_020089B0(Sprite *param0);
-void sub_02008A0C(Sprite *param0);
+void sub_02008780(PokemonSprite *param0);
+BOOL sub_020087B4(PokemonSprite *param0);
+void sub_020087C8(PokemonSprite *param0, int param1);
+void sub_020089A0(PokemonSprite *param0);
+void sub_020089B0(PokemonSprite *param0);
+void sub_02008A0C(PokemonSprite *param0);
 void sub_02008A78(UnkStruct_02007768 *param0, u32 param1, u32 param2);
 void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2);
-ArchivedSprite *sub_02008A90(Sprite *param0);
+ArchivedSprite *sub_02008A90(PokemonSprite *param0);
 void sub_02008A94(UnkStruct_02007768 *param0);
 void sub_02008B2C(UnkStruct_02007768 *param0, int param1);
-BOOL sub_02008B38(Sprite *param0);
+BOOL sub_02008B38(PokemonSprite *param0);
 void sub_02008B54(UnkStruct_02007768 *param0, u32 param1);
 void sub_02008B60(UnkStruct_02007768 *param0, u32 param1);
 void sub_020091D8(u8 *param0, u32 param1, BOOL param2);
 void sub_02009348(u8 *param0);
 static void sub_02008B78(UnkStruct_02007768 *param0);
 static void sub_02008FC8(UnkStruct_02007768 *param0);
-static void sub_020088D8(Sprite *param0);
+static void sub_020088D8(PokemonSprite *param0);
 static u8 sub_020091AC(u8 param0);
-static void sub_020091C0(Sprite *param0, u8 *param1);
+static void sub_020091C0(PokemonSprite *param0, u8 *param1);
 
 void *sub_0200762C(int param0)
 {
@@ -335,7 +335,7 @@ void *sub_0200762C(int param0)
     MI_CpuClearFast(v0->unk_304, sizeof(0x20 * 6));
 
     for (v1 = 0; v1 < 4; v1++) {
-        MI_CpuClearFast(&v0->unk_00[v1], sizeof(Sprite));
+        MI_CpuClearFast(&v0->unk_00[v1], sizeof(PokemonSprite));
     }
 
     NNS_G2dSetupSoftwareSpriteCamera();
@@ -491,7 +491,7 @@ void sub_02007B6C(UnkStruct_02007768 *param0)
     Heap_FreeToHeap(param0);
 }
 
-void sub_02007B98(Sprite *param0, int param1)
+void sub_02007B98(PokemonSprite *param0, int param1)
 {
     int v0;
 
@@ -511,17 +511,17 @@ void sub_02007B98(Sprite *param0, int param1)
     }
 }
 
-void sub_02007C10(Sprite *param0, SpriteAnimationFrame *param1)
+void sub_02007C10(PokemonSprite *param0, SpriteAnimationFrame *param1)
 {
     MI_CpuCopy8(param1, &param0->unk_84, sizeof(SpriteAnimationFrame) * 10);
 }
 
-BOOL sub_02007C24(Sprite *param0)
+BOOL sub_02007C24(PokemonSprite *param0)
 {
     return param0->unk_58 != 0;
 }
 
-Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7)
+PokemonSprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, SpriteAnimationFrame *param6, UnkFuncPtr_02007C34 *param7)
 {
     int v0;
 
@@ -536,11 +536,11 @@ Sprite *sub_02007C34(UnkStruct_02007768 *param0, ArchivedSprite *param1, int par
     return sub_02007C7C(param0, param1, param2, param3, param4, param5, v0, param6, param7);
 }
 
-Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8)
+PokemonSprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int param2, int param3, int param4, int param5, int param6, SpriteAnimationFrame *param7, UnkFuncPtr_02007C34 *param8)
 {
     GF_ASSERT(param0->unk_00[param6].unk_00_0 == 0);
 
-    MI_CpuClearFast(&param0->unk_00[param6], sizeof(Sprite));
+    MI_CpuClearFast(&param0->unk_00[param6], sizeof(PokemonSprite));
 
     param0->unk_00[param6].unk_00_0 = 1;
     param0->unk_00[param6].unk_00_7 = 1;
@@ -574,7 +574,7 @@ Sprite *sub_02007C7C(UnkStruct_02007768 *param0, ArchivedSprite *param1, int par
     return &param0->unk_00[param6];
 }
 
-void sub_02007DC8(Sprite *param0)
+void sub_02007DC8(PokemonSprite *param0)
 {
     param0->unk_00_0 = 0;
 }
@@ -588,7 +588,7 @@ void sub_02007DD4(UnkStruct_02007768 *param0)
     }
 }
 
-void sub_02007DEC(Sprite *param0, int param1, int param2)
+void sub_02007DEC(PokemonSprite *param0, int param1, int param2)
 {
     switch (param1) {
     case 0:
@@ -740,7 +740,7 @@ void sub_02007DEC(Sprite *param0, int param1, int param2)
     }
 }
 
-int sub_020080C0(Sprite *param0, int param1)
+int sub_020080C0(PokemonSprite *param0, int param1)
 {
     switch (param1) {
     case 0:
@@ -843,7 +843,7 @@ int sub_020080C0(Sprite *param0, int param1)
     return 0;
 }
 
-void sub_02008274(Sprite *param0, int param1, int param2)
+void sub_02008274(PokemonSprite *param0, int param1, int param2)
 {
     switch (param1) {
     case 0:
@@ -995,7 +995,7 @@ void sub_02008274(Sprite *param0, int param1, int param2)
     }
 }
 
-void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4)
+void sub_020086D4(PokemonSprite *param0, int param1, int param2, int param3, int param4)
 {
     param0->unk_24.unk_30_1 = 1;
     param0->unk_24.unk_20 = param1;
@@ -1004,7 +1004,7 @@ void sub_020086D4(Sprite *param0, int param1, int param2, int param3, int param4
     param0->unk_24.unk_23 = param4;
 }
 
-void sub_020086FC(Sprite *param0, int param1, int param2, int param3, int param4)
+void sub_020086FC(PokemonSprite *param0, int param1, int param2, int param3, int param4)
 {
     param0->unk_24.unk_30_12 = 1;
     param0->unk_24.unk_24 = param1;
@@ -1030,7 +1030,7 @@ void sub_0200872C(UnkStruct_02007768 *param0, int param1, int param2, int param3
     }
 }
 
-void sub_02008780(Sprite *param0)
+void sub_02008780(PokemonSprite *param0)
 {
     param0->unk_24.unk_30_12 = 0;
     param0->unk_24.unk_24 = 0;
@@ -1041,12 +1041,12 @@ void sub_02008780(Sprite *param0)
     param0->unk_00_8 = 1;
 }
 
-BOOL sub_020087B4(Sprite *param0)
+BOOL sub_020087B4(PokemonSprite *param0)
 {
     return param0->unk_24.unk_30_12 == 1;
 }
 
-void sub_020087C8(Sprite *param0, int param1)
+void sub_020087C8(PokemonSprite *param0, int param1)
 {
     param0->unk_24.unk_0A = ((80 / 2) - param1) - ((((80 / 2) - param1) * param0->unk_24.unk_12) >> 8);
 }
@@ -1082,7 +1082,7 @@ static inline void inline_02008900(u8 *param0, u8 *param1, u8 *param2, u8 *param
     }
 }
 
-static void sub_020087DC(Sprite *param0)
+static void sub_020087DC(PokemonSprite *param0)
 {
     if (param0->unk_58) {
         if (param0->unk_5A == 0) {
@@ -1116,7 +1116,7 @@ static void sub_020087DC(Sprite *param0)
     }
 }
 
-static void sub_020088D8(Sprite *param0)
+static void sub_020088D8(PokemonSprite *param0)
 {
     sub_020087DC(param0);
 }
@@ -1146,19 +1146,19 @@ int sub_02008900(UnkStruct_02008900 *param0)
     return -1;
 }
 
-void sub_020089A0(Sprite *param0)
+void sub_020089A0(PokemonSprite *param0)
 {
     param0->unk_00_7 = 1;
     param0->unk_00_8 = 1;
 }
 
-void sub_020089B0(Sprite *param0)
+void sub_020089B0(PokemonSprite *param0)
 {
     param0->unk_14 = param0->unk_04;
     param0->unk_78 = param0->unk_6C;
 }
 
-void sub_02008A0C(Sprite *param0)
+void sub_02008A0C(PokemonSprite *param0)
 {
     param0->unk_04 = param0->unk_14;
     param0->unk_6C = param0->unk_78;
@@ -1178,7 +1178,7 @@ void sub_02008A84(UnkStruct_02007768 *param0, u32 param1, u32 param2)
     param0->unk_2F8 = param2;
 }
 
-ArchivedSprite *sub_02008A90(Sprite *param0)
+ArchivedSprite *sub_02008A90(PokemonSprite *param0)
 {
     return &param0->unk_04;
 }
@@ -1215,7 +1215,7 @@ void sub_02008B2C(UnkStruct_02007768 *param0, int param1)
     param0->unk_333 = param1;
 }
 
-BOOL sub_02008B38(Sprite *param0)
+BOOL sub_02008B38(PokemonSprite *param0)
 {
     GF_ASSERT(param0 != NULL);
     return param0->unk_00_0 != 0;
@@ -1426,7 +1426,7 @@ static u8 sub_020091AC(u8 param0)
     return v0;
 }
 
-static void sub_020091C0(Sprite *param0, u8 *param1)
+static void sub_020091C0(PokemonSprite *param0, u8 *param1)
 {
     if (param0->unk_04.spindaSpots == 0) {
         return;
diff --git a/src/unk_02012744.c b/src/unk_02012744.c
index 020e6c22db..86d942902f 100644
--- a/src/unk_02012744.c
+++ b/src/unk_02012744.c
@@ -6,13 +6,13 @@
 #include "struct_defs/struct_020127E8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "graphics.h"
 #include "heap.h"
+#include "sprite.h"
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     int unk_04;
     int unk_08;
 } UnkStruct_02012CE0_sub1;
@@ -20,7 +20,7 @@ typedef struct {
 typedef struct FontOAM {
     UnkStruct_02012CE0_sub1 *unk_00;
     int unk_04;
-    const CellActor *unk_08;
+    const Sprite *unk_08;
     int unk_0C;
     int unk_10;
 } FontOAM;
@@ -67,7 +67,7 @@ static void sub_02012E6C(const Window *param0, const UnkStruct_02013034 *param1,
 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 CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2);
+static Sprite *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);
@@ -202,7 +202,7 @@ void sub_020128C4(FontOAM *param0, int param1, int param2)
     param2 *= FX32_ONE;
 
     if (param0->unk_08) {
-        v2 = CellActor_GetPosition(param0->unk_08);
+        v2 = Sprite_GetPosition(param0->unk_08);
 
         param1 += v2->x;
         param2 += v2->y;
@@ -214,7 +214,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);
 
-        CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
+        Sprite_SetPosition(param0->unk_00[v0].unk_00, &v1);
     }
 }
 
@@ -230,7 +230,7 @@ void sub_02012938(FontOAM *param0)
     if (param0->unk_08) {
         v3 = param0->unk_0C << FX32_SHIFT;
         v4 = param0->unk_10 << FX32_SHIFT;
-        v2 = CellActor_GetPosition(param0->unk_08);
+        v2 = Sprite_GetPosition(param0->unk_08);
 
         v3 += v2->x;
         v4 += v2->y;
@@ -241,7 +241,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);
 
-            CellActor_SetPosition(param0->unk_00[v0].unk_00, &v1);
+            Sprite_SetPosition(param0->unk_00[v0].unk_00, &v1);
         }
     }
 }
@@ -263,7 +263,7 @@ void sub_020129D0(FontOAM *param0, BOOL param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetDrawFlag(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetDrawFlag(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -274,7 +274,7 @@ void sub_02012A00(FontOAM *param0, u8 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetExplicitPriority(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetExplicitPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -285,7 +285,7 @@ void sub_02012A30(FontOAM *param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetPriority(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetPriority(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -296,7 +296,7 @@ void sub_02012A60(FontOAM *param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetExplicitPalette(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetExplicitPalette(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -307,7 +307,7 @@ void sub_02012A90(FontOAM *param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetExplicitPaletteOffset(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetExplicitPaletteOffset(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -318,7 +318,7 @@ void sub_02012AC0(FontOAM *param0, u32 param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetExplicitPaletteOffsetAutoAdjust(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -329,7 +329,7 @@ void sub_02012AF0(FontOAM *param0, GXOamMode param1)
     GF_ASSERT(param0);
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_SetExplicitOAMMode(param0->unk_00[v0].unk_00, param1);
+        Sprite_SetExplicitOAMMode(param0->unk_00[v0].unk_00, param1);
     }
 }
 
@@ -393,10 +393,10 @@ void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Windo
     int v0;
     char *v1;
     NNSG2dImageProxy *v2;
-    CellActor *v3 = param0->unk_00[0].unk_00;
+    Sprite *v3 = param0->unk_00[0].unk_00;
     int v4;
 
-    v4 = CellActor_GetVRamType(v3);
+    v4 = Sprite_GetVRamType(v3);
     v0 = sub_02012B58(param1, v4);
     v1 = (char *)Heap_AllocFromHeapAtEnd(param3, v0);
 
@@ -405,7 +405,7 @@ void sub_02012BE0(FontOAM *param0, const UnkStruct_02012B20 *param1, const Windo
     sub_02012F98(param2, v1, &param1->unk_00, v4, param3);
     DC_FlushRange(v1, v0);
 
-    v2 = SpriteActor_ImageProxy(v3);
+    v2 = Sprite_GetImageProxy(v3);
 
     if (v4 == NNS_G2D_VRAM_TYPE_2DMAIN) {
         GX_LoadOBJ(v1, NNS_G2dGetImageLocation(v2, NNS_G2D_VRAM_TYPE_2DMAIN), v0);
@@ -718,14 +718,14 @@ static void sub_020130DC(FontOAM *param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_04; v0++) {
-        CellActor_Delete(param0->unk_00[v0].unk_00);
+        Sprite_Delete(param0->unk_00[v0].unk_00);
     }
 }
 
-static CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2)
+static Sprite *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct_02013034 *param1, const NNSG2dImageProxy *param2)
 {
-    CellActorInitParams v0;
-    CellActorResourceData v1;
+    SpriteListTemplate v0;
+    SpriteResourcesHeader v1;
 
     v1.imageProxy = param2;
     v1.charData = NULL;
@@ -737,7 +737,7 @@ static CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct
     v1.isVRamTransfer = 0;
     v1.priority = param0->unk_20;
 
-    v0.collection = param0->unk_08;
+    v0.list = param0->unk_08;
     v0.resourceData = &v1;
     v0.priority = param0->unk_24;
     v0.vramType = param0->unk_28;
@@ -749,14 +749,14 @@ static CellActor *sub_02013100(const UnkStruct_020127E8 *param0, const UnkStruct
     if (param0->unk_10) {
         const VecFx32 *v2;
 
-        v2 = CellActor_GetPosition(param0->unk_10);
+        v2 = Sprite_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 CellActorCollection_Add(&v0);
+    return SpriteList_Add(&v0);
 }
 
 static UnkStruct_02013034 *sub_02013188(int param0)
@@ -800,7 +800,7 @@ static void sub_020131D0(UnkStruct_02013034 *param0, UnkStruct_02013034 *param1)
     param1->unk_0C = param0;
 }
 
-void sub_020131E0(FontOAM *param0, const CellActor *param1)
+void sub_020131E0(FontOAM *param0, const Sprite *param1)
 {
     param0->unk_08 = param1;
     sub_02012938(param0);
diff --git a/src/unk_02015F84.c b/src/unk_02015F84.c
index 8ea96c6ec9..f83b2c6568 100644
--- a/src/unk_02015F84.c
+++ b/src/unk_02015F84.c
@@ -38,7 +38,7 @@ typedef struct UnkStruct_02016DAC_t {
 } UnkStruct_02016DAC;
 
 typedef struct UnkStruct_02016E64_t {
-    Sprite *unk_00;
+    PokemonSprite *unk_00;
     SysTask *unk_04;
     void *unk_08;
     u32 *unk_0C;
@@ -194,7 +194,7 @@ void sub_02015FB8(PokemonAnimationSys *param0)
     Heap_FreeToHeap(param0);
 }
 
-void PokeAnimation_Init(PokemonAnimationSys *param0, Sprite *param1, const PokeAnimationSettings *param2, const u8 param3)
+void PokeAnimation_Init(PokemonAnimationSys *param0, PokemonSprite *param1, const PokeAnimationSettings *param2, const u8 param3)
 {
     u8 v0 = param3;
     int v1 = param2->animation;
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index ab0921f012..1d8faebb56 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -6,13 +6,13 @@
 #include "field/field_system.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
 #include "map_object.h"
 #include "player_avatar.h"
 #include "save_player.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -23,7 +23,7 @@
 #include "unk_0200F174.h"
 
 typedef struct {
-    CellActorCollection *unk_00;
+    SpriteList *unk_00;
     SpriteResourcesHeaderList *unk_04;
     SpriteResourceCollection *unk_08[4];
     SpriteResourceList *unk_18[2];
@@ -50,20 +50,20 @@ typedef struct {
 
 typedef struct {
     VecFx32 unk_00;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
     int unk_10;
 } UnkStruct_0205D3C4;
 
 typedef struct {
     VecFx32 unk_00;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
     int unk_10;
     int unk_14;
 } UnkStruct_0205D5E0;
 
 typedef struct {
     VecFx32 unk_00;
-    CellActor *unk_0C;
+    Sprite *unk_0C;
     int unk_10;
 } UnkStruct_0205D4A4;
 
@@ -76,7 +76,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 CellActor *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *param2, int param3, int param4);
+static Sprite *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);
@@ -123,7 +123,7 @@ void sub_0205CA94(SysTask *param0, void *param1)
     v3 = v0->unk_1E4;
 
     if (v0->unk_04.unk_00) {
-        CellActorCollection_Update(v0->unk_04.unk_00);
+        SpriteList_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -186,7 +186,7 @@ void sub_0205CBFC(SysTask *param0, void *param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 5) {
-        CellActorCollection_Update(v0->unk_04.unk_00);
+        SpriteList_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -241,7 +241,7 @@ void sub_0205CD3C(SysTask *param0, void *param1)
     v2 = v0->unk_1E4;
 
     if (v2 != 6) {
-        CellActorCollection_Update(v0->unk_04.unk_00);
+        SpriteList_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -304,7 +304,7 @@ void sub_0205CE7C(SysTask *param0, void *param1)
     v3 = v0->unk_1E4;
 
     if (v3 != 6) {
-        CellActorCollection_Update(v0->unk_04.unk_00);
+        SpriteList_Update(v0->unk_04.unk_00);
     }
 
     switch (v0->unk_1E4) {
@@ -492,7 +492,7 @@ static void sub_0205D22C(UnkStruct_0205D094 *param0)
 {
     int v0;
 
-    CellActorCollection_Delete(param0->unk_00);
+    SpriteList_Delete(param0->unk_00);
     param0->unk_00 = NULL;
 
     SpriteResourcesHeaderList_Free(param0->unk_04);
@@ -550,15 +550,15 @@ void sub_0205D274(UnkStruct_0205D274 *param0, UnkStruct_0205D3AC *param1, int pa
     param1->unk_04(&param0->unk_04, param1);
 }
 
-static CellActor *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *param2, int param3, int param4)
+static Sprite *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *param2, int param3, int param4)
 {
-    CellActorInitParamsEx v0;
-    CellActor *v1;
+    AffineSpriteListTemplate v0;
+    Sprite *v1;
     VecFx32 v2 = { FX32_ONE, FX32_ONE, FX32_ONE };
 
-    memset(&v0, 0, sizeof(CellActorInitParamsEx));
+    memset(&v0, 0, sizeof(AffineSpriteListTemplate));
 
-    v0.collection = param0->unk_00;
+    v0.list = param0->unk_00;
     v0.resourceData = &param0->unk_04->headers[param1];
     v0.position = *param2;
     v0.affineScale = v2;
@@ -566,7 +566,7 @@ static CellActor *sub_0205D344(UnkStruct_0205D094 *param0, int param1, VecFx32 *
     v0.vramType = param4;
     v0.heapID = 4;
 
-    v1 = CellActorCollection_AddEx(&v0);
+    v1 = SpriteList_AddEx(&v0);
     GF_ASSERT(v1);
 
     return v1;
@@ -597,7 +597,7 @@ void sub_0205D404(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D3C4 *v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -613,9 +613,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));
 
-        CellActor_SetPosition(v1->unk_0C, &v0);
+        Sprite_SetPosition(v1->unk_0C, &v0);
         v1->unk_10 += (0x8000 / 16);
-        CellActor_UpdateAnim(v1->unk_0C, FX32_ONE);
+        Sprite_UpdateAnim(v1->unk_0C, FX32_ONE);
 
         if (v1->unk_10 == ((0x8000 / 16) * 16)) {
             return 2;
@@ -646,7 +646,7 @@ void sub_0205D4E0(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -658,7 +658,7 @@ int sub_0205D500(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 7) {
-        CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
+        Sprite_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
@@ -685,7 +685,7 @@ void sub_0205D564(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D3C4 *v0 = (UnkStruct_0205D3C4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -697,8 +697,8 @@ int sub_0205D584(struct UnkStruct_0205D3AC_t *param0)
 
     v0->unk_00.y += (FX32_ONE * 8);
 
-    CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
-    CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
+    Sprite_SetPosition(v0->unk_0C, &v0->unk_00);
+    Sprite_UpdateAnim(v0->unk_0C, FX32_ONE);
 
     if (v0->unk_10 == 0) {
         if (v0->unk_00.y >= (384 * FX32_ONE)) {
@@ -708,7 +708,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);
-            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
+            Sprite_SetPosition(v0->unk_0C, &v0->unk_00);
             return 0;
         }
     }
@@ -729,7 +729,7 @@ void sub_0205D5E0(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    CellActor_SetAnim(v0->unk_0C, 1);
+    Sprite_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D624(struct UnkStruct_0205D3AC_t *param0)
@@ -737,7 +737,7 @@ void sub_0205D624(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D5E0 *v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
 
         param0->unk_00 = NULL;
@@ -752,7 +752,7 @@ int sub_0205D644(struct UnkStruct_0205D3AC_t *param0)
     switch (v0->unk_10) {
     case 0:
         v0->unk_14 += (FX32_CONST(0.20f));
-        CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
+        Sprite_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if (v0->unk_14 >= (2 * FX32_ONE)) {
             v0->unk_10++;
@@ -761,8 +761,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);
-            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
-            CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
+            Sprite_SetPosition(v0->unk_0C, &v0->unk_00);
+            Sprite_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_00.y = (384 * FX32_ONE);
             v0->unk_10++;
@@ -771,8 +771,8 @@ int sub_0205D644(struct UnkStruct_0205D3AC_t *param0)
     case 2:
         v0->unk_00.y -= (FX32_ONE * 8);
 
-        CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
-        CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
+        Sprite_SetPosition(v0->unk_0C, &v0->unk_00);
+        Sprite_UpdateAnim(v0->unk_0C, v0->unk_14);
 
         if (v0->unk_00.y < (300 * FX32_ONE)) {
             v1 = 2;
@@ -782,8 +782,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);
-            CellActor_SetPosition(v0->unk_0C, &v0->unk_00);
-            CellActor_UpdateAnim(v0->unk_0C, v0->unk_14);
+            Sprite_SetPosition(v0->unk_0C, &v0->unk_00);
+            Sprite_UpdateAnim(v0->unk_0C, v0->unk_14);
         } else {
             v0->unk_10++;
         }
@@ -809,9 +809,9 @@ void sub_0205D714(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
     v0->unk_00.y = (69 * FX32_ONE);
     v0->unk_0C = sub_0205D344(param0, 0, &v0->unk_00, 0, 1);
 
-    CellActor_SetAnim(v0->unk_0C, 1);
+    Sprite_SetAnim(v0->unk_0C, 1);
     v0->unk_14 = (2 * FX32_ONE);
-    CellActor_SetDrawFlag(v0->unk_0C, 0);
+    Sprite_SetDrawFlag(v0->unk_0C, 0);
 }
 
 void sub_0205D768(struct UnkStruct_0205D3AC_t *param0)
@@ -819,7 +819,7 @@ void sub_0205D768(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D5E0 *v0 = (UnkStruct_0205D5E0 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -833,7 +833,7 @@ int sub_0205D788(struct UnkStruct_0205D3AC_t *param0)
 
     switch (v1->unk_10) {
     case 0:
-        CellActor_SetDrawFlag(v1->unk_0C, 1);
+        Sprite_SetDrawFlag(v1->unk_0C, 1);
         v1->unk_10++;
         break;
     case 1:
@@ -841,16 +841,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));
 
-            CellActor_SetPosition(v1->unk_0C, &v0);
+            Sprite_SetPosition(v1->unk_0C, &v0);
             v1->unk_14 += (0x8000 / 8);
-            CellActor_UpdateAnim(v1->unk_0C, FX32_ONE);
+            Sprite_UpdateAnim(v1->unk_0C, FX32_ONE);
         } else {
             v1->unk_10++;
         }
         break;
     case 2:
         v1->unk_14 -= (FX32_CONST(0.40f));
-        CellActor_UpdateAnim(v1->unk_0C, v1->unk_14);
+        Sprite_UpdateAnim(v1->unk_0C, v1->unk_14);
 
         if (v1->unk_14 <= 0) {
             v1->unk_10++;
@@ -877,7 +877,7 @@ void sub_0205D844(UnkStruct_0205D094 *param0, struct UnkStruct_0205D3AC_t *param
     v0->unk_00.y = 96 * FX32_ONE;
     v0->unk_0C = sub_0205D344(param0, 1, &v0->unk_00, 1, 1);
 
-    CellActor_SetAnim(v0->unk_0C, 1);
+    Sprite_SetAnim(v0->unk_0C, 1);
 }
 
 void sub_0205D888(struct UnkStruct_0205D3AC_t *param0)
@@ -885,7 +885,7 @@ void sub_0205D888(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (param0->unk_00 != NULL) {
-        CellActor_Delete(v0->unk_0C);
+        Sprite_Delete(v0->unk_0C);
         Heap_FreeToHeapExplicit(4, param0->unk_00);
         param0->unk_00 = NULL;
     }
@@ -896,7 +896,7 @@ int sub_0205D8A8(struct UnkStruct_0205D3AC_t *param0)
     UnkStruct_0205D4A4 *v0 = (UnkStruct_0205D4A4 *)param0->unk_00;
 
     if (v0->unk_10 < 8) {
-        CellActor_UpdateAnim(v0->unk_0C, FX32_ONE);
+        Sprite_UpdateAnim(v0->unk_0C, FX32_ONE);
         v0->unk_10++;
         return 1;
     }
diff --git a/src/unk_0206A780.c b/src/unk_0206A780.c
index 1fd4861d27..2f7add4f9c 100644
--- a/src/unk_0206A780.c
+++ b/src/unk_0206A780.c
@@ -7,9 +7,9 @@
 
 #include "overlay005/ov5_021D2F14.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_system.h"
 
 static const SpriteTemplate Unk_020EFA04[] = {
@@ -88,17 +88,17 @@ void sub_0206A870(UnkStruct_0206A844 *param0)
 
     for (v0 = 0; v0 < 2; v0++) {
         if (param0->unk_1C8[v0] != NULL) {
-            CellActor_UpdateAnim(param0->unk_1C8[v0]->sprite, FX32_ONE);
+            Sprite_UpdateAnim(param0->unk_1C8[v0]->sprite, FX32_ONE);
         }
     }
 
-    CellActorCollection_Update(param0->unk_00.unk_00);
+    SpriteList_Update(param0->unk_00.unk_00);
 }
 
 void sub_0206A8A0(UnkStruct_0206A844 *param0, s16 param1, s16 param2, s16 param3)
 {
-    Sprite_SetPositionXY2(param0->unk_1C8[0], param1, param2);
-    Sprite_SetPositionXY2(param0->unk_1C8[1], param1, param3);
+    ManagedSprite_SetPositionXY(param0->unk_1C8[0], param1, param2);
+    ManagedSprite_SetPositionXY(param0->unk_1C8[1], param1, param3);
 }
 
 void sub_0206A8C4(UnkStruct_0206A844 *param0, u16 param1, BOOL param2)
@@ -107,5 +107,5 @@ void sub_0206A8C4(UnkStruct_0206A844 *param0, u16 param1, BOOL param2)
         return;
     }
 
-    Sprite_SetDrawFlag2(param0->unk_1C8[param1], param2);
+    ManagedSprite_SetDrawFlag(param0->unk_1C8[param1], param2);
 }
diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c
index 7f33e11d00..75d55f3ecb 100644
--- a/src/unk_0206F314.c
+++ b/src/unk_0206F314.c
@@ -12,7 +12,6 @@
 #include "overlay005/struct_ov5_021D30A8.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "field_task.h"
 #include "font.h"
 #include "game_options.h"
@@ -24,6 +23,7 @@
 #include "render_window.h"
 #include "save_player.h"
 #include "savedata.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -98,7 +98,7 @@ typedef struct {
     Window unk_F4;
     Window unk_104[3];
     UnkStruct_ov5_021D30A8 unk_134;
-    CellActorData *unk_2FC[2];
+    ManagedSprite *unk_2FC[2];
     UnkStruct_0202E8C0 *unk_304;
     UnkStruct_0202EE10 *unk_308[7];
     UnkStruct_02070050 *unk_324;
@@ -345,7 +345,7 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0)
         if (param0->unk_28 > 0) {
             Sound_PlayEffect(1500);
             --param0->unk_28;
-            Sprite_SetPositionXY2(param0->unk_2FC[0], 126, 16 + 16 * param0->unk_28);
+            ManagedSprite_SetPositionXY(param0->unk_2FC[0], 126, 16 + 16 * param0->unk_28);
         }
     }
 
@@ -353,7 +353,7 @@ static int sub_0206F554(UnkStruct_0206F7F8 *param0)
         if (param0->unk_28 < (param0->unk_21 - 1)) {
             Sound_PlayEffect(1500);
             ++param0->unk_28;
-            Sprite_SetPositionXY2(param0->unk_2FC[0], 126, 16 + 16 * param0->unk_28);
+            ManagedSprite_SetPositionXY(param0->unk_2FC[0], 126, 16 + 16 * param0->unk_28);
         }
     }
 
@@ -383,7 +383,7 @@ static int sub_0206F658(UnkStruct_0206F7F8 *param0)
     case 0:
         Window_FillTilemap(&param0->unk_E4, ((15 << 4) | 15));
         param0->unk_1E = Text_AddPrinterWithParamsAndColor(&param0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_68[1], 0, 0, param0->unk_1A, TEXT_COLOR(1, 2, 15), NULL);
-        Sprite_SetExplicitPalette2(param0->unk_2FC[0], 2);
+        ManagedSprite_SetExplicitPalette(param0->unk_2FC[0], 2);
         param0->unk_0C++;
         break;
     case 1:
@@ -407,12 +407,12 @@ static int sub_0206F658(UnkStruct_0206F7F8 *param0)
     case 3:
         param0->unk_328->unk_04 = 0;
         sub_02070050(param0, 1);
-        Sprite_SetExplicitPalette2(param0->unk_2FC[0], 1);
+        ManagedSprite_SetExplicitPalette(param0->unk_2FC[0], 1);
         param0->unk_0C = 0;
         return 6;
     case 0xFF:
         sub_0206FFB4(param0);
-        Sprite_SetExplicitPalette2(param0->unk_2FC[0], 1);
+        ManagedSprite_SetExplicitPalette(param0->unk_2FC[0], 1);
         param0->unk_0C = 0;
         return 6;
     }
@@ -429,7 +429,7 @@ static int sub_0206F748(UnkStruct_0206F7F8 *param0)
         Sound_PlayEffect(1522);
         Window_FillTilemap(&param0->unk_E4, ((15 << 4) | 15));
         param0->unk_1E = Text_AddPrinterWithParamsAndColor(&param0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_68[2], 0, 0, param0->unk_1A, TEXT_COLOR(1, 2, 15), NULL);
-        Sprite_SetExplicitPalette2(param0->unk_2FC[0], 2);
+        ManagedSprite_SetExplicitPalette(param0->unk_2FC[0], 2);
         param0->unk_0C++;
         break;
     case 1:
@@ -446,7 +446,7 @@ static int sub_0206F748(UnkStruct_0206F7F8 *param0)
 
         Sound_PlayEffect(1500);
         sub_0206FFB4(param0);
-        Sprite_SetExplicitPalette2(param0->unk_2FC[0], 1);
+        ManagedSprite_SetExplicitPalette(param0->unk_2FC[0], 1);
         param0->unk_0C = 0;
         return 6;
     }
@@ -655,7 +655,7 @@ static void sub_0206FCC4(UnkStruct_0206F7F8 *param0)
         param0->unk_2FC[v0] = ov5_021D3584(&param0->unk_134, &v2[v0]);
     }
 
-    Sprite_SetDrawFlag2(param0->unk_2FC[1], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[1], 0);
 }
 
 static void sub_0206FD94(UnkStruct_0206F7F8 *param0)
@@ -702,7 +702,7 @@ static void sub_0206FDC0(UnkStruct_0206F7F8 *param0, u16 param1, u16 param2)
     Window_DrawMessageBoxWithScrollCursor(&param0->unk_E4, 1, (1024 - (18 + 12)), 10);
     Window_FillTilemap(&param0->unk_E4, ((15 << 4) | 15));
     Text_AddPrinterWithParamsAndColor(&param0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_10, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL);
-    Sprite_SetDrawFlag2(param0->unk_2FC[0], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[0], 1);
     Bg_ScheduleTilemapTransfer(param0->unk_D0, 3);
 }
 
@@ -713,7 +713,7 @@ static void sub_0206FF10(UnkStruct_0206F7F8 *param0)
     Window_ClearAndCopyToVRAM(&(param0->unk_D4));
     Window_EraseStandardFrame(&(param0->unk_D4), 0);
     Window_Remove(&(param0->unk_D4));
-    Sprite_SetDrawFlag2(param0->unk_2FC[0], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[0], 0);
     Bg_ScheduleTilemapTransfer(param0->unk_D0, 3);
 }
 
@@ -729,7 +729,7 @@ static void sub_0206FF60(ListMenu *param0, u32 param1, u8 param2)
     ListMenu_GetListAndCursorPos(param0, &v0, &v1);
     v2 = ListMenu_GetAttribute(param0, 2);
 
-    Sprite_SetPositionXY2(v3->unk_2FC[0], 126, 16 + 16 * (v1 + v0));
+    ManagedSprite_SetPositionXY(v3->unk_2FC[0], 126, 16 + 16 * (v1 + v0));
 }
 
 static void sub_0206FFB4(UnkStruct_0206F7F8 *param0)
@@ -741,15 +741,15 @@ static void sub_0206FFB4(UnkStruct_0206F7F8 *param0)
 static void sub_0206FFE4(UnkStruct_0206F7F8 *param0)
 {
     sub_0206FFB4(param0);
-    Sprite_SetPositionXY2(param0->unk_2FC[0], 126, 16 + param0->unk_28 * 16);
-    Sprite_SetDrawFlag2(param0->unk_2FC[0], 1);
+    ManagedSprite_SetPositionXY(param0->unk_2FC[0], 126, 16 + param0->unk_28 * 16);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[0], 1);
 }
 
 static void sub_02070010(UnkStruct_0206F7F8 *param0)
 {
     Window_FillTilemap(&param0->unk_E4, ((15 << 4) | 15));
     Text_AddPrinterWithParamsAndColor(&param0->unk_E4, FONT_MESSAGE, param0->unk_2C.unk_50[param0->unk_1F], 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL);
-    Sprite_SetDrawFlag2(param0->unk_2FC[0], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[0], 0);
 }
 
 static void sub_02070050(UnkStruct_0206F7F8 *param0, BOOL param1)
@@ -819,7 +819,7 @@ static void sub_020701DC(UnkStruct_0206F7F8 *param0, u16 param1)
     Window_Add(param0->unk_D0, &param0->unk_D4, 1, 4, 1, 24, 12, 13, 1);
     Window_DrawStandardFrame(&param0->unk_D4, 1, (1024 - (18 + 12) - 9), 11);
     sub_02070050(param0, 0);
-    Sprite_SetDrawFlag2(param0->unk_2FC[1], 1);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[1], 1);
     Window_Add(param0->unk_D0, &param0->unk_F4, 3, 8, 14, 8, 2, 13, ((((1024 - (18 + 12) - 9) - 27 * 4) - 6 * 4) - (8 * 2)));
     Window_FillTilemap(&param0->unk_F4, ((0 << 4) | 0));
     Text_AddPrinterWithParamsAndColor(&param0->unk_F4, FONT_SYSTEM, param0->unk_2C.unk_14, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
@@ -833,8 +833,8 @@ static void sub_02070288(UnkStruct_0206F7F8 *param0)
     Window_Remove(&param0->unk_D4);
     Window_ClearAndCopyToVRAM(&param0->unk_F4);
     Window_Remove(&param0->unk_F4);
-    Sprite_SetDrawFlag2(param0->unk_2FC[0], 0);
-    Sprite_SetDrawFlag2(param0->unk_2FC[1], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[0], 0);
+    ManagedSprite_SetDrawFlag(param0->unk_2FC[1], 0);
 }
 
 static BOOL sub_020702D0(FieldTask *param0)
@@ -852,31 +852,31 @@ static BOOL sub_020702D0(FieldTask *param0)
         break;
     case 2:
         v1->unk_00 = sub_0206F488(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 3:
         v1->unk_00 = sub_0206F498(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 4:
         v1->unk_00 = sub_0206F508(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 5:
         v1->unk_00 = sub_0206F514(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 6:
         v1->unk_00 = sub_0206F554(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 7:
         v1->unk_00 = sub_0206F658(v1->unk_08);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 8:
         v1->unk_00 = sub_0206F748(v2);
-        CellActorCollection_Update(v1->unk_08->unk_134.unk_00);
+        SpriteList_Update(v1->unk_08->unk_134.unk_00);
         break;
     case 9:
         if (!(gSystem.pressedKeys & PAD_BUTTON_A)) {
diff --git a/src/unk_0207C908.c b/src/unk_0207C908.c
index 31e875c30d..7e2e815b19 100644
--- a/src/unk_0207C908.c
+++ b/src/unk_0207C908.c
@@ -139,9 +139,9 @@ void sub_0207CA44(SpriteManager *param0, u32 param1, u32 param2)
     SpriteManager_UnloadAnimObjById(param0, param2);
 }
 
-CellActorData *sub_0207CA58(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3)
+ManagedSprite *sub_0207CA58(SpriteSystem *param0, SpriteManager *param1, int param2, const SpriteTemplate *param3)
 {
-    CellActorData *v0;
+    ManagedSprite *v0;
     SpriteTemplate v1;
 
     v1 = *param3;
@@ -151,7 +151,7 @@ CellActorData *sub_0207CA58(SpriteSystem *param0, SpriteManager *param1, int par
     return v0;
 }
 
-void sub_0207CA88(CellActorData *param0)
+void sub_0207CA88(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
@@ -183,7 +183,7 @@ void sub_0207CAF8(SpriteManager *param0, u32 param1)
     SpriteManager_UnloadCharObjById(param0, param1);
 }
 
-void sub_0207CB00(CellActorData *param0)
+void sub_0207CB00(ManagedSprite *param0)
 {
     Sprite_DeleteAndFreeResources(param0);
 }
diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c
index a3d437f89f..319276b692 100644
--- a/src/unk_0207E0B8.c
+++ b/src/unk_0207E0B8.c
@@ -17,7 +17,6 @@
 
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "game_options.h"
 #include "game_overlay.h"
@@ -33,6 +32,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "strbuf.h"
 #include "string_list.h"
@@ -286,7 +286,7 @@ static int sub_0207E0B8(OverlayManager *param0, int *param1)
     } else if ((v0->unk_5A4->unk_20 == 9) || (v0->unk_5A4->unk_20 == 14)) {
         sub_020826E0(v0, 31, 1);
     } else if ((v0->unk_5A4->unk_20 == 7) || (v0->unk_5A4->unk_20 == 8) || (v0->unk_5A4->unk_20 == 11) || (v0->unk_5A4->unk_20 == 12)) {
-        Sprite_SetExplicitPalette(v0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(v0->unk_5B0[6], 1);
     } else if ((v0->unk_5A4->unk_20 == 2) || (v0->unk_5A4->unk_20 == 17)) {
         sub_020826E0(v0, 34, 1);
     } else if (v0->unk_5A4->unk_20 == 15) {
@@ -300,7 +300,7 @@ static int sub_0207E0B8(OverlayManager *param0, int *param1)
     } else if (v0->unk_5A4->unk_20 != 10) {
         sub_020826E0(v0, 29, 1);
     } else {
-        Sprite_SetExplicitPalette(v0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(v0->unk_5B0[6], 1);
     }
 
     sub_02081BC0(v0);
@@ -509,7 +509,7 @@ static int sub_0207E518(GameWindowLayout *param0)
             param0->unk_5A4->unk_23 = 1;
             return 32;
         } else {
-            Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+            Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
             return sub_02084780(param0);
         }
     }
@@ -522,7 +522,7 @@ static int sub_0207E5B4(GameWindowLayout *param0)
     u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         return ApplyItemEffectOnPokemon(param0);
     } else if (v0 == 3) {
         param0->unk_5A4->unk_23 = 0;
@@ -537,7 +537,7 @@ static int sub_0207E5F4(GameWindowLayout *param0)
     u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         return ProcessItemApplication(param0);
     } else if (v0 == 3) {
         param0->unk_5A4->unk_23 = 0;
@@ -561,7 +561,7 @@ static int sub_0207E634(GameWindowLayout *param0)
         Menu_Free(param0->unk_700, NULL);
         StringList_Free(param0->unk_6FC);
         sub_020826E0(param0, 29, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         return 1;
     default: {
         UnkFuncPtr_0207E634 v1;
@@ -619,7 +619,7 @@ static int sub_0207E750(GameWindowLayout *param0)
     u8 v0 = HandleSpecialInput(param0);
 
     if ((v0 == 0) || (v0 == 2)) {
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
         if (param0->unk_704[param0->unk_B11].unk_10 != 1) {
             return sub_0208615C(param0);
@@ -1004,8 +1004,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)) {
-        CellActor_SetDrawFlag(param0->unk_5B0[8], 0);
-        CellActor_SetAnim(param0->unk_5B0[9], 0);
+        Sprite_SetDrawFlag(param0->unk_5B0[8], 0);
+        Sprite_SetAnim(param0->unk_5B0[9], 0);
 
         {
             s16 v1, v2;
@@ -1018,7 +1018,7 @@ static void sub_0207EE14(GameWindowLayout *param0)
     }
 
     if ((param0->unk_5A4->unk_20 == 4) || (param0->unk_5A4->unk_20 == 21)) {
-        CellActor_SetDrawFlag(param0->unk_5B0[9], 0);
+        Sprite_SetDrawFlag(param0->unk_5B0[9], 0);
         v0 ^= 2;
     }
 
@@ -1390,7 +1390,7 @@ static void sub_0207F9A0(GameWindowLayout *param0)
     u8 v0, v1;
 
     sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-    CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
     Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
 }
 
@@ -1458,10 +1458,10 @@ static u8 sub_0207FA24(GameWindowLayout *param0)
 
     if ((v0 != param0->unk_B11) && (v0 != 0xff)) {
         if ((v0 == 6) || (v0 == 7)) {
-            CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
+            Sprite_SetDrawFlag(param0->unk_5B0[6], 0);
         } else {
-            CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
-            CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
+            Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, v0));
+            Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
             Sprite_SetPositionXY(param0->unk_5B0[6], v2, v3);
         }
 
@@ -1548,8 +1548,8 @@ static u8 sub_0207FC94(GameWindowLayout *param0)
         }
 
         sub_0201E028(param0->unk_7F4, &v1, &v2, NULL, NULL, param0->unk_B11, 4);
-        CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
-        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
+        Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B11));
+        Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
         Sprite_SetPositionXY(param0->unk_5B0[6], v1, v2);
 
         param0->unk_B0C = 1;
@@ -1570,13 +1570,13 @@ static u8 sub_0207FC94(GameWindowLayout *param0)
 void sub_0207FD68(GameWindowLayout *param0, u8 param1)
 {
     if ((param1 == 6) || (param1 == 7)) {
-        CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
+        Sprite_SetDrawFlag(param0->unk_5B0[6], 0);
     } else {
         u8 v0, v1;
 
         sub_0201E028(param0->unk_7F4, &v0, &v1, NULL, NULL, param0->unk_B11, 4);
-        CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
+        Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+        Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
         Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
     }
 
@@ -1725,7 +1725,7 @@ static void sub_0207FFC8(GameWindowLayout *param0)
     Heap_FreeToHeapExplicit(12, v0);
     sub_02081E08(param0);
     sub_020826F4(param0, 0xffffffff, 1);
-    Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 }
 
 static u8 sub_020800B4(GameWindowLayout *param0, u8 *param1)
@@ -1979,7 +1979,7 @@ u8 sub_02080488(GameWindowLayout *param0, u8 param1)
 static void sub_02080500(GameWindowLayout *param0, u8 param1, u8 param2)
 {
     if (param1 == 6) {
-        u8 v0 = CellActor_GetActiveAnim(param0->unk_5B0[8]);
+        u8 v0 = Sprite_GetActiveAnim(param0->unk_5B0[8]);
 
         if (param2 == 0) {
             v0 = (v0 & 2);
@@ -1987,12 +1987,12 @@ static void sub_02080500(GameWindowLayout *param0, u8 param1, u8 param2)
             v0 = (v0 & 2) + 1;
         }
 
-        CellActor_SetAnim(param0->unk_5B0[8], v0);
+        Sprite_SetAnim(param0->unk_5B0[8], v0);
         return;
     }
 
     if (param1 == 7) {
-        u8 v1 = CellActor_GetActiveAnim(param0->unk_5B0[9]);
+        u8 v1 = Sprite_GetActiveAnim(param0->unk_5B0[9]);
 
         if (param2 == 0) {
             v1 = (v1 & 2);
@@ -2000,7 +2000,7 @@ static void sub_02080500(GameWindowLayout *param0, u8 param1, u8 param2)
             v1 = (v1 & 2) + 1;
         }
 
-        CellActor_SetAnim(param0->unk_5B0[9], v1);
+        Sprite_SetAnim(param0->unk_5B0[9], v1);
         return;
     }
 
@@ -2008,12 +2008,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;
 
-        CellActor_SetAnim(param0->unk_5B0[0 + param1], 0);
+        Sprite_SetAnim(param0->unk_5B0[0 + param1], 0);
     } else {
         param0->unk_704[param1].unk_16 += 2;
         param0->unk_704[param1].unk_18 += 2;
 
-        CellActor_SetAnim(param0->unk_5B0[0 + param1], 1);
+        Sprite_SetAnim(param0->unk_5B0[0 + param1], 1);
     }
 
     sub_0207F8F8(param0, param1);
@@ -2334,7 +2334,7 @@ static u8 HandleWindowInputEvent(GameWindowLayout *param0, int *param1)
             sub_020826E0(param0, 29, 1);
         }
 
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         return 1;
     default: {
         UnkFuncPtr_0207E634 v1 = (UnkFuncPtr_0207E634)v0;
@@ -2371,7 +2371,7 @@ static int ProcessWindowInput(GameWindowLayout *param0)
                 switch (CheckPokemonCondition(param0)) {
                 case 0:
                     Sound_PlayEffect(1516);
-                    Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+                    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
                     if (param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06 < param0->unk_B14[0]) {
                         param0->unk_B14[0] = param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06;
@@ -2405,7 +2405,7 @@ static int ProcessWindowInput(GameWindowLayout *param0)
                 switch (CheckPokemonCondition(param0)) {
                 case 0:
                     Sound_PlayEffect(1516);
-                    Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+                    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
 
                     if (param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06 < param0->unk_B14[0]) {
                         param0->unk_B14[0] = param0->unk_704[param0->unk_B11].unk_08 - param0->unk_704[param0->unk_B11].unk_06;
@@ -2428,7 +2428,7 @@ static int ProcessWindowInput(GameWindowLayout *param0)
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Sound_PlayEffect(1500);
             Window_EraseMessageBox(&param0->unk_04[34], 1);
-            Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+            Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
             sub_020826E0(param0, 36, 1);
             param0->unk_B14[1] = 0;
         }
@@ -2468,7 +2468,7 @@ static int ProcessWindowInput(GameWindowLayout *param0)
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Sound_PlayEffect(1500);
             Window_EraseMessageBox(&param0->unk_04[34], 1);
-            Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+            Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
             sub_02083B88(param0);
             return 1;
         }
@@ -2485,7 +2485,7 @@ static u8 CheckPokemonCondition(GameWindowLayout *param0)
     }
 
     if ((param0->unk_B11 == param0->unk_B0F_0) || (param0->unk_704[param0->unk_B11].unk_06 == 0) || (param0->unk_704[param0->unk_B11].unk_06 == param0->unk_704[param0->unk_B11].unk_08)) {
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
         sub_02082708(param0, 131, 1);
 
         param0->unk_B14[1] = 1;
@@ -2831,7 +2831,7 @@ static int ResetWindowOnInput(GameWindowLayout *param0)
     if (param0->unk_5A4->unk_20 == 10) {
         Window_EraseMessageBox(&param0->unk_04[34], 1);
         sub_020826E0(param0, 29, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         param0->unk_5A4->unk_20 = 0;
         return 1;
     }
@@ -2889,7 +2889,7 @@ static int CheckForItemApplication(GameWindowLayout *param0)
         return 32;
     }
 
-    Sprite_SetExplicitPalette(param0->unk_5B0[6], 1);
+    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 1);
     sub_02082708(param0, 195, 1);
     param0->unk_B04.unk_00 = sub_02083A78;
     param0->unk_B04.unk_04 = sub_02083AA4;
diff --git a/src/unk_02082C2C.c b/src/unk_02082C2C.c
index 5c5ede1464..77813a61ea 100644
--- a/src/unk_02082C2C.c
+++ b/src/unk_02082C2C.c
@@ -6,7 +6,6 @@
 #include "struct_defs/struct_0207F248.h"
 #include "struct_defs/struct_020831B4.h"
 
-#include "cell_actor.h"
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
@@ -15,6 +14,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "pokemon_icon.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "sprite_util.h"
 #include "unk_0201E010.h"
@@ -115,7 +115,7 @@ void sub_02082DA8(GameWindowLayout *param0, u8 param1)
     v2 = Pokemon_GetValue(v0, MON_DATA_SPECIES, NULL);
     v3 = Pokemon_GetValue(v0, MON_DATA_FORM, NULL);
     v1 = NARC_ctor(NARC_INDEX_POKETOOL__ICONGRA__PL_POKE_ICON, 12);
-    v4 = NNS_G2dGetImageLocation(SpriteActor_ImageProxy(param0->unk_704[param1].unk_24), NNS_G2D_VRAM_TYPE_2DMAIN);
+    v4 = NNS_G2dGetImageLocation(Sprite_GetImageProxy(param0->unk_704[param1].unk_24), NNS_G2D_VRAM_TYPE_2DMAIN);
     v5 = LoadMemberFromOpenNARC(v1, Pokemon_IconSpriteIndex(v0), 0, 12, 1);
     v7 = NNS_G2dGetUnpackedCharacterData(v5, &v6);
 
@@ -125,7 +125,7 @@ void sub_02082DA8(GameWindowLayout *param0, u8 param1)
     }
 
     Heap_FreeToHeap(v5);
-    Sprite_SetExplicitPalette(param0->unk_704[param1].unk_24, PokeIconPaletteIndex(v2, v3, 0) + 3);
+    Sprite_SetExplicitPalette2(param0->unk_704[param1].unk_24, PokeIconPaletteIndex(v2, v3, 0) + 3);
     NARC_dtor(v1);
 }
 
@@ -169,13 +169,13 @@ void sub_02082E58(GameWindowLayout *param0)
         param0->unk_5B0[10 + v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[4 + v0]);
         param0->unk_704[v0].unk_1A = Unk_020F20C0[4 + v0].x;
         param0->unk_704[v0].unk_1C = Unk_020F20C0[4 + v0].y;
-        CellActor_SetDrawFlag(param0->unk_5B0[10 + v0], 0);
+        Sprite_SetDrawFlag(param0->unk_5B0[10 + v0], 0);
         param0->unk_5B0[16 + v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[10 + v0]);
         param0->unk_5B0[22 + v0] = SpriteSystem_NewSpriteFromResourceHeader(param0->unk_5A8, param0->unk_5AC, &Unk_020F20C0[16 + v0]);
     }
 
-    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
-    CellActor_SetDrawFlag(param0->unk_5B0[28], 0);
+    Sprite_SetDrawFlag(param0->unk_5B0[7], 0);
+    Sprite_SetDrawFlag(param0->unk_5B0[28], 0);
 }
 
 void sub_02082FAC(GameWindowLayout *param0, u8 param1, u16 param2, u16 param3)
@@ -206,46 +206,46 @@ void sub_02082FF4(GameWindowLayout *param0)
 
 void sub_02083014(GameWindowLayout *param0, u8 param1, u8 param2)
 {
-    CellActor **v0 = &param0->unk_5B0[10 + param1];
+    Sprite **v0 = &param0->unk_5B0[10 + param1];
 
     if (param2 == 7) {
-        CellActor_SetDrawFlag(*v0, 0);
+        Sprite_SetDrawFlag(*v0, 0);
         return;
     }
 
-    CellActor_SetAnim(*v0, param2);
-    CellActor_SetDrawFlag(*v0, 1);
+    Sprite_SetAnim(*v0, param2);
+    Sprite_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083040(GameWindowLayout *param0, u8 param1, u16 param2)
 {
-    CellActor **v0 = &param0->unk_5B0[16 + param1];
+    Sprite **v0 = &param0->unk_5B0[16 + param1];
 
     if (param2 == 0) {
-        CellActor_SetDrawFlag(*v0, 0);
+        Sprite_SetDrawFlag(*v0, 0);
         return;
     }
 
     if (Item_IsMail(param2) == 1) {
-        CellActor_SetAnim(*v0, 1);
+        Sprite_SetAnim(*v0, 1);
     } else {
-        CellActor_SetAnim(*v0, 0);
+        Sprite_SetAnim(*v0, 0);
     }
 
-    CellActor_SetDrawFlag(*v0, 1);
+    Sprite_SetDrawFlag(*v0, 1);
 }
 
 void sub_02083080(GameWindowLayout *param0, u8 param1)
 {
-    CellActor **v0 = &param0->unk_5B0[16 + param1];
+    Sprite **v0 = &param0->unk_5B0[16 + param1];
 
-    CellActor_SetAnim(*v0, 1);
-    CellActor_SetDrawFlag(*v0, 1);
+    Sprite_SetAnim(*v0, 1);
+    Sprite_SetDrawFlag(*v0, 1);
 }
 
 void sub_020830A0(GameWindowLayout *param0, u8 param1, s16 param2, s16 param3)
 {
-    CellActor **v0 = &param0->unk_5B0[16 + param1];
+    Sprite **v0 = &param0->unk_5B0[16 + param1];
 
     param0->unk_704[param1].unk_1E = param2 + 8;
     param0->unk_704[param1].unk_20 = param3 + 8;
@@ -260,24 +260,24 @@ void sub_020830D4(GameWindowLayout *param0, u8 param1)
 
 void sub_02083104(GameWindowLayout *param0, u8 param1)
 {
-    CellActor **v0 = &param0->unk_5B0[22 + param1];
+    Sprite **v0 = &param0->unk_5B0[22 + param1];
 
     if (param0->unk_704[param1].unk_12 == 0) {
-        CellActor_SetDrawFlag(*v0, 0);
+        Sprite_SetDrawFlag(*v0, 0);
         return;
     }
 
-    CellActor_SetDrawFlag(*v0, 1);
+    Sprite_SetDrawFlag(*v0, 1);
 }
 
-static void sub_02083138(CellActor *param0, u8 param1)
+static void sub_02083138(Sprite *param0, u8 param1)
 {
-    if (CellActor_GetActiveAnim(param0) == param1) {
+    if (Sprite_GetActiveAnim(param0) == param1) {
         return;
     }
 
-    SpriteActor_SetAnimFrame(param0, 0);
-    CellActor_SetAnim(param0, param1);
+    Sprite_SetAnimFrame(param0, 0);
+    Sprite_SetAnim(param0, param1);
 }
 
 static u8 sub_02083158(StrBufWrapper *param0)
@@ -324,10 +324,10 @@ void sub_020831B4(GameWindowLayout *param0)
         }
 
         sub_02083138(v0->unk_24, v2);
-        CellActor_UpdateAnim(v0->unk_24, FX32_ONE);
+        Sprite_UpdateAnim(v0->unk_24, FX32_ONE);
 
         if ((param0->unk_B11 == v1) && (v2 != 0) && (v2 != 5)) {
-            if (CellActor_GetAnimFrame(v0->unk_24) == 0) {
+            if (Sprite_GetAnimFrame(v0->unk_24) == 0) {
                 Sprite_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 - 3);
             } else {
                 Sprite_SetPositionXY(v0->unk_24, v0->unk_16, v0->unk_18 + 1);
@@ -345,10 +345,10 @@ void sub_0208327C(GameWindowLayout *param0, u8 param1, u8 param2)
     u8 v0, v1;
 
     sub_0201E010(&param0->unk_7F4[param1], &v0, &v1);
-    CellActor_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
-    CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
+    Sprite_SetAnim(param0->unk_5B0[6], sub_020805D0(param0->unk_5A4->unk_21, param1));
+    Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
     Sprite_SetPositionXY(param0->unk_5B0[6], v0, v1);
-    Sprite_SetExplicitPalette(param0->unk_5B0[6], param2);
+    Sprite_SetExplicitPalette2(param0->unk_5B0[6], param2);
 }
 
 void sub_020832E4(GameWindowLayout *param0, s16 param1, s16 param2)
@@ -360,19 +360,19 @@ void sub_020832E4(GameWindowLayout *param0, s16 param1, s16 param2)
     v0.y += (256 * FX32_ONE);
     v0.z = 0;
 
-    CellActor_SetPosition(param0->unk_5B0[28], &v0);
-    CellActor_SetDrawFlag(param0->unk_5B0[28], 1);
-    SpriteActor_SetAnimFrame(param0->unk_5B0[28], 0);
-    CellActor_SetAnim(param0->unk_5B0[28], 0);
+    Sprite_SetPosition(param0->unk_5B0[28], &v0);
+    Sprite_SetDrawFlag(param0->unk_5B0[28], 1);
+    Sprite_SetAnimFrame(param0->unk_5B0[28], 0);
+    Sprite_SetAnim(param0->unk_5B0[28], 0);
 }
 
 void sub_02083334(GameWindowLayout *param0)
 {
-    if (CellActor_GetDrawFlag(param0->unk_5B0[28]) == 1) {
-        CellActor_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
+    if (Sprite_GetDrawFlag(param0->unk_5B0[28]) == 1) {
+        Sprite_UpdateAnim(param0->unk_5B0[28], FX32_ONE);
 
-        if (CellActor_GetAnimFrame(param0->unk_5B0[28]) == 2) {
-            CellActor_SetDrawFlag(param0->unk_5B0[28], 0);
+        if (Sprite_GetAnimFrame(param0->unk_5B0[28]) == 2) {
+            Sprite_SetDrawFlag(param0->unk_5B0[28], 0);
         }
     }
 }
diff --git a/src/unk_02083370.c b/src/unk_02083370.c
index 67a886cf7e..b79a200852 100644
--- a/src/unk_02083370.c
+++ b/src/unk_02083370.c
@@ -15,7 +15,6 @@
 
 #include "bag.h"
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "font.h"
 #include "heap.h"
 #include "menu.h"
@@ -23,6 +22,7 @@
 #include "party.h"
 #include "pokemon.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_system.h"
 #include "string_list.h"
 #include "string_template.h"
@@ -221,7 +221,7 @@ int sub_02083658(GameWindowLayout *param0)
         if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
             Window_EraseMessageBox(&param0->unk_04[34], 1);
             sub_020826E0(param0, 29, 1);
-            Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+            Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
             return 1;
         }
     }
@@ -370,7 +370,7 @@ static int sub_02083990(void *param0)
 
     Window_EraseMessageBox(&v0->unk_04[34], 1);
     sub_020826E0(v0, 29, 1);
-    Sprite_SetExplicitPalette(v0->unk_5B0[6], 0);
+    Sprite_SetExplicitPalette2(v0->unk_5B0[6], 0);
 
     return 1;
 }
@@ -380,7 +380,7 @@ int sub_020839BC(GameWindowLayout *param0)
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         Window_EraseMessageBox(&param0->unk_04[34], 1);
         sub_020826E0(param0, 29, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         return 1;
     }
 
@@ -426,7 +426,7 @@ int sub_02083AA4(void *param0)
 
     Window_EraseMessageBox(&v0->unk_04[34], 1);
     sub_020826E0(v0, 29, 1);
-    Sprite_SetExplicitPalette(v0->unk_5B0[6], 0);
+    Sprite_SetExplicitPalette2(v0->unk_5B0[6], 0);
 
     return 1;
 }
@@ -438,11 +438,11 @@ static void sub_02083AD0(GameWindowLayout *param0, int *param1)
     param0->unk_B0F_6 = 1;
     param0->unk_B0F_0 = param0->unk_B11;
 
-    Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
     Sprite_GetPositionXY(param0->unk_5B0[6], &v0, &v1);
     Sprite_SetPositionXY(param0->unk_5B0[7], v0, v1);
-    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);
+    Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+    Sprite_SetDrawFlag(param0->unk_5B0[7], 1);
     sub_0207F8F8(param0, param0->unk_B0F_0);
     Window_EraseMessageBox(&param0->unk_04[33], 1);
     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;
-    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
+    Sprite_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);
     }
 
-    CellActor_SetDrawFlag(param0->unk_5B0[6], 0);
-    CellActor_SetDrawFlag(param0->unk_5B0[7], 0);
+    Sprite_SetDrawFlag(param0->unk_5B0[6], 0);
+    Sprite_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]);
-        CellActor_SetDrawFlag(param0->unk_5B0[6], 1);
+        Sprite_SetDrawFlag(param0->unk_5B0[6], 1);
 
         v0->unk_304 = 0;
         param0->unk_B0F_6 = 0;
@@ -623,7 +623,7 @@ static void sub_02084134(GameWindowLayout *param0)
 {
     StrBufWrapper *v0;
     DualArrayShortData *v1;
-    CellActorData *v2;
+    ManagedSprite *v2;
     s16 v3;
 
     v1 = &param0->unk_7F8;
@@ -727,7 +727,7 @@ static void sub_020844B0(GameWindowLayout *param0, int *param1)
 
         sub_02082508(param0, param0->unk_B11);
         sub_020826E0(param0, 34, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
 
         if (v0 == param0->unk_5A4->unk_32_4 - 1) {
             sub_0207FD68(param0, 6);
@@ -764,7 +764,7 @@ int sub_020845A8(GameWindowLayout *param0)
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         Window_EraseMessageBox(&param0->unk_04[34], 1);
         sub_020826E0(param0, 34, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         return 1;
     }
 
@@ -798,7 +798,7 @@ static void sub_020845E8(GameWindowLayout *param0, int *param1)
     Window_EraseMessageBox(&param0->unk_04[33], 1);
     sub_0208337C(param0);
     sub_020826E0(param0, 29, 1);
-    Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+    Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
 
     *param1 = 1;
 }
@@ -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);
-        CellActor_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
+        Sprite_SetDrawFlag(param0->unk_5B0[22 + param0->unk_B11], 1);
     } else {
         MessageLoader_GetStrbuf(param0->unk_69C, 130, param0->unk_6A4);
         param0->unk_B11 = 7;
@@ -1017,11 +1017,11 @@ static int sub_02084A18(GameWindowLayout *param0)
         param0->unk_B0F_6 = 1;
         param0->unk_B0F_0 = param0->unk_B11;
 
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         Sprite_GetPositionXY(param0->unk_5B0[6], &v0, &v1);
         Sprite_SetPositionXY(param0->unk_5B0[7], v0, v1);
-        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);
+        Sprite_SetAnim(param0->unk_5B0[7], sub_020805D0(param0->unk_5A4->unk_21, param0->unk_B0F_0) + 2);
+        Sprite_SetDrawFlag(param0->unk_5B0[7], 1);
         sub_0207F8F8(param0, param0->unk_B0F_0);
         sub_020826E0(param0, 36, 1);
 
@@ -1035,7 +1035,7 @@ int sub_02084B34(GameWindowLayout *param0)
     if (gSystem.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
         Window_EraseMessageBox(&param0->unk_04[34], 1);
         sub_020826E0(param0, 29, 1);
-        Sprite_SetExplicitPalette(param0->unk_5B0[6], 0);
+        Sprite_SetExplicitPalette2(param0->unk_5B0[6], 0);
         return 1;
     }
 
diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c
index 4d430eb04b..8d2d2bf643 100644
--- a/src/unk_0208694C.c
+++ b/src/unk_0208694C.c
@@ -10,7 +10,6 @@
 #include "struct_defs/struct_02099F80.h"
 
 #include "bg_window.h"
-#include "cell_actor.h"
 #include "char_transfer.h"
 #include "charcode_util.h"
 #include "font.h"
@@ -28,6 +27,7 @@
 #include "pokemon_icon.h"
 #include "render_oam.h"
 #include "render_window.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_transfer.h"
 #include "sprite_util.h"
@@ -83,15 +83,15 @@ struct UnkStruct_02087A10_t {
     Strbuf *unk_17C;
     Strbuf *unk_180;
     Strbuf *unk_184;
-    CellActorCollection *unk_188;
+    SpriteList *unk_188;
     G2dRenderer unk_18C;
     SpriteResourceCollection *unk_318[4];
     SpriteResource *unk_328[2][4];
-    CellActorResourceData unk_348;
-    CellActorResourceData unk_36C;
-    CellActor *unk_390[14];
-    CellActor *unk_3C8[12];
-    CellActor *unk_3F8[2];
+    SpriteResourcesHeader unk_348;
+    SpriteResourcesHeader unk_36C;
+    Sprite *unk_390[14];
+    Sprite *unk_3C8[12];
+    Sprite *unk_3F8[2];
     SysTask *unk_400[7];
     Window unk_41C[10];
     int unk_4BC;
@@ -117,14 +117,14 @@ struct UnkStruct_02087A10_t {
 };
 
 typedef struct {
-    CellActor *unk_00;
-    CellActor *unk_04;
+    Sprite *unk_00;
+    Sprite *unk_04;
     int unk_08;
     int unk_0C;
 } UnkStruct_020879DC;
 
 typedef struct {
-    CellActor *unk_00;
+    Sprite *unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;
@@ -149,7 +149,7 @@ static void sub_020871CC(void);
 static void sub_020871EC(BgConfig *param0);
 static void sub_0208765C(BgConfig *param0, Window *param1);
 static void sub_0208769C(UnkStruct_02087A10 *param0, NARC *param1);
-static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7);
+static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], Sprite **param6, void *param7);
 static void sub_0208737C(UnkStruct_02087A10 *param0, OverlayManager *param1);
 static void sub_02088240(BgConfig *param0, int param1, VecFx32 param2[]);
 static void sub_02088260(VecFx32 param0[], int param1);
@@ -166,17 +166,17 @@ static void sub_02088754(Window *param0, u16 *param1, int param2, u16 *param3, u
 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(CellActor **param0, int param1, int param2);
+static void sub_02088E1C(Sprite **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, TextColor param3, u8 *param4);
 static void sub_02088454(UnkStruct_02087A10 *param0, int param1);
-static void sub_02088F40(int param0[], CellActor **param1, int param2);
+static void sub_02088F40(int param0[], Sprite **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);
 static void sub_0208732C(int param0);
 static void sub_02087544(UnkStruct_02087A10 *param0, OverlayManager *param1);
-static void sub_02087BE4(UnkStruct_02087A10 *param0, CellActorInitParamsEx *param1);
+static void sub_02087BE4(UnkStruct_02087A10 *param0, AffineSpriteListTemplate *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);
@@ -1013,7 +1013,7 @@ static int sub_02086B64(OverlayManager *param0, int *param1)
         break;
     }
 
-    CellActorCollection_Update(v0->unk_188);
+    SpriteList_Update(v0->unk_188);
 
     return 0;
 }
@@ -1023,8 +1023,8 @@ static int sub_02086D38(UnkStruct_02087A10 *param0, int param1)
     sub_02088350(param0);
 
     if (gSystem.pressedKeys & PAD_BUTTON_SELECT) {
-        if (CellActor_GetDrawFlag(param0->unk_390[8]) == 0) {
-            CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        if (Sprite_GetDrawFlag(param0->unk_390[8]) == 0) {
+            Sprite_SetDrawFlag(param0->unk_390[8], 1);
             return param1;
         }
 
@@ -1148,7 +1148,7 @@ static int sub_02086F3C(OverlayManager *param0, int *param1)
         SpriteResourceCollection_Delete(v0->unk_318[v2]);
     }
 
-    CellActorCollection_Delete(v0->unk_188);
+    SpriteList_Delete(v0->unk_188);
     RenderOam_Free();
     Heap_FreeToHeapExplicit(18, v0->unk_510);
 
@@ -1576,12 +1576,12 @@ static void sub_020879DC(SysTask *param0, void *param1)
     VecFx32 v1;
     UnkStruct_020879DC *v2 = (UnkStruct_020879DC *)param1;
 
-    v0 = CellActor_GetPosition(v2->unk_00);
+    v0 = Sprite_GetPosition(v2->unk_00);
     v1.x = v0->x + v2->unk_08;
     v1.y = FX32_ONE * Unk_020F2984[v2->unk_0C][1];
     v1.z = 0;
 
-    CellActor_SetPosition(v2->unk_04, &v1);
+    Sprite_SetPosition(v2->unk_04, &v1);
 }
 
 static void sub_02087A10(UnkStruct_02087A10 *param0)
@@ -1592,9 +1592,9 @@ static void sub_02087A10(UnkStruct_02087A10 *param0)
     SpriteResourcesHeader_Init(&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);
 
     {
-        CellActorInitParamsEx v1;
+        AffineSpriteListTemplate v1;
 
-        v1.collection = param0->unk_188;
+        v1.list = param0->unk_188;
         v1.resourceData = &param0->unk_348;
         v1.position.x = FX32_CONST(32);
         v1.position.y = FX32_CONST(96);
@@ -1611,15 +1611,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_390[v0] = SpriteList_AddEx(&v1);
 
-            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]);
+            Sprite_SetAnimateFlag(param0->unk_390[v0], 1);
+            Sprite_SetAnim(param0->unk_390[v0], Unk_020F2984[v0][2]);
+            Sprite_SetPriority(param0->unk_390[v0], Unk_020F2984[v0][3]);
         }
 
-        CellActor_SetDrawFlag(param0->unk_390[4], 0);
-        CellActor_SetDrawFlag(param0->unk_390[8], 0);
+        Sprite_SetDrawFlag(param0->unk_390[4], 0);
+        Sprite_SetDrawFlag(param0->unk_390[8], 0);
 
         for (v0 = 0; v0 < 7; v0++) {
             UnkStruct_020879DC *v2;
@@ -1636,10 +1636,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] = CellActorCollection_AddEx(&v1);
+            param0->unk_3C8[v0] = SpriteList_AddEx(&v1);
 
-            CellActor_SetAnimateFlag(param0->unk_3C8[v0], 1);
-            CellActor_SetAnim(param0->unk_3C8[v0], 43);
+            Sprite_SetAnimateFlag(param0->unk_3C8[v0], 1);
+            Sprite_SetAnim(param0->unk_3C8[v0], 43);
         }
 
         sub_02088E1C(param0->unk_3C8, param0->unk_158, param0->unk_0C);
@@ -1650,50 +1650,50 @@ static void sub_02087A10(UnkStruct_02087A10 *param0)
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_OBJ, 1);
 }
 
-static void sub_02087BE4(UnkStruct_02087A10 *param0, CellActorInitParamsEx *param1)
+static void sub_02087BE4(UnkStruct_02087A10 *param0, AffineSpriteListTemplate *param1)
 {
     param1->position.x = FX32_ONE * 24;
     param1->position.y = FX32_ONE * (16 - 8);
-    param0->unk_3F8[0] = CellActorCollection_AddEx(param1);
+    param0->unk_3F8[0] = SpriteList_AddEx(param1);
 
-    CellActor_SetAnimateFlag(param0->unk_3F8[0], 1);
+    Sprite_SetAnimateFlag(param0->unk_3F8[0], 1);
 
     switch (param0->unk_00) {
     case 0:
         if (param0->unk_04 == 0) {
-            CellActor_SetAnim(param0->unk_3F8[0], 48);
+            Sprite_SetAnim(param0->unk_3F8[0], 48);
         } else {
-            CellActor_SetAnim(param0->unk_3F8[0], 49);
+            Sprite_SetAnim(param0->unk_3F8[0], 49);
         }
         break;
     case 3:
-        CellActor_SetAnim(param0->unk_3F8[0], 51);
+        Sprite_SetAnim(param0->unk_3F8[0], 51);
         break;
     case 6:
-        CellActor_SetAnim(param0->unk_3F8[0], 55);
+        Sprite_SetAnim(param0->unk_3F8[0], 55);
         break;
     case 5:
-        CellActor_SetAnim(param0->unk_3F8[0], 54);
+        Sprite_SetAnim(param0->unk_3F8[0], 54);
         break;
     case 4:
     case 7:
-        CellActor_SetAnim(param0->unk_3F8[0], 53);
+        Sprite_SetAnim(param0->unk_3F8[0], 53);
         break;
     case 2:
-        CellActor_SetAnim(param0->unk_3F8[0], 47);
+        Sprite_SetAnim(param0->unk_3F8[0], 47);
         break;
     case 1:
-        CellActor_SetAnim(param0->unk_3F8[0], 50);
+        Sprite_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] = CellActorCollection_AddEx(param1);
+            param0->unk_3F8[1] = SpriteList_AddEx(param1);
 
             if (param0->unk_10 == 0) {
-                CellActor_SetAnim(param0->unk_3F8[1], 45);
+                Sprite_SetAnim(param0->unk_3F8[1], 45);
             } else {
-                CellActor_SetAnim(param0->unk_3F8[1], 46);
+                Sprite_SetAnim(param0->unk_3F8[1], 46);
             }
         }
         break;
@@ -1711,19 +1711,19 @@ static void sub_02087CDC(SysTask *param0, void *param1)
     switch (v0->unk_04) {
     case 0:
         v1.x = v0->unk_08 + 4 * FX32_ONE;
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
         break;
     case 2:
         v1.x = v0->unk_08 - 3 * FX32_ONE;
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
         break;
     case 4:
         v1.x = v0->unk_08 + 2 * FX32_ONE;
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
         break;
     case 6:
         v1.x = v0->unk_08;
-        CellActor_SetPosition(v0->unk_00, &v1);
+        Sprite_SetPosition(v0->unk_00, &v1);
         SysTask_FinishAndFreeParam(param0);
         break;
     }
@@ -1731,7 +1731,7 @@ static void sub_02087CDC(SysTask *param0, void *param1)
     v0->unk_04++;
 }
 
-static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], CellActor **param6, void *param7)
+static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int param3, int *param4, VecFx32 param5[], Sprite **param6, void *param7)
 {
     int v0 = *param4;
     int v1 = v0 ^ 1;
@@ -1762,8 +1762,8 @@ static void sub_02087D64(BgConfig *param0, Window *param1, int *param2, int para
             v4 = SysTask_GetParam(v5);
             v4->unk_00 = param6[7];
             v4->unk_04 = 0;
-            v4->unk_08 = CellActor_GetPosition(param6[7])->x;
-            v4->unk_0C = CellActor_GetPosition(param6[7])->y;
+            v4->unk_08 = Sprite_GetPosition(param6[7])->x;
+            v4->unk_0C = Sprite_GetPosition(param6[7])->y;
 
             param5[v0].x = -11;
             (*param2)++;
@@ -1949,41 +1949,41 @@ static void sub_02088350(UnkStruct_02087A10 *param0)
     int v1 = 0;
     BOOL v2 = 0;
 
-    if (CellActor_GetDrawFlag(param0->unk_390[8]) == 0) {
+    if (Sprite_GetDrawFlag(param0->unk_390[8]) == 0) {
         v2 = 1;
     }
 
     if (gSystem.pressedKeysRepeatable & PAD_KEY_UP) {
         Sound_PlayEffect(1500);
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 1;
         v0++;
     }
 
     if (gSystem.pressedKeysRepeatable & PAD_KEY_DOWN) {
         Sound_PlayEffect(1500);
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 2;
         v0++;
     }
 
     if (gSystem.pressedKeysRepeatable & PAD_KEY_LEFT) {
         Sound_PlayEffect(1500);
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 3;
         v0++;
     }
 
     if (gSystem.pressedKeysRepeatable & PAD_KEY_RIGHT) {
         Sound_PlayEffect(1500);
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         v1 = 4;
         v0++;
     }
 
     if (gSystem.pressedKeys & PAD_BUTTON_START) {
         Sound_PlayEffect(1500);
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         param0->unk_1C.unk_00 = 12;
         param0->unk_1C.unk_04 = 0;
         v0++;
@@ -2013,12 +2013,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)) {
-            CellActor_SetAnim(param0->unk_390[8], 39);
+            Sprite_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);
-        CellActor_SetPosition(param0->unk_390[8], &v0);
+        Sprite_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);
@@ -2026,13 +2026,13 @@ static void sub_02088454(UnkStruct_02087A10 *param0, int param1)
         v1.x = FX32_ONE * Unk_020F251C[v2];
         v1.y = FX32_ONE * (88 - 20);
 
-        CellActor_SetAnim(param0->unk_390[8], Unk_020F24E8[v2]);
-        CellActor_SetPosition(param0->unk_390[8], &v1);
+        Sprite_SetAnim(param0->unk_390[8], Unk_020F24E8[v2]);
+        Sprite_SetPosition(param0->unk_390[8], &v1);
     }
 
     param0->unk_38 = 180;
 
-    SpriteActor_SetAnimFrame(param0->unk_390[8], 0);
+    Sprite_SetAnimFrame(param0->unk_390[8], 0);
 
     param0->unk_1C.unk_08 = param0->unk_1C.unk_00;
     param0->unk_1C.unk_0C = param0->unk_1C.unk_04;
@@ -2224,8 +2224,8 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2)
         }
     }
 
-    if ((CellActor_GetDrawFlag(param0->unk_390[8]) == 0) && (gSystem.touchPressed == 0)) {
-        CellActor_SetDrawFlag(param0->unk_390[8], 1);
+    if ((Sprite_GetDrawFlag(param0->unk_390[8]) == 0) && (gSystem.touchPressed == 0)) {
+        Sprite_SetDrawFlag(param0->unk_390[8], 1);
         return 2;
     }
 
@@ -2262,7 +2262,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);
-            CellActor_SetDrawFlag(param0->unk_390[8], param2);
+            Sprite_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 6):
@@ -2284,12 +2284,12 @@ static int sub_02088898(UnkStruct_02087A10 *param0, u16 param1, int param2)
             param0->unk_4F4[5]++;
 
             Sound_PlayEffect(1500);
-            CellActor_SetDrawFlag(param0->unk_390[8], param2);
+            Sprite_SetDrawFlag(param0->unk_390[8], param2);
         }
         break;
     case (0xe001 + 7):
         sub_02015760(param0->unk_628);
-        CellActor_SetDrawFlag(param0->unk_390[8], param2);
+        Sprite_SetDrawFlag(param0->unk_390[8], param2);
 
         if (param0->unk_14 == 0) {
             Sound_PlayEffect(1506);
@@ -2315,11 +2315,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);
-            CellActor_SetDrawFlag(param0->unk_390[8], 1);
-            CellActor_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_XLU);
+            Sprite_SetDrawFlag(param0->unk_390[8], 1);
+            Sprite_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);
-            CellActor_SetAnim(param0->unk_390[8], 60);
+            Sprite_SetAnim(param0->unk_390[8], 60);
 
             param0->unk_1C.unk_18 = 1;
 
@@ -2420,16 +2420,16 @@ static int sub_02088D08(int param0, int param1, int param2, int param3, u16 *par
     return 0;
 }
 
-static void sub_02088E1C(CellActor **param0, int param1, int param2)
+static void sub_02088E1C(Sprite **param0, int param1, int param2)
 {
     int v0;
 
     for (v0 = 0; v0 < param2; v0++) {
-        CellActor_SetAnim(param0[v0], 43);
+        Sprite_SetAnim(param0[v0], 43);
     }
 
     if (param1 != param2) {
-        CellActor_SetAnim(param0[param1], 44);
+        Sprite_SetAnim(param0[param1], 44);
     }
 }
 
@@ -2465,24 +2465,24 @@ static void sub_02088E58(Window *param0, u16 param1, int param2, TextColor param
     Window_CopyToVRAM(param0);
 }
 
-static void sub_02088F40(int param0[], CellActor **param1, int param2)
+static void sub_02088F40(int param0[], Sprite **param1, int param2)
 {
     int v0, v1;
 
     for (v0 = 0; v0 < 3; v0++) {
         if (param0[v0]) {
             for (v1 = 0; v1 < 3; v1++) {
-                CellActor_SetAnim(param1[v1], Unk_020F2984[v1][2]);
+                Sprite_SetAnim(param1[v1], Unk_020F2984[v1][2]);
             }
 
-            CellActor_SetAnim(param1[v0], Unk_020F2984[v0][2] - 3);
+            Sprite_SetAnim(param1[v0], Unk_020F2984[v0][2] - 3);
             break;
         }
     }
 
     for (v0 = 5; v0 < 7; v0++) {
         if (param0[v0]) {
-            CellActor_SetAnim(param1[v0], Unk_020F2984[v0][2] + 1);
+            Sprite_SetAnim(param1[v0], Unk_020F2984[v0][2] + 1);
         }
     }
 
@@ -2493,24 +2493,24 @@ static void sub_02088F40(int param0[], CellActor **param1, int param2)
 
 static void sub_02088FD0(UnkStruct_02087A10 *param0)
 {
-    if (!CellActor_IsAnimated(param0->unk_390[8])) {
+    if (!Sprite_IsAnimated(param0->unk_390[8])) {
         if (param0->unk_158 == param0->unk_0C) {
             param0->unk_1C.unk_00 = 12;
             param0->unk_1C.unk_04 = 0;
-            CellActor_SetAnim(param0->unk_390[8], 39);
+            Sprite_SetAnim(param0->unk_390[8], 39);
         } else {
-            CellActor_SetAnim(param0->unk_390[8], 39);
+            Sprite_SetAnim(param0->unk_390[8], 39);
         }
 
         if (param0->unk_1C.unk_14 == 0) {
-            CellActor_SetDrawFlag(param0->unk_390[8], 0);
+            Sprite_SetDrawFlag(param0->unk_390[8], 0);
         } else {
             sub_02088454(param0, 0);
         }
 
         param0->unk_1C.unk_18 = 0;
 
-        CellActor_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_NORMAL);
+        Sprite_SetExplicitOAMMode(param0->unk_390[8], GX_OAM_MODE_NORMAL);
     }
 }
 
diff --git a/src/unk_02089604.c b/src/unk_02089604.c
index 837906cf9f..eb183d2547 100644
--- a/src/unk_02089604.c
+++ b/src/unk_02089604.c
@@ -189,16 +189,16 @@ BOOL sub_02089974(UnkStruct_02089688 *param0)
                     continue;
                 }
 
-                Sprite_OffsetPositionXY2(param0->unk_00[v0].unk_0C, param0->unk_00[v0].unk_14.unk_00, param0->unk_00[v0].unk_14.unk_02);
+                ManagedSprite_OffsetPositionXY(param0->unk_00[v0].unk_0C, param0->unk_00[v0].unk_14.unk_00, param0->unk_00[v0].unk_14.unk_02);
                 param0->unk_00[v0].unk_14.unk_04--;
 
                 if ((v0 >= param0->unk_2B0) && (v0 < param0->unk_2B4)) {
-                    Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
+                    ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
                     param0->unk_00[v0].unk_14.unk_05++;
                 }
 
                 if ((v0 >= param0->unk_2B8) && (v0 < param0->unk_2BC)) {
-                    Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
+                    ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
                     param0->unk_00[v0].unk_14.unk_05++;
                 }
             }
@@ -208,19 +208,19 @@ BOOL sub_02089974(UnkStruct_02089688 *param0)
                     continue;
                 }
 
-                Sprite_OffsetPositionXY2(param0->unk_1A0[v0].unk_0C, param0->unk_1A0[v0].unk_14.unk_00, param0->unk_1A0[v0].unk_14.unk_02);
+                ManagedSprite_OffsetPositionXY(param0->unk_1A0[v0].unk_0C, param0->unk_1A0[v0].unk_14.unk_00, param0->unk_1A0[v0].unk_14.unk_02);
                 param0->unk_1A0[v0].unk_14.unk_04--;
             }
 
             if (param0->unk_00[0].unk_14.unk_04 == 0) {
                 for (v0 = param0->unk_2B0; v0 < param0->unk_2B4; v0++) {
-                    Sprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
-                    Sprite_TickOneFrame(param0->unk_00[v0].unk_0C);
+                    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+                    ManagedSprite_TickFrame(param0->unk_00[v0].unk_0C);
                 }
 
                 for (v0 = param0->unk_2B8; v0 < param0->unk_2BC; v0++) {
-                    Sprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
-                    Sprite_TickOneFrame(param0->unk_00[v0].unk_0C);
+                    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+                    ManagedSprite_TickFrame(param0->unk_00[v0].unk_0C);
                 }
 
                 param0->unk_29C++;
@@ -235,7 +235,7 @@ BOOL sub_02089974(UnkStruct_02089688 *param0)
                 continue;
             }
 
-            Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
+            ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v1[param0->unk_00[v0].unk_14.unk_05], v1[param0->unk_00[v0].unk_14.unk_05]);
             param0->unk_00[v0].unk_14.unk_05++;
         }
 
@@ -244,7 +244,7 @@ BOOL sub_02089974(UnkStruct_02089688 *param0)
                 continue;
             }
 
-            Sprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
+            ManagedSprite_SetAffineScale(param0->unk_00[v0].unk_0C, v2[param0->unk_00[v0].unk_14.unk_05], v2[param0->unk_00[v0].unk_14.unk_05]);
             param0->unk_00[v0].unk_14.unk_05++;
         }
 
@@ -530,12 +530,12 @@ asm void sub_02089C20 (UnkStruct_02089688 * param0)
     add r1, r0, #0
     add r0, r4, r7
     ldr r0, [r0, #0xc]
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
     mov r0, #0x96
     lsl r0, r0, #2
     ldr r0, [r4, r0]
     mov r1, #3
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
     add r0, r4, r7
     ldr r3, [r0, #4]
     ldr r0, [sp]
@@ -759,7 +759,7 @@ void sub_02089F80(UnkStruct_02089688 *param0)
     for (v0 = 0; v0 < param0->unk_2A4; v0++) {
         if (param0->unk_00[v0].unk_00 == 0) {
             param0->unk_00[v0].unk_00 = 1;
-            Sprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+            ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
         }
 
         v1 = param0->unk_00[v0].unk_00 - 1;
@@ -794,12 +794,12 @@ void sub_02089FFC(UnkStruct_02089688 *param0)
     v0 = param0->unk_1F0[0].unk_00;
     param0->unk_00[v0].unk_00 = 0;
 
-    Sprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+    ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
     v1 = param0->unk_00[v0].unk_04;
 
     if (v0 > param0->unk_3C4) {
         v0--;
-        Sprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
+        ManagedSprite_SetAnim(param0->unk_00[v0].unk_0C, sub_0208AD98(param0->unk_00[v0].unk_00, param0->unk_00[v0].unk_08));
 
         v2 = param0->unk_00[v0].unk_04;
 
@@ -903,13 +903,13 @@ void sub_0208A180(u32 param0, u32 param1, void *param2)
                 v1 = v0->unk_1F0[0].unk_00;
                 v0->unk_00[v1].unk_00 = param0 - 16 + 1;
 
-                Sprite_SetAnim(v0->unk_00[v1].unk_0C, sub_0208AD98(v0->unk_00[v1].unk_00, v0->unk_00[v1].unk_08));
+                ManagedSprite_SetAnim(v0->unk_00[v1].unk_0C, sub_0208AD98(v0->unk_00[v1].unk_00, v0->unk_00[v1].unk_08));
                 sub_0208AAB4(v0, 1, 1);
                 sub_0208AB2C(v0, param0 - 16);
                 sub_0208AAB4(v0, 1, 0);
                 sub_0208AAB4(v0, 2, 1);
                 sub_0208AB6C(v0, param0 - 16, 2);
-                Sprite_SetAnim(v0->unk_1F0[2].unk_0C, 3);
+                ManagedSprite_SetAnim(v0->unk_1F0[2].unk_0C, 3);
 
                 v2 = v0->unk_00[v1].unk_04;
                 v1++;
diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c
index de6923e22c..e9ee47fd51 100644
--- a/src/unk_0208A3F4.c
+++ b/src/unk_0208A3F4.c
@@ -244,16 +244,16 @@ asm void sub_0208A758 (UnkStruct_02089688 * param0)
     ldr r0, [r4, r0]
     asr r1, r1, #0x10
     mov r2, #0x18
-    bl Sprite_SetPositionXY2
+    bl ManagedSprite_SetPositionXY
     mov r0, #0x73
     lsl r0, r0, #2
     ldr r0, [r4, r0]
     mov r1, #0x16
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
     mov r0, #0x73
     lsl r0, r0, #2
     ldr r0, [r4, r0]
-    bl Sprite_TickOneFrame
+    bl ManagedSprite_TickFrame
     ldr r0, [sp, #0xc]
     add r4, #0x1c
     add r0, r0, #1
@@ -268,18 +268,18 @@ asm void sub_0208A758 (UnkStruct_02089688 * param0)
     str r0, [r5, #0xc]
     asr r1, r1, #0x10
     mov r2, #0x18
-    bl Sprite_SetPositionXY2
+    bl ManagedSprite_SetPositionXY
     ldr r0, [r5, #0]
     ldr r1, [r5, #8]
     bl sub_0208AD98
     add r1, r0, #0
     ldr r0, [r5, #0xc]
-    bl Sprite_SetAnim
+    bl ManagedSprite_SetAnim
     ldr r0, [r5, #0xc]
     mov r1, #2
-    bl Sprite_SetAffineOverwriteMode
+    bl ManagedSprite_SetAffineOverwriteMode
     ldr r0, [r5, #0xc]
-    bl Sprite_TickOneFrame
+    bl ManagedSprite_TickFrame
     add r5, #0x1c
  _0208A882:
     ldr r1, [sp]
@@ -333,26 +333,26 @@ void sub_0208A8A0(UnkStruct_02089688 *param0)
     param0->unk_1F0[2].unk_0C = SpriteSystem_NewSprite(v1, v2, &v0);
 
     sub_0208AAE4(param0, param0->unk_3C4);
-    Sprite_SetAnim(param0->unk_1F0[0].unk_0C, 0);
-    Sprite_TickOneFrame(param0->unk_1F0[0].unk_0C);
+    ManagedSprite_SetAnim(param0->unk_1F0[0].unk_0C, 0);
+    ManagedSprite_TickFrame(param0->unk_1F0[0].unk_0C);
 
     param0->unk_1F0[1].unk_14.unk_00 = 0;
     param0->unk_1F0[1].unk_14.unk_02 = 0;
     param0->unk_1F0[1].unk_00 = 1;
 
     sub_0208AB2C(param0, 0);
-    Sprite_SetAnim(param0->unk_1F0[1].unk_0C, param0->unk_1F0[1].unk_00);
-    Sprite_TickOneFrame(param0->unk_1F0[1].unk_0C);
-    Sprite_SetExplicitOamMode2(param0->unk_1F0[1].unk_0C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnim(param0->unk_1F0[1].unk_0C, param0->unk_1F0[1].unk_00);
+    ManagedSprite_TickFrame(param0->unk_1F0[1].unk_0C);
+    ManagedSprite_SetExplicitOamMode(param0->unk_1F0[1].unk_0C, GX_OAM_MODE_XLU);
 
     param0->unk_1F0[2].unk_14.unk_00 = 0;
     param0->unk_1F0[2].unk_14.unk_02 = 0;
     param0->unk_1F0[2].unk_00 = 1;
 
     sub_0208AB2C(param0, 0);
-    Sprite_SetAnim(param0->unk_1F0[2].unk_0C, param0->unk_1F0[2].unk_00);
-    Sprite_TickOneFrame(param0->unk_1F0[2].unk_0C);
-    Sprite_SetExplicitOamMode2(param0->unk_1F0[2].unk_0C, GX_OAM_MODE_XLU);
+    ManagedSprite_SetAnim(param0->unk_1F0[2].unk_0C, param0->unk_1F0[2].unk_00);
+    ManagedSprite_TickFrame(param0->unk_1F0[2].unk_0C);
+    ManagedSprite_SetExplicitOamMode(param0->unk_1F0[2].unk_0C, GX_OAM_MODE_XLU);
     sub_0208AAB4(param0, 1, 0);
     sub_0208AAB4(param0, 2, 0);
 }
@@ -394,32 +394,32 @@ void sub_0208A9BC(UnkStruct_02089688 *param0)
         v4 = (param0->unk_2C0.unk_18[26].rect.left + param0->unk_2C0.unk_18[26].rect.right) / 2;
         v5 = (param0->unk_2C0.unk_18[26].rect.top + param0->unk_2C0.unk_18[26].rect.bottom) / 2;
 
-        Sprite_SetPositionXY2(param0->unk_240[0].unk_0C, v4, v5);
-        Sprite_SetAnim(param0->unk_240[0].unk_0C, 0);
-        Sprite_TickOneFrame(param0->unk_240[0].unk_0C);
+        ManagedSprite_SetPositionXY(param0->unk_240[0].unk_0C, v4, v5);
+        ManagedSprite_SetAnim(param0->unk_240[0].unk_0C, 0);
+        ManagedSprite_TickFrame(param0->unk_240[0].unk_0C);
 
         v4 = (param0->unk_2C0.unk_18[27].rect.left + param0->unk_2C0.unk_18[27].rect.right) / 2;
         v5 = (param0->unk_2C0.unk_18[27].rect.top + param0->unk_2C0.unk_18[27].rect.bottom) / 2;
 
-        Sprite_SetPositionXY2(param0->unk_240[1].unk_0C, v4, v5);
-        Sprite_SetAnim(param0->unk_240[1].unk_0C, 0);
-        Sprite_TickOneFrame(param0->unk_240[1].unk_0C);
+        ManagedSprite_SetPositionXY(param0->unk_240[1].unk_0C, v4, v5);
+        ManagedSprite_SetAnim(param0->unk_240[1].unk_0C, 0);
+        ManagedSprite_TickFrame(param0->unk_240[1].unk_0C);
     }
 }
 
 void sub_0208AAB4(UnkStruct_02089688 *param0, int param1, BOOL param2)
 {
     if (param2 == 1) {
-        Sprite_SetDrawFlag2(param0->unk_1F0[param1].unk_0C, 1);
+        ManagedSprite_SetDrawFlag(param0->unk_1F0[param1].unk_0C, 1);
     } else {
-        Sprite_SetDrawFlag2(param0->unk_1F0[param1].unk_0C, 0);
+        ManagedSprite_SetDrawFlag(param0->unk_1F0[param1].unk_0C, 0);
     }
 }
 
 void sub_0208AAE4(UnkStruct_02089688 *param0, int param1)
 {
     s16 v0, v1;
-    CellActorData *v2;
+    ManagedSprite *v2;
 
     if (param1 < param0->unk_3C4) {
         return;
@@ -428,8 +428,8 @@ void sub_0208AAE4(UnkStruct_02089688 *param0, int param1)
     v2 = param0->unk_00[param1].unk_0C;
     param0->unk_1F0[0].unk_00 = param1;
 
-    Sprite_GetPositionXY2(v2, &v0, &v1);
-    Sprite_SetPositionXY2(param0->unk_1F0[0].unk_0C, v0, v1 + 16);
+    ManagedSprite_GetPositionXY(v2, &v0, &v1);
+    ManagedSprite_SetPositionXY(param0->unk_1F0[0].unk_0C, v0, v1 + 16);
 }
 
 void sub_0208AB2C(UnkStruct_02089688 *param0, int param1)
@@ -439,7 +439,7 @@ void sub_0208AB2C(UnkStruct_02089688 *param0, int param1)
     v0 = (param0->unk_2C0.unk_18[param1 + 16].rect.left + param0->unk_2C0.unk_18[param1 + 16].rect.right) / 2;
     v1 = (param0->unk_2C0.unk_18[param1 + 16].rect.top + param0->unk_2C0.unk_18[param1 + 16].rect.bottom) / 2;
 
-    Sprite_SetPositionXY2(param0->unk_1F0[1].unk_0C, v0, v1);
+    ManagedSprite_SetPositionXY(param0->unk_1F0[1].unk_0C, v0, v1);
 }
 
 void sub_0208AB6C(UnkStruct_02089688 *param0, int param1, int param2)
@@ -449,14 +449,14 @@ void sub_0208AB6C(UnkStruct_02089688 *param0, int param1, int param2)
     v0 = (param0->unk_2C0.unk_18[param1 + 16].rect.left + param0->unk_2C0.unk_18[param1 + 16].rect.right) / 2;
     v1 = (param0->unk_2C0.unk_18[param1 + 16].rect.top + param0->unk_2C0.unk_18[param1 + 16].rect.bottom) / 2;
 
-    Sprite_SetPositionXY2(param0->unk_1F0[param2].unk_0C, v0, v1);
+    ManagedSprite_SetPositionXY(param0->unk_1F0[param2].unk_0C, v0, v1);
 }
 
 void sub_0208ABB4(UnkStruct_02089688 *param0)
 {
-    Sprite_TickOneFrame(param0->unk_1F0[0].unk_0C);
-    Sprite_TickOneFrame(param0->unk_1F0[1].unk_0C);
-    Sprite_TickOneFrame(param0->unk_1F0[2].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_1F0[0].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_1F0[1].unk_0C);
+    ManagedSprite_TickFrame(param0->unk_1F0[2].unk_0C);
 
     {
         int v0 = 2;
@@ -464,13 +464,13 @@ void sub_0208ABB4(UnkStruct_02089688 *param0)
         BOOL v2;
 
         for (v0 = 1; v0 < 3; v0++) {
-            v1 = Sprite_GetActiveAnim(param0->unk_1F0[v0].unk_0C);
+            v1 = ManagedSprite_GetActiveAnim(param0->unk_1F0[v0].unk_0C);
 
             if (v1 == 3) {
-                v2 = Sprite_IsAnimated(param0->unk_1F0[v0].unk_0C);
+                v2 = ManagedSprite_IsAnimated(param0->unk_1F0[v0].unk_0C);
 
                 if (v2 == 0) {
-                    Sprite_SetAnim(param0->unk_1F0[v0].unk_0C, param0->unk_1F0[v0].unk_00);
+                    ManagedSprite_SetAnim(param0->unk_1F0[v0].unk_0C, param0->unk_1F0[v0].unk_00);
 
                     if (param0->unk_2C0.unk_88 == 1) {
                         sub_0208AAB4(param0, 1, 0);
@@ -482,11 +482,11 @@ void sub_0208ABB4(UnkStruct_02089688 *param0)
                 }
             } else {
                 if (v1 != param0->unk_1F0[v0].unk_00) {
-                    Sprite_SetAnim(param0->unk_1F0[v0].unk_0C, param0->unk_1F0[v0].unk_00);
+                    ManagedSprite_SetAnim(param0->unk_1F0[v0].unk_0C, param0->unk_1F0[v0].unk_00);
                 }
 
                 {
-                    v1 = Sprite_GetActiveAnim(param0->unk_1F0[2].unk_0C);
+                    v1 = ManagedSprite_GetActiveAnim(param0->unk_1F0[2].unk_0C);
 
                     if (v1 != 3) {
                         if (param0->unk_2C0.unk_88 == 1) {
@@ -530,19 +530,19 @@ void sub_0208AC8C(UnkStruct_02089688 *param0)
             param0->unk_240[v0].unk_14.unk_04++;
 
             if (param0->unk_240[v0].unk_14.unk_04 == 1) {
-                Sprite_SetAnim(param0->unk_240[v0].unk_0C, 1);
+                ManagedSprite_SetAnim(param0->unk_240[v0].unk_0C, 1);
                 sub_0208AC80(param0->unk_2C0.unk_90[v0], v1, v2 - 0);
             } else if (param0->unk_240[v0].unk_14.unk_04 == 2) {
-                Sprite_SetAnim(param0->unk_240[v0].unk_0C, 2);
+                ManagedSprite_SetAnim(param0->unk_240[v0].unk_0C, 2);
                 sub_0208AC80(param0->unk_2C0.unk_90[v0], v1, v2 - 1);
             } else if (param0->unk_240[v0].unk_14.unk_04 == 10) {
-                Sprite_SetAnim(param0->unk_240[v0].unk_0C, 0);
+                ManagedSprite_SetAnim(param0->unk_240[v0].unk_0C, 0);
                 sub_0208AC80(param0->unk_2C0.unk_90[v0], v1, v2 + 0);
                 param0->unk_240[v0].unk_00++;
             }
             break;
         default:
-            Sprite_SetAnim(param0->unk_240[v0].unk_0C, 0);
+            ManagedSprite_SetAnim(param0->unk_240[v0].unk_0C, 0);
             sub_0208AC80(param0->unk_2C0.unk_90[v0], v1, v2);
             param0->unk_240[v0].unk_00 = 0;
             break;
@@ -601,10 +601,10 @@ void sub_0208ADE4(UnkStruct_02089688 *param0, int param1)
             }
         }
 
-        Sprite_GetPositionXY2(param0->unk_00[v0].unk_0C, &v3, &v4);
+        ManagedSprite_GetPositionXY(param0->unk_00[v0].unk_0C, &v3, &v4);
 
         if (param1 == 0) {
-            Sprite_SetPositionXY2(param0->unk_00[v0].unk_0C, v2, v4);
+            ManagedSprite_SetPositionXY(param0->unk_00[v0].unk_0C, v2, v4);
         } else {
             param0->unk_00[v0].unk_14.unk_00 = (v2 - v3) / 2;
             param0->unk_00[v0].unk_14.unk_02 = 0;
@@ -613,7 +613,7 @@ void sub_0208ADE4(UnkStruct_02089688 *param0, int param1)
         }
 
         if ((v0 == param0->unk_1A0[v1].unk_00) && (v1 != param0->unk_3C0)) {
-            Sprite_GetPositionXY2(param0->unk_1A0[v1].unk_0C, &v3, &v4);
+            ManagedSprite_GetPositionXY(param0->unk_1A0[v1].unk_0C, &v3, &v4);
 
             if (param0->unk_2B0 == param0->unk_2B4) {
                 v2 += 8;
@@ -626,7 +626,7 @@ void sub_0208ADE4(UnkStruct_02089688 *param0, int param1)
             }
 
             if (param1 == 0) {
-                Sprite_SetPositionXY2(param0->unk_1A0[v1].unk_0C, v2, v4);
+                ManagedSprite_SetPositionXY(param0->unk_1A0[v1].unk_0C, v2, v4);
             } else {
                 param0->unk_1A0[v1].unk_14.unk_00 = (v2 - v3) / 2;
                 param0->unk_1A0[v1].unk_14.unk_02 = 0;
@@ -645,7 +645,7 @@ static inline void inline_0208AF44(UnkStruct_02089688 *param0, int param1, s16 p
 
     v2 = &param0->unk_00[param1];
 
-    Sprite_GetPositionXY2(v2->unk_0C, &v0, &v1);
+    ManagedSprite_GetPositionXY(v2->unk_0C, &v0, &v1);
 
     v2->unk_10->rect.top = v1 - param3;
     v2->unk_10->rect.left = v0 - param2;
diff --git a/src/unk_0208B284.c b/src/unk_0208B284.c
index b63d0f32bf..c033f773ac 100644
--- a/src/unk_0208B284.c
+++ b/src/unk_0208B284.c
@@ -124,7 +124,7 @@ static void sub_0208B3D4(SysTask *param0, void *param1)
                 v0->unk_24[v1].unk_06 = v0->unk_24[v1 - 1].unk_06;
             }
 
-            Sprite_GetPositionFxXYWithSubscreenOffset(v0->unk_24[v1].unk_00, &v5, &v6, v0->unk_10.unk_10);
+            ManagedSprite_GetPositionFxXYWithSubscreenOffset(v0->unk_24[v1].unk_00, &v5, &v6, v0->unk_10.unk_10);
 
             v3 = FX_FX32_TO_F32(v5);
             v4 = FX_FX32_TO_F32(v6);
@@ -132,7 +132,7 @@ static void sub_0208B3D4(SysTask *param0, void *param1)
             v9 = sub_0208B2DC(v0->unk_24[v1].unk_04, v0->unk_24[v1].unk_06, v3, v4, &v7, &v8, (8.0f - ((v1 - v2) * 0.5f)) / 2, 16);
 
             if (v9 && (v0->unk_24[v1].unk_08 == 0)) {
-                Sprite_OffsetPositionFxXY(v0->unk_24[v1].unk_00, FX_F32_TO_FX32(v7), FX_F32_TO_FX32(v8));
+                ManagedSprite_OffsetPositionFxXY(v0->unk_24[v1].unk_00, FX_F32_TO_FX32(v7), FX_F32_TO_FX32(v8));
             } else {
                 {
                     int v10;
@@ -161,7 +161,7 @@ static void sub_0208B3D4(SysTask *param0, void *param1)
                         v0->unk_24[v1].unk_0C %= 720;
                         v14 = (v0->unk_24[0].unk_04 << FX32_SHIFT) + (CalcSineDegrees_Wraparound(v0->unk_24[v1].unk_0C) * v0->unk_FC);
                         v15 = (v0->unk_24[0].unk_06 << FX32_SHIFT) + (CalcCosineDegrees_Wraparound(v0->unk_24[v1].unk_0C) * v0->unk_100);
-                        Sprite_SetPositionFxXYWithSubscreenOffset(v0->unk_24[v1].unk_00, v14, v15, v0->unk_10.unk_10);
+                        ManagedSprite_SetPositionFxXYWithSubscreenOffset(v0->unk_24[v1].unk_00, v14, v15, v0->unk_10.unk_10);
                         break;
                     default:
                         break;
@@ -257,8 +257,8 @@ void sub_0208B7B4(UnkStruct_0208B878 *param0)
     for (v0 = 0; v0 < param0->unk_10.unk_00; v0++) {
         param0->unk_24[v0].unk_00 = SpriteSystem_NewSprite(v2, v3, &v1);
 
-        Sprite_TickOneFrame(param0->unk_24[v0].unk_00);
-        Sprite_SetPositionXY2(param0->unk_24[v0].unk_00, 256 / 2, 192 / 2);
+        ManagedSprite_TickFrame(param0->unk_24[v0].unk_00);
+        ManagedSprite_SetPositionXY(param0->unk_24[v0].unk_00, 256 / 2, 192 / 2);
     }
 }
 
@@ -352,7 +352,7 @@ BOOL sub_0208B948(UnkStruct_0208B878 *param0, s16 param1, s16 param2)
         for (v0 = 0; v0 < param0->unk_10.unk_00; v0++) {
             param0->unk_24[v0].unk_04 = param1;
             param0->unk_24[v0].unk_06 = param2;
-            Sprite_SetPositionXYWithSubscreenOffset2(param0->unk_24[v0].unk_00, param1, param2, param0->unk_10.unk_10);
+            ManagedSprite_SetPositionXYWithSubscreenOffset(param0->unk_24[v0].unk_00, param1, param2, param0->unk_10.unk_10);
         }
     }
 
@@ -387,7 +387,7 @@ BOOL sub_0208B9E0(UnkStruct_0208B878 *param0, BOOL param1)
         int v0;
 
         for (v0 = 0; v0 < param0->unk_10.unk_00; v0++) {
-            Sprite_SetDrawFlag2(param0->unk_24[v0].unk_00, param1);
+            ManagedSprite_SetDrawFlag(param0->unk_24[v0].unk_00, param1);
         }
     }
 
@@ -410,7 +410,7 @@ void sub_0208BA30(UnkStruct_0208B878 *param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_10.unk_00; v0++) {
-        Sprite_SetAnim(param0->unk_24[v0].unk_00, 1);
+        ManagedSprite_SetAnim(param0->unk_24[v0].unk_00, 1);
     }
 }
 
@@ -419,6 +419,6 @@ void sub_0208BA54(UnkStruct_0208B878 *param0)
     int v0;
 
     for (v0 = 0; v0 < param0->unk_10.unk_00; v0++) {
-        Sprite_SetAnim(param0->unk_24[v0].unk_00, 0);
+        ManagedSprite_SetAnim(param0->unk_24[v0].unk_00, 0);
     }
 }
diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c
index 1d9441be00..5aea8b04ec 100644
--- a/src/unk_02094EDC.c
+++ b/src/unk_02094EDC.c
@@ -664,10 +664,10 @@ void sub_02095380(const UnkStruct_ov6_02248BE8 *param0, Pokemon *param1, int par
     }
 }
 
-Sprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8)
+PokemonSprite *sub_02095484(UnkStruct_02007768 *param0, int param1, Pokemon *param2, int param3, UnkStruct_ov16_0223E0C8 *param4, int param5, int param6, int param7, int param8)
 {
     ArchivedSprite v0;
-    Sprite *v1;
+    PokemonSprite *v1;
     int v2, v3, v4;
 
     Pokemon_BuildArchivedSprite(&v0, param2, param3);
diff --git a/src/unk_02098FFC.c b/src/unk_02098FFC.c
index 9b22ec5bcb..b84768c6c5 100644
--- a/src/unk_02098FFC.c
+++ b/src/unk_02098FFC.c
@@ -7,9 +7,9 @@
 #include "struct_defs/struct_0209903C_sub1.h"
 #include "struct_defs/struct_0209916C.h"
 
-#include "cell_actor.h"
 #include "heap.h"
 #include "narc.h"
+#include "sprite.h"
 #include "sprite_resource.h"
 #include "sprite_system.h"
 #include "sprite_transfer.h"
@@ -79,7 +79,7 @@ static void sub_02099118(UnkStruct_0209903C *param0)
     u32 v0;
 
     Heap_FreeToHeap(param0->unk_1C4);
-    CellActorCollection_Delete(param0->unk_10);
+    SpriteList_Delete(param0->unk_10);
     SpriteTransfer_ResetCharTransferList(param0->unk_1B4[0]);
     SpriteTransfer_ResetPlttTransferList(param0->unk_1B4[1]);
 
@@ -91,7 +91,7 @@ static void sub_02099118(UnkStruct_0209903C *param0)
 
 void sub_02099160(UnkStruct_0209903C *param0)
 {
-    CellActorCollection_Update(param0->unk_10);
+    SpriteList_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)
@@ -100,8 +100,8 @@ UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 par
     s16 v1;
     u32 v2;
     UnkStruct_0209916C *v3;
-    CellActorData *v4 = NULL;
-    CellActorInitParamsEx v5;
+    ManagedSprite *v4 = NULL;
+    AffineSpriteListTemplate v5;
     SpriteResource *v6;
 
     v1 = sub_020994B8(param0, param1);
@@ -126,15 +126,15 @@ UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 par
     SpriteResourceCollection_ModifyPalette(param0->unk_1A4[1], param0->unk_1B4[1]->resources[v1], 88, 3 + param1, 0, param0->unk_00);
     SpriteTransfer_ReplacePlttData(param0->unk_1B4[1]->resources[v1]);
 
-    v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorData));
+    v4 = Heap_AllocFromHeap(param0->unk_00, sizeof(ManagedSprite));
 
     v4->resourceHeaderList = Heap_AllocFromHeap(param0->unk_00, sizeof(SpriteResourcesHeaderList));
-    v4->resourceHeaderList->headers = Heap_AllocFromHeap(param0->unk_00, sizeof(CellActorResourceData));
+    v4->resourceHeaderList->headers = Heap_AllocFromHeap(param0->unk_00, sizeof(SpriteResourcesHeader));
     v4->resourceHeader = v4->resourceHeaderList->headers;
 
     SpriteResourcesHeader_Init(v4->resourceHeader, 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.collection = param0->unk_10;
+    v5.list = param0->unk_10;
     v5.resourceData = v4->resourceHeader;
     v5.position.x = FX32_CONST(param2);
     v5.position.y = FX32_CONST(param3);
@@ -152,13 +152,13 @@ UnkStruct_0209916C *sub_0209916C(UnkStruct_0209903C *param0, int param1, u16 par
     v5.vramType = v0;
     v5.heapID = param0->unk_00;
 
-    v4->sprite = CellActorCollection_AddEx(&v5);
+    v4->sprite = SpriteList_AddEx(&v5);
 
     if (v4->sprite != NULL) {
-        CellActor_SetAnim(v4->sprite, 0);
+        Sprite_SetAnim(v4->sprite, 0);
         v2 = SpriteTransfer_GetPlttOffset(
             v6, v0);
-        CellActor_SetExplicitPalette(v4->sprite, v2);
+        Sprite_SetExplicitPalette(v4->sprite, v2);
     } else {
         GF_ASSERT(FALSE);
     }