Rename unk_0200CF18 -> sprite_system and align function names

Author: adrienntindall

asm/frontier_map.s

@@ -454,7 +454,7 @@ FrontierMap_VBlank: ; 0x02238A7C
 	push {r4, lr}
 	add r4, r0, #0
 	bl GF_RunVramTransferTasks
-	bl thunk_OamManager_ApplyAndResetBuffers
+	bl SpriteSystem_TransferOam
 	ldr r0, [r4, #4]
 	bl PaletteData_PushTransparentBuffers
 	ldr r0, [r4]
@@ -523,16 +523,16 @@ _02238AF4:
 	mov r1, #1
 	tst r1, r4
 	beq _02238B04
-	bl UnkImageStruct_TickSpriteAnimation1Frame
+	bl ManagedSprite_TickFrame
 _02238B04:
 	add r6, r6, #1
 	lsr r4, r4, #1
 	add r5, r5, #4
 	cmp r6, #8
 	blt _02238AF4
 	ldr r0, [r7, #0x38]
-	bl SpriteGfxHandler_RenderAndAnimateSprites
-	bl SpriteRenderer_thunk_UpdateCellTransferStateManager
+	bl SpriteSystem_DrawSprites
+	bl SpriteSystem_UpdateTransfer
 	bl ov80_02239A38
 	mov r0, #1
 	mov r1, #0
@@ -646,7 +646,7 @@ _02238BEE:
 	str r0, [sp]
 _02238BFE:
 	ldr r0, [r5, #0x34]
-	bl SpriteRenderer_GetG2dRendererPtr
+	bl SpriteSystem_GetRenderer
 	str r0, [sp, #8]
 	ldr r0, [sp]
 	bl _ffix
@@ -1134,7 +1134,7 @@ ov80_02239004: ; 0x02239004
 	add r0, #0x1c
 	bl ov42_02229394
 	ldr r0, [r5, #0x38]
-	bl sub_0200E2B0
+	bl SpriteManager_GetSpriteList
 	add r7, r0, #0
 	add r0, r6, #0
 	bl ov80_0222A7EC
@@ -1176,7 +1176,7 @@ _0223905A:
 	add r6, r0, #0
 	bne _0223909C
 	ldr r0, [r5, #0x34]
-	bl SpriteRenderer_GetG2dRendererPtr
+	bl SpriteSystem_GetRenderer
 	ldr r1, [r5]
 	add r2, sp, #0x20
 	mov r3, #0x65
@@ -1204,7 +1204,7 @@ _0223909C:
 	cmp r6, #0
 	bne _022390DA
 	ldr r0, [r5, #0x34]
-	bl SpriteRenderer_GetG2dRendererPtr
+	bl SpriteSystem_GetRenderer
 	ldr r1, [r5]
 	add r2, sp, #0x20
 	mov r3, #0x65
@@ -1527,30 +1527,30 @@ ov80_02239384: ; 0x02239384
 	push {r4, lr}
 	add r4, r0, #0
 	mov r0, #0x65
-	bl SpriteRenderer_Create
+	bl SpriteSystem_Alloc
 	ldr r1, _022393D8 ; =ov80_0223D5B8
 	ldr r2, _022393DC ; =ov80_0223D570
 	mov r3, #0x20
 	str r0, [r4, #0x34]
-	bl SpriteRenderer_CreateOamCharPlttManagers
+	bl SpriteSystem_Init
 	ldr r1, _022393E0 ; =0x00200010
 	mov r0, #1
 	bl G2dRenderer_SetObjCharTransferReservedRegion
 	mov r0, #1
 	bl G2dRenderer_SetPlttTransferReservedRegion
 	ldr r0, [r4, #0x34]
-	bl SpriteRenderer_CreateGfxHandler
+	bl SpriteManager_New
 	str r0, [r4, #0x38]
 	ldr r0, [r4, #0x34]
 	ldr r1, [r4, #0x38]
 	mov r2, #0x80
-	bl SpriteRenderer_CreateSpriteList
+	bl SpriteSystem_InitSprites
 	ldr r0, [r4, #0x34]
 	ldr r1, [r4, #0x38]
 	ldr r2, _022393E4 ; =ov80_0223D584
-	bl SpriteRenderer_Init2DGfxResManagersFromCountsArray
+	bl SpriteSystem_InitManagerWithCapacities
 	ldr r0, [r4, #0x34]
-	bl SpriteRenderer_GetG2dRendererPtr
+	bl SpriteSystem_GetRenderer
 	mov r2, #2
 	mov r1, #0
 	lsl r2, r2, #0x14
@@ -1604,32 +1604,32 @@ _02239426:
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _0223945A
-	bl UnkImageStruct_Delete
+	bl Sprite_DeleteAndFreeResources
 	ldr r1, _02239478 ; =0x0000C350
 	ldr r0, [r5, #0x38]
 	add r1, r4, r1
-	bl SpriteGfxHandler_UnloadCharObjById
+	bl SpriteManager_UnloadCharObjById
 	ldr r1, _02239478 ; =0x0000C350
 	ldr r0, [r5, #0x38]
 	add r1, r4, r1
-	bl SpriteGfxHandler_UnloadPlttObjById
+	bl SpriteManager_UnloadPlttObjById
 	ldr r1, _02239478 ; =0x0000C350
 	ldr r0, [r5, #0x38]
 	add r1, r4, r1
-	bl SpriteGfxHandler_UnloadCellObjById
+	bl SpriteManager_UnloadCellObjById
 	ldr r0, [r5, #0x38]
 	add r1, r4, r7
-	bl SpriteGfxHandler_UnloadAnimObjById
+	bl SpriteManager_UnloadAnimObjById
 _0223945A:
 	add r4, r4, #1
 	add r6, r6, #4
 	cmp r4, #4
 	blt _02239426
 	ldr r0, [r5, #0x34]
 	ldr r1, [r5, #0x38]
-	bl SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
+	bl SpriteSystem_FreeResourcesAndManager
 	ldr r0, [r5, #0x34]
-	bl SpriteRenderer_Delete
+	bl SpriteSystem_Free
 	pop {r3, r4, r5, r6, r7, pc}
 	nop
 _02239474: .word 0x0000FFFF
@@ -2074,10 +2074,10 @@ _02239782:
 	ldr r0, [r4]
 	cmp r0, #0
 	beq _022397F0
-	bl UnkImageStruct_GetSpriteCurrentAnimSeqNo
+	bl ManagedSprite_GetActiveAnim
 	strb r0, [r6, #0x15]
 	ldr r0, [r4]
-	bl UnkImageStruct_GetSpriteAnimCtrlCurrentFrame
+	bl ManagedSprite_GetAnimationFrame
 	ldrh r2, [r5]
 	ldr r1, _02239818 ; =0xFFFFE000
 	and r1, r2
@@ -2099,7 +2099,7 @@ _02239782:
 	orr r0, r1
 	strh r0, [r5]
 	ldr r0, [r4]
-	bl UnkImageStruct_GetSpriteVisibleFlag
+	bl ManagedSprite_GetDrawFlag
 	lsl r0, r0, #0x10
 	lsr r0, r0, #0x10
 	lsl r0, r0, #0x1f
@@ -2115,7 +2115,7 @@ _02239782:
 	ldr r2, [sp, #8]
 	strb r0, [r6, #0x14]
 	ldr r0, [r4]
-	bl UnkImageStruct_GetSpritePositionXY
+	bl ManagedSprite_GetPositionXY
 	mov r0, #2
 	ldrh r1, [r5]
 	lsl r0, r0, #0xe
@@ -2199,12 +2199,12 @@ _02239870:
 	ldrsh r1, [r5, r1]
 	ldrsh r2, [r5, r2]
 	str r0, [sp, #8]
-	bl UnkImageStruct_SetSpritePositionXY
+	bl ManagedSprite_SetPositionXY
 	ldrh r1, [r4]
 	ldr r0, [sp, #8]
 	lsl r1, r1, #0x11
 	lsr r1, r1, #0x1f
-	bl UnkImageStruct_SetSpriteVisibleFlag
+	bl ManagedSprite_SetDrawFlag
 	ldrh r2, [r4]
 	lsl r1, r6, #0x10
 	add r0, r7, #0
@@ -2214,12 +2214,12 @@ _02239870:
 	bl ov80_02239708
 	ldrb r1, [r5, #0x15]
 	ldr r0, [sp, #8]
-	bl UnkImageStruct_SetSpriteAnimSeqNo
+	bl ManagedSprite_SetAnim
 	ldrh r1, [r4]
 	ldr r0, [sp, #8]
 	lsl r1, r1, #0x13
 	lsr r1, r1, #0x13
-	bl UnkImageStruct_SetSpriteAnimCtrlCurrentFrame
+	bl ManagedSprite_SetAnimationFrame
 _022398C4:
 	add r6, r6, #1
 	add r4, #8

asm/include/overlay_01_021E7FDC.inc

@@ -27,13 +27,13 @@
 .public sub_0200B00C
 .public sub_0200B050
 .public sub_0200B0CC
-.public GF_PlttResObj_GetVramSlotNum
+.public SpriteTransfer_GetPlttOffset
 .public AllocFromHeap
 .public FreeToHeap
 .public SpriteList_Delete
 .public Sprite_CreateAffine
 .public Sprite_SetAnimCtrlSeq
-.public Sprite_SetPalIndex
+.public Sprite_SetPaletteOverride
 .public Sprite_SetPalIndexRespectVramOffset
 .public Sprite_GetPalIndex
 .public GF_AssertFail

asm/include/overlay_01_021EB1E8.inc

@@ -53,9 +53,9 @@
 .public Sprite_CreateAffine
 .public Sprite_Delete
 .public Sprite_SetMatrix
-.public Sprite_SetVisibleFlag
+.public Sprite_SetDrawFlag
 .public Sprite_GetMatrixPtr
-.public Sprite_SetAnimCtrlCurrentFrame
+.public Sprite_SetAnimationFrame
 .public GF_AssertFail
 .public GF_InitG2dRenderer
 .public PlayerAvatar_GetMapObject

asm/include/overlay_02.inc

@@ -35,13 +35,13 @@
 .public AddCellOrAnimResObjFromOpenNarc
 .public sub_0200A740
 .public DestroySingle2DGfxResObj
-.public Get2DGfxResObjById
+.public SpriteResourceCollection_Find
 .public sub_0200ADA4
 .public sub_0200AEB0
 .public sub_0200AF00
 .public sub_0200B00C
 .public sub_0200B0A8
-.public GF_PlttResObj_GetPlttProxy
+.public SpriteTransfer_GetPaletteProxy
 .public NewMsgDataFromNarc
 .public DestroyMsgData
 .public NewString_ReadMsgData
@@ -136,12 +136,12 @@
 .public Sprite_Delete
 .public Sprite_SetMatrix
 .public Sprite_SetAffineMatrix
-.public Sprite_SetScale
-.public Sprite_SetRotation
-.public Sprite_SetVisibleFlag
+.public Sprite_SetAffineScale
+.public Sprite_SetAffineZRotation
+.public Sprite_SetDrawFlag
 .public Sprite_SetAnimActiveFlag
 .public Sprite_SetAnimSpeed
-.public Sprite_SetAffineOverwriteType
+.public Sprite_SetAffineOverwriteMode
 .public Sprite_GetMatrixPtr
 .public Sprite_GetScalePtr
 .public Sprite_SetAnimCtrlSeq

asm/include/overlay_03.inc

@@ -17,7 +17,7 @@
 .public GfGfxLoader_GXLoadPal
 .public ReplaceCharResObjFromNarc
 .public ReplacePlttResObjFromNarc
-.public Get2DGfxResObjById
+.public SpriteResourceCollection_Find
 .public sub_0200AE8C
 .public sub_0200B084
 .public NewMsgDataFromNarc
@@ -32,7 +32,7 @@
 .public BufferIntegerAsString
 .public BufferSafariZoneObjectName
 .public StringExpandPlaceholders
-.public thunk_Sprite_SetPalIndex
+.public SetSpritePaletteOverride
 .public Sprite_SetPositionXY
 .public SysTask_CreateOnMainQueue
 .public SysTask_Destroy
@@ -81,14 +81,14 @@
 .public SpriteList_RenderAndAnimateSprites
 .public Sprite_Delete
 .public Sprite_SetMatrix
-.public Sprite_SetVisibleFlag
+.public Sprite_SetDrawFlag
 .public Sprite_SetAnimActiveFlag
-.public Sprite_GetVisibleFlag
+.public Sprite_GetDrawFlag
 .public Sprite_SetAnimCtrlSeq
-.public Sprite_TickAnimCtrlFrame
-.public Sprite_SetAnimCtrlCurrentFrame
+.public Sprite_UpdateAnim
+.public Sprite_SetAnimationFrame
 .public Sprite_SetPriority
-.public Sprite_IsCellAnimationRunning
+.public Sprite_IsAnimated
 .public System_GetTouchNew
 .public GF_AssertFail
 .public String_New

asm/include/overlay_05.inc

@@ -34,28 +34,28 @@
 .public sub_0200CDAC
 .public PrintUIntOnWindow
 .public sub_0200CE7C
-.public SpriteRenderer_Create
-.public SpriteRenderer_CreateGfxHandler
-.public SpriteRenderer_CreateOamCharPlttManagers
-.public SpriteRenderer_CreateSpriteList
-.public SpriteGfxHandler_RenderAndAnimateSprites
-.public thunk_OamManager_ApplyAndResetBuffers
-.public SpriteRenderer_Delete
-.public SpriteRenderer_Init2DGfxResManagersFromCountsArray
-.public SpriteRenderer_LoadCharResObjFromOpenNarc
-.public SpriteRenderer_LoadPlttResObjFromNarcId
-.public SpriteRenderer_LoadPlttResObjFromOpenNarc
-.public SpriteRenderer_LoadCellResObjFromOpenNarc
-.public SpriteRenderer_LoadAnimResObjFromOpenNarc
-.public SpriteRenderer_LoadResourcesAndCreateSprite
-.public GfGfxHandler_GetPlttProxy
-.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
-.public UnkImageStruct_Delete
-.public UnkImageStruct_SetSpriteAnimSeqNo
-.public UnkImageStruct_SetSpriteVisibleFlag
-.public UnkImageStruct_SetSpritePalIndex
-.public UnkImageStruct_SetSpritePositionXY
-.public sub_0200E2B0
+.public SpriteSystem_Alloc
+.public SpriteManager_New
+.public SpriteSystem_Init
+.public SpriteSystem_InitSprites
+.public SpriteSystem_DrawSprites
+.public SpriteSystem_TransferOam
+.public SpriteSystem_Free
+.public SpriteSystem_InitManagerWithCapacities
+.public SpriteSystem_LoadCharResObjFromOpenNarc
+.public SpriteSystem_LoadPlttResObj
+.public SpriteSystem_LoadPlttResObjFromOpenNarc
+.public SpriteSystem_LoadCellResObjFromOpenNarc
+.public SpriteSystem_LoadAnimResObjFromOpenNarc
+.public SpriteSystem_NewSprite
+.public SpriteManager_FindPlttResourceProxy
+.public SpriteSystem_FreeResourcesAndManager
+.public Sprite_DeleteAndFreeResources
+.public ManagedSprite_SetAnim
+.public ManagedSprite_SetDrawFlag
+.public ManagedSprite_SetPaletteOverride
+.public ManagedSprite_SetPositionXY
+.public SpriteManager_GetSpriteList
 .public LoadUserFrameGfx1
 .public LoadUserFrameGfx2
 .public DrawFrameAndWindow2
@@ -121,7 +121,7 @@
 .public GfGfx_EngineATogglePlanes
 .public GfGfx_DisableEngineBPlanes
 .public Camera_SetPerspectiveClippingPlane
-.public Sprite_TickAnimCtrlFrame
+.public Sprite_UpdateAnim
 .public GF_AssertFail
 .public String_New
 .public String_Delete