Use variable names from ghidra project. Reorganize some data tables and header files to work easier with it.

4 files changed, 9 insertions, 9 deletions

diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c
index 9d393fbeb..efb837e20 100644
--- a/src/code/code_0x800A5AC0.c
+++ b/src/code/code_0x800A5AC0.c
@@ -9,9 +9,9 @@ UNK_RET EnAObj_Init(void* a0, UNK_TYPE a1) {
     ActorEnAObj* s0 = (ActorEnAObj*)a0;
     s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300;
     s0->base.variable = (s0->base.variable & 0xFF) - 9;
-    Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&D_801ADEAC);
+    Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&enAObjInitVar);
     func_800B3BA4(&s0->base.unkBC, 0, (UNK_PTR)&func_800B3FC0, 12);
-    Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &D_801ADE80);
+    Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &enAObjCylinderInit);
     Collision_CylinderMoveToActor((Actor*)s0, &s0->collision);
     s0->base.unkA0.unk16 = 255;
     s0->update = (actor_func)EnAObj_Update1;
diff --git a/src/code/code_0x800BF9A0.c b/src/code/code_0x800BF9A0.c
index a252fb962..d61cd01ed 100644
--- a/src/code/code_0x800BF9A0.c
+++ b/src/code/code_0x800BF9A0.c
@@ -10,7 +10,7 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
     func_800847CC(&D_801DCBB0, D_801B4610);
     func_800847CC(&D_801DCBC4);
 
-    for (i = 0, s0 = &D_801AEFD0; i < D_801B4610; i++, s0++) {
+    for (i = 0, s0 = &actorOverlayTable[0]; i < D_801B4610; i++, s0++) {
         v1 = s0->vramEnd - s0->vramStart;
         if (s0->ramAddr == 0) continue;
         func_800847CC(&D_801DCBE4, i, s0->ramAddr, s0->ramAddr + v1, s0->clients, &D_801DCBFC);
@@ -19,7 +19,7 @@ UNK_RET func_800BF9A0(UNK_TYPE a0, UNK_TYPE a1) {
 
 UNK_TYPE func_800BFA78(UNK_TYPE a0, UNK_TYPE a1) {
     s32 i;
-    ActorOverlayTableEntry* v0 = &D_801AEFD0;
+    ActorOverlayTableEntry* v0 = &actorOverlayTable[0];
     UNK_TYPE t1;
     UNK_TYPE a2;
     UNK_TYPE a0_2 = a0;
diff --git a/src/code/code_0x800E03A0.c b/src/code/code_0x800E03A0.c
index cf2e33159..7e091e1b2 100644
--- a/src/code/code_0x800E03A0.c
+++ b/src/code/code_0x800E03A0.c
@@ -3,14 +3,14 @@
 
 s800E03A0* func_800E03A0(s32 a0) {
     if ((a0 < 0) || (a0 > 22)) return 0;
-    return &((&D_801B9F20)[a0]);
+    return &(D_801B9F20[a0]);
 }
 
 // Probably zeroes out a s800E03A0?
 void func_800E03CC(u8* a0) {
     s32 i;
     u8* v1;
-    
+
     for (i = 0, v1 = a0; i < 32; i++) {
         *v1++ = 0;
     }
diff --git a/src/code/z_lib.c b/src/code/z_lib.c
index 8ae55a51a..ddb63dfd1 100644
--- a/src/code/z_lib.c
+++ b/src/code/z_lib.c
@@ -421,7 +421,7 @@ UNK_TYPE Lib_PitchVec3f(Vector3f* a0, Vector3f* a1) {
 
 void Lib_ApplyActorInitVars(Actor* a0, ActorInitVar* a1) {
     do {
-        D_801BE960[a1->type]((u8*)a0, a1);
+        actorInitVarFuncs[a1->type]((u8*)a0, a1);
     } while ((a1++)->cont);
 }
 
@@ -650,7 +650,7 @@ f32 Lib_PushAwayVec3f(Vector3f* a0, Vector3f* a1, f32 a2) {
 void Lib_Nop801004FC(void) {}
 
 UNK_TYPE Lib_PtrSegToPhys(u32 a0) {
-    return(D_801F8180[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
+    return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
 }
 
 UNK_TYPE Lib_PtrSegToPhysNull(u32 a0) {
@@ -658,7 +658,7 @@ UNK_TYPE Lib_PtrSegToPhysNull(u32 a0) {
         return a0;
     }
 
-    return(D_801F8180[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
+    return(rspSegmentPhysAddrs[(a0 << 4) >> 28] + (a0 & 0xFFFFFF)) + 0x80000000;
 }
 
 UNK_TYPE Lib_PtrSegToK0(UNK_TYPE a0) {