Actor Cleanups (#177)

* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions

3 files changed, 19 insertions, 9 deletions

diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c
index 3b83d1b71..f899bab69 100644
--- a/src/code/z_cheap_proc.c
+++ b/src/code/z_cheap_proc.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include <global.h>
 
-void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) {
+void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     Gfx* dispRefs[4];
 
@@ -15,7 +15,7 @@ void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) {
     Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219);
 }
 
-void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) {
+void Gfx_DrawDListXlu(GlobalContext* globalCtx, Gfx* dlist) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     Gfx* dispRefs[4];
 
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 2e7266d05..3d2a6b1fe 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -65,10 +65,20 @@ const ActorInit En_A_Obj_InitVars = {
     (ActorFunc)EnAObj_Draw,
 };
 
-// TODO: Define this section of .data here and rename the symbols
-extern ColliderCylinderInit D_80115440;
-extern u32 D_8011546C[];
-extern u32 D_80115484[];
+static ColliderCylinderInit sCylinderInit = {
+    { COLTYPE_UNK10, 0x00, 0x39, 0x39, 0x20, COLSHAPE_CYLINDER },
+    { 0x02, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
+    { 25, 60, 0, { 0, 0, 0 } },
+};
+
+static UNK_PTR D_8011546C[] = {
+    0x040394B0, 0x040394B0, 0x0403A120, 0x0403A480, 0x0403A7F0, 0x06000730,
+};
+
+static Gfx* D_80115484[] = {
+    0x04039C00, 0x04039C00, 0x04039C00, 0x0403A2D0, 0x0403A2D0, 0x0403A630,
+    0x06000210, 0x0403AB80, 0x0403A9B0, 0x0403C050, 0x0403C5B0, 0x0400D340,
+};
 
 void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) {
     this->actionFunc = actionFunc;
@@ -153,7 +163,7 @@ void EnAObj_Init(Actor* thisx, GlobalContext* globalCtx) {
             this->unk_178 = 45.0f;
             func_8001D234(this, thisx->params);
             Collider_InitCylinder(globalCtx, &this->collider);
-            Collider_SetCylinder(globalCtx, &this->collider, thisx, &D_80115440);
+            Collider_SetCylinder(globalCtx, &this->collider, thisx, &sCylinderInit);
             thisx->colChkInfo.mass = 0xFF;
             thisx->unk_1F = 0;
             break;
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 871102f56..54f7bfe5f 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -74,8 +74,8 @@ const ActorInit En_Item00_InitVars = {
 };
 
 // TODO: Define this section of .data here and rename the symbols
-extern ColliderCylinderInit D_801154E0;
-extern InitChainEntry D_8011550C[];
+extern ColliderCylinderInit D_801154E0; // rename to sCylinderInit when data is moved
+extern InitChainEntry D_8011550C[];     // rename to sInitChain when data is moved
 extern Color_RGB8 D_80115510;
 extern Color_RGB8 D_80115514;
 extern UNK_TYPE D_80115518;