Decompile Gameplay_Keep and fix all existing decompiled objects (#595)

* First batch of files * Add missing folders back * Fix missing folders again * Finish fixing existing texture files * Gameplay_Keep XML finished * Most actor gameplay_keep undefined syms removed * Only ~200 gkeep symbols remain * All gkeep symbols that ZAP supports are fixed * Cleanup, and make gkeep names more accurate * Starting to figure out what some unknown blobs are, merge zeldaret in * fix a few more things * refactor gkeep * Change how gitkeep is handled * gkeep xml cleanup * Gkeep finished, now just waiting up ZAP updates * 100 link animations finished * 150 link animations finished * 200 link animations finished * 250 link animations finished * 350 link animations finished * 400 link animations finished * 450 link animations finished * 500 link animations finished * 550 link animations finished * All Link animations finished cannot build yet because ZAP doesn't have LinkAnimationHeader yet * xml changes for new zap stuff * finish gameplay_keep * fixing existing objects * ready for pr besides zap padding issue * mostly ready for pr * format all c files * all conflicts fixed * make changes that roman requested * fix thing i didn't mean to change * some animation symbols renamed * fixed roman's stuff * lifemeter hardcoded pointers removed * fix issue with incorrect data in gameplay_keep * removed unused asm * fixed most of fig's comments * fix all of fig's comments * reformat files * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * Update assets/xml/textures/icon_item_static.xml Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * fixed stuff * fixed most of roman's comments * remove leading zeroes * should build now * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "f84d8337b" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "f84d8337b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * all of gkeep symbols fixed * compiler error fixed * format files * final changes Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
author: Zelllll <56516451+Zelllll@users.noreply.github.com> 2021-01-24 18:36:40 -0600
committer: GitHub <noreply@github.com> 2021-01-24 19:36:40 -0500
commit: 20c1f4e6480b2e85a8149b04507b6b212bda8afc (patch)
tree: 04e1838792ab9ce30a0b6520790c17ed3d3a5572 /src
parent: 84195fcef613a9f9e9b2518294c6084097f279d7 (diff)
110 files changed, 963 insertions, 913 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index a00993987..c4661629a 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -41,7 +41,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
             func_80038A28(actor->floorPoly, actor->world.pos.x, actor->floorHeight, actor->world.pos.z, &sp60);
             Matrix_Put(&sp60);
 
-            if (dlist != D_04049210) {
+            if (dlist != gCircleShadowDL) {
                 Matrix_RotateY(actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY);
             }
 
@@ -58,17 +58,17 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf
 }
 
 void ActorShadow_DrawCircle(Actor* actor, Lights* lights, GlobalContext* globalCtx) {
-    ActorShadow_Draw(actor, lights, globalCtx, D_04049210, NULL);
+    ActorShadow_Draw(actor, lights, globalCtx, gCircleShadowDL, NULL);
 }
 
 void ActorShadow_DrawWhiteCircle(Actor* actor, Lights* lights, GlobalContext* globalCtx) {
     static Color_RGBA8 white = { 255, 255, 255, 255 };
 
-    ActorShadow_Draw(actor, lights, globalCtx, D_04049210, &white);
+    ActorShadow_Draw(actor, lights, globalCtx, gCircleShadowDL, &white);
 }
 
 void ActorShadow_DrawHorse(Actor* actor, Lights* lights, GlobalContext* globalCtx) {
-    ActorShadow_Draw(actor, lights, globalCtx, D_04049AD0, NULL);
+    ActorShadow_Draw(actor, lights, globalCtx, gHorseShadowDL, NULL);
 }
 
 void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) {
@@ -90,7 +90,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_OPA_DISP++, &D_04048180);
+    gSPDisplayList(POLY_OPA_DISP++, gFootShadowDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1693);
 }
@@ -386,7 +386,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
                         Matrix_Translate(entry->unk_0C, entry->unk_0C, 0.0f, MTXMODE_APPLY);
                         gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116),
                                   G_MTX_MODELVIEW | G_MTX_LOAD);
-                        gSPDisplayList(OVERLAY_DISP++, D_0404D450);
+                        gSPDisplayList(OVERLAY_DISP++, gZTargetLockOnTriangleDL);
                         Matrix_Pull();
                     }
                 }
@@ -413,7 +413,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255);
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153),
                   G_MTX_MODELVIEW | G_MTX_LOAD);
-        gSPDisplayList(POLY_XLU_DISP++, &D_0400CB70);
+        gSPDisplayList(POLY_XLU_DISP++, &gZTargetArrowDL);
     }
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2158);
@@ -1919,7 +1919,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
 
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458),
                       G_MTX_MODELVIEW | G_MTX_LOAD);
-            gSPDisplayList(POLY_XLU_DISP++, &gGameKeepMoteDL0);
+            gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
 
             Matrix_Pull();
             phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF);
@@ -1927,7 +1927,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
 
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463),
                       G_MTX_MODELVIEW | G_MTX_LOAD);
-            gSPDisplayList(POLY_XLU_DISP++, &gGameKeepMoteDL0);
+            gSPDisplayList(POLY_XLU_DISP++, &gEffFlash1DL);
         }
 
         lightPos.x = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x;
@@ -2245,8 +2245,8 @@ void func_80030ED8(Actor* actor) {
 void func_80030FA8(GraphicsContext* gfxCtx) {
     OPEN_DISPS(gfxCtx, "../z_actor.c", 6161);
 
-    gDPLoadTextureBlock(POLY_XLU_DISP++, &D_0401E370, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP,
-                        G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTextureBlock(POLY_XLU_DISP++, gUnknownCircle5Tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0,
+                        G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
 
     gDPSetTileSize(POLY_XLU_DISP++, G_TX_RENDERTILE, 384, 224, 892, 732);
     gSPTextureRectangle(POLY_XLU_DISP++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597);
@@ -3457,7 +3457,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_OPA_DISP++, &D_04049210);
+    gSPDisplayList(POLY_OPA_DISP++, &gCircleShadowDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8155);
 }
diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c
index e802e9b8e..2f560f2b5 100644
--- a/src/code/z_debug_display.c
+++ b/src/code/z_debug_display.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 typedef struct {
     /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object
@@ -16,12 +17,8 @@ static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = {
 };
 
 static DebugDispObjectInfo sDebugObjectInfoTable[] = {
-    { 0, 0x040035F0 }, // Circle
-    { 0, 0x040038F0 }, // Cross
-    { 0, 0x040036F0 }, // Ball
-    { 0, 0x040037F0 }, // Cursor
-    { 1, 0x040039F0 }, // Arrow
-    { 1, 0x04003C90 }, // Camera
+    { 0, gDebugCircleTex }, { 0, gDebugCrossTex }, { 0, gDebugBallTex },
+    { 0, gDebugCursorTex }, { 1, gDebugArrowDL },  { 1, gDebugCameraDL },
 };
 
 static Lights1 sDebugObjectLights = gdSPDefLights1(0x80, 0x80, 0x80, 0xFF, 0xFF, 0xFF, 0x49, 0x49, 0x49);
@@ -86,7 +83,7 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalCont
 
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_XLU_DISP++, &D_04004298);
+    gSPDisplayList(POLY_XLU_DISP++, &gDebugSpriteDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192);
 }
diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c
index bc3d3465b..4bd7603c2 100644
--- a/src/code/z_eff_blure.c
+++ b/src/code/z_eff_blure.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     EffectBlureElement* elem;
@@ -755,8 +756,8 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx*
     gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE);
     gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
 
-    gDPLoadTextureBlock(POLY_XLU_DISP++, D_04006020, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP,
-                        G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
+    gDPLoadTextureBlock(POLY_XLU_DISP++, gUnknownEffBlureTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 32, 0,
+                        G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_WRAP, 6, 5, G_TX_NOLOD, G_TX_NOLOD);
 
     gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL0, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
                       ENVIRONMENT, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED);
diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c
index 852eaeefe..7122f5d03 100644
--- a/src/code/z_eff_shield_particle.c
+++ b/src/code/z_eff_shield_particle.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "vt.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 static Vtx sVertices[5] = {
     VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF),
@@ -163,8 +164,8 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
         gDPPipeSync(POLY_XLU_DISP++);
         gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
 
-        gDPLoadTextureBlock(POLY_XLU_DISP++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                            G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(POLY_XLU_DISP++, gUnknownCircle6Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
 
         if (1) {} // Necessary to match
 
diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c
index c310d4a3b..78c74b9a2 100644
--- a/src/code/z_eff_spark.c
+++ b/src/code/z_eff_spark.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 // original name: "spark"
 void EffectSpark_Init(void* thisx, void* initParamsx) {
@@ -166,8 +167,8 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
         gDPPipeSync(POLY_XLU_DISP++);
 
         gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
-        gDPLoadTextureBlock(POLY_XLU_DISP++, D_04038FB0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
-                            G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
+        gDPLoadTextureBlock(POLY_XLU_DISP++, gUnknownCircle6Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+                            G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
 
         gDPSetCombineMode(POLY_XLU_DISP++, G_CC_SHADEDECALA, G_CC_PASS2);
         gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_ZB_CLD_SURF2);
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 7f65ff5eb..69d696ad3 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "vt.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -53,19 +54,25 @@ static ColliderCylinderInit sCylinderInit = {
     { 25, 60, 0, { 0, 0, 0 } },
 };
 
-extern CollisionHeader D_040394B0;
-extern CollisionHeader D_0403A120;
-extern CollisionHeader D_0403A480;
-extern CollisionHeader D_0403A7F0;
 extern CollisionHeader D_06000730;
 
 static CollisionHeader* D_8011546C[] = {
-    &D_040394B0, &D_040394B0, &D_0403A120, &D_0403A480, &D_0403A7F0, &D_06000730,
+    &gUnknown1Col, &gUnknown1Col, &gUnknown4Col, &gUnknown5Col, &gUnknown6Col, &D_06000730,
 };
 
 static Gfx* D_80115484[] = {
-    0x04039C00, 0x04039C00, 0x04039C00, 0x0403A2D0, 0x0403A2D0, 0x0403A630,
-    0x06000210, 0x0403AB80, 0x0403A9B0, 0x0403C050, 0x0403C5B0, 0x0400D340,
+    gUnusedRockRectangularPrism2DL,
+    gUnusedRockRectangularPrism2DL,
+    gUnusedRockRectangularPrism2DL,
+    gUnusedRockRectangularPrism4DL,
+    gUnusedRockRectangularPrism4DL,
+    gUnusedRockRectangularPrism5DL,
+    0x06000210,
+    gUnusedGrassBladesDL,
+    gUnusedTreeStumpDL,
+    gSignRectangularDL,
+    gSignDirectionalDL,
+    gBoulderFragmentsDL,
 };
 
 void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) {
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 4058748f8..5a436b063 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -753,7 +754,7 @@ void func_8001EF30(EnItem00* this, GlobalContext* globalCtx) {
 
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115530[iconNb]));
 
-    gSPDisplayList(POLY_OPA_DISP++, &D_04042440);
+    gSPDisplayList(POLY_OPA_DISP++, &gRupeeDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1568);
 }
@@ -782,7 +783,7 @@ void func_8001F080(EnItem00* this, GlobalContext* globalCtx) {
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_OPA_DISP++, D_0403F070);
+    gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1611);
 }
@@ -799,13 +800,13 @@ void func_8001F1F4(EnItem00* this, GlobalContext* globalCtx) {
     func_8002EBCC(&this->actor, globalCtx, 0);
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_OPA_DISP++, &D_0403BBA0);
+    gSPDisplayList(POLY_OPA_DISP++, &gHeartPieceExteriorDL);
 
     func_80093D84(globalCtx->state.gfxCtx);
     func_8002ED80(&this->actor, globalCtx, 0);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_XLU_DISP++, &D_0403BCD8);
+    gSPDisplayList(POLY_XLU_DISP++, &gHeartContainerInteriorDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1647);
 }
@@ -822,7 +823,7 @@ void func_8001F334(EnItem00* this, GlobalContext* globalCtx) {
     func_8002ED80(&this->actor, globalCtx, 0);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670),
               G_MTX_MODELVIEW | G_MTX_LOAD);
-    gSPDisplayList(POLY_XLU_DISP++, &D_0403B030);
+    gSPDisplayList(POLY_XLU_DISP++, &gHeartPieceInteriorDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1673);
 }
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index b85cf87b5..08f161c51 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "textures/parameter_static/parameter_static.h"
 
 /*
  * These are the colors for the hearts in the interface. The prim color is the red color of the heart
@@ -256,15 +257,23 @@ s32 func_80078E84(GlobalContext* globalCtx) {
     return 0;
 }
 
+u64* sHeartTextures[] = {
+    gHUDHeartFullTex,         gHUDHeartQuarterTex,      gHUDHeartQuarterTex,      gHUDHeartQuarterTex,
+    gHUDHeartQuarterTex,      gHUDHeartQuarterTex,      gHUDHeartHalfTex,         gHUDHeartHalfTex,
+    gHUDHeartHalfTex,         gHUDHeartHalfTex,         gHUDHeartHalfTex,         gHUDHeartThreeQuarterTex,
+    gHUDHeartThreeQuarterTex, gHUDHeartThreeQuarterTex, gHUDHeartThreeQuarterTex, gHUDHeartThreeQuarterTex,
+};
+
+u64* sDDHeartTextures[] = {
+    gHUDDefenseHeartFullTex,         gHUDDefenseHeartQuarterTex,      gHUDDefenseHeartQuarterTex,
+    gHUDDefenseHeartQuarterTex,      gHUDDefenseHeartQuarterTex,      gHUDDefenseHeartQuarterTex,
+    gHUDDefenseHeartHalfTex,         gHUDDefenseHeartHalfTex,         gHUDDefenseHeartHalfTex,
+    gHUDDefenseHeartHalfTex,         gHUDDefenseHeartHalfTex,         gHUDDefenseHeartThreeQuarterTex,
+    gHUDDefenseHeartThreeQuarterTex, gHUDDefenseHeartThreeQuarterTex, gHUDDefenseHeartThreeQuarterTex,
+    gHUDDefenseHeartThreeQuarterTex,
+};
+
 void HealthMeter_Draw(GlobalContext* globalCtx) {
-    static UNK_PTR sHeartTextures[] = {
-        0x02000400, 0x02000100, 0x02000100, 0x02000100, 0x02000100, 0x02000100, 0x02000200, 0x02000200,
-        0x02000200, 0x02000200, 0x02000200, 0x02000300, 0x02000300, 0x02000300, 0x02000300, 0x02000300,
-    };
-    static UNK_PTR sDDHeartTextures[] = {
-        0x02000900, 0x02000600, 0x02000600, 0x02000600, 0x02000600, 0x02000600, 0x02000700, 0x02000700,
-        0x02000700, 0x02000700, 0x02000700, 0x02000800, 0x02000800, 0x02000800, 0x02000800, 0x02000800,
-    };
     s32 pad[5];
     UNK_PTR heartBgImg;
     u32 curColorSet;
diff --git a/src/code/z_lights.c b/src/code/z_lights.c
index b140d8d57..8ea295524 100644
--- a/src/code/z_lights.c
+++ b/src/code/z_lights.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define LIGHTS_BUFFER_SIZE 32
 
@@ -366,7 +367,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
     POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++);
     gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE);
     gDPSetColorDither(POLY_XLU_DISP++, G_CD_MAGICSQ);
-    gSPDisplayList(POLY_XLU_DISP++, D_04015720);
+    gSPDisplayList(POLY_XLU_DISP++, gGlowCircleTextureLoadDL);
 
     while (node != NULL) {
         LightInfo* info;
@@ -385,7 +386,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
             Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lights.c", 918),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, D_04015760);
+            gSPDisplayList(POLY_XLU_DISP++, gGlowCircleDL);
         }
 
         node = node->next;
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index fab39d42b..509c95145 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "vt.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 MapData* gMapData;
 
@@ -339,7 +340,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) {
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 255, 0, 255);
-        gSPDisplayList(OVERLAY_DISP++, D_0400C820);
+        gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL);
 
         tempX = sPlayerInitialPosX;
         tempZ = sPlayerInitialPosZ;
@@ -353,7 +354,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) {
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, 200, 0, 0, 255);
-        gSPDisplayList(OVERLAY_DISP++, D_0400C820);
+        gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL);
     }
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 607);
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index e4d9141ed..b80f50251 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 typedef struct {
     /* 0x00 */ u8 flag;
@@ -1365,7 +1366,7 @@ u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) {
     gSegments[4] = VIRTUAL_TO_PHYSICAL(segment + 0x3800);
     gSegments[6] = VIRTUAL_TO_PHYSICAL(segment + 0x8800);
 
-    SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge], &D_04003238, 9, ptr,
+    SkelAnime_InitLink(globalCtx, skelAnime, gPlayerSkelHeaders[(void)0, gSaveContext.linkAge], &gPlayer488Anim, 9, ptr,
                        ptr, PLAYER_LIMB_MAX);
 
     return size + 0x8890;
diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c
index 1392b1fb0..28ddca1a4 100644
--- a/src/code/z_skin_matrix.c
+++ b/src/code/z_skin_matrix.c
@@ -96,7 +96,7 @@ void SkinMatrix_MtxFMtxFMult(MtxF* mfB, MtxF* mfA, MtxF* dest) {
     rw = mfA->ww;
     dest->wx = (cx * rx) + (cy * ry) + (cz * rz) + (cw * rw);
 
-    //---COL2---
+    //---2Col---
     cx = mfB->xy;
     cy = mfB->yy;
     cz = mfB->zy;
@@ -126,7 +126,7 @@ void SkinMatrix_MtxFMtxFMult(MtxF* mfB, MtxF* mfA, MtxF* dest) {
     rw = mfA->ww;
     dest->wy = (cx * rx) + (cy * ry) + (cz * rz) + (cw * rw);
 
-    //---COL3---
+    //---3Col---
     cx = mfB->xz;
     cy = mfB->yz;
     cz = mfB->zz;
@@ -156,7 +156,7 @@ void SkinMatrix_MtxFMtxFMult(MtxF* mfB, MtxF* mfA, MtxF* dest) {
     rw = mfA->ww;
     dest->wz = (cx * rx) + (cy * ry) + (cz * rz) + (cw * rw);
 
-    //---COL4---
+    //---4Col---
     cx = mfB->xw;
     cy = mfB->yw;
     cz = mfB->zw;
diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index 08e6faf3f..dc2208cee 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_haka_gate.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -46,7 +47,6 @@ void BgHakaGate_GateOpen(BgHakaGate* this, GlobalContext* globalCtx);
 void BgHakaGate_SkullOfTruth(BgHakaGate* this, GlobalContext* globalCtx);
 void BgHakaGate_FalseSkull(BgHakaGate* this, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
 extern CollisionHeader D_0600A938;
 extern Gfx D_0600F1B0[];
 extern Gfx D_06010A10[];
@@ -338,7 +338,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
         Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 744),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 749);
     }
 }
diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
index 7dcd20b12..bb4b607e0 100644
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_haka_tubo.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -78,8 +79,6 @@ static InitChainEntry sInitChain[] = {
 
 extern CollisionHeader D_060108B8;
 extern Gfx D_0600FE40[];
-extern Gfx D_0400CD80[];
-extern Gfx D_040184B0[];
 
 void BgHakaTubo_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgHakaTubo* this = THIS;
@@ -133,7 +132,8 @@ void BgHakaTubo_Idle(BgHakaTubo* this, GlobalContext* globalCtx) {
             pos.y = this->dyna.actor.world.pos.y + 80.0f;
             EffectSsBomb2_SpawnLayered(globalCtx, &pos, &sZeroVector, &sZeroVector, 100, 45);
             Audio_PlaySoundAtPosition(globalCtx, &this->dyna.actor.world.pos, 50, NA_SE_EV_BOX_BREAK);
-            EffectSsHahen_SpawnBurst(globalCtx, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40, D_0400CD80);
+            EffectSsHahen_SpawnBurst(globalCtx, &pos, 20.0f, 0, 350, 100, 50, OBJECT_HAKA_OBJECTS, 40,
+                                     gEffFragments2DL);
             this->dropTimer = 5;
             this->dyna.actor.draw = NULL;
             Actor_SetScale(&this->dyna.actor, 0.0f);
@@ -240,7 +240,7 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
                                 (this->fireScroll * -15) & 0xFF, 32, 64));
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 497),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_040184B0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 501);
 }
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
index 5713f37bf..cf9550fd0 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_hidan_curtain.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -22,8 +23,6 @@ void BgHidanCurtain_TurnOn(BgHidanCurtain* this, GlobalContext* globalCtx);
 void BgHidanCurtain_TurnOff(BgHidanCurtain* this, GlobalContext* globalCtx);
 void BgHidanCurtain_WaitForTimer(BgHidanCurtain* this, GlobalContext* globalCtx);
 
-extern Gfx D_040184B0[];
-
 typedef struct {
     /* 0x00 */ s16 radius;
     /* 0x02 */ s16 height;
@@ -257,7 +256,7 @@ void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 698),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-    gSPDisplayList(POLY_XLU_DISP++, D_040184B0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 702);
 }
diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
index 1bac23a64..65e53b04f 100644
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
@@ -1,4 +1,5 @@
 #include "z_bg_hidan_fwbig.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -25,8 +26,6 @@ void BgHidanFwbig_WaitForPlayer(BgHidanFwbig* this, GlobalContext* globalCtx);
 void BgHidanFwbig_Move(BgHidanFwbig* this, GlobalContext* globalCtx);
 
 extern Gfx D_0600DB20[];
-extern Gfx D_040173D0[];
-extern Gfx D_04017BD0[];
 
 const ActorInit Bg_Hidan_Fwbig_InitVars = {
     ACTOR_BG_HIDAN_FWBIG,
@@ -250,9 +249,9 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) {
     OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 630);
     func_80093D84(globalCtx->state.gfxCtx);
 
-    gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_040173D0));
+    gSPSegment(POLY_XLU_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gEffUnknown4Tex));
 
-    gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_04017BD0));
+    gSPSegment(POLY_XLU_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(gEffUnknown5Tex));
 
     height = thisx->scale.y * 2400.0f;
     gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0,
diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index 78ff4335a..95affff46 100644
--- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_mori_hineri.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -51,7 +52,6 @@ extern CollisionHeader D_060054B8;
 extern CollisionHeader D_06003490;
 extern CollisionHeader D_060043D0;
 extern CollisionHeader D_06006078;
-extern Gfx D_04049FE0[]; // display list for studded dungeon door
 extern Gfx D_06000AE8[];
 extern Gfx D_06001678[];
 
@@ -252,7 +252,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
         Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 652),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, D_04049FE0);
+        gSPDisplayList(POLY_OPA_DISP++, gDoorMetalBarsDL);
     }
     if ((this->boxObjIdx > 0) && ((this->boxObjIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_BOX)) > 0) &&
         (Object_IsLoaded(&globalCtx->objectCtx, this->boxObjIdx))) {
diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
index 52c4b8f27..d68723068 100644
--- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
+++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_po_syokudai.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -75,7 +76,6 @@ static InitChainEntry sInitChain[] = {
 };
 
 extern Gfx D_060003A0[];
-extern Gfx D_0404D4E0[];
 
 void BgPoSyokudai_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgPoSyokudai* this = THIS;
@@ -186,7 +186,7 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 368),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 373);
 }
diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
index 3337507fd..b9888508d 100644
--- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
+++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
@@ -1,4 +1,5 @@
 #include "z_bg_spot00_hanebasi.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -9,7 +10,6 @@ void BgSpot00Hanebasi_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BgSpot00Hanebasi_Update(Actor* thisx, GlobalContext* globalCtx);
 void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_0404D4E0;
 extern UNK_TYPE D_060000C0;
 extern UNK_TYPE D_06000280;
 extern UNK_TYPE D_06000430;
diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
index b63443cc5..fe426516b 100644
--- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
+++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
@@ -32,7 +32,9 @@ const ActorInit Bg_Spot09_Obj_InitVars = {
     (ActorFunc)BgSpot09Obj_Draw,
 };
 
-static CollisionHeader* D_808B1F90[] = { NULL, gBgSpot09Col1, gBgSpot09Col2, gBgSpot09Col3, gBgSpot09Col4 };
+static CollisionHeader* D_808B1F90[] = {
+    NULL, &gValleyObjects1Col, &gValleyObjects2Col, &gValleyObjects3Col, &gValleyObjects4Col,
+};
 
 static s32 (*D_808B1FA4[])(BgSpot09Obj* this, GlobalContext* globalCtx) = {
     func_808B1BEC,
@@ -52,7 +54,9 @@ static InitChainEntry sInitChain2[] = {
     ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP),
 };
 
-static Gfx* sDLists[] = { gBgSpot09DL1, gBgSpot09DL2, gBgSpot09DL3, gBgSpot09DL4, gBgSpot09DL5 };
+static Gfx* sDLists[] = {
+    gValleyBridgeSidesDL, gValleyBrokenBridgeDL, gValleyBridgeChildDL, gCarpentersTentDL, gValleyRepairedBridgeDL,
+};
 
 s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) {
     s32 carpentersRescued;
@@ -175,7 +179,7 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, gBgSpot09DL6);
+        gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL);
 
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396);
     }
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
index 696a3bf0b..35bb82a53 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c
@@ -121,7 +121,7 @@ void BgSpot11Bakudankabe_Init(Actor* thisx, GlobalContext* globalCtx) {
         return;
     }
     func_808B2180(this, globalCtx);
-    CollisionHeader_GetVirtual(&gBgSpot11Col, &colHeader);
+    CollisionHeader_GetVirtual(&gDesertColossusBombableWallCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
     Actor_SetScale(&this->dyna.actor, 1.0f);
     osSyncPrintf("(spot11 爆弾壁)(arg_data 0x%04x)\n", this->dyna.actor.params);
@@ -151,5 +151,5 @@ void BgSpot11Bakudankabe_Update(Actor* thisx, GlobalContext* globalCtx) {
 void BgSpot11Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
     BgSpot11Bakudankabe* this = THIS;
 
-    Gfx_DrawDListOpa(globalCtx, gBgSpot11DL1);
+    Gfx_DrawDListOpa(globalCtx, gDesertColossusBombableWallDL);
 }
diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
index 2024014ae..cabec315d 100644
--- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
+++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
@@ -1,5 +1,12 @@
+/*
+ * File: z_bg_spot11_oasis.c
+ * Overlay: ovl_Bg_Spot11_Oasis
+ * Description: Refilling Oasis (Desert Colossus)
+ */
+
 #include "z_bg_spot11_oasis.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "objects/object_spot11_obj/object_spot11_obj.h"
 
 #define FLAGS 0x00000010
 
@@ -43,8 +50,6 @@ static Vec3f D_808B2E34[] = {
     { -75.0f, -90.0f, 90.0f }, { 30.0f, -100.0f, 40.0f },
 };
 
-extern Gfx D_06000870[];
-
 void func_808B27F0(GlobalContext* globalCtx, s16 waterSurface) {
     WaterBox* waterBox = &globalCtx->colCtx.colHeader->waterBoxes[0];
 
@@ -154,6 +159,6 @@ void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) {
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
                                 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
-    gSPDisplayList(POLY_XLU_DISP++, D_06000870);
+    gSPDisplayList(POLY_XLU_DISP++, gDesertColossusOasisDL);
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 346);
 }
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
index e67a642ee..c21fd4166 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_spot17_bakudankabe.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+#include "objects/object_spot17_obj/object_spot17_obj.h"
 
 #define FLAGS 0x00000000
 
@@ -35,9 +36,6 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneDownward, 1000, ICHAIN_STOP),
 };
 
-extern CollisionHeader D_06000A38;
-extern Gfx D_060008A0[];
-extern Gfx D_06000960[];
 extern Gfx D_0500A880[];
 
 void func_808B6BC0(BgSpot17Bakudankabe* this, GlobalContext* globalCtx) {
@@ -105,7 +103,8 @@ void BgSpot17Bakudankabe_Init(Actor* thisx, GlobalContext* globalCtx) {
         Actor_Kill(&this->dyna.actor);
         return;
     }
-    CollisionHeader_GetVirtual(&D_06000A38, &colHeader);
+
+    CollisionHeader_GetVirtual(&gCraterBombableWallCol, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
     Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
 }
@@ -143,7 +142,7 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     gDPSetEnvColor(POLY_OPA_DISP++, r, g, 255, 128);
 
-    gSPDisplayList(POLY_OPA_DISP++, D_060008A0);
+    gSPDisplayList(POLY_OPA_DISP++, gCraterBombableWallDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 283);
 
@@ -153,7 +152,7 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 290),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_06000960);
+    gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 295);
 }
diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
index 87e7de0e0..045cd7cd3 100644
--- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
+++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
@@ -67,7 +67,7 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) {
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0,
                                 (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20));
-    gSPDisplayList(POLY_XLU_DISP++, gBgSpot17DL1);
+    gSPDisplayList(POLY_XLU_DISP++, gCraterSmokeConeDL);
 
     if (1) {}
 
diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 3c3e115a7..d57ea1bb5 100644
--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -1,4 +1,5 @@
 #include "z_boss_fd.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000035
 
diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 0f29c3f27..c41c92fe0 100644
--- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -1,4 +1,5 @@
 #include "z_boss_tw.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000035
 
diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index 47acd0531..67cc04c6e 100644
--- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -1,4 +1,5 @@
 #include "z_boss_va.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000035
 
@@ -9,7 +10,6 @@ void BossVa_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BossVa_Update(Actor* thisx, GlobalContext* globalCtx);
 void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_04055DB0;
 extern UNK_TYPE D_06000024;
 extern UNK_TYPE D_06000FA0;
 extern UNK_TYPE D_06001230;
diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
index cb9a55e3e..f32fdba94 100644
--- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@@ -1,4 +1,5 @@
 #include "z_demo_6k.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -8,8 +9,6 @@ void Demo6K_Init(Actor* thisx, GlobalContext* globalCtx);
 void Demo6K_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void Demo6K_Update(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_040101A8;
-extern UNK_TYPE D_04015780;
 extern UNK_TYPE D_06001040;
 extern UNK_TYPE D_06001190;
 extern UNK_TYPE D_060022B0;
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 70962d802..8b00466e9 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -1880,7 +1880,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
         if (this->light.flicker == 0) {
             this->light.flicker = 1;
         } else {
-            disp = (u32)gGameKeepMoteDL0; // necessary to match, should be able to remove after fake matches are fixed
+            disp = (u32)gEffFlash1DL; // necessary to match, should be able to remove after fake matches are fixed
             alpha = &this->light.alpha;
             func_80093D84(globalCtx->state.gfxCtx);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1],
@@ -1923,7 +1923,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) {
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2901),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     this->blueOrb.rotation += 0x01F4;
-    gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2907);
 }
 
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 8225aa46d..1125309d5 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -1,4 +1,5 @@
 #include "z_demo_kankyo.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -10,8 +11,6 @@ void DemoKankyo_Update(Actor* thisx, GlobalContext* globalCtx);
 void DemoKankyo_Draw(Actor* thisx, GlobalContext* globalCtx);
 
 extern UNK_TYPE D_01000000;
-extern UNK_TYPE D_04010050;
-extern UNK_TYPE D_04052DB0;
 extern UNK_TYPE D_06000080;
 extern UNK_TYPE D_06000DE0;
 extern UNK_TYPE D_06007440;
diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
index e44f5375f..a178242cb 100644
--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@@ -1,4 +1,5 @@
 #include "z_door_killer.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
index 36da6c777..6ab00688e 100644
--- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
@@ -6,6 +6,7 @@
 
 #include "z_door_shutter.h"
 #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -80,16 +81,26 @@ typedef struct {
 } ShutterInfo;
 
 static ShutterInfo D_80998134[] = {
-    { 0x060067A0, 0x0404B0D0, 130, 12, 20, 15 }, { 0x06006910, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x060000C0, 0x060001F0, 240, 14, 70, 15 }, { 0x06000590, 0x06006460, 0, 110, 50, 15 },
-    { 0x06012AB0, NULL, 130, 12, 50, 15 },       { 0x0601EC20, NULL, 130, 12, 50, 15 },
-    { 0x06000100, 0x060001F0, 240, 14, 50, 15 }, { 0x060010C0, NULL, 130, 12, 50, 15 },
-    { 0x04049FE0, 0x0404B0D0, 130, 12, 20, 15 }, { 0x06010CB0, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x06011F20, 0x0404B0D0, 130, 12, 20, 15 }, { 0x060000C0, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x06005D90, 0x0404B0D0, 130, 12, 20, 15 }, { 0x06007000, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x06002620, 0x0404B0D0, 130, 12, 20, 15 }, { 0x06003890, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x06001D10, 0x0404B0D0, 130, 12, 20, 15 }, { 0x060010D0, 0x0404B0D0, 130, 12, 20, 15 },
-    { 0x060020D0, 0x0404B0D0, 130, 12, 20, 15 }, { 0x060000C0, 0x0404B0D0, 130, 12, 20, 15 },
+    { 0x060067A0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06006910, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060000C0, 0x060001F0, 240, 14, 70, 15 },
+    { 0x06000590, 0x06006460, 0, 110, 50, 15 },
+    { 0x06012AB0, NULL, 130, 12, 50, 15 },
+    { 0x0601EC20, NULL, 130, 12, 50, 15 },
+    { 0x06000100, 0x060001F0, 240, 14, 50, 15 },
+    { 0x060010C0, NULL, 130, 12, 50, 15 },
+    { gDoorMetalBarsDL, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06010CB0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06011F20, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060000C0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06005D90, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06007000, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06002620, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06003890, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x06001D10, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060010D0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060020D0, gDungeonDoorDL, 130, 12, 20, 15 },
+    { 0x060000C0, gDungeonDoorDL, 130, 12, 20, 15 },
 };
 
 static s8 D_80998224[] = {
diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
index caef50411..7dd8574e9 100644
--- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
@@ -1,4 +1,5 @@
 #include "z_eff_dust.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -9,8 +10,6 @@ void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EffDust_Update(Actor* thisx, GlobalContext* globalCtx);
 void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_04037880;
-
 /*
 const ActorInit Eff_Dust_InitVars = {
     ACTOR_EFF_DUST,
diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
index cd699e904..7b39b5459 100644
--- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
+++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_anubice_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index c99c478af..13f5adb68 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_arrow.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -15,11 +16,6 @@ void EnArrow_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnArrow_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_04004310;
-extern UNK_TYPE D_0400436C;
-extern UNK_TYPE D_04006010;
-extern UNK_TYPE D_04037880;
-
 /*
 const ActorInit En_Arrow_InitVars = {
     ACTOR_EN_ARROW,
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index 1055b920e..a13dc72b1 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bb.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x01000015
 
@@ -90,7 +91,6 @@ void EnBb_Green(EnBb* this, GlobalContext* globalCtx);
 
 void EnBb_Stunned(EnBb* this, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
 extern AnimationHeader D_06000184;
 extern AnimationHeader D_06000444;
 extern SkeletonHeader D_06001A30;
@@ -1336,7 +1336,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) {
             Matrix_Scale(this->flameScaleX * 0.01f, this->flameScaleY * 0.01f, 1.0f, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bb.c", 2106),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+            gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         } else {
             Matrix_MultVec3f(&blureBase1, &blureVtx1);
             Matrix_MultVec3f(&blureBase2, &blureVtx2);
diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
index 84be5871f..bae8cbeb7 100644
--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@@ -6,6 +6,7 @@
 
 #include "z_en_bom.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -84,9 +85,6 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32_DIV1000(gravity, -4000, ICHAIN_STOP),
 };
 
-extern Gfx D_04007A50[]; // gold fuse cap
-extern Gfx D_04007860[]; // bomb
-
 void EnBom_SetupAction(EnBom* this, EnBomActionFunc actionFunc) {
     this->actionFunc = actionFunc;
 }
@@ -369,14 +367,14 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_OPA_DISP++, D_04007A50);
+        gSPDisplayList(POLY_OPA_DISP++, gBombCapDL);
         Matrix_RotateRPY(0x4000, 0, 0, MTXMODE_APPLY);
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPPipeSync(POLY_OPA_DISP++);
         gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 0, 40, 255);
         gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, (s16)this->flashIntensity, 0, 40, 255);
-        gSPDisplayList(POLY_OPA_DISP++, D_04007860);
+        gSPDisplayList(POLY_OPA_DISP++, gBombBodyDL);
         Collider_UpdateSpheres(0, &this->explosionCollider);
     }
 
diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
index 621ac4611..d709c35fd 100644
--- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
@@ -1,4 +1,5 @@
 #include "z_en_bom_chu.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -9,8 +10,6 @@ void EnBomChu_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnBomChu_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_04007E10;
-
 /*
 const ActorInit En_Bom_Chu_InitVars = {
     ACTOR_EN_BOM_CHU,
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index 5a28ab7e6..537a9374e 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_boom.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -54,8 +55,6 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_VEC3S(shape.rot, 0, ICHAIN_STOP),
 };
 
-extern Gfx D_0400C808[];
-
 void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc) {
     this->actionFunc = actionFunc;
 }
@@ -274,7 +273,7 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_boom.c", 601),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_OPA_DISP++, D_0400C808);
+    gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_boom.c", 604);
 }
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
index cd24764a7..5e2403356 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@@ -135,7 +135,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) {
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha);
     gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gGameKeepMoteDL0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gEffFlash1DL));
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 326);
 }
diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index 9fa372255..98261f3b0 100644
--- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bw.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000015
 
@@ -33,7 +34,6 @@ void func_809D0268(EnBw* this, GlobalContext* globalCtx);
 void func_809D03CC(EnBw* this);
 void func_809D0424(EnBw* this, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
 extern AnimationHeader D_06000228;
 extern SkeletonHeader D_060020F0;
 extern AnimationHeader D_060021A0;
@@ -889,7 +889,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
     func_800D1FD4(&globalCtx->mf_11DA0);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1500),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     if (this->iceTimer != 0) {
         thisx->colorFilterTimer++;
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
index a251fddf0..2a60632dd 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@@ -1,4 +1,5 @@
 #include "z_en_dekubaba.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000005
 
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index 64b78e866..896a34b1c 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_door.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -59,23 +60,17 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_STOP),
 };
 
-AnimationHeader* D_809FCECC[] = { 0x0400E758, 0x0400E5B4, 0x04010038, 0x0400E6A0 };
+AnimationHeader* D_809FCECC[] = { &gDoor3Anim, &gDoor1Anim, &gDoor4Anim, &gDoor2Anim };
 
 static u8 sDoorAnimOpenFrames[] = { 25, 25, 25, 25 };
 
 static u8 sDoorAnimCloseFrames[] = { 60, 70, 60, 70 };
 
 static Gfx* D_809FCEE4[5][2] = {
-    { 0x0400ECB8, 0x0400EE00 }, { 0x0600F998, 0x0600F938 }, { 0x06004958, 0x06004A10 },
-    { 0x060013B8, 0x06001420 }, { 0x050047A0, 0x05004978 },
+    { gDoorLeftDL, gDoorRightDL }, { 0x0600F998, 0x0600F938 }, { 0x06004958, 0x06004A10 },
+    { 0x060013B8, 0x06001420 },    { 0x050047A0, 0x05004978 },
 };
 
-extern Gfx D_0400ECB8[];
-extern Gfx D_0400EE00[];
-
-extern AnimationHeader D_0400E758;
-extern SkeletonHeader D_0400FF78;
-
 void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx2) {
     GlobalContext* globalCtx = globalCtx2;
     EnDoor* this = THIS;
@@ -87,7 +82,7 @@ void EnDoor_Init(Actor* thisx, GlobalContext* globalCtx2) {
 
     objectInfo = &sDoorInfo[0];
     Actor_ProcessInitChain(&this->actor, sInitChain);
-    SkelAnime_Init(globalCtx, &this->skelAnime, &D_0400FF78, &D_0400E758, this->jointTable, this->morphTable, 5);
+    SkelAnime_Init(globalCtx, &this->skelAnime, &gDoorSkel, &gDoor3Anim, this->jointTable, this->morphTable, 5);
     for (i = 0; i < ARRAY_COUNT(sDoorInfo) - 2; i++, objectInfo++) {
         if (globalCtx->sceneNum == objectInfo->sceneNum) {
             break;
@@ -335,9 +330,9 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) {
         if (this->actor.world.rot.y != 0) {
             if (1) {}
             if (this->actor.world.rot.y > 0) {
-                gSPDisplayList(POLY_OPA_DISP++, D_0400EE00);
+                gSPDisplayList(POLY_OPA_DISP++, gDoorRightDL);
             } else {
-                gSPDisplayList(POLY_OPA_DISP++, D_0400ECB8);
+                gSPDisplayList(POLY_OPA_DISP++, gDoorLeftDL);
             }
         }
         if (this->lockTimer != 0) {
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index 1e1fd7413..65fe060e6 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_elf.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x02000030
 
@@ -90,9 +91,6 @@ static FairyColorFlags sColorFlags[] = {
     { 0, 0, 1 }, { 2, 0, 1 }, { 0, 2, 1 }, { 1, 1, 0 }, { 1, 0, 1 }, { 0, 1, 1 },
 };
 
-extern SkeletonHeader D_04016A48;
-extern AnimationHeader D_04014BA4;
-
 void EnElf_SetupAction(EnElf* this, EnElfActionFunc actionFunc) {
     this->actionFunc = actionFunc;
 }
@@ -323,7 +321,7 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 i;
 
     Actor_ProcessInitChain(thisx, sInitChain);
-    SkelAnime_Init(globalCtx, &this->skelAnime, &D_04016A48, &D_04014BA4, this->jointTable, this->morphTable, 15);
+    SkelAnime_Init(globalCtx, &this->skelAnime, &gFairySkel, &gFairyAnim, this->jointTable, this->morphTable, 15);
     ActorShape_Init(&thisx->shape, 0.0f, NULL, 15.0f);
     thisx->shape.shadowAlpha = 0xFF;
 
diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
index 5ecb50764..296b97dd1 100644
--- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
+++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
@@ -5,8 +5,9 @@
  */
 
 #include "z_en_ex_item.h"
-#include "vt.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "vt.h"
 
 #define FLAGS 0x00000030
 
@@ -504,7 +505,7 @@ void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) {
     gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 887),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(keySegments[index]));
-    gSPDisplayList(POLY_OPA_DISP++, D_0403F070);
+    gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 893);
 }
diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
index e87505289..f336c3665 100644
--- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
+++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
@@ -1,6 +1,7 @@
 #include "z_en_ex_ruppy.h"
 #include "vt.h"
 #include "../ovl_En_Diving_Game/z_en_diving_game.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -376,7 +377,9 @@ void EnExRuppy_Update(Actor* thisx, GlobalContext* globalCtx) {
     Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 20.0f, 20.0f, 50.0f, 0x1C);
 }
 
-UNK_PTR D_80A0B3B8[] = { 0x04042140, 0x04042160, 0x04042180, 0x040421C0, 0x040421A0 };
+UNK_PTR D_80A0B3B8[] = {
+    gRupeeGreenTex, gRupeeBlueTex, gRupeeRedTex, gRupeePinkTex, gRupeeOrangeTex,
+};
 
 void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
@@ -390,7 +393,7 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) {
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80A0B3B8[this->colorIdx]));
-        gSPDisplayList(POLY_OPA_DISP++, D_04042440);
+        gSPDisplayList(POLY_OPA_DISP++, gRupeeDL);
 
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 784);
     }
diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
index 3ef5f0529..03dea3370 100644
--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
@@ -1,4 +1,5 @@
 #include "z_en_fd.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000215
 
@@ -863,8 +864,8 @@ void EnFd_UpdateDots(EnFd* this) {
 }
 
 void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) {
-    static Gfx* D_80A0E0F8[] = {
-        0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0,
+    static UNK_PTR D_80A0E0F8[] = {
+        gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
     };
     s32 firstDone;
     s16 i;
diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
index 402342c88..0469fda54 100644
--- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
+++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
@@ -1,4 +1,5 @@
 #include "z_en_fd_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000015
 
@@ -13,8 +14,6 @@ void func_80A0E70C(EnFdFire* this, GlobalContext* globalCtx);
 void EnFdFire_DanceTowardsPlayer(EnFdFire* this, GlobalContext* globalCtx);
 void EnFdFire_WaitToDie(EnFdFire* this, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
-
 const ActorInit En_Fd_Fire_InitVars = {
     ACTOR_EN_FD_FIRE,
     ACTORCAT_ENEMY,
@@ -283,7 +282,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
                    envColors[((this->actor.params & 0x8000) >> 0xF)].b,
                    envColors[((this->actor.params & 0x8000) >> 0xF)].a);
     gDPPipeSync(POLY_XLU_DISP++);
-    gSPDisplayList(POLY_XLU_DISP++, &D_0404D4E0);
+    gSPDisplayList(POLY_XLU_DISP++, &gEffFire1DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd_fire.c", 672);
 }
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index 8cfe3990c..7c5f87b2c 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -1,4 +1,5 @@
 #include "z_en_fish.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -9,10 +10,6 @@ void EnFish_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnFish_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnFish_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_040185FC;
-extern UNK_TYPE D_04018FE0;
-extern UNK_TYPE D_0401909C;
-
 /*
 const ActorInit En_Fish_InitVars = {
     ACTOR_EN_FISH,
diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
index af8b42136..69031c56a 100644
--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
@@ -1,5 +1,6 @@
 #include "z_en_fw.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000215
 
@@ -440,8 +441,8 @@ void EnFw_UpdateDust(EnFw* this) {
 }
 
 void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) {
-    static Gfx* D_80A1FC18[] = {
-        0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0,
+    static UNK_PTR D_80A1FC18[] = {
+        gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, gDust4Tex, gDust3Tex, gDust2Tex, gDust1Tex,
     };
     EnFwEffect* eff = this->effects;
     s16 firstDone;
diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
index 35e5a4d00..3eb8d773e 100644
--- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
@@ -9,6 +9,7 @@
 #include "overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000030
 
@@ -466,7 +467,8 @@ void EnGSwitch_DrawPot(Actor* thisx, GlobalContext* globalCtx) {
     }
 }
 
-static u8* sRupeeTex[] = { 0x04042140, 0x04042160, 0x04042180, 0x040421C0, 0x040421A0, 0x040421E0 };
+static UNK_PTR sRupeeTex[] = { gRupeeGreenTex, gRupeeBlueTex,   gRupeeRedTex,
+                               gRupeePinkTex,  gRupeeOrangeTex, gRupeeSilverTex };
 
 void EnGSwitch_DrawRupee(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
@@ -480,7 +482,7 @@ void EnGSwitch_DrawRupee(Actor* thisx, GlobalContext* globalCtx) {
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 957),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRupeeTex[this->colorIdx]));
-        gSPDisplayList(POLY_OPA_DISP++, D_04042440);
+        gSPDisplayList(POLY_OPA_DISP++, gRupeeDL);
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 961);
     }
     if (this->type == ENGSWITCH_TARGET_RUPEE) {
@@ -564,7 +566,7 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, GlobalContext* globalCtx) {
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 1088),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRupeeTex[effect->colorIdx]));
-            gSPDisplayList(POLY_OPA_DISP++, D_04042440);
+            gSPDisplayList(POLY_OPA_DISP++, gRupeeDL);
         }
     }
     CLOSE_DISPS(gfxCtx, "../z_en_g_switch.c", 1095);
diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c
index 5e36f29a9..078e2a799 100644
--- a/src/overlays/actors/ovl_En_Go/z_en_go.c
+++ b/src/overlays/actors/ovl_En_Go/z_en_go.c
@@ -1,4 +1,5 @@
 #include "z_en_go.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000039
 
diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
index 2e3abc769..bdac0d42d 100644
--- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c
+++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c
@@ -1,4 +1,5 @@
 #include "z_en_go2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000039
 
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index f408b1cbb..285c287c7 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -6,7 +6,7 @@
 
 #include "z_en_goroiwa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-
+#include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
 
 #define FLAGS 0x00000010
@@ -76,7 +76,6 @@ static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_HEAVY };
 // Unused
 static f32 D_80A4DEBC[] = { 10.0f, 9.2f };
 
-extern Gfx D_0400D340[];
 extern Gfx D_060006B0[];
 
 void func_80A4BCA0(EnGoroiwa* this) {
@@ -501,7 +500,7 @@ void func_80A4D0FC(EnGoroiwa* this, GlobalContext* globalCtx) {
         fragmentVelocity.z = effectPos.z * 0.2f;
         Math_Vec3f_Sum(&effectPos, thisPos, &effectPos);
         EffectSsKakera_Spawn(globalCtx, &effectPos, &fragmentVelocity, &effectPos, -340, 33, 28, 2, 0,
-                             (Rand_ZeroOne() * 7.0f) + 1.0f, 1, 0, 70, KAKERA_COLOR_NONE, 1, D_0400D340);
+                             (Rand_ZeroOne() * 7.0f) + 1.0f, 1, 0, 70, KAKERA_COLOR_NONE, 1, gBoulderFragmentsDL);
     }
 
     effectPos.x = thisPos->x;
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 06c1485c7..8ac449cd1 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -6,6 +6,7 @@
 
 #include "z_en_gs.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x02000009
 
@@ -21,7 +22,6 @@ void func_80A4F700(EnGs* this, GlobalContext* globalCtx);
 
 void func_80A4F77C(EnGs* this);
 
-extern Gfx D_0404D4E0[];
 extern Gfx D_06000950[];
 extern Gfx D_060009D0[];
 extern Gfx D_06000A60[];
@@ -614,7 +614,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
                 Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 0x20, 0x40, 1, 0, -frames * 0x14, 0x20, 0x80));
             gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 0, 255);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
-            gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+            gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         }
 
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gs.c", 1101);
diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
index 6cb7c16d3..c0b050568 100644
--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_honotrap.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -47,7 +48,6 @@ void EnHonotrap_FlameChase(EnHonotrap* this, GlobalContext* globalCtx);
 void EnHonotrap_SetupFlameVanish(EnHonotrap* this);
 void EnHonotrap_FlameVanish(EnHonotrap* this, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
 extern Gfx D_05006810[];
 
 const ActorInit En_Honotrap_InitVars = {
@@ -519,7 +519,7 @@ void EnHonotrap_DrawFlame(Actor* thisx, GlobalContext* globalCtx) {
                    MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 1024),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 1028);
 }
diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
index 25e6c502a..e46706193 100644
--- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
+++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_horse_normal.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -715,7 +716,7 @@ void EnHorseNormal_Draw(Actor* thisx, GlobalContext* globalCtx) {
         mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_horse_normal.c", 2329);
         if (mtx2 != NULL) {
             gSPMatrix(POLY_XLU_DISP++, mtx2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-            gSPDisplayList(POLY_XLU_DISP++, D_04049AD0);
+            gSPDisplayList(POLY_XLU_DISP++, gHorseShadowDL);
         }
     }
 
diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
index 00aae40d9..292b66bd1 100644
--- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
+++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
@@ -1,4 +1,5 @@
 #include "z_en_ice_hono.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -19,8 +20,6 @@ void EnIceHono_SetupActionDroppedFlame(EnIceHono* this);
 void EnIceHono_SetupActionSpreadFlames(EnIceHono* this);
 void EnIceHono_SetupActionSmallFlame(EnIceHono* this);
 
-extern Gfx D_0404D4E0[];
-
 const ActorInit En_Ice_Hono_InitVars = {
     ACTOR_EN_ICE_HONO,
     ACTORCAT_ITEMACTION,
@@ -387,7 +386,7 @@ void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 718),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 722);
 }
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 011531907..4843d1f82 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -1,5 +1,6 @@
 #include "z_en_insect.h"
 #include "vt.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -26,9 +27,6 @@ void func_80A7D26C(EnInsect* this, GlobalContext* globalCtx);
 void func_80A7D39C(EnInsect* this);
 void func_80A7D460(EnInsect* this, GlobalContext* globalCtx);
 
-extern SkeletonHeader D_04035590;
-extern AnimationHeader D_040341FC;
-
 static f32 D_80A7DEB0 = 0.0f;
 static s16 D_80A7DEB4 = 0;
 static s16 D_80A7DEB8 = 0;
@@ -108,7 +106,7 @@ s32 func_80A7BE6C(EnInsect* this, GlobalContext* globalCtx) {
 }
 
 void func_80A7BF58(EnInsect* this) {
-    Animation_Change(&this->skelAnime, &D_040341FC, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, 0.0f);
+    Animation_Change(&this->skelAnime, &gBugCrawlAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP_INTERP, 0.0f);
 }
 
 /**
@@ -168,7 +166,7 @@ void EnInsect_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     temp_s2 = this->actor.params & 3;
 
-    SkelAnime_Init(globalCtx, &this->skelAnime, &D_04035590, &D_040341FC, this->jointTable, this->morphTable, 24);
+    SkelAnime_Init(globalCtx, &this->skelAnime, &gBugSkel, &gBugCrawlAnim, this->jointTable, this->morphTable, 24);
     Collider_InitJntSph(globalCtx, &this->collider);
     Collider_SetJntSph(globalCtx, &this->collider, &this->actor, &sColliderInit, &this->colliderItem);
 
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index 6b8a895cb..b75559a81 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_kanban.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
 
 #define FLAGS 0x00000019
@@ -75,7 +76,6 @@ void EnKanban_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnKanban_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern Gfx D_0403C050[];
 extern Gfx D_06000C30[];
 extern Gfx D_06001630[];
 
@@ -842,7 +842,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) {
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1725),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         if (this->partFlags == 0xFFFF) {
-            gSPDisplayList(POLY_OPA_DISP++, D_0403C050);
+            gSPDisplayList(POLY_OPA_DISP++, gSignRectangularDL);
         } else {
             for (i = 0; i < ARRAY_COUNT(sPartFlags); i++) {
                 if (sPartFlags[i] & this->partFlags) {
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index 7bc1f9e50..b57116f37 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -6,6 +6,7 @@
 
 #include "z_en_karebaba.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000005
 
@@ -459,7 +460,7 @@ void EnKarebaba_DrawCenterShadow(EnKarebaba* this, GlobalContext* globalCtx) {
     Matrix_Scale(0.15f, 1.0f, 0.15f, MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1029),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_04049210);
+    gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1034);
 }
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 74fb15209..de7292ee9 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -6,6 +6,7 @@
 
 #include "z_en_kusa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
 
 #define FLAGS 0x00800010
@@ -91,8 +92,6 @@ static InitChainEntry sInitChain[] = {
 };
 
 extern Gfx D_060002E0[];
-extern Gfx D_040355E0[]; // bush fragments 1
-extern Gfx D_040356A0[]; // bush fragments 2
 
 void EnKusa_SetupAction(EnKusa* this, EnKusaActionFunc actionFunc) {
     this->timer = 0;
@@ -191,7 +190,7 @@ void EnKusa_SpawnFragments(EnKusa* this, GlobalContext* globalCtx) {
         index = (s32)(Rand_ZeroOne() * 111.1f) & 7;
 
         EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -100, 64, 40, 3, 0, D_80A9C26C[index], 0, 0, 80,
-                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, D_040355E0);
+                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubStalkDL);
 
         pos.x = this->actor.world.pos.x + (scale->x * this->actor.scale.x * 40.0f);
         pos.y = this->actor.world.pos.y + (scale->y * this->actor.scale.y * 40.0f) + 10.0f;
@@ -204,7 +203,7 @@ void EnKusa_SpawnFragments(EnKusa* this, GlobalContext* globalCtx) {
         index = (s32)(Rand_ZeroOne() * 111.1f) % 7;
 
         EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -100, 64, 40, 3, 0, D_80A9C26C[index], 0, 0, 80,
-                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, D_040356A0);
+                             KAKERA_COLOR_NONE, OBJECT_GAMEPLAY_KEEP, gCuttableShrubTipDL);
     }
 }
 
diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c
index 8ff45bc79..35808a507 100644
--- a/src/overlays/actors/ovl_En_Light/z_en_light.c
+++ b/src/overlays/actors/ovl_En_Light/z_en_light.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_light.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -45,7 +46,6 @@ static FlameParams D_80A9E840[] = {
     { { 170, 255, 255, 255 }, { 0, 0, 255 }, 75 },   { { 170, 255, 255, 255 }, { 0, 150, 255 }, 75 },
 };
 
-extern Gfx D_0404D4E0[];
 extern Gfx D_05000440[];
 
 void EnLight_Init(Actor* thisx, GlobalContext* globalCtx) {
@@ -171,7 +171,7 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
             POLY_XLU_DISP++, 0x08,
             Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (this->timer * -20) & 511, 32, 128));
 
-        dList = D_0404D4E0;
+        dList = gEffFire1DL;
         gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, flameParams->primColor.r, flameParams->primColor.g,
                         flameParams->primColor.b, flameParams->primColor.a);
         gDPSetEnvColor(POLY_XLU_DISP++, flameParams->envColor.r, flameParams->envColor.g, flameParams->envColor.b, 0);
diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
index f1d446aca..78f481a4a 100644
--- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
@@ -1,4 +1,5 @@
 #include "z_en_m_thunder.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000000
 
@@ -51,12 +52,6 @@ static u32 D_80AA0458[] = { 0x08000000, 0x02000000, 0x04000000 };
 static u16 sSfxIds[] = { NA_SE_IT_ROLLING_CUT_LV2, NA_SE_IT_ROLLING_CUT_LV1, NA_SE_IT_ROLLING_CUT_LV2,
                          NA_SE_IT_ROLLING_CUT_LV1 };
 
-extern Gfx D_04012570[];
-extern Gfx D_04012690[];
-extern Gfx D_04012AF0[];
-extern Gfx D_04012C10[];
-extern Gfx D_04013610[];
-
 // Setup action
 void func_80A9EFE0(EnMThunder* this, EnMThunderActionFunc actionFunc) {
     this->actionFunc = actionFunc;
@@ -345,13 +340,13 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) {
     switch (this->unk_1C6) {
         case 0:
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 170, (u8)((u32)(this->unk_1B0 * 255) & 0xFF));
-            gSPDisplayList(POLY_XLU_DISP++, D_04012AF0);
-            gSPDisplayList(POLY_XLU_DISP++, D_04012C10);
+            gSPDisplayList(POLY_XLU_DISP++, gSpinAttack3DL);
+            gSPDisplayList(POLY_XLU_DISP++, gSpinAttack4DL);
             break;
         case 1:
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, (u8)((u32)(this->unk_1B0 * 255) & 0xFF));
-            gSPDisplayList(POLY_XLU_DISP++, D_04012570);
-            gSPDisplayList(POLY_XLU_DISP++, D_04012690);
+            gSPDisplayList(POLY_XLU_DISP++, gSpinAttack1DL);
+            gSPDisplayList(POLY_XLU_DISP++, gSpinAttack2DL);
             break;
     }
 
@@ -404,7 +399,7 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) {
                                 (globalCtx->gameplayFrames * 0x14) & 0xFF,
                                 (u8)(globalCtx->gameplayFrames * phi_t1) & 0xFF, 8, 8));
 
-    gSPDisplayList(POLY_XLU_DISP++, D_04013610);
+    gSPDisplayList(POLY_XLU_DISP++, gSpinAttackChargingDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 1031);
 }
diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
index ebcf34871..5cc7250a4 100644
--- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
@@ -1,4 +1,5 @@
 #include "z_en_ossan.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000019
 
@@ -8,9 +9,6 @@ void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx);
 void EnOssan_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnOssan_Update(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_0400CDC0;
-extern UNK_TYPE D_0400CE40;
-extern UNK_TYPE D_0400CF40;
 extern UNK_TYPE D_060000F0;
 extern UNK_TYPE D_060000FC;
 extern UNK_TYPE D_060002E4;
diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
index adc0fafc1..765e12b61 100644
--- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_po_field.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00001035
 
@@ -151,7 +152,6 @@ extern AnimationHeader D_06000F9C;
 extern AnimationHeader D_06000608;
 extern AnimationHeader D_06000454;
 extern AnimationHeader D_06001360;
-extern Gfx D_0404D4E0[];
 extern Gfx D_060059F0[];
 extern Gfx D_06005900[];
 extern Gfx D_06005620[];
@@ -810,7 +810,7 @@ void EnPoField_DrawFlame(EnPoField* this, GlobalContext* globalCtx) {
         }
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1709),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1712);
     }
 }
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index d1089914e..b58ca4d6b 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_po_sisters.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00005215
 
@@ -175,8 +176,6 @@ extern AnimationHeader D_06000680;
 extern Gfx D_060027B0[];
 extern Gfx D_060046E0[];
 
-extern Gfx D_0404D4E0[];
-
 void EnPoSisters_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnPoSisters* this = THIS;
     s32 pad;
@@ -1414,7 +1413,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) {
         Matrix_Scale(phi_f20, phi_f20, phi_f20, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3132),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3139);
 }
diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
index a21b41997..22745408f 100644
--- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
+++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c
@@ -57,7 +57,7 @@ void EnPubox_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->dyna.unk_15C = DPM_UNK;
     thisx->targetMode = 1;
     thisx->gravity = -2.0f;
-    CollisionHeader_GetVirtual(&gPuBoxCol, &colHeader);
+    CollisionHeader_GetVirtual(&gUnknownUnusedBox2Col, &colHeader);
     this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader);
 }
 
@@ -87,5 +87,5 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void EnPubox_Draw(Actor* thisx, GlobalContext* globalCtx) {
-    Gfx_DrawDListOpa(globalCtx, gPuBoxDL2);
+    Gfx_DrawDListOpa(globalCtx, gUnknownUnusedBox2DL);
 }
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 459ed3951..d638ca09e 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_tk.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000009
 
@@ -20,14 +21,6 @@ void EnTk_Rest(EnTk* this, GlobalContext* globalCtx);
 void EnTk_Walk(EnTk* this, GlobalContext* globalCtx);
 void EnTk_Dig(EnTk* this, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_04051DB0;
-extern UNK_TYPE D_040521B0;
-extern UNK_TYPE D_040525B0;
-extern UNK_TYPE D_040529B0;
-extern UNK_TYPE D_04052DB0;
-extern UNK_TYPE D_040531B0;
-extern UNK_TYPE D_040535B0;
-extern UNK_TYPE D_040539B0;
 extern AnimationHeader D_06001144;
 extern AnimationHeader D_06001FA8;
 extern AnimationHeader D_06002F84;
@@ -96,8 +89,8 @@ void EnTkEff_Update(EnTk* this) {
 }
 
 void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
-    static UNK_PTR images[] = {
-        &D_040539B0, &D_040535B0, &D_040531B0, &D_04052DB0, &D_040529B0, &D_040525B0, &D_040521B0, &D_04051DB0,
+    static UNK_PTR dustImages[] = {
+        &gDust8Tex, &gDust7Tex, &gDust6Tex, &gDust5Tex, &gDust4Tex, &gDust3Tex, &gDust2Tex, &gDust1Tex,
     };
 
     EnTkEff* eff = this->eff;
@@ -133,8 +126,8 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-            imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(images) / eff->timeTotal);
-            gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(images[imageIdx]));
+            imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(dustImages) / eff->timeTotal);
+            gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustImages[imageIdx]));
 
             gSPDisplayList(POLY_XLU_DISP++, D_0600BCA0);
         }
diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c
index fe49bf9b7..3b03d2773 100644
--- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c
+++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c
@@ -39,5 +39,5 @@ void EnVase_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void EnVase_Draw(Actor* thisx, GlobalContext* globalCtx) {
-    Gfx_DrawDListOpa(globalCtx, &gVaseDL);
+    Gfx_DrawDListOpa(globalCtx, &gUnusedVaseDL);
 }
diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
index 02b11d5c9..99fd39037 100644
--- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
+++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
@@ -6,6 +6,7 @@
 
 #include "z_en_viewer.h"
 #include "overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -37,7 +38,6 @@ void func_80B2BA38(EnViewer* this, GlobalContext* globalCtx);
 void func_80B2C130(EnViewer* this, GlobalContext* globalCtx);
 
 extern Mtx D_01000000;
-extern Gfx D_0404D4E0[];
 extern AnimationHeader D_06000450;
 extern AnimationHeader D_060005B4;
 extern AnimationHeader D_060008A0;
@@ -874,7 +874,7 @@ void func_80B2C8AC(EnViewer* this2, GlobalContext* globalCtx) {
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_viewer.c", 2027),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 2034);
 }
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
index 257de1df2..a693e0553 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
@@ -6,6 +6,7 @@
 
 #include "z_en_vm.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000011
 
@@ -121,12 +122,14 @@ static Vec3f D_80B2EB70 = { -500.0f, 0.0f, 0.0f };
 
 static Vec3f D_80B2EB7C = { 0.4f, 0.4f, 0.4f };
 
-static UNK_PTR D_80B2EB88[] = { 0x0402CFE0, 0x0402D7E0, 0x0402DFE0, 0x0402E7E0, 0x0402EFE0,
-                                0x0402F7E0, 0x0402FFE0, 0x040307E0, 0x04030FE0, 0x040317E0 };
+static UNK_PTR D_80B2EB88[] = {
+    gEffEnemyDeathFlame1Tex, gEffEnemyDeathFlame2Tex,  gEffEnemyDeathFlame3Tex, gEffEnemyDeathFlame4Tex,
+    gEffEnemyDeathFlame5Tex, gEffEnemyDeathFlame6Tex,  gEffEnemyDeathFlame7Tex, gEffEnemyDeathFlame8Tex,
+    gEffEnemyDeathFlame9Tex, gEffEnemyDeathFlame10Tex,
+};
 
 extern SkeletonHeader D_06003F60;
 extern AnimationHeader D_06000068;
-extern Gfx D_04031FE0[];
 extern Gfx D_06002728[];
 
 void EnVm_SetupAction(EnVm* this, EnVmActionFunc actionFunc) {
@@ -539,12 +542,12 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx) {
         func_80094BC4(globalCtx->state.gfxCtx);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 255, 0);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[globalCtx2->gameplayFrames % 8]));
-        gSPDisplayList(POLY_XLU_DISP++, D_04031FE0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL);
         Matrix_RotateY(32767.0f, MTXMODE_APPLY);
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vm.c", 1044),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[(globalCtx2->gameplayFrames + 4) % 8]));
-        gSPDisplayList(POLY_XLU_DISP++, D_04031FE0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL);
     }
     gSPSegment(POLY_OPA_DISP++, 0x08, func_80094E78(globalCtx->state.gfxCtx, 0, this->beamTexScroll));
     Matrix_Translate(this->beamPos1.x, this->beamPos1.y, this->beamPos1.z, MTXMODE_NEW);
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
index b117168f4..9ea7bb8c9 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_wallmas.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000015
 
@@ -613,7 +614,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) {
 
     Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD);
-    gSPDisplayList(POLY_XLU_DISP++, &D_04049210);
+    gSPDisplayList(POLY_XLU_DISP++, &gCircleShadowDL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426);
 }
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
index ad6a2c601..b03f41236 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c
@@ -221,7 +221,7 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) {
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, (s32)(this->primAlpha * 0.6f) & 0xFF);
         gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 128);
-        gSPDisplayList(POLY_XLU_DISP++, sDiamondTextureDList);
+        gSPDisplayList(POLY_XLU_DISP++, sDiamondTexDList);
         gSPDisplayList(POLY_XLU_DISP++,
                        Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 2, gameplayFrames * -4, 32, 32, 1,
                                         0, gameplayFrames * -16, 64, 32));
@@ -270,12 +270,12 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) {
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 632),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY);
-    gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
     Matrix_Pull();
     Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY);
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 639),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 643);
 }
diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c
index dfe6b5661..6326e3766 100644
--- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c
+++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c
@@ -1,11 +1,10 @@
 #include "z_magic_dark.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
-static u64 sDiamondTexture[] = {
+static u64 sDiamondTex[] = {
 #include "assets/overlays/ovl_Magic_Dark/diamond_texture.i8.inc.c"
 };
 
-extern UNK_TYPE D_04032490[];
-
 static Vtx sDiamondVerts[] = {
     VTX(0, 0, 64, 1024, 512, 0x00, 0x00, 0x78, 0xFF),    VTX(55, 0, 32, 1707, 512, 0x67, 0x00, 0x3C, 0xFF),
     VTX(0, 108, 0, 1365, 0, 0x00, 0x78, 0x00, 0xFF),     VTX(55, 0, -32, 2389, 512, 0x67, 0x00, 0xC4, 0xFF),
@@ -19,13 +18,13 @@ static Vtx sDiamondVerts[] = {
     VTX(-55, 0, 32, 2389, 512, 0x98, 0x00, 0x3C, 0xFF),  VTX(-55, 0, -32, 1707, 512, 0x99, 0x00, 0xC4, 0xFF),
 };
 
-static Gfx sDiamondTextureDList[] = {
+static Gfx sDiamondTexDList[] = {
     gsDPPipeSync(),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPLoadTextureBlock(D_04032490, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
+    gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
                          G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, 1),
-    gsDPLoadMultiBlock(sDiamondTexture, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
+    gsDPLoadMultiBlock(sDiamondTex, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
                        G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 13),
     gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE,
                        ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0),
diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
index c644aaad9..05f935fa0 100644
--- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
+++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_bean.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00400000
 
diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
index cbc41deec..e966e0b7c 100644
--- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
+++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_ice_poly.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000010
 
@@ -18,8 +19,6 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx);
 void ObjIcePoly_Idle(ObjIcePoly* this, GlobalContext* globalCtx);
 void ObjIcePoly_Melt(ObjIcePoly* this, GlobalContext* globalCtx);
 
-extern Gfx* D_04033EE0[];
-
 const ActorInit Obj_Ice_Poly_InitVars = {
     ACTOR_OBJ_ICE_POLY,
     ACTORCAT_PROP,
@@ -206,7 +205,7 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx) {
                Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, globalCtx->gameplayFrames % 0x100, 0x20, 0x10, 1, 0,
                                 (globalCtx->gameplayFrames * 2) % 0x100, 0x40, 0x20));
     gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, this->alpha);
-    gSPDisplayList(POLY_XLU_DISP++, D_04033EE0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_ice_poly.c", 444);
 }
diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
index 914a0f354..a180b0f38 100644
--- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
@@ -6,6 +6,7 @@
 
 #include "z_obj_syokudai.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x00000410
 
@@ -16,8 +17,6 @@ void ObjSyokudai_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void ObjSyokudai_Update(Actor* thisx, GlobalContext* globalCtx);
 void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern Gfx D_0404D4E0[];
-
 const ActorInit Obj_Syokudai_InitVars = {
     ACTOR_OBJ_SYOKUDAI,
     ACTORCAT_PROP,
@@ -302,7 +301,7 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745),
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 749);
 }
diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index ed8dc8753..31fedde2c 100644
--- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_object_kankyo.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS 0x02000030
 
@@ -16,12 +17,6 @@ void ObjectKankyo_Update(Actor* thisx, GlobalContext* globalCtx);
 void ObjectKankyo_Draw(Actor* thisx, GlobalContext* globalCtx);
 
 extern UNK_TYPE D_01000000;
-extern UNK_TYPE D_04010050;
-extern UNK_TYPE D_0402CF30;
-extern UNK_TYPE D_0404C160;
-extern UNK_TYPE D_0404D160;
-extern UNK_TYPE D_0404D1A8;
-extern UNK_TYPE D_04052DB0;
 extern UNK_TYPE D_06005FF0;
 extern UNK_TYPE D_06009620;
 
diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c
index e2a9ebef2..5e94690c6 100644
--- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c
+++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c
@@ -1,7 +1,5 @@
 #include "z_oceff_storm.h"
-
-extern u32 D_04032490[];
-extern u32 D_04032890[];
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 static u32 tex0[] = {
     0x2F6E6F59, 0x6197B3CC, 0xC8AD8E6C, 0x5333170A, 0x17366173, 0x86ABC7C6, 0xA9928C7E, 0x55496341, 0x40705B59,
@@ -157,9 +155,9 @@ static Gfx sCylinderTexDl[] = {
     gsDPPipeSync(),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPLoadTextureBlock(D_04032490, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
+    gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
                          G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 2, 13),
-    gsDPLoadMultiBlock(D_04032890, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
+    gsDPLoadMultiBlock(gEffUnknown11Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
                        G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 12),
     gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT,
                        COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
index 94c337f43..933aa470c 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
@@ -98,12 +98,12 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
     if (this->actor.params == OCEFF_WIPE4_UNUSED) {
-        gSPDisplayList(POLY_XLU_DISP++, sTextureDL1);
+        gSPDisplayList(POLY_XLU_DISP++, sTexture1DL);
     } else {
-        gSPDisplayList(POLY_XLU_DISP++, sTextureDL0);
+        gSPDisplayList(POLY_XLU_DISP++, sTexture0DL);
     }
 
-    gSPDisplayList(POLY_XLU_DISP++, sTextureDL2);
+    gSPDisplayList(POLY_XLU_DISP++, sTexture2DL);
     gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64, 1,
                                                      scroll * (-1), scroll, 32, 32));
     gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl);
diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c
index dd7a1ef05..f843987ee 100644
--- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c
+++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c
@@ -1,6 +1,5 @@
 #include "z_oceff_wipe4.h"
-
-extern u8 D_04032C90[];
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 static u32 tex0[] = {
     0x00061507, 0x00000000, 0x295a2b08, 0x10030f03, 0x0d070006, 0x00031625, 0x3f230012, 0x79590000, 0x00102c2a,
@@ -76,29 +75,29 @@ static Vtx vertices[] = {
     VTX(143, -46, 0, 410, 1024, 0xFF, 0xFF, 0xFF, 0x00),   VTX(243, -176, 1000, 307, 0, 0xFF, 0xFF, 0xFF, 0xFF),
 };
 
-static Gfx sTextureDL0[] = {
+static Gfx sTexture0DL[] = {
     gsDPPipeSync(),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPLoadMultiBlock(D_04032C90, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
+    gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
                        G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 15),
     gsDPSetPrimColor(0x00, 0x00, 170, 255, 255, 255),
     gsDPSetEnvColor(0, 150, 0, 128),
     gsSPEndDisplayList(),
 };
 
-static Gfx sTextureDL1[] = {
+static Gfx sTexture1DL[] = {
     gsDPPipeSync(),
     gsDPSetTextureLUT(G_TT_NONE),
     gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
-    gsDPLoadMultiBlock(D_04032C90, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
+    gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
                        G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 0),
     gsDPSetPrimColor(0x00, 0x00, 255, 170, 255, 255),
     gsDPSetEnvColor(120, 0, 100, 128),
     gsSPEndDisplayList(),
 };
 
-static Gfx sTextureDL2[] = {
+static Gfx sTexture2DL[] = {
     gsDPPipeSync(),
     gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
                          G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 6, 14, 1),
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index b2cfc50a4..1e0091d56 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -15,6 +15,7 @@
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define THIS ((Player*)thisx)
 
@@ -392,15 +393,15 @@ PlayerAgeProperties sAgeProperties[] = {
         },
         0,
         0x80,
-        0x04002718,
-        0x04002720,
-        0x04002838,
-        0x04002E70,
-        0x04002E78,
-        { 0x04002E80, 0x04002E88, 0x04002D90, 0x04002D98 },
-        { 0x04002D70, 0x04002D78 },
-        { 0x04002E50, 0x04002E58 },
-        { 0x04002E68, 0x04002E60 },
+        &gPlayer132Anim,
+        &gPlayer133Anim,
+        &gPlayer168Anim,
+        &gPlayer367Anim,
+        &gPlayer368Anim,
+        { &gPlayer369Anim, &gPlayer370Anim, &gPlayer339Anim, &gPlayer340Anim },
+        { &gPlayer335Anim, &gPlayer336Anim },
+        { &gPlayer363Anim, &gPlayer364Anim },
+        { &gPlayer366Anim, &gPlayer365Anim },
     },
     {
         40.0f,
@@ -443,15 +444,15 @@ PlayerAgeProperties sAgeProperties[] = {
         },
         0x20,
         0,
-        0x04002318,
-        0x04002360,
-        0x040023A8,
-        0x040023E0,
-        0x040023E8,
-        { 0x040023F0, 0x040023F8, 0x04002D90, 0x04002D98 },
-        { 0x04002D70, 0x04002D78 },
-        { 0x040023C0, 0x040023C8 },
-        { 0x040023D8, 0x040023D0 },
+        &gPlayer4Anim,
+        &gPlayer13Anim,
+        &gPlayer22Anim,
+        &gPlayer29Anim,
+        &gPlayer30Anim,
+        { &gPlayer31Anim, &gPlayer32Anim, &gPlayer339Anim, &gPlayer340Anim },
+        { &gPlayer335Anim, &gPlayer336Anim },
+        { &gPlayer25Anim, &gPlayer26Anim },
+        { &gPlayer28Anim, &gPlayer27Anim },
     },
 };
 
@@ -611,197 +612,198 @@ GetItemEntry sGetItemTable[] = {
 };
 
 LinkAnimationHeader* D_80853914[] = {
-    0x04003240, 0x04003238, 0x04003238, 0x04002BE0, 0x04003240, 0x04003240,
+    &gPlayer489Anim, &gPlayer488Anim, &gPlayer488Anim, &gPlayer285Anim, &gPlayer489Anim, &gPlayer489Anim,
 };
 
 LinkAnimationHeader* D_8085392C[] = {
-    0x04003290, 0x04003268, 0x04003268, 0x04002BF8, 0x04003290, 0x04003290,
+    &gPlayer499Anim, &gPlayer494Anim, &gPlayer494Anim, &gPlayer288Anim, &gPlayer499Anim, &gPlayer499Anim,
 };
 
 LinkAnimationHeader* D_80853944[] = {
-    0x04003140, 0x04002B38, 0x04003138, 0x04002B40, 0x04003140, 0x04003140,
+    &gPlayer457Anim, &gPlayer264Anim, &gPlayer456Anim, &gPlayer265Anim, &gPlayer457Anim, &gPlayer457Anim,
 };
 
 LinkAnimationHeader* D_8085395C[] = {
-    0x04002E98, 0x040029E8, 0x04002E98, 0x040029F0, 0x04002E98, 0x04002E98,
+    &gPlayer372Anim, &gPlayer222Anim, &gPlayer372Anim, &gPlayer223Anim, &gPlayer372Anim, &gPlayer372Anim,
 };
 
 LinkAnimationHeader* D_80853974[] = {
-    0x04002FB0, 0x04002FA8, 0x04002FB0, 0x04002A40, 0x04002FB0, 0x04002FB0,
+    &gPlayer407Anim, &gPlayer406Anim, &gPlayer407Anim, &gPlayer233Anim, &gPlayer407Anim, &gPlayer407Anim,
 };
 
 LinkAnimationHeader* D_8085398C[] = {
-    0x04003220, 0x04002590, 0x04002590, 0x04002BC0, 0x04003220, 0x04003220,
+    &gPlayer485Anim, &gPlayer83Anim, &gPlayer83Anim, &gPlayer281Anim, &gPlayer485Anim, &gPlayer485Anim,
 };
 
 LinkAnimationHeader* D_808539A4[] = {
-    0x04003230, 0x040025D0, 0x040025D0, 0x04002BD0, 0x04003230, 0x04003230,
+    &gPlayer487Anim, &gPlayer91Anim, &gPlayer91Anim, &gPlayer283Anim, &gPlayer487Anim, &gPlayer487Anim,
 };
 
 LinkAnimationHeader* D_808539BC[] = {
-    0x04002BB0, 0x040031F8, 0x040031F8, 0x04002BB0, 0x04002BB0, 0x04002BB0,
+    &gPlayer279Anim, &gPlayer480Anim, &gPlayer480Anim, &gPlayer279Anim, &gPlayer279Anim, &gPlayer279Anim,
 };
 
 LinkAnimationHeader* D_808539D4[] = {
-    0x04003088, 0x04002A70, 0x04002A70, 0x04003088, 0x04003088, 0x04003088,
+    &gPlayer434Anim, &gPlayer239Anim, &gPlayer239Anim, &gPlayer434Anim, &gPlayer434Anim, &gPlayer434Anim,
 };
 
 LinkAnimationHeader* D_808539EC[] = {
-    0x04002750, 0x04002748, 0x04002748, 0x04002750, 0x04002750, 0x04002750,
+    &gPlayer139Anim, &gPlayer138Anim, &gPlayer138Anim, &gPlayer139Anim, &gPlayer139Anim, &gPlayer139Anim,
 };
 
 LinkAnimationHeader* D_80853A04[] = {
-    0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330, 0x04002330,
+    &gPlayer7Anim, &gPlayer7Anim, &gPlayer7Anim, &gPlayer7Anim, &gPlayer7Anim, &gPlayer7Anim,
 };
 
 LinkAnimationHeader* D_80853A1C[] = {
-    0x04002760, 0x04002758, 0x04002758, 0x04002760, 0x04002760, 0x04002760,
+    &gPlayer141Anim, &gPlayer140Anim, &gPlayer140Anim, &gPlayer141Anim, &gPlayer141Anim, &gPlayer141Anim,
 };
 
 LinkAnimationHeader* D_80853A34[] = {
-    0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338, 0x04002338,
+    &gPlayer8Anim, &gPlayer8Anim, &gPlayer8Anim, &gPlayer8Anim, &gPlayer8Anim, &gPlayer8Anim,
 };
 
 LinkAnimationHeader* D_80853A4C[] = {
-    0x04002E08, 0x04002E00, 0x04002E00, 0x04002E08, 0x04002E08, 0x04002E08,
+    &gPlayer354Anim, &gPlayer353Anim, &gPlayer353Anim, &gPlayer354Anim, &gPlayer354Anim, &gPlayer354Anim,
 };
 
 LinkAnimationHeader* D_80853A64[] = {
-    0x04003028, 0x04003020, 0x04003020, 0x04003028, 0x04003028, 0x04003028,
+    &gPlayer422Anim, &gPlayer421Anim, &gPlayer421Anim, &gPlayer422Anim, &gPlayer422Anim, &gPlayer422Anim,
 };
 
 LinkAnimationHeader* D_80853A7C[] = {
-    0x04003170, 0x04003168, 0x04003168, 0x04003170, 0x04003170, 0x04003170,
+    &gPlayer463Anim, &gPlayer462Anim, &gPlayer462Anim, &gPlayer463Anim, &gPlayer463Anim, &gPlayer463Anim,
 };
 
 LinkAnimationHeader* D_80853A94[] = {
-    0x04003038, 0x04003030, 0x04003030, 0x04002A68, 0x04003038, 0x04003038,
+    &gPlayer424Anim, &gPlayer423Anim, &gPlayer423Anim, &gPlayer238Anim, &gPlayer424Anim, &gPlayer424Anim,
 };
 
 LinkAnimationHeader* D_80853AAC[] = {
-    0x04002FC0, 0x04002FB8, 0x04002FB8, 0x04002FC8, 0x04002FC0, 0x04002FC0,
+    &gPlayer409Anim, &gPlayer408Anim, &gPlayer408Anim, &gPlayer410Anim, &gPlayer409Anim, &gPlayer409Anim,
 };
 
 LinkAnimationHeader* D_80853AC4[] = {
-    0x04003278, 0x04003270, 0x04003270, 0x04002BE8, 0x04003278, 0x04003278,
+    &gPlayer496Anim, &gPlayer495Anim, &gPlayer495Anim, &gPlayer286Anim, &gPlayer496Anim, &gPlayer496Anim,
 };
 
 LinkAnimationHeader* D_80853ADC[] = {
-    0x04003288, 0x04003280, 0x04003280, 0x04002BF0, 0x04003288, 0x04003288,
+    &gPlayer498Anim, &gPlayer497Anim, &gPlayer497Anim, &gPlayer287Anim, &gPlayer498Anim, &gPlayer498Anim,
 };
 
 LinkAnimationHeader* D_80853AF4[] = {
-    0x04002EB8, 0x04002EA0, 0x04002EA0, 0x04002EB8, 0x040026C8, 0x04002EB8,
+    &gPlayer376Anim, &gPlayer373Anim, &gPlayer373Anim, &gPlayer376Anim, &gPlayer122Anim, &gPlayer376Anim,
 };
 
 LinkAnimationHeader* D_80853B0C[] = {
-    0x04002ED8, 0x04002ED0, 0x04002ED0, 0x04002ED8, 0x040026D0, 0x04002ED8,
+    &gPlayer380Anim, &gPlayer379Anim, &gPlayer379Anim, &gPlayer380Anim, &gPlayer123Anim, &gPlayer380Anim,
 };
 
 LinkAnimationHeader* D_80853B24[] = {
-    0x04002EB0, 0x04002EA8, 0x04002EA8, 0x04002EB0, 0x04002EB0, 0x04002EB0,
+    &gPlayer375Anim, &gPlayer374Anim, &gPlayer374Anim, &gPlayer375Anim, &gPlayer375Anim, &gPlayer375Anim,
 };
 
 LinkAnimationHeader* D_80853B3C[] = {
-    0x04003190, 0x04003188, 0x04003188, 0x04002B68, 0x04003190, 0x04003190,
+    &gPlayer467Anim, &gPlayer466Anim, &gPlayer466Anim, &gPlayer270Anim, &gPlayer467Anim, &gPlayer467Anim,
 };
 
 LinkAnimationHeader* D_80853B54[] = {
-    0x04003178, 0x04002568, 0x04002568, 0x04002B58, 0x04003178, 0x04003178,
+    &gPlayer464Anim, &gPlayer78Anim, &gPlayer78Anim, &gPlayer268Anim, &gPlayer464Anim, &gPlayer464Anim,
 };
 
 LinkAnimationHeader* D_80853B6C[] = {
-    0x04003180, 0x04002570, 0x04002570, 0x04002B60, 0x04003180, 0x04003180,
+    &gPlayer465Anim, &gPlayer79Anim, &gPlayer79Anim, &gPlayer269Anim, &gPlayer465Anim, &gPlayer465Anim,
 };
 
 LinkAnimationHeader* D_80853B84[] = {
-    0x04002D60, 0x04002D58, 0x04002D58, 0x04002D60, 0x04002D60, 0x04002D60,
+    &gPlayer333Anim, &gPlayer332Anim, &gPlayer332Anim, &gPlayer333Anim, &gPlayer333Anim, &gPlayer333Anim,
 };
 
 LinkAnimationHeader* D_80853B9C[] = {
-    0x04002BB8, 0x04003218, 0x04003218, 0x04002BB8, 0x04002BB8, 0x04002BB8,
+    &gPlayer280Anim, &gPlayer484Anim, &gPlayer484Anim, &gPlayer280Anim, &gPlayer280Anim, &gPlayer280Anim,
 };
 
 LinkAnimationHeader* D_80853BB4[] = {
-    0x04002BC8, 0x04003228, 0x04003228, 0x04002BC8, 0x04002BC8, 0x04002BC8,
+    &gPlayer282Anim, &gPlayer486Anim, &gPlayer486Anim, &gPlayer282Anim, &gPlayer282Anim, &gPlayer282Anim,
 };
 
 LinkAnimationHeader* D_80853BCC[] = {
-    0x040031C8, 0x040031C0, 0x040031C0, 0x040031C8, 0x040031C8, 0x040031C8,
+    &gPlayer474Anim, &gPlayer473Anim, &gPlayer473Anim, &gPlayer474Anim, &gPlayer474Anim, &gPlayer474Anim,
 };
 
 LinkAnimationHeader* D_80853BE4[] = {
-    0x04003118, 0x04003110, 0x04003110, 0x04003118, 0x04003118, 0x04003118,
+    &gPlayer452Anim, &gPlayer451Anim, &gPlayer451Anim, &gPlayer452Anim, &gPlayer452Anim, &gPlayer452Anim,
 };
 
 LinkAnimationHeader* D_80853BFC[] = {
-    0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8, 0x04002DE8,
+    &gPlayer350Anim, &gPlayer350Anim, &gPlayer350Anim, &gPlayer350Anim, &gPlayer350Anim, &gPlayer350Anim,
 };
 
 LinkAnimationHeader* D_80853C14[] = {
-    0x04002E30, 0x04002E18, 0x04002E18, 0x04002E30, 0x04002E30, 0x04002E30,
+    &gPlayer359Anim, &gPlayer356Anim, &gPlayer356Anim, &gPlayer359Anim, &gPlayer359Anim, &gPlayer359Anim,
 };
 
 LinkAnimationHeader* D_80853C2C[] = {
-    0x04002E40, 0x04002E38, 0x04002E38, 0x04002E40, 0x04002E40, 0x04002E40,
+    &gPlayer361Anim, &gPlayer360Anim, &gPlayer360Anim, &gPlayer361Anim, &gPlayer361Anim, &gPlayer361Anim,
 };
 
 LinkAnimationHeader* D_80853C44[] = {
-    0x04002E28, 0x04002E20, 0x04002E20, 0x04002E28, 0x04002E28, 0x04002E28,
+    &gPlayer358Anim, &gPlayer357Anim, &gPlayer357Anim, &gPlayer358Anim, &gPlayer358Anim, &gPlayer358Anim,
 };
 
 LinkAnimationHeader* D_80853C5C[] = {
-    0x040030C8, 0x040030C0, 0x040030C0, 0x040030C8, 0x040030C8, 0x040030C8,
+    &gPlayer442Anim, &gPlayer441Anim, &gPlayer441Anim, &gPlayer442Anim, &gPlayer442Anim, &gPlayer442Anim,
 };
 
 LinkAnimationHeader* D_80853C74[] = {
-    0x040030D8, 0x040030D0, 0x040030D0, 0x040030D8, 0x040030D8, 0x040030D8,
+    &gPlayer444Anim, &gPlayer443Anim, &gPlayer443Anim, &gPlayer444Anim, &gPlayer444Anim, &gPlayer444Anim,
 };
 
 LinkAnimationHeader* D_80853C8C[] = {
-    0x040030B8, 0x040030B0, 0x040030B0, 0x040030B8, 0x040030B8, 0x040030B8,
+    &gPlayer440Anim, &gPlayer439Anim, &gPlayer439Anim, &gPlayer440Anim, &gPlayer440Anim, &gPlayer440Anim,
 };
 
 LinkAnimationHeader* D_80853CA4[] = {
-    0x04002F20, 0x04002F18, 0x04002F18, 0x04002F20, 0x04002F20, 0x04002F20,
+    &gPlayer389Anim, &gPlayer388Anim, &gPlayer388Anim, &gPlayer389Anim, &gPlayer389Anim, &gPlayer389Anim,
 };
 
 LinkAnimationHeader* D_80853CBC[] = {
-    0x04002FF0, 0x04002FE8, 0x04002FE8, 0x04002FF0, 0x04002FF0, 0x04002FF0,
+    &gPlayer415Anim, &gPlayer414Anim, &gPlayer414Anim, &gPlayer415Anim, &gPlayer415Anim, &gPlayer415Anim,
 };
 
 LinkAnimationHeader* D_80853CD4[] = {
-    0x04003010, 0x04003008, 0x04003008, 0x04003010, 0x04003010, 0x04003010,
+    &gPlayer419Anim, &gPlayer418Anim, &gPlayer418Anim, &gPlayer419Anim, &gPlayer419Anim, &gPlayer419Anim,
 };
 
 LinkAnimationHeader* D_80853CEC[] = {
-    0x04003000, 0x04002FF8, 0x04002FF8, 0x04003000, 0x04003000, 0x04003000,
+    &gPlayer417Anim, &gPlayer416Anim, &gPlayer416Anim, &gPlayer417Anim, &gPlayer417Anim, &gPlayer417Anim,
 };
 
 LinkAnimationHeader* D_80853D04[] = {
-    0x04002EF0, 0x04002EE8, 0x04002EE8, 0x04002EF8, 0x04002EF0, 0x04002EF0,
+    &gPlayer383Anim, &gPlayer382Anim, &gPlayer382Anim, &gPlayer384Anim, &gPlayer383Anim, &gPlayer383Anim,
 };
 
 LinkAnimationHeader* D_80853D1C[] = {
-    0x040031E0, 0x040031D8, 0x040031D8, 0x040031E8, 0x040031E0, 0x040031E0,
+    &gPlayer477Anim, &gPlayer476Anim, &gPlayer476Anim, &gPlayer478Anim, &gPlayer477Anim, &gPlayer477Anim,
 };
 
 LinkAnimationHeader* D_80853D34[] = {
-    0x04003468, 0x04003438, 0x04003438, 0x04003468, 0x04003468, 0x04003468,
+    &gPlayer558Anim, &gPlayer552Anim, &gPlayer552Anim, &gPlayer558Anim, &gPlayer558Anim, &gPlayer558Anim,
 };
 
 LinkAnimationHeader* D_80853D4C[][3] = {
-    { 0x04002A28, 0x04002A38, 0x04002A30 },
-    { 0x04002950, 0x04002960, 0x04002958 },
-    { 0x040029D0, 0x040029E0, 0x040029D8 },
-    { 0x04002988, 0x04002998, 0x04002990 },
+    { &gPlayer230Anim, &gPlayer232Anim, &gPlayer231Anim },
+    { &gPlayer203Anim, &gPlayer205Anim, &gPlayer204Anim },
+    { &gPlayer219Anim, &gPlayer221Anim, &gPlayer220Anim },
+    { &gPlayer210Anim, &gPlayer212Anim, &gPlayer211Anim },
 };
 
 LinkAnimationHeader* D_80853D7C[][2] = {
-    { 0x04003248, 0x04003200 }, { 0x04003258, 0x04003210 }, { 0x04003250, 0x04003208 }, { 0x04003250, 0x04003208 },
-    { 0x04003430, 0x040033F0 }, { 0x04003430, 0x040033F0 }, { 0x04003430, 0x040033F0 }, { 0x040033F8, 0x040033D0 },
-    { 0x04003400, 0x040033D8 }, { 0x04003420, 0x04003420 }, { 0x04003408, 0x040033E0 }, { 0x04003410, 0x040033E8 },
-    { 0x04003418, 0x04003418 }, { 0x04003428, 0x04003428 },
+    { &gPlayer490Anim, &gPlayer481Anim }, { &gPlayer492Anim, &gPlayer483Anim }, { &gPlayer491Anim, &gPlayer482Anim },
+    { &gPlayer491Anim, &gPlayer482Anim }, { &gPlayer551Anim, &gPlayer543Anim }, { &gPlayer551Anim, &gPlayer543Anim },
+    { &gPlayer551Anim, &gPlayer543Anim }, { &gPlayer544Anim, &gPlayer539Anim }, { &gPlayer545Anim, &gPlayer540Anim },
+    { &gPlayer549Anim, &gPlayer549Anim }, { &gPlayer546Anim, &gPlayer541Anim }, { &gPlayer547Anim, &gPlayer542Anim },
+    { &gPlayer548Anim, &gPlayer548Anim }, { &gPlayer550Anim, &gPlayer550Anim },
 };
 
 struct_80832924 D_80853DEC[] = {
@@ -953,9 +955,10 @@ void (*D_80853FE8[])(GlobalContext* globalCtx, Player* this) = {
 };
 
 struct_808540F4 D_808540F4[] = {
-    { 0x04002F50, 12 }, { 0x04003080, 6 }, { 0x04002C68, 8 },  { 0x04003090, 8 },  { 0x04002A20, 8 },
-    { 0x04002F30, 10 }, { 0x04002C58, 7 }, { 0x04002C60, 11 }, { 0x04002F50, 12 }, { 0x04003078, 4 },
-    { 0x04003058, 4 },  { 0x04002F38, 4 }, { 0x040024E0, 5 },  { 0x04002F48, 13 },
+    { &gPlayer395Anim, 12 }, { &gPlayer433Anim, 6 },  { &gPlayer302Anim, 8 }, { &gPlayer435Anim, 8 },
+    { &gPlayer229Anim, 8 },  { &gPlayer391Anim, 10 }, { &gPlayer300Anim, 7 }, { &gPlayer301Anim, 11 },
+    { &gPlayer395Anim, 12 }, { &gPlayer432Anim, 4 },  { &gPlayer428Anim, 4 }, { &gPlayer392Anim, 4 },
+    { &gPlayer61Anim, 5 },   { &gPlayer394Anim, 13 },
 };
 
 s8 D_80854164[][6] = {
@@ -969,50 +972,64 @@ ExplosiveInfo sExplosiveInfos[] = {
 };
 
 struct_80854190 D_80854190[] = {
-    { 0x04002A80, 0x04002A90, 0x04002A88, 1, 4 },  { 0x040028C0, 0x040028C8, 0x04002498, 1, 4 },
-    { 0x04002A98, 0x04002AA0, 0x04002540, 0, 5 },  { 0x040028D0, 0x040028D8, 0x040024A0, 1, 7 },
-    { 0x04002968, 0x04002970, 0x040024C0, 1, 4 },  { 0x04002880, 0x04002888, 0x04002478, 0, 5 },
-    { 0x04002978, 0x04002980, 0x040024C8, 2, 8 },  { 0x04002890, 0x04002898, 0x04002480, 3, 8 },
-    { 0x040029A0, 0x040029A8, 0x040024D0, 0, 4 },  { 0x040028A0, 0x040028A8, 0x04002488, 0, 5 },
-    { 0x040029B0, 0x040029B8, 0x040024D8, 0, 6 },  { 0x040028B0, 0x040028B8, 0x04002490, 1, 5 },
-    { 0x04002AA8, 0x04002AB0, 0x04002548, 0, 3 },  { 0x040028E0, 0x040028E8, 0x040024A8, 0, 3 },
-    { 0x04002AB8, 0x04002AC0, 0x04002550, 1, 9 },  { 0x040028F0, 0x040028F8, 0x040024B0, 1, 8 },
-    { 0x04002A60, 0x04002A50, 0x04002A50, 1, 10 }, { 0x04002900, 0x04002910, 0x04002910, 1, 11 },
-    { 0x04002A50, 0x04002A58, 0x04002A58, 1, 2 },  { 0x04002910, 0x04002908, 0x04002908, 1, 2 },
-    { 0x04002B80, 0x04002B88, 0x04002B88, 1, 5 },  { 0x04002B70, 0x04002B78, 0x04002B78, 1, 4 },
-    { 0x04002C40, 0x04002C50, 0x04002C48, 3, 10 }, { 0x04002C70, 0x04002C80, 0x04002C78, 2, 11 },
-    { 0x04002B28, 0x04002B30, 0x04002560, 0, 12 }, { 0x04002940, 0x04002948, 0x040024B8, 0, 15 },
-    { 0x040029C0, 0x040029C8, 0x04002560, 0, 16 }, { 0x040029C0, 0x040029C8, 0x040024B8, 0, 16 },
+    { &gPlayer241Anim, &gPlayer243Anim, &gPlayer242Anim, 1, 4 },
+    { &gPlayer185Anim, &gPlayer186Anim, &gPlayer52Anim, 1, 4 },
+    { &gPlayer244Anim, &gPlayer245Anim, &gPlayer73Anim, 0, 5 },
+    { &gPlayer187Anim, &gPlayer188Anim, &gPlayer53Anim, 1, 7 },
+    { &gPlayer206Anim, &gPlayer207Anim, &gPlayer57Anim, 1, 4 },
+    { &gPlayer177Anim, &gPlayer178Anim, &gPlayer48Anim, 0, 5 },
+    { &gPlayer208Anim, &gPlayer209Anim, &gPlayer58Anim, 2, 8 },
+    { &gPlayer179Anim, &gPlayer180Anim, &gPlayer49Anim, 3, 8 },
+    { &gPlayer213Anim, &gPlayer214Anim, &gPlayer59Anim, 0, 4 },
+    { &gPlayer181Anim, &gPlayer182Anim, &gPlayer50Anim, 0, 5 },
+    { &gPlayer215Anim, &gPlayer216Anim, &gPlayer60Anim, 0, 6 },
+    { &gPlayer183Anim, &gPlayer184Anim, &gPlayer51Anim, 1, 5 },
+    { &gPlayer246Anim, &gPlayer247Anim, &gPlayer74Anim, 0, 3 },
+    { &gPlayer189Anim, &gPlayer190Anim, &gPlayer54Anim, 0, 3 },
+    { &gPlayer248Anim, &gPlayer249Anim, &gPlayer75Anim, 1, 9 },
+    { &gPlayer191Anim, &gPlayer192Anim, &gPlayer55Anim, 1, 8 },
+    { &gPlayer237Anim, &gPlayer235Anim, &gPlayer235Anim, 1, 10 },
+    { &gPlayer193Anim, &gPlayer195Anim, &gPlayer195Anim, 1, 11 },
+    { &gPlayer235Anim, &gPlayer236Anim, &gPlayer236Anim, 1, 2 },
+    { &gPlayer195Anim, &gPlayer194Anim, &gPlayer194Anim, 1, 2 },
+    { &gPlayer273Anim, &gPlayer274Anim, &gPlayer274Anim, 1, 5 },
+    { &gPlayer271Anim, &gPlayer272Anim, &gPlayer272Anim, 1, 4 },
+    { &gPlayer297Anim, &gPlayer299Anim, &gPlayer298Anim, 3, 10 },
+    { &gPlayer303Anim, &gPlayer305Anim, &gPlayer304Anim, 2, 11 },
+    { &gPlayer262Anim, &gPlayer263Anim, &gPlayer77Anim, 0, 12 },
+    { &gPlayer201Anim, &gPlayer202Anim, &gPlayer56Anim, 0, 15 },
+    { &gPlayer217Anim, &gPlayer218Anim, &gPlayer77Anim, 0, 16 },
+    { &gPlayer217Anim, &gPlayer218Anim, &gPlayer56Anim, 0, 16 },
 };
 
 LinkAnimationHeader* D_80854350[] = {
-    0x04002AE8,
-    0x04002920,
+    &gPlayer254Anim,
+    &gPlayer197Anim,
 };
 
 LinkAnimationHeader* D_80854358[] = {
-    0x04002AE0,
-    0x04002920,
+    &gPlayer253Anim,
+    &gPlayer197Anim,
 };
 
 LinkAnimationHeader* D_80854360[] = {
-    0x04002AF0,
-    0x04002928,
+    &gPlayer255Anim,
+    &gPlayer198Anim,
 };
 
 LinkAnimationHeader* D_80854368[] = {
-    0x04002AF8,
-    0x04002930,
+    &gPlayer256Anim,
+    &gPlayer199Anim,
 };
 
 LinkAnimationHeader* D_80854370[] = {
-    0x04002B00,
-    0x04002938,
+    &gPlayer257Anim,
+    &gPlayer200Anim,
 };
 
 LinkAnimationHeader* D_80854378[] = {
-    0x04002AD8,
-    0x04002918,
+    &gPlayer252Anim,
+    &gPlayer196Anim,
 };
 
 u8 D_80854380[2] = { 0x18, 0x19 };
@@ -1027,174 +1044,39 @@ u16 D_80854398[] = { NA_SE_IT_BOW_DRAW, NA_SE_IT_SLING_DRAW, NA_SE_IT_HOOKSHOT_R
 u8 sMagicArrowCosts[] = { 4, 4, 8 };
 
 LinkAnimationHeader* D_808543A4[] = {
-    0x040025C0,
-    0x040025C8,
+    &gPlayer89Anim,
+    &gPlayer90Anim,
 };
 
 LinkAnimationHeader* D_808543AC[] = {
-    0x04002580,
-    0x04002588,
+    &gPlayer81Anim,
+    &gPlayer82Anim,
 };
 
 LinkAnimationHeader* D_808543B4[] = {
-    0x04002510,
-    0x04002518,
+    &gPlayer67Anim,
+    &gPlayer68Anim,
 };
 
 LinkAnimationHeader* D_808543BC[] = {
-    0x04002510,
-    0x04002520,
+    &gPlayer67Anim,
+    &gPlayer69Anim,
 };
 
 LinkAnimationHeader* D_808543C4[] = {
-    0x04002EC0,
-    0x04002A08,
+    &gPlayer377Anim,
+    &gPlayer226Anim,
 };
 
 LinkAnimationHeader* D_808543CC[] = {
-    0x040026F0,
-    0x04002CC8,
+    &gPlayer127Anim,
+    &gPlayer314Anim,
 };
 
 LinkAnimationHeader* D_808543D4[] = {
-    0x040026C0,
-    0x04002CC0,
-};
-
-// external segments
-extern LinkAnimationHeader D_04002340;
-extern LinkAnimationHeader D_04002378;
-extern LinkAnimationHeader D_04002400;
-extern LinkAnimationHeader D_04002408;
-extern LinkAnimationHeader D_04002420;
-extern LinkAnimationHeader D_04002428;
-extern LinkAnimationHeader D_04002430;
-extern LinkAnimationHeader D_04002468;
-extern LinkAnimationHeader D_040024E8;
-extern LinkAnimationHeader D_040024F8;
-extern LinkAnimationHeader D_04002538;
-extern LinkAnimationHeader D_040025F8;
-extern LinkAnimationHeader D_04002600;
-extern LinkAnimationHeader D_04002608;
-extern LinkAnimationHeader D_04002618;
-extern LinkAnimationHeader D_04002620;
-extern LinkAnimationHeader D_04002628;
-extern LinkAnimationHeader D_04002630;
-extern LinkAnimationHeader D_04002638;
-extern LinkAnimationHeader D_04002650;
-extern LinkAnimationHeader D_04002660;
-extern LinkAnimationHeader D_04002668;
-extern LinkAnimationHeader D_04002670;
-extern LinkAnimationHeader D_04002688;
-extern LinkAnimationHeader D_04002698;
-extern LinkAnimationHeader D_040026A0;
-extern LinkAnimationHeader D_040026B0;
-extern LinkAnimationHeader D_040026B8;
-extern LinkAnimationHeader D_040026E8;
-extern LinkAnimationHeader D_04002700;
-extern LinkAnimationHeader D_04002708;
-extern LinkAnimationHeader D_04002770;
-extern LinkAnimationHeader D_04002780;
-extern LinkAnimationHeader D_04002788;
-extern LinkAnimationHeader D_040027D0;
-extern LinkAnimationHeader D_04002830;
-extern LinkAnimationHeader D_04002838;
-extern LinkAnimationHeader D_04002860;
-extern LinkAnimationHeader D_04002878;
-extern LinkAnimationHeader D_04002908;
-extern LinkAnimationHeader D_04002AC8;
-extern LinkAnimationHeader D_04002C00;
-extern LinkAnimationHeader D_04002C08;
-extern LinkAnimationHeader D_04002C10;
-extern LinkAnimationHeader D_04002C18;
-extern LinkAnimationHeader D_04002C20;
-extern LinkAnimationHeader D_04002C28;
-extern LinkAnimationHeader D_04002C30;
-extern LinkAnimationHeader D_04002C38;
-extern LinkAnimationHeader D_04002C90;
-extern LinkAnimationHeader D_04002C98;
-extern LinkAnimationHeader D_04002CA0;
-extern LinkAnimationHeader D_04002D28;
-extern LinkAnimationHeader D_04002D38;
-extern LinkAnimationHeader D_04002D40;
-extern LinkAnimationHeader D_04002D48;
-extern LinkAnimationHeader D_04002D68;
-extern LinkAnimationHeader D_04002D80;
-extern LinkAnimationHeader D_04002D88;
-extern LinkAnimationHeader D_04002DA0;
-extern LinkAnimationHeader D_04002DA8;
-extern LinkAnimationHeader D_04002DB0;
-extern LinkAnimationHeader D_04002DB8;
-extern LinkAnimationHeader D_04002DC0;
-extern LinkAnimationHeader D_04002DD0;
-extern LinkAnimationHeader D_04002DF0;
-extern LinkAnimationHeader D_04002DF8;
-extern LinkAnimationHeader D_04002E10;
-extern LinkAnimationHeader D_04002E48;
-extern LinkAnimationHeader D_04002E90;
-extern LinkAnimationHeader D_04002EC8;
-extern LinkAnimationHeader D_04002F00;
-extern LinkAnimationHeader D_04002F08;
-extern LinkAnimationHeader D_04002F10;
-extern LinkAnimationHeader D_04002F28;
-extern LinkAnimationHeader D_04002F30;
-extern LinkAnimationHeader D_04002F40;
-extern LinkAnimationHeader D_04002F58;
-extern LinkAnimationHeader D_04002F60;
-extern LinkAnimationHeader D_04002F68;
-extern LinkAnimationHeader D_04002F98;
-extern LinkAnimationHeader D_04002FA0;
-extern LinkAnimationHeader D_04002FD0;
-extern LinkAnimationHeader D_04002FE0;
-extern LinkAnimationHeader D_04003000;
-extern LinkAnimationHeader D_04003020;
-extern LinkAnimationHeader D_04003040;
-extern LinkAnimationHeader D_04003048;
-extern LinkAnimationHeader D_04003050;
-extern LinkAnimationHeader D_04003060;
-extern LinkAnimationHeader D_04003068;
-extern LinkAnimationHeader D_04003070;
-extern LinkAnimationHeader D_04003098;
-extern LinkAnimationHeader D_040030A0;
-extern LinkAnimationHeader D_040030A8;
-extern LinkAnimationHeader D_040030E0;
-extern LinkAnimationHeader D_040030F0;
-extern LinkAnimationHeader D_040030F8;
-extern LinkAnimationHeader D_04003100;
-extern LinkAnimationHeader D_04003108;
-extern LinkAnimationHeader D_04003120;
-extern LinkAnimationHeader D_04003128;
-extern LinkAnimationHeader D_04003148;
-extern LinkAnimationHeader D_04003150;
-extern LinkAnimationHeader D_04003158;
-extern LinkAnimationHeader D_04003160;
-extern LinkAnimationHeader D_040031A0;
-extern LinkAnimationHeader D_040031A8;
-extern LinkAnimationHeader D_04003298;
-extern LinkAnimationHeader D_040032B0;
-extern LinkAnimationHeader D_040032B8;
-extern LinkAnimationHeader D_040032C0;
-extern LinkAnimationHeader D_040032C8;
-extern LinkAnimationHeader D_040032D0;
-extern LinkAnimationHeader D_040032D8;
-extern LinkAnimationHeader D_040032E0;
-extern LinkAnimationHeader D_040032E8;
-extern LinkAnimationHeader D_040032F0;
-extern LinkAnimationHeader D_04003300;
-extern LinkAnimationHeader D_04003308;
-extern LinkAnimationHeader D_04003310;
-extern LinkAnimationHeader D_04003318;
-extern LinkAnimationHeader D_04003320;
-extern LinkAnimationHeader D_04003328;
-extern LinkAnimationHeader D_04003330;
-extern LinkAnimationHeader D_04003380;
-extern LinkAnimationHeader D_04003390;
-extern LinkAnimationHeader D_040033A0;
-extern LinkAnimationHeader D_040033B0;
-extern LinkAnimationHeader D_040033B8;
-extern LinkAnimationHeader D_040033C8;
-extern Gfx D_04037E30[];
-extern Gfx D_04033EE0[];
+    &gPlayer121Anim,
+    &gPlayer313Anim,
+};
 
 // return type can't be void due to regalloc in func_8084FCAC
 s32 func_80832210(Player* this) {
@@ -1671,7 +1553,7 @@ s32 func_808334B4(Player* this) {
 
 LinkAnimationHeader* func_808334E4(Player* this) {
     if (func_808334B4(this)) {
-        return &D_04002638;
+        return &gPlayer104Anim;
     } else {
         return D_808539A4[this->modelAnimType];
     }
@@ -1679,7 +1561,7 @@ LinkAnimationHeader* func_808334E4(Player* this) {
 
 LinkAnimationHeader* func_80833528(Player* this) {
     if (func_808334B4(this)) {
-        return &D_04002630;
+        return &gPlayer103Anim;
     } else {
         return D_8085398C[this->modelAnimType];
     }
@@ -1687,7 +1569,7 @@ LinkAnimationHeader* func_80833528(Player* this) {
 
 LinkAnimationHeader* func_8083356C(Player* this) {
     if (func_8002DD78(this)) {
-        return &D_040026E8;
+        return &gPlayer126Anim;
     } else {
         return D_80853B3C[this->modelAnimType];
     }
@@ -1695,7 +1577,7 @@ LinkAnimationHeader* func_8083356C(Player* this) {
 
 LinkAnimationHeader* func_808335B0(Player* this) {
     if (func_808334B4(this)) {
-        return &D_04002620;
+        return &gPlayer101Anim;
     } else {
         return D_80853B6C[this->modelAnimType];
     }
@@ -1703,7 +1585,7 @@ LinkAnimationHeader* func_808335B0(Player* this) {
 
 LinkAnimationHeader* func_808335F4(Player* this) {
     if (func_808334B4(this)) {
-        return &D_04002618;
+        return &gPlayer100Anim;
     } else {
         return D_80853B54[this->modelAnimType];
     }
@@ -2004,8 +1886,8 @@ void func_808340DC(Player* this, GlobalContext* globalCtx) {
     this->unk_15A = ABS(sp38);
 
     anim = D_808540F4[this->unk_15A].anim;
-    if ((anim == &D_04002F30) && (this->currentShield == PLAYER_SHIELD_NONE)) {
-        anim = &D_04002F40;
+    if ((anim == &gPlayer391Anim) && (this->currentShield == PLAYER_SHIELD_NONE)) {
+        anim = &gPlayer393Anim;
     }
 
     phi_f2 = Animation_GetLastFrame(anim);
@@ -2290,19 +2172,19 @@ s32 func_80834D2C(Player* this, GlobalContext* globalCtx) {
         }
 
         if (!Player_HoldsHookshot(this)) {
-            anim = &D_040026A0;
+            anim = &gPlayer117Anim;
         } else {
-            anim = &D_04002CA0;
+            anim = &gPlayer309Anim;
         }
         LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, anim);
     } else {
         func_80833638(this, func_80835884);
         this->unk_834 = 10;
-        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &D_04002628);
+        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayer102Anim);
     }
 
     if (this->stateFlags1 & 0x800000) {
-        func_80832284(globalCtx, this, &D_04003380);
+        func_80832284(globalCtx, this, &gPlayer529Anim);
     } else if ((this->actor.bgCheckFlags & 1) && !func_80833B54(this)) {
         func_80832284(globalCtx, this, D_80853914[this->modelAnimType]);
     }
@@ -2420,7 +2302,7 @@ s32 func_808351D4(Player* this, GlobalContext* globalCtx) {
     Math_ScaledStepToS(&this->unk_6C0, 1200, 400);
     this->unk_6AE |= 0x100;
 
-    if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.animation == &D_040026E8)) {
+    if ((this->unk_836 == 0) && (func_80833350(this) == 0) && (this->skelAnime.animation == &gPlayer126Anim)) {
         LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, D_808543CC[sp2C]);
         this->unk_836 = -1;
     } else if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) {
@@ -2471,7 +2353,7 @@ s32 func_808353D8(Player* this, GlobalContext* globalCtx) {
             if (Player_HoldsHookshot(this)) {
                 this->unk_836 = 1;
             } else {
-                LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &D_040026B8);
+                LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayer120Anim);
             }
         }
     } else {
@@ -2490,7 +2372,7 @@ s32 func_808353D8(Player* this, GlobalContext* globalCtx) {
             func_80833638(this, func_8083501C);
         } else {
             func_80833638(this, func_80835588);
-            LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &D_040026B0);
+            LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayer119Anim);
         }
 
         this->unk_834 = 0;
@@ -2530,7 +2412,7 @@ s32 func_80835644(GlobalContext* globalCtx, Player* this, Actor* arg2) {
 void func_80835688(Player* this, GlobalContext* globalCtx) {
     if (!func_80835644(globalCtx, this, this->heldActor)) {
         func_80833638(this, func_808356E8);
-        LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &D_04002E10);
+        LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayer355Anim);
     }
 }
 
@@ -2547,7 +2429,7 @@ s32 func_808356E8(Player* this, GlobalContext* globalCtx) {
 
     if (this->stateFlags1 & 0x800) {
         if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) {
-            LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &D_04002E10);
+            LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayer355Anim);
         }
 
         if ((heldActor->id == ACTOR_EN_NIW) && (this->actor.velocity.y <= 0.0f)) {
@@ -2583,7 +2465,7 @@ s32 func_80835800(Player* this, GlobalContext* globalCtx) {
 s32 func_80835884(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime2)) {
         func_80833638(this, func_808358F0);
-        LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &D_04002638);
+        LinkAnimation_PlayLoop(globalCtx, &this->skelAnime2, &gPlayer104Anim);
     }
 
     func_80834EB8(this, globalCtx);
@@ -2606,7 +2488,7 @@ s32 func_808358F0(Player* this, GlobalContext* globalCtx) {
 
     if (!D_80853618) {
         func_80833638(this, func_808359FC);
-        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, (this->unk_870 < 0.5f) ? &D_04002608 : &D_04002600);
+        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, (this->unk_870 < 0.5f) ? &gPlayer98Anim : &gPlayer97Anim);
     }
 
     return 1;
@@ -2648,7 +2530,7 @@ s32 func_80835B60(Player* this, GlobalContext* globalCtx) {
 
     if (!(this->stateFlags1 & 0x2000000)) {
         func_80833638(this, func_80835C08);
-        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &D_040025F8);
+        LinkAnimation_PlayOnce(globalCtx, &this->skelAnime2, &gPlayer96Anim);
         func_808357E8(this, D_80125EF8);
         func_8002F7DC(&this->actor, NA_SE_PL_CATCH_BOOMERANG);
         func_80832698(this, NA_SE_VO_LI_SWORD_N);
@@ -2864,7 +2746,7 @@ void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimationHeader*
     this->stateFlags1 |= 0x80;
 
     func_80832264(globalCtx, this, anim);
-    if (anim == &D_04002878) {
+    if (anim == &gPlayer176Anim) {
         this->skelAnime.endFrame = 84.0f;
     }
 
@@ -2902,7 +2784,7 @@ s32 func_80836670(Player* this, GlobalContext* globalCtx) {
     if (!(this->stateFlags1 & 0x800000) && (this->actor.parent != NULL) && Player_HoldsHookshot(this)) {
         func_80835C58(globalCtx, this, func_80850AEC, 1);
         this->stateFlags3 |= 0x80;
-        func_80832264(globalCtx, this, &D_04002C90);
+        func_80832264(globalCtx, this, &gPlayer307Anim);
         func_80832F54(globalCtx, this, 0x9B);
         func_80832224(this);
         this->currentYaw = this->actor.shape.rot.y;
@@ -3458,7 +3340,7 @@ void func_80837B60(Player* this) {
 
 void func_80837B9C(Player* this, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_8084411C, 0);
-    func_80832284(globalCtx, this, &D_04003040);
+    func_80832284(globalCtx, this, &gPlayer425Anim);
     this->unk_850 = 1;
     if (this->unk_6AD != 3) {
         this->unk_6AD = 0;
@@ -3466,7 +3348,8 @@ void func_80837B9C(Player* this, GlobalContext* globalCtx) {
 }
 
 LinkAnimationHeader* D_808544B0[] = {
-    0x04002F80, 0x04002F78, 0x04002DE0, 0x04002DD8, 0x04002F70, 0x04002528, 0x04002DC8, 0x040024F0,
+    &gPlayer401Anim, &gPlayer400Anim, &gPlayer349Anim, &gPlayer348Anim,
+    &gPlayer399Anim, &gPlayer70Anim,  &gPlayer346Anim, &gPlayer63Anim,
 };
 
 void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f32 arg4, s16 arg5, s32 arg6) {
@@ -3494,7 +3377,7 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f
     if (arg2 == 3) {
         func_80835C58(globalCtx, this, func_8084FB10, 0);
 
-        sp2C = &D_04002FD0;
+        sp2C = &gPlayer411Anim;
 
         func_80832224(this);
         func_8083264C(this, 255, 10, 40, 0);
@@ -3506,7 +3389,7 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f
 
         func_8083264C(this, 255, 80, 150, 0);
 
-        func_808322A4(globalCtx, this, &D_04002F00);
+        func_808322A4(globalCtx, this, &gPlayer385Anim);
         func_80832224(this);
 
         this->unk_850 = 20;
@@ -3519,7 +3402,7 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f
             this->linearVelocity = 4.0f;
             this->actor.velocity.y = 0.0f;
 
-            sp2C = &D_04003320;
+            sp2C = &gPlayer517Anim;
 
             func_80832698(this, NA_SE_VO_LI_DAMAGE_S);
         } else if ((arg2 == 1) || (arg2 == 2) || !(this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x206000)) {
@@ -3545,9 +3428,9 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f
                 this->actor.velocity.y = arg4;
 
                 if (ABS(arg5) > 0x4000) {
-                    sp2C = &D_04002F58;
+                    sp2C = &gPlayer396Anim;
                 } else {
-                    sp2C = &D_04002DB0;
+                    sp2C = &gPlayer343Anim;
                 }
 
                 if ((this->actor.category != ACTORCAT_PLAYER) && (this->actor.colChkInfo.health == 0)) {
@@ -3880,7 +3763,7 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) {
             sp34 = this->wallHeight;
 
             if (this->ageProperties->unk_14 <= sp34) {
-                sp38 = &D_04002D48;
+                sp38 = &gPlayer330Anim;
                 this->linearVelocity = 1.0f;
             } else {
                 sp2C = COLPOLY_GET_NORMAL(this->actor.wallPoly->normal.x);
@@ -3890,14 +3773,14 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) {
                 this->stateFlags1 |= 0x4000;
 
                 if (func_808332B8(this)) {
-                    sp38 = &D_040032E8;
+                    sp38 = &gPlayer510Anim;
                     sp34 -= (60.0f * this->ageProperties->unk_08);
                     this->stateFlags1 &= ~0x8000000;
                 } else if (this->ageProperties->unk_18 <= sp34) {
-                    sp38 = &D_04002D40;
+                    sp38 = &gPlayer329Anim;
                     sp34 -= (59.0f * this->ageProperties->unk_08);
                 } else {
-                    sp38 = &D_04002D38;
+                    sp38 = &gPlayer328Anim;
                     sp34 -= (41.0f * this->ageProperties->unk_08);
                 }
 
@@ -3921,7 +3804,7 @@ s32 func_80838A14(Player* this, GlobalContext* globalCtx) {
         }
     } else if ((this->actor.bgCheckFlags & 1) && (this->unk_88C == 1) && (this->unk_88D >= 3)) {
         temp = (this->wallHeight * 0.08f) + 5.5f;
-        func_808389E8(this, &D_04002FE0, temp, globalCtx);
+        func_808389E8(this, &gPlayer413Anim, temp, globalCtx);
         this->linearVelocity = 2.5f;
 
         return 1;
@@ -3945,7 +3828,7 @@ void func_80838E70(GlobalContext* globalCtx, Player* this, f32 arg2, s16 arg3) {
 
 void func_80838F18(GlobalContext* globalCtx, Player* this) {
     func_80835C58(globalCtx, this, func_8084D610, 0);
-    func_80832C6C(globalCtx, this, &D_04003328);
+    func_80832C6C(globalCtx, this, &gPlayer518Anim);
 }
 
 void func_80838F5C(GlobalContext* globalCtx, Player* this) {
@@ -3959,7 +3842,7 @@ void func_80838F5C(GlobalContext* globalCtx, Player* this) {
 s32 func_80838FB8(GlobalContext* globalCtx, Player* this) {
     if ((globalCtx->sceneLoadFlag == 0) && (this->stateFlags1 & 0x80000000)) {
         func_80838F5C(globalCtx, this);
-        func_80832284(globalCtx, this, &D_04003040);
+        func_80832284(globalCtx, this, &gPlayer425Anim);
         func_80832698(this, NA_SE_VO_LI_FALL_S);
         func_800788CC(NA_SE_OC_SECRET_WARP_IN);
         return 1;
@@ -4386,10 +4269,10 @@ void func_8083A0F4(GlobalContext* globalCtx, Player* this) {
             if (interactActorId == ACTOR_BG_HEAVY_BLOCK) {
                 func_80835C58(globalCtx, this, func_80846120, 0);
                 this->stateFlags1 |= 0x20000000;
-                anim = &D_04002F98;
+                anim = &gPlayer404Anim;
             } else if ((interactActorId == ACTOR_EN_ISHI) && ((interactRangeActor->params & 0xF) == 1)) {
                 func_80835C58(globalCtx, this, func_80846260, 0);
-                anim = &D_040032B0;
+                anim = &gPlayer503Anim;
             } else if (((interactActorId == ACTOR_EN_BOMBF) || (interactActorId == ACTOR_EN_KUSA)) &&
                        (Player_GetStrength() <= PLAYER_STR_NONE)) {
                 func_80835C58(globalCtx, this, func_80846408, 0);
@@ -4398,7 +4281,7 @@ void func_8083A0F4(GlobalContext* globalCtx, Player* this) {
                 this->actor.world.pos.z =
                     (Math_CosS(interactRangeActor->yawTowardsPlayer) * 20.0f) + interactRangeActor->world.pos.z;
                 this->currentYaw = this->actor.shape.rot.y = interactRangeActor->yawTowardsPlayer + 0x8000;
-                anim = &D_04003060;
+                anim = &gPlayer429Anim;
             } else {
                 func_80835C58(globalCtx, this, func_80846050, 0);
                 anim = D_80853A4C[this->modelAnimType];
@@ -4468,9 +4351,9 @@ s32 func_8083A4A8(Player* this, GlobalContext* globalCtx) {
     yawDiff = this->currentYaw - this->actor.shape.rot.y;
 
     if ((ABS(yawDiff) < 0x1000) && (this->linearVelocity > 4.0f)) {
-        anim = &D_04003148;
+        anim = &gPlayer458Anim;
     } else {
-        anim = &D_04002FE0;
+        anim = &gPlayer413Anim;
     }
 
     if (this->linearVelocity > (IREG(66) / 100.0f)) {
@@ -4539,7 +4422,7 @@ s32 func_8083A6AC(Player* this, GlobalContext* globalCtx) {
                 sp50 = 1;
             }
 
-            func_8083A5C4(globalCtx, this, sp84, sp54, sp50 ? &D_04002D88 : &D_04002F10);
+            func_8083A5C4(globalCtx, this, sp84, sp54, sp50 ? &gPlayer338Anim : &gPlayer387Anim);
 
             if (sp50) {
                 func_80836898(globalCtx, this, func_8083A3B0);
@@ -4625,7 +4508,7 @@ void func_8083AA10(Player* this, GlobalContext* globalCtx) {
 
                         if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, sp44.x, sp44.z, &sp3C, &sp50) &&
                             ((sp3C - sp40) > 50.0f)) {
-                            func_808389E8(this, &D_04003158, 6.0f, globalCtx);
+                            func_808389E8(this, &gPlayer460Anim, 6.0f, globalCtx);
                             func_80835C58(globalCtx, this, func_80844A44, 0);
                             return;
                         }
@@ -4637,7 +4520,7 @@ void func_8083AA10(Player* this, GlobalContext* globalCtx) {
 
                 if ((D_80853604 == 9) || (D_80853600 <= this->ageProperties->unk_34) ||
                     !func_8083A6AC(this, globalCtx)) {
-                    func_80832284(globalCtx, this, &D_04003040);
+                    func_80832284(globalCtx, this, &gPlayer425Anim);
                     return;
                 }
             }
@@ -4709,7 +4592,7 @@ void func_8083AF44(GlobalContext* globalCtx, Player* this, s32 magicSpell) {
     this->unk_84F = magicSpell - 3;
     func_80087708(globalCtx, sMagicSpellCosts[magicSpell], 4);
 
-    LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &D_04002D28, 0.83f);
+    LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayer326Anim, 0.83f);
 
     if (magicSpell == 5) {
         this->unk_46C = func_800800F8(globalCtx, 1100, -101, NULL, 0);
@@ -4734,9 +4617,9 @@ u8 D_80854528[] = {
 };
 
 LinkAnimationHeader* D_80854548[] = {
-    0x04002F88,
-    0x04002690,
-    0x04003198,
+    &gPlayer402Anim,
+    &gPlayer115Anim,
+    &gPlayer468Anim,
 };
 
 s32 func_8083B040(Player* this, GlobalContext* globalCtx) {
@@ -4836,20 +4719,20 @@ s32 func_8083B040(Player* this, GlobalContext* globalCtx) {
                 if (sp2C >= 0) {
                     if (sp2C == 0xC) {
                         func_80835DE4(globalCtx, this, func_8084EED8, 0);
-                        func_808322D0(globalCtx, this, &D_04002650);
+                        func_808322D0(globalCtx, this, &gPlayer107Anim);
                         func_80835EA4(globalCtx, 3);
                     } else if ((sp2C > 0) && (sp2C < 4)) {
                         func_80835DE4(globalCtx, this, func_8084EFC0, 0);
-                        func_808322D0(globalCtx, this, &D_04002688);
+                        func_808322D0(globalCtx, this, &gPlayer114Anim);
                         func_80835EA4(globalCtx, (sp2C == 1) ? 1 : 5);
                     } else {
                         func_80835DE4(globalCtx, this, func_8084EAC0, 0);
-                        func_80832B78(globalCtx, this, &D_04002668);
+                        func_80832B78(globalCtx, this, &gPlayer110Anim);
                         func_80835EA4(globalCtx, 2);
                     }
                 } else {
                     func_80835DE4(globalCtx, this, func_8084E3C4, 0);
-                    func_808322D0(globalCtx, this, &D_040030A0);
+                    func_808322D0(globalCtx, this, &gPlayer437Anim);
                     this->stateFlags2 |= 0x8000000;
                     func_80835EA4(globalCtx, (this->unk_6A8 != NULL) ? 0x5B : 0x5A);
                     if (this->unk_6A8 != NULL) {
@@ -5066,7 +4949,7 @@ s32 func_8083BDBC(Player* this, GlobalContext* globalCtx) {
             if (func_80833BCC(this)) {
                 if (this->actor.category != ACTORCAT_PLAYER) {
                     if (sp2C < 0) {
-                        func_808389E8(this, &D_04002FE0, REG(69) / 100.0f, globalCtx);
+                        func_808389E8(this, &gPlayer413Anim, REG(69) / 100.0f, globalCtx);
                     } else {
                         func_8083BC04(this, globalCtx);
                     }
@@ -5179,7 +5062,7 @@ s32 func_8083C2B0(Player* this, GlobalContext* globalCtx) {
                 Player_SetModelsForHoldingShield(this);
                 anim = D_80853AF4[this->modelAnimType];
             } else {
-                anim = &D_04002400;
+                anim = &gPlayer33Anim;
             }
 
             if (anim != this->skelAnime.animation) {
@@ -5248,7 +5131,7 @@ s32 func_8083C544(Player* this, GlobalContext* globalCtx) {
 s32 func_8083C61C(GlobalContext* globalCtx, Player* this) {
     if ((globalCtx->roomCtx.curRoom.unk_03 != 2) && (this->actor.bgCheckFlags & 1) && (AMMO(ITEM_NUT) != 0)) {
         func_80835C58(globalCtx, this, func_8084E604, 0);
-        func_80832264(globalCtx, this, &D_04003048);
+        func_80832264(globalCtx, this, &gPlayer426Anim);
         this->unk_6AD = 0;
         return 1;
     }
@@ -5257,8 +5140,8 @@ s32 func_8083C61C(GlobalContext* globalCtx, Player* this) {
 }
 
 struct_80854554 D_80854554[] = {
-    { 0x04002648, 0x04002640, 2, 3 },
-    { 0x04002680, 0x04002678, 5, 3 },
+    { &gPlayer106Anim, &gPlayer105Anim, 2, 3 },
+    { &gPlayer113Anim, &gPlayer112Anim, 5, 3 },
 };
 
 s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) {
@@ -5292,7 +5175,7 @@ s32 func_8083C6B8(GlobalContext* globalCtx, Player* this) {
             func_80835C58(globalCtx, this, func_80850C68, 0);
             this->unk_860 = 1;
             func_80832210(this);
-            func_80832264(globalCtx, this, &D_04002C30);
+            func_80832264(globalCtx, this, &gPlayer295Anim);
             return 1;
         } else {
             return 0;
@@ -5333,7 +5216,7 @@ s32 func_8083C910(GlobalContext* globalCtx, Player* this, f32 arg2) {
         sp28 -= this->actor.world.pos.y;
         if (this->ageProperties->unk_24 <= sp28) {
             func_80835C58(globalCtx, this, func_8084D7C4, 0);
-            func_80832C6C(globalCtx, this, &D_040032F0);
+            func_80832C6C(globalCtx, this, &gPlayer511Anim);
             this->stateFlags1 |= 0x28000000;
             this->unk_850 = 20;
             this->linearVelocity = 2.0f;
@@ -5390,8 +5273,8 @@ void func_8083CB94(Player* this, GlobalContext* globalCtx) {
 
 void func_8083CBF0(Player* this, s16 yaw, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_808423EC, 1);
-    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_040024F8, 2.2f, 0.0f, Animation_GetLastFrame(&D_040024F8),
-                         ANIMMODE_ONCE, -6.0f);
+    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer64Anim, 2.2f, 0.0f,
+                         Animation_GetLastFrame(&gPlayer64Anim), ANIMMODE_ONCE, -6.0f);
     this->linearVelocity = 8.0f;
     this->currentYaw = yaw;
 }
@@ -5404,7 +5287,7 @@ void func_8083CC9C(Player* this, GlobalContext* globalCtx) {
 
 void func_8083CD00(Player* this, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_8084251C, 1);
-    LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &D_040024E8, 2.0f);
+    LinkAnimation_PlayOnceSetSpeed(globalCtx, &this->skelAnime, &gPlayer62Anim, 2.0f);
 }
 
 void func_8083CD54(GlobalContext* globalCtx, Player* this, s16 yaw) {
@@ -5495,7 +5378,7 @@ s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) {
                                (this->currentBoots != PLAYER_BOOTS_IRON))) {
 
             func_80835C58(globalCtx, this, func_8084DC48, 0);
-            func_80832264(globalCtx, this, &D_04003308);
+            func_80832264(globalCtx, this, &gPlayer514Anim);
 
             this->unk_6C2 = 0;
             this->stateFlags2 |= 0x400;
@@ -5527,7 +5410,7 @@ s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) {
                 }
 
                 func_80832340(globalCtx, this);
-                func_80832B0C(globalCtx, this, (this->stateFlags1 & 0x800) ? &D_04003318 : &D_04003300);
+                func_80832B0C(globalCtx, this, (this->stateFlags1 & 0x800) ? &gPlayer516Anim : &gPlayer513Anim);
 
                 if (func_8083CFA8(globalCtx, this, this->actor.velocity.y, 500)) {
                     func_8002F7DC(&this->actor, NA_SE_PL_FACE_UP);
@@ -5542,7 +5425,7 @@ s32 func_8083D12C(GlobalContext* globalCtx, Player* this, Input* arg2) {
 }
 
 void func_8083D330(GlobalContext* globalCtx, Player* this) {
-    func_80832284(globalCtx, this, &D_040032F0);
+    func_80832284(globalCtx, this, &gPlayer511Anim);
     this->unk_6C2 = 16000;
     this->unk_850 = 1;
 }
@@ -5560,7 +5443,7 @@ void func_8083D36C(GlobalContext* globalCtx, Player* this) {
             func_8083D330(globalCtx, this);
         } else {
             func_80835C58(globalCtx, this, func_8084D610, 1);
-            func_80832B0C(globalCtx, this, (this->actor.bgCheckFlags & 1) ? &D_04003330 : &D_040032E0);
+            func_80832B0C(globalCtx, this, (this->actor.bgCheckFlags & 1) ? &gPlayer519Anim : &gPlayer509Anim);
         }
     }
 
@@ -5800,8 +5683,8 @@ void func_8083DFE0(Player* this, f32* arg1, s16* arg2) {
 }
 
 struct_80854578 D_80854578[] = {
-    { 0x04003398, 35.16999817f, 6.609999657f },
-    { 0x040033A8, -34.15999985f, 7.909999847f },
+    { &gPlayer532Anim, 35.16999817f, 6.609999657f },
+    { &gPlayer534Anim, -34.15999985f, 7.909999847f },
 };
 
 s32 func_8083E0FC(Player* this, GlobalContext* globalCtx) {
@@ -5858,8 +5741,8 @@ void func_8083E298(CollisionPoly* arg0, Vec3f* arg1, s16* arg2) {
 }
 
 LinkAnimationHeader* D_80854590[] = {
-    0x04002EE0,
-    0x040031D0,
+    &gPlayer381Anim,
+    &gPlayer475Anim,
 };
 
 s32 func_8083E318(GlobalContext* globalCtx, Player* this, CollisionPoly* arg2) {
@@ -5947,7 +5830,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) {
 
                     if (!(this->stateFlags2 & 0x400) || (this->currentBoots == PLAYER_BOOTS_IRON)) {
                         func_80836898(globalCtx, this, func_8083A434);
-                        func_808322D0(globalCtx, this, &D_04002788);
+                        func_808322D0(globalCtx, this, &gPlayer146Anim);
                         func_80835EA4(globalCtx, 9);
                     }
 
@@ -5990,7 +5873,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) {
                     chest->unk_1F4 = 1;
                     Camera_ChangeSetting(Gameplay_GetCamera(globalCtx, 0), CAM_SET_ITEM0);
                 } else {
-                    func_80832264(globalCtx, this, &D_04002DF8);
+                    func_80832264(globalCtx, this, &gPlayer352Anim);
                     chest->unk_1F4 = -1;
                 }
 
@@ -6138,9 +6021,9 @@ s32 func_8083EC18(Player* this, GlobalContext* globalCtx, u32 arg2) {
                     if ((sp8C != 0) || (arg2 & 2)) {
                         if ((this->unk_84F = sp8C) != 0) {
                             if (this->actor.bgCheckFlags & 1) {
-                                sp30 = &D_04002D80;
+                                sp30 = &gPlayer337Anim;
                             } else {
-                                sp30 = &D_04002D68;
+                                sp30 = &gPlayer334Anim;
                             }
                             sp34 = (this->ageProperties->unk_38 - 1.0f) - sp34;
                         } else {
@@ -6227,7 +6110,7 @@ s32 func_8083F0C8(Player* this, GlobalContext* globalCtx, u32 arg2) {
                 this->actor.world.pos.z = sp44 + (sp30 * sp34);
                 func_80832224(this);
                 this->actor.prevPos = this->actor.world.pos;
-                func_80832264(globalCtx, this, &D_04002708);
+                func_80832264(globalCtx, this, &gPlayer130Anim);
                 func_80832F54(globalCtx, this, 0x9D);
 
                 return 1;
@@ -6303,13 +6186,13 @@ s32 func_8083F570(Player* this, GlobalContext* globalCtx) {
 
             if (this->linearVelocity > 0.0f) {
                 this->actor.shape.rot.y = this->actor.wallYaw + 0x8000;
-                func_80832264(globalCtx, this, &D_04002700);
+                func_80832264(globalCtx, this, &gPlayer129Anim);
                 func_80832F54(globalCtx, this, 0x9D);
                 func_800800F8(globalCtx, 0x2581, 999, NULL, 0);
             } else {
                 this->actor.shape.rot.y = this->actor.wallYaw;
-                LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04002708, -1.0f,
-                                     Animation_GetLastFrame(&D_04002708), 0.0f, ANIMMODE_ONCE, 0.0f);
+                LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer130Anim, -1.0f,
+                                     Animation_GetLastFrame(&gPlayer130Anim), 0.0f, ANIMMODE_ONCE, 0.0f);
                 func_80832F54(globalCtx, this, 0x9D);
                 func_800800F8(globalCtx, 0x2582, 999, NULL, 0);
             }
@@ -6375,7 +6258,7 @@ s32 func_8083F7BC(Player* this, GlobalContext* globalCtx) {
                     this->unk_3C4 = NULL;
                 }
 
-                func_8083F72C(this, &D_040030F8, globalCtx);
+                func_8083F72C(this, &gPlayer448Anim, globalCtx);
 
                 return 1;
             }
@@ -6404,7 +6287,7 @@ s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) {
     }
 
     func_80839FFC(this, globalCtx);
-    func_80832264(globalCtx, this, &D_04003100);
+    func_80832264(globalCtx, this, &gPlayer449Anim);
     this->stateFlags2 &= ~0x10;
     return 1;
 }
@@ -6412,7 +6295,7 @@ s32 func_8083F9D0(GlobalContext* globalCtx, Player* this) {
 void func_8083FAB8(Player* this, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_8084B898, 0);
     this->stateFlags2 |= 0x10;
-    func_80832264(globalCtx, this, &D_040030F0);
+    func_80832264(globalCtx, this, &gPlayer447Anim);
 }
 
 void func_8083FB14(Player* this, GlobalContext* globalCtx) {
@@ -6864,7 +6747,7 @@ void func_80840DE4(Player* this, GlobalContext* globalCtx) {
 
     this->skelAnime.animation = func_8083356C(this);
 
-    if (this->skelAnime.animation == &D_040026E8) {
+    if (this->skelAnime.animation == &gPlayer126Anim) {
         frames = 24.0f;
         coeff = -(MREG(95) / 100.0f);
     } else {
@@ -6967,7 +6850,7 @@ void func_80841138(Player* this, GlobalContext* globalCtx) {
                 func_8084029C(this, 1.2f + ((REG(38) / 1000.0f) * temp2));
             }
             LinkAnimation_LoadToMorph(globalCtx, &this->skelAnime, D_80853BFC[this->modelAnimType], this->unk_868);
-            LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, &D_04002DD0, this->unk_868 * 0.551724135876f);
+            LinkAnimation_LoadToJoint(globalCtx, &this->skelAnime, &gPlayer347Anim, this->unk_868 * 0.551724135876f);
         }
     }
 
@@ -6978,7 +6861,7 @@ void func_80841138(Player* this, GlobalContext* globalCtx) {
 
 void func_8084140C(Player* this, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_8084170C, 1);
-    func_80832B0C(globalCtx, this, &D_04002DA0);
+    func_80832B0C(globalCtx, this, &gPlayer341Anim);
 }
 
 s32 func_80841458(Player* this, f32* arg1, s16* arg2, GlobalContext* globalCtx) {
@@ -7041,7 +6924,7 @@ void func_808414F8(Player* this, GlobalContext* globalCtx) {
 
 void func_808416C0(Player* this, GlobalContext* globalCtx) {
     func_80835C58(globalCtx, this, func_808417FC, 1);
-    func_80832264(globalCtx, this, &D_04002DA8);
+    func_80832264(globalCtx, this, &gPlayer342Anim);
 }
 
 void func_8084170C(Player* this, GlobalContext* globalCtx) {
@@ -7221,10 +7104,10 @@ void func_80841CC4(Player* this, s32 arg1, GlobalContext* globalCtx) {
     }
 
     if (rate < 0.0f) {
-        anim = &D_04002E48;
+        anim = &gPlayer362Anim;
         rate = -rate;
     } else {
-        anim = &D_04002E90;
+        anim = &gPlayer371Anim;
     }
 
     if (arg1 == 0) {
@@ -7445,7 +7328,7 @@ s32 func_8084285C(Player* this, f32 arg1, f32 arg2, f32 arg3) {
 
 s32 func_808428D8(Player* this, GlobalContext* globalCtx) {
     if (!Player_IsChildWithHylianShield(this) && Player_GetSwordHeld(this) && D_80853614) {
-        func_80832264(globalCtx, this, &D_04002EC8);
+        func_80832264(globalCtx, this, &gPlayer378Anim);
         this->unk_84F = 1;
         this->swordAnimation = 0xC;
         this->currentYaw = this->actor.shape.rot.y + this->unk_6BE;
@@ -7515,10 +7398,10 @@ void func_80842CF0(GlobalContext* globalCtx, Player* this) {
 }
 
 LinkAnimationHeader* D_808545CC[] = {
-    0x04002B10,
-    0x04002B20,
-    0x04002B08,
-    0x04002B18,
+    &gPlayer259Anim,
+    &gPlayer261Anim,
+    &gPlayer258Anim,
+    &gPlayer260Anim,
 };
 
 void func_80842D20(GlobalContext* globalCtx, Player* this) {
@@ -7705,8 +7588,8 @@ void func_80843188(Player* this, GlobalContext* globalCtx) {
 
                 if (Player_IsChildWithHylianShield(this)) {
                     func_8083A060(this, globalCtx);
-                    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04002400, 1.0f,
-                                         Animation_GetLastFrame(&D_04002400), 0.0f, ANIMMODE_ONCE, 0.0f);
+                    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer33Anim, 1.0f,
+                                         Animation_GetLastFrame(&gPlayer33Anim), 0.0f, ANIMMODE_ONCE, 0.0f);
                     func_80832F54(globalCtx, this, 4);
                 } else {
                     if (this->itemActionParam < 0) {
@@ -7801,7 +7684,8 @@ void func_8084377C(Player* this, GlobalContext* globalCtx) {
                 this->stateFlags1 |= 0x4000000;
             }
 
-            func_80832264(globalCtx, this, (this->currentYaw != this->actor.shape.rot.y) ? &D_04002F60 : &D_04002DB8);
+            func_80832264(globalCtx, this,
+                          (this->currentYaw != this->actor.shape.rot.y) ? &gPlayer397Anim : &gPlayer344Anim);
             func_80832698(this, NA_SE_VO_LI_FREEZE);
         }
     }
@@ -7825,7 +7709,8 @@ void func_80843954(Player* this, GlobalContext* globalCtx) {
             this->stateFlags1 |= 0x4000000;
         }
 
-        func_808322D0(globalCtx, this, (this->currentYaw != this->actor.shape.rot.y) ? &D_04002F68 : &D_04002DC0);
+        func_808322D0(globalCtx, this,
+                      (this->currentYaw != this->actor.shape.rot.y) ? &gPlayer398Anim : &gPlayer345Anim);
         this->currentYaw = this->actor.shape.rot.y;
     }
 }
@@ -7861,11 +7746,11 @@ void func_80843AE8(GlobalContext* globalCtx, Player* this) {
             this->unk_850--;
             if (this->unk_850 == 0) {
                 if (this->stateFlags1 & 0x8000000) {
-                    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04003328, 1.0f, 0.0f,
-                                         Animation_GetLastFrame(&D_04003328), ANIMMODE_ONCE, -16.0f);
+                    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer518Anim, 1.0f, 0.0f,
+                                         Animation_GetLastFrame(&gPlayer518Anim), ANIMMODE_ONCE, -16.0f);
                 } else {
-                    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04002878, 1.0f, 99.0f,
-                                         Animation_GetLastFrame(&D_04002878), ANIMMODE_ONCE, 0.0f);
+                    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer176Anim, 1.0f, 99.0f,
+                                         Animation_GetLastFrame(&gPlayer176Anim), ANIMMODE_ONCE, 0.0f);
                 }
                 gSaveContext.healthAccumulator = 0x140;
                 this->unk_850 = -1;
@@ -7916,9 +7801,9 @@ void func_80843CEC(Player* this, GlobalContext* globalCtx) {
         return;
     }
 
-    if (this->skelAnime.animation == &D_04002878) {
+    if (this->skelAnime.animation == &gPlayer176Anim) {
         func_80832924(this, D_808545F0);
-    } else if (this->skelAnime.animation == &D_04002F08) {
+    } else if (this->skelAnime.animation == &gPlayer386Anim) {
         if (LinkAnimation_OnFrame(&this->skelAnime, 88.0f)) {
             func_80832770(this, NA_SE_PL_BOUND);
         }
@@ -8047,8 +7932,8 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) {
                             this->stateFlags1 &= ~4;
                         }
 
-                        LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04003020, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE,
-                                             8.0f);
+                        LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer421Anim, 1.0f, 0.0f, 0.0f,
+                                             ANIMMODE_ONCE, 8.0f);
                         this->unk_850 = -1;
                     }
                 } else {
@@ -8090,10 +7975,10 @@ void func_8084411C(Player* this, GlobalContext* globalCtx) {
             } else {
                 anim = D_80853D4C[this->unk_84F][1];
             }
-        } else if (this->skelAnime.animation == &D_04003148) {
-            anim = &D_04003150;
+        } else if (this->skelAnime.animation == &gPlayer458Anim) {
+            anim = &gPlayer459Anim;
         } else if (func_8008E9C4(this)) {
-            anim = &D_04002538;
+            anim = &gPlayer72Anim;
             func_80833C3C(this);
         } else if (this->fallDistance <= 80) {
             anim = D_80853A7C[this->modelAnimType];
@@ -8208,7 +8093,7 @@ void func_80844A44(Player* this, GlobalContext* globalCtx) {
     this->stateFlags2 |= 0x20;
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_80832284(globalCtx, this, &D_04003160);
+        func_80832284(globalCtx, this, &gPlayer461Anim);
     }
 
     Math_StepToF(&this->linearVelocity, 0.0f, 0.05f);
@@ -8485,7 +8370,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) {
     this->stateFlags2 |= 0x20;
     sp3C = LinkAnimation_Update(globalCtx, &this->skelAnime);
 
-    if (this->skelAnime.animation == &D_04002D48) {
+    if (this->skelAnime.animation == &gPlayer330Anim) {
         this->linearVelocity = 1.0f;
 
         if (LinkAnimation_OnFrame(&this->skelAnime, 8.0f)) {
@@ -8525,14 +8410,14 @@ void func_80845668(Player* this, GlobalContext* globalCtx) {
 
         temp3 = 0.0f;
 
-        if (this->skelAnime.animation == &D_040032E8) {
+        if (this->skelAnime.animation == &gPlayer510Anim) {
             if (LinkAnimation_OnFrame(&this->skelAnime, 30.0f)) {
                 func_8083D0A8(globalCtx, this, 10.0f);
             }
             temp3 = 50.0f;
-        } else if (this->skelAnime.animation == &D_04002D40) {
+        } else if (this->skelAnime.animation == &gPlayer329Anim) {
             temp3 = 30.0f;
-        } else if (this->skelAnime.animation == &D_04002D38) {
+        } else if (this->skelAnime.animation == &gPlayer328Anim) {
             temp3 = 16.0f;
         }
 
@@ -8541,7 +8426,7 @@ void func_80845668(Player* this, GlobalContext* globalCtx) {
             func_80832698(this, NA_SE_VO_LI_CLIMB_END);
         }
 
-        if ((this->skelAnime.animation == &D_04002D38) || (this->skelAnime.curFrame > 5.0f)) {
+        if ((this->skelAnime.animation == &gPlayer328Anim) || (this->skelAnime.curFrame > 5.0f)) {
             if (this->unk_850 == 0) {
                 func_80832854(this);
                 this->unk_850 = 1;
@@ -8754,7 +8639,7 @@ struct_80832924 D_8085461C[] = {
 void func_80846120(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_850++ > 20)) {
         if (!func_8083B040(this, globalCtx)) {
-            func_8083A098(this, &D_04002FA0, globalCtx);
+            func_8083A098(this, &gPlayer405Anim, globalCtx);
         }
         return;
     }
@@ -8787,7 +8672,7 @@ void func_80846260(Player* this, GlobalContext* globalCtx) {
     func_8083721C(this);
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_80832284(globalCtx, this, &D_040032C0);
+        func_80832284(globalCtx, this, &gPlayer505Anim);
         this->unk_850 = 1;
         return;
     }
@@ -8809,7 +8694,7 @@ void func_80846260(Player* this, GlobalContext* globalCtx) {
 
     } else if (CHECK_BTN_ANY(sControlInput->press.button, BTN_A | BTN_B | BTN_CLEFT | BTN_CRIGHT | BTN_CDOWN)) {
         func_80835C58(globalCtx, this, func_80846358, 1);
-        func_80832264(globalCtx, this, &D_040032B8);
+        func_80832264(globalCtx, this, &gPlayer504Anim);
     }
 }
 
@@ -8833,7 +8718,7 @@ void func_80846358(Player* this, GlobalContext* globalCtx) {
 
 void func_80846408(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_80832284(globalCtx, this, &D_04003070);
+        func_80832284(globalCtx, this, &gPlayer431Anim);
         this->unk_850 = 15;
         return;
     }
@@ -8841,7 +8726,7 @@ void func_80846408(Player* this, GlobalContext* globalCtx) {
     if (this->unk_850 != 0) {
         this->unk_850--;
         if (this->unk_850 == 0) {
-            func_8083A098(this, &D_04003068, globalCtx);
+            func_8083A098(this, &gPlayer430Anim, globalCtx);
             this->stateFlags1 &= ~0x800;
             func_80832698(this, NA_SE_VO_LI_DAMAGE_S);
         }
@@ -8961,7 +8846,7 @@ void func_80846660(GlobalContext* globalCtx, Player* this) {
         this->unk_84F = 1;
     }
     this->stateFlags1 |= 0x20000000;
-    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04003298, 2.0f / 3.0f, 0.0f, 24.0f, ANIMMODE_ONCE, 0.0f);
+    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer500Anim, 2.0f / 3.0f, 0.0f, 24.0f, ANIMMODE_ONCE, 0.0f);
     this->actor.world.pos.y += 800.0f;
 }
 
@@ -9007,7 +8892,7 @@ void func_808468A8(GlobalContext* globalCtx, Player* this) {
 }
 
 void func_808468E8(GlobalContext* globalCtx, Player* this) {
-    func_808389E8(this, &D_04002FE0, 12.0f, globalCtx);
+    func_808389E8(this, &gPlayer413Anim, 12.0f, globalCtx);
     func_80835C58(globalCtx, this, func_8084F9C0, 0);
     this->stateFlags1 |= 0x20000000;
     this->fallStartHeight = this->actor.world.pos.y;
@@ -9998,7 +9883,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) {
             this->actor.parent = this->rideActor;
             func_8083A360(globalCtx, this);
             this->stateFlags1 |= 0x800000;
-            func_80832264(globalCtx, this, &D_040033B8);
+            func_80832264(globalCtx, this, &gPlayer536Anim);
             func_80832F54(globalCtx, this, 0x9B);
             this->unk_850 = 99;
         }
@@ -10130,8 +10015,8 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) {
                     func_80837B9C(this, globalCtx);
                 } else if ((this->actor.bgCheckFlags & 1) || (this->stateFlags1 & 0x8000000)) {
                     func_80836448(globalCtx, this,
-                                  func_808332B8(this) ? &D_04003310
-                                                      : (this->shockTimer != 0) ? &D_04002F08 : &D_04002878);
+                                  func_808332B8(this) ? &gPlayer515Anim
+                                                      : (this->shockTimer != 0) ? &gPlayer386Anim : &gPlayer176Anim);
                 }
             } else {
                 if ((this->actor.parent == NULL) &&
@@ -10422,7 +10307,7 @@ void func_8084A0E8(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* cullDLi
                                         (globalCtx->gameplayFrames * -15) % 128, 16, 32));
             gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, D_8085486C);
             gDPSetEnvColor(POLY_XLU_DISP++, 120, 90, 30, 128);
-            gSPDisplayList(POLY_XLU_DISP++, D_04037E30);
+            gSPDisplayList(POLY_XLU_DISP++, gHoverBootsCircleDL);
         }
     }
 
@@ -10514,7 +10399,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19459),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, 255);
-            gSPDisplayList(POLY_XLU_DISP++, D_04033EE0);
+            gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL);
         }
 
         if (this->unk_862 > 0) {
@@ -10770,12 +10655,12 @@ void func_8084B530(Player* this, GlobalContext* globalCtx) {
             func_80832DBC(this);
             if ((this->targetActor->category == ACTORCAT_NPC) &&
                 (this->heldItemActionParam != PLAYER_AP_FISHING_POLE)) {
-                func_808322D0(globalCtx, this, &D_040031A0);
+                func_808322D0(globalCtx, this, &gPlayer469Anim);
             } else {
                 func_80832284(globalCtx, this, func_80833338(this));
             }
         } else {
-            func_808322A4(globalCtx, this, &D_040031A8);
+            func_808322A4(globalCtx, this, &gPlayer470Anim);
         }
     }
 
@@ -10827,7 +10712,7 @@ void func_8084B898(Player* this, GlobalContext* globalCtx) {
 
     this->stateFlags2 |= 0x141;
 
-    if (func_80832CB0(globalCtx, this, &D_04003108)) {
+    if (func_80832CB0(globalCtx, this, &gPlayer450Anim)) {
         this->unk_850 = 1;
     } else if (this->unk_850 == 0) {
         if (LinkAnimation_OnFrame(&this->skelAnime, 11.0f)) {
@@ -10844,7 +10729,7 @@ void func_8084B898(Player* this, GlobalContext* globalCtx) {
         if (temp < 0) {
             func_8083FB14(this, globalCtx);
         } else if (temp == 0) {
-            func_8083F72C(this, &D_040030E0, globalCtx);
+            func_8083F72C(this, &gPlayer445Anim, globalCtx);
         } else {
             this->stateFlags2 |= 0x10;
         }
@@ -10929,10 +10814,10 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) {
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
         // clang-format off
-        anim = (this->unk_84F > 0) ? &D_04002F28 : D_80853CD4[this->modelAnimType]; func_80832284(globalCtx, this, anim);
+        anim = (this->unk_84F > 0) ? &gPlayer390Anim : D_80853CD4[this->modelAnimType]; func_80832284(globalCtx, this, anim);
         // clang-format on
     } else if (this->unk_84F == 0) {
-        if (this->skelAnime.animation == &D_04002F10) {
+        if (this->skelAnime.animation == &gPlayer387Anim) {
             temp = 11.0f;
         } else {
             temp = 1.0f;
@@ -10940,7 +10825,7 @@ void func_8084BBE4(Player* this, GlobalContext* globalCtx) {
 
         if (LinkAnimation_OnFrame(&this->skelAnime, temp)) {
             func_80832770(this, NA_SE_PL_WALK_GROUND);
-            if (this->skelAnime.animation == &D_04002F10) {
+            if (this->skelAnime.animation == &gPlayer387Anim) {
                 this->unk_84F = 1;
             } else {
                 this->unk_84F = -1;
@@ -11070,10 +10955,10 @@ void func_8084BF1C(Player* this, GlobalContext* globalCtx) {
                             this->actor.world.pos.y = temp_f0;
                             this->stateFlags1 &= ~0x200000;
                             func_8083A5C4(globalCtx, this, this->actor.wallPoly, this->ageProperties->unk_3C,
-                                          &D_04003000);
+                                          &gPlayer417Anim);
                             this->currentYaw += 0x8000;
                             this->actor.shape.rot.y = this->currentYaw;
-                            func_8083A9B8(this, &D_04003000, globalCtx);
+                            func_8083A9B8(this, &gPlayer417Anim, globalCtx);
                             this->stateFlags1 |= 0x4000;
                         } else {
                             func_8083F070(this, this->ageProperties->unk_CC[this->unk_850], globalCtx);
@@ -11291,7 +11176,7 @@ s32 func_8084C9BC(Player* this, GlobalContext* globalCtx) {
                 rideActor->actor.child = NULL;
                 func_80835DAC(globalCtx, this, func_8084D3E4, 0);
                 this->unk_878 = sp34 - rideActor->actor.world.pos.y;
-                func_80832264(globalCtx, this, (this->unk_43C < 0) ? &D_04003390 : &D_040033A0);
+                func_80832264(globalCtx, this, (this->unk_43C < 0) ? &gPlayer531Anim : &gPlayer533Anim);
                 return 1;
             }
         }
@@ -11321,17 +11206,33 @@ void func_8084CBF4(Player* this, f32 arg1, f32 arg2) {
 }
 
 LinkAnimationHeader* D_80854944[] = {
-    0x04003370, 0x04003368, 0x04003380, 0x04003358, 0x04003338, 0x04003348, 0x04003350, NULL, NULL,
+    &gPlayer527Anim,
+    &gPlayer526Anim,
+    &gPlayer529Anim,
+    &gPlayer524Anim,
+    &gPlayer520Anim,
+    &gPlayer522Anim,
+    &gPlayer523Anim,
+    NULL,
+    NULL,
 };
 
 LinkAnimationHeader* D_80854968[] = {
-    0x04003388, 0x04003388, 0x04003388, 0x04003360, 0x04003340, 0x04003340, 0x04003340, NULL, NULL,
+    &gPlayer530Anim,
+    &gPlayer530Anim,
+    &gPlayer530Anim,
+    &gPlayer525Anim,
+    &gPlayer521Anim,
+    &gPlayer521Anim,
+    &gPlayer521Anim,
+    NULL,
+    NULL,
 };
 
 LinkAnimationHeader* D_8085498C[] = {
-    0x040033C8,
-    0x040033B8,
-    0x040033C0,
+    &gPlayer538Anim,
+    &gPlayer536Anim,
+    &gPlayer537Anim,
 };
 
 u8 D_80854998[2][2] = {
@@ -11357,7 +11258,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) {
 
     if (this->unk_850 == 0) {
         if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-            this->skelAnime.animation = &D_040033B8;
+            this->skelAnime.animation = &gPlayer536Anim;
             this->unk_850 = 99;
             return;
         }
@@ -11406,10 +11307,10 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) {
 
     if (this->unk_850 == 1) {
         if ((D_808535E0 != 0) || func_8083224C(globalCtx)) {
-            func_80832264(globalCtx, this, &D_040033C8);
+            func_80832264(globalCtx, this, &gPlayer538Anim);
         } else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
             this->unk_850 = 99;
-        } else if (this->skelAnime.animation == &D_040033B8) {
+        } else if (this->skelAnime.animation == &gPlayer536Anim) {
             func_80832924(this, D_808549A4);
         }
     } else {
@@ -11449,7 +11350,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) {
                     this->unk_84F = 0;
                 }
 
-                if (this->skelAnime2.animation == &D_040033B0) {
+                if (this->skelAnime2.animation == &gPlayer535Anim) {
                     if (LinkAnimation_OnFrame(&this->skelAnime2, 23.0f)) {
                         func_8002F7DC(&this->actor, NA_SE_IT_LASH);
                         func_80832698(this, NA_SE_VO_LI_LASH);
@@ -11470,7 +11371,7 @@ void func_8084CC98(Player* this, GlobalContext* globalCtx) {
                 LinkAnimationHeader* anim = NULL;
 
                 if (EN_HORSE_CHECK_3(rideActor)) {
-                    anim = &D_040033B0;
+                    anim = &gPlayer535Anim;
                 } else if (EN_HORSE_CHECK_2(rideActor)) {
                     if ((this->unk_850 >= 2) && (this->unk_850 != 99)) {
                         anim = D_80854968[this->unk_850 - 2];
@@ -11567,19 +11468,19 @@ void func_8084D530(Player* this, f32* arg1, f32 arg2, s16 arg3) {
 void func_8084D574(GlobalContext* globalCtx, Player* this, s16 arg2) {
     func_80835C58(globalCtx, this, func_8084D84C, 0);
     this->actor.shape.rot.y = this->currentYaw = arg2;
-    func_80832C6C(globalCtx, this, &D_040032F0);
+    func_80832C6C(globalCtx, this, &gPlayer511Anim);
 }
 
 void func_8084D5CC(GlobalContext* globalCtx, Player* this) {
     func_80835C58(globalCtx, this, func_8084DAB4, 0);
-    func_80832C6C(globalCtx, this, &D_040032F0);
+    func_80832C6C(globalCtx, this, &gPlayer511Anim);
 }
 
 void func_8084D610(Player* this, GlobalContext* globalCtx) {
     f32 sp34;
     s16 sp32;
 
-    func_80832CB0(globalCtx, this, &D_04003328);
+    func_80832CB0(globalCtx, this, &gPlayer518Anim);
     func_8084B000(this);
 
     if (!func_8083224C(globalCtx) && !func_80837348(globalCtx, this, D_80854444, 1) &&
@@ -11662,7 +11563,7 @@ s32 func_8084D980(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3)
     temp1 = this->currentYaw - *arg3;
 
     if (ABS(temp1) > 0x6000) {
-        anim = &D_04003328;
+        anim = &gPlayer518Anim;
 
         if (Math_StepToF(&this->linearVelocity, 0.0f, 1.0f)) {
             this->currentYaw = *arg3;
@@ -11674,13 +11575,13 @@ s32 func_8084D980(GlobalContext* globalCtx, Player* this, f32* arg2, s16* arg3)
         temp2 = func_8083FD78(this, arg2, arg3, globalCtx);
 
         if (temp2 > 0) {
-            anim = &D_040032F0;
+            anim = &gPlayer511Anim;
         } else if (temp2 < 0) {
-            anim = &D_040032D8;
+            anim = &gPlayer508Anim;
         } else if ((temp1 = this->actor.shape.rot.y - *arg3) > 0) {
-            anim = &D_040032D0;
+            anim = &gPlayer507Anim;
         } else {
-            anim = &D_040032C8;
+            anim = &gPlayer506Anim;
         }
     }
 
@@ -11757,7 +11658,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) {
                 func_8084DBC4(globalCtx, this, -2.0f);
             } else {
                 this->unk_84F++;
-                func_80832C6C(globalCtx, this, &D_04003328);
+                func_80832C6C(globalCtx, this, &gPlayer518Anim);
             }
         } else if (this->unk_84F == 1) {
             LinkAnimation_Update(globalCtx, &this->skelAnime);
@@ -11766,7 +11667,7 @@ void func_8084DC48(Player* this, GlobalContext* globalCtx) {
             if (this->unk_6C2 < 10000) {
                 this->unk_84F++;
                 this->unk_850 = this->actor.yDistToWater;
-                func_80832C6C(globalCtx, this, &D_040032F0);
+                func_80832C6C(globalCtx, this, &gPlayer511Anim);
             }
         } else if (!func_8083D12C(globalCtx, this, sControlInput)) {
             sp2C = (this->unk_850 * 0.018f) + 4.0f;
@@ -11896,7 +11797,7 @@ s16 D_808549D4[] = { 0x0600, 0x04F6, 0x0604, 0x01F1, 0x0568, 0x05F4 };
 
 void func_8084E3C4(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_808322A4(globalCtx, this, &D_040030A8);
+        func_808322A4(globalCtx, this, &gPlayer438Anim);
         this->unk_850 = 1;
         if (this->stateFlags2 & 0x2800000) {
             this->stateFlags2 |= 0x1000000;
@@ -11920,7 +11821,7 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) {
             this->naviActor->textId = -this->naviTextId;
             func_80853148(globalCtx, this->targetActor);
         } else if (!func_8083B040(this, globalCtx)) {
-            func_8083A098(this, &D_04003098, globalCtx);
+            func_8083A098(this, &gPlayer436Anim, globalCtx);
         }
 
         this->stateFlags2 &= ~0x3800000;
@@ -11950,7 +11851,7 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) {
 
 void func_8084E604(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_8083A098(this, &D_04003050, globalCtx);
+        func_8083A098(this, &gPlayer427Anim, globalCtx);
     } else if (LinkAnimation_OnFrame(&this->skelAnime, 3.0f)) {
         Inventory_ChangeAmmo(ITEM_NUT, -1);
         Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, this->bodyPartsPos[15].x, this->bodyPartsPos[15].y,
@@ -12010,10 +11911,10 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) {
                 return;
             }
 
-            if (this->skelAnime.animation == &D_04002DF8) {
-                func_808322D0(globalCtx, this, &D_04002788);
+            if (this->skelAnime.animation == &gPlayer352Anim) {
+                func_808322D0(globalCtx, this, &gPlayer146Anim);
             } else {
-                func_808322D0(globalCtx, this, &D_04002780);
+                func_808322D0(globalCtx, this, &gPlayer145Anim);
             }
 
             this->unk_850 = 2;
@@ -12027,7 +11928,7 @@ void func_8084E6D4(Player* this, GlobalContext* globalCtx) {
             return;
         }
 
-        if (this->skelAnime.animation == &D_04002788) {
+        if (this->skelAnime.animation == &gPlayer146Anim) {
             Math_ScaledStepToS(&this->actor.shape.rot.y, Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000, 4000);
         }
 
@@ -12113,7 +12014,7 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) {
                 }
             }
 
-            func_808322A4(globalCtx, this, &D_04002670);
+            func_808322A4(globalCtx, this, &gPlayer111Anim);
             this->unk_850 = 1;
             return;
         }
@@ -12122,7 +12023,7 @@ void func_8084EAC0(Player* this, GlobalContext* globalCtx) {
         func_8005B1A4(Gameplay_GetCamera(globalCtx, 0));
     } else if (this->unk_850 == 1) {
         if ((gSaveContext.healthAccumulator == 0) && (gSaveContext.unk_13F0 != 9)) {
-            func_80832B78(globalCtx, this, &D_04002660);
+            func_80832B78(globalCtx, this, &gPlayer109Anim);
             this->unk_850 = 2;
             Player_UpdateBottleHeld(globalCtx, this, ITEM_BOTTLE, PLAYER_AP_BOTTLE);
         }
@@ -12298,7 +12199,7 @@ void func_8084F104(Player* this, GlobalContext* globalCtx) {
                 this->unk_862 = 0;
 
                 if (this->unk_84F == 1) {
-                    func_80832264(globalCtx, this, &D_04002698);
+                    func_80832264(globalCtx, this, &gPlayer116Anim);
                     this->unk_850 = -1;
                 } else {
                     func_8083C0E8(this, globalCtx);
@@ -12320,7 +12221,7 @@ void func_8084F308(Player* this, GlobalContext* globalCtx) {
     this->stateFlags2 |= 0x60;
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_80832284(globalCtx, this, &D_04003128);
+        func_80832284(globalCtx, this, &gPlayer454Anim);
     }
 
     if (func_80832594(this, 0, 100)) {
@@ -12722,8 +12623,8 @@ void func_808502D0(Player* this, GlobalContext* globalCtx) {
                 func_80832318(this);
                 this->skelAnime.moveFlags = 0;
 
-                if ((sp3C == &D_04002908) && (this->modelAnimType != 3)) {
-                    sp3C = &D_04002AC8;
+                if ((sp3C == &gPlayer194Anim) && (this->modelAnimType != 3)) {
+                    sp3C = &gPlayer250Anim;
                 }
 
                 func_8083A098(this, sp3C, globalCtx);
@@ -12815,21 +12716,21 @@ void func_8085076C(Player* this, GlobalContext* globalCtx) {
 }
 
 LinkAnimationHeader* D_80854A58[] = {
-    0x04002CF8,
-    0x04002CE0,
-    0x04002D10,
+    &gPlayer320Anim,
+    &gPlayer317Anim,
+    &gPlayer323Anim,
 };
 
 LinkAnimationHeader* D_80854A64[] = {
-    0x04002D00,
-    0x04002CE8,
-    0x04002D18,
+    &gPlayer321Anim,
+    &gPlayer318Anim,
+    &gPlayer324Anim,
 };
 
 LinkAnimationHeader* D_80854A70[] = {
-    0x04002D08,
-    0x04002CF0,
-    0x04002D20,
+    &gPlayer322Anim,
+    &gPlayer319Anim,
+    &gPlayer325Anim,
 };
 
 u8 D_80854A7C[] = { 70, 10, 10 };
@@ -12928,7 +12829,7 @@ void func_80850AEC(Player* this, GlobalContext* globalCtx) {
     this->stateFlags2 |= 0x20;
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_80832284(globalCtx, this, &D_04002C98);
+        func_80832284(globalCtx, this, &gPlayer308Anim);
     }
 
     Math_Vec3f_Sum(&this->actor.world.pos, &this->actor.velocity, &this->actor.world.pos);
@@ -12953,7 +12854,7 @@ void func_80850AEC(Player* this, GlobalContext* globalCtx) {
         return;
     }
 
-    if ((this->skelAnime.animation != &D_04002C90) || (4.0f <= this->skelAnime.curFrame)) {
+    if ((this->skelAnime.animation != &gPlayer307Anim) || (4.0f <= this->skelAnime.curFrame)) {
         this->actor.gravity = 0.0f;
         Math_ScaledStepToS(&this->actor.shape.rot.x, this->actor.world.rot.x, 0x800);
         func_8083264C(this, 100, 2, 100, 0);
@@ -12969,16 +12870,16 @@ void func_80850C68(Player* this, GlobalContext* globalCtx) {
             this->skelAnime.curFrame -= this->skelAnime.animLength;
         }
 
-        LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, &D_04002C38, this->skelAnime.curFrame,
-                                   (this->unk_858 < 0.0f) ? &D_04002C18 : &D_04002C20, 5.0f, fabsf(this->unk_858),
-                                   this->blendTable);
-        LinkAnimation_BlendToMorph(globalCtx, &this->skelAnime, &D_04002C38, this->skelAnime.curFrame,
-                                   (this->unk_85C < 0.0f) ? &D_04002C28 : &D_04002C10, 5.0f, fabsf(this->unk_85C),
-                                   D_80858AD8);
+        LinkAnimation_BlendToJoint(globalCtx, &this->skelAnime, &gPlayer296Anim, this->skelAnime.curFrame,
+                                   (this->unk_858 < 0.0f) ? &gPlayer292Anim : &gPlayer293Anim, 5.0f,
+                                   fabsf(this->unk_858), this->blendTable);
+        LinkAnimation_BlendToMorph(globalCtx, &this->skelAnime, &gPlayer296Anim, this->skelAnime.curFrame,
+                                   (this->unk_85C < 0.0f) ? &gPlayer294Anim : &gPlayer291Anim, 5.0f,
+                                   fabsf(this->unk_85C), D_80858AD8);
         LinkAnimation_InterpJointMorph(globalCtx, &this->skelAnime, 0.5f);
     } else if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
         this->unk_860 = 2;
-        func_80832284(globalCtx, this, &D_04002C38);
+        func_80832284(globalCtx, this, &gPlayer296Anim);
         this->unk_850 = 1;
     }
 
@@ -12988,13 +12889,13 @@ void func_80850C68(Player* this, GlobalContext* globalCtx) {
         func_80853080(this, globalCtx);
     } else if (this->unk_860 == 3) {
         func_80835C58(globalCtx, this, func_80850E84, 0);
-        func_80832B0C(globalCtx, this, &D_04002C00);
+        func_80832B0C(globalCtx, this, &gPlayer289Anim);
     }
 }
 
 void func_80850E84(Player* this, GlobalContext* globalCtx) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_860 == 0)) {
-        func_8083A098(this, &D_04002C08, globalCtx);
+        func_8083A098(this, &gPlayer290Anim, globalCtx);
     }
 }
 
@@ -13020,51 +12921,215 @@ struct_80832924 D_80854B14[] = {
 };
 
 struct_80854B18 D_80854B18[] = {
-    { 0, NULL },           { -1, func_808515A4 }, { 2, 0x04002790 },     { 0, NULL },           { 0, NULL },
-    { 3, 0x04002740 },     { 0, NULL },           { 0, NULL },           { -1, func_808515A4 }, { 2, 0x04002778 },
-    { -1, func_80851788 }, { 3, 0x04002860 },     { -1, func_808518DC }, { 7, 0x04002348 },     { 5, 0x04002350 },
-    { 5, 0x04002358 },     { 5, 0x040023B0 },     { 7, 0x040023B8 },     { -1, func_808519EC }, { 2, 0x04002728 },
-    { 2, 0x04002738 },     { 0, NULL },           { -1, func_80851B90 }, { 3, 0x040027A8 },     { 9, 0x04002DB0 },
-    { 2, 0x04002DC0 },     { -1, func_80851D2C }, { 2, 0x04003098 },     { 3, 0x04002780 },     { -1, func_808515A4 },
-    { 2, 0x04003088 },     { 0, NULL },           { 0, NULL },           { 5, 0x04002320 },     { -1, func_80851368 },
-    { -1, func_80851E64 }, { 5, 0x04002328 },     { 16, 0x04002F90 },    { -1, func_80851F84 }, { -1, func_80851E90 },
-    { 6, 0x04002410 },     { 6, 0x04002418 },     { -1, func_80852080 }, { 5, 0x04002390 },     { -1, func_808521F4 },
-    { -1, func_8085225C }, { -1, func_80852280 }, { 5, 0x040023A0 },     { 5, 0x04002368 },     { -1, func_808515A4 },
-    { 5, 0x04002370 },     { 5, 0x040027B0 },     { 5, 0x040027B8 },     { 5, 0x040027C0 },     { 3, 0x04002768 },
-    { 3, 0x040027D8 },     { 4, 0x040027E0 },     { 3, 0x04002380 },     { 3, 0x04002828 },     { 6, 0x04002470 },
-    { 6, 0x040032A8 },     { 14, 0x040032A0 },    { 3, 0x040032A0 },     { 5, 0x04002AE8 },     { 16, 0x04002450 },
-    { 15, 0x04002460 },    { 15, 0x04002458 },    { 3, 0x04002440 },     { 3, 0x04002438 },     { 3, 0x04002C88 },
-    { 6, 0x04003450 },     { 6, 0x04003448 },     { 6, 0x04003460 },     { 6, 0x04003440 },     { 3, 0x04002798 },
-    { 3, 0x04002818 },     { 4, 0x04002848 },     { 3, 0x04002850 },     { 3, 0x040034E0 },     { 3, 0x040034D8 },
-    { 6, 0x040034C8 },     { 3, 0x04003470 },     { 3, 0x04003478 },     { 3, 0x040034C0 },     { 3, 0x04003480 },
-    { 3, 0x04003490 },     { 3, 0x04003488 },     { 3, 0x04003498 },     { 3, 0x040034B0 },     { -1, func_808524B0 },
-    { 3, 0x04003420 },     { -1, func_80852544 }, { -1, func_80852564 }, { 3, 0x04003250 },     { -1, func_80852608 },
-    { 3, 0x04002810 },     { 3, 0x04002838 },     { 3, 0x04002CD0 },     { 3, 0x04002CD8 },     { 3, 0x04002868 },
-    { 3, 0x040027E8 },     { 3, 0x040027F8 },     { 3, 0x04002800 },
+    { 0, NULL },
+    { -1, func_808515A4 },
+    { 2, &gPlayer147Anim },
+    { 0, NULL },
+    { 0, NULL },
+    { 3, &gPlayer137Anim },
+    { 0, NULL },
+    { 0, NULL },
+    { -1, func_808515A4 },
+    { 2, &gPlayer144Anim },
+    { -1, func_80851788 },
+    { 3, &gPlayer173Anim },
+    { -1, func_808518DC },
+    { 7, &gPlayer10Anim },
+    { 5, &gPlayer11Anim },
+    { 5, &gPlayer12Anim },
+    { 5, &gPlayer23Anim },
+    { 7, &gPlayer24Anim },
+    { -1, func_808519EC },
+    { 2, &gPlayer134Anim },
+    { 2, &gPlayer136Anim },
+    { 0, NULL },
+    { -1, func_80851B90 },
+    { 3, &gPlayer150Anim },
+    { 9, &gPlayer343Anim },
+    { 2, &gPlayer345Anim },
+    { -1, func_80851D2C },
+    { 2, &gPlayer436Anim },
+    { 3, &gPlayer145Anim },
+    { -1, func_808515A4 },
+    { 2, &gPlayer434Anim },
+    { 0, NULL },
+    { 0, NULL },
+    { 5, &gPlayer5Anim },
+    { -1, func_80851368 },
+    { -1, func_80851E64 },
+    { 5, &gPlayer6Anim },
+    { 16, &gPlayer403Anim },
+    { -1, func_80851F84 },
+    { -1, func_80851E90 },
+    { 6, &gPlayer35Anim },
+    { 6, &gPlayer36Anim },
+    { -1, func_80852080 },
+    { 5, &gPlayer19Anim },
+    { -1, func_808521F4 },
+    { -1, func_8085225C },
+    { -1, func_80852280 },
+    { 5, &gPlayer21Anim },
+    { 5, &gPlayer14Anim },
+    { -1, func_808515A4 },
+    { 5, &gPlayer15Anim },
+    { 5, &gPlayer151Anim },
+    { 5, &gPlayer152Anim },
+    { 5, &gPlayer153Anim },
+    { 3, &gPlayer142Anim },
+    { 3, &gPlayer156Anim },
+    { 4, &gPlayer157Anim },
+    { 3, &gPlayer17Anim },
+    { 3, &gPlayer166Anim },
+    { 6, &gPlayer47Anim },
+    { 6, &gPlayer502Anim },
+    { 14, &gPlayer501Anim },
+    { 3, &gPlayer501Anim },
+    { 5, &gPlayer254Anim },
+    { 16, &gPlayer43Anim },
+    { 15, &gPlayer45Anim },
+    { 15, &gPlayer44Anim },
+    { 3, &gPlayer41Anim },
+    { 3, &gPlayer40Anim },
+    { 3, &gPlayer306Anim },
+    { 6, &gPlayer555Anim },
+    { 6, &gPlayer554Anim },
+    { 6, &gPlayer557Anim },
+    { 6, &gPlayer553Anim },
+    { 3, &gPlayer148Anim },
+    { 3, &gPlayer164Anim },
+    { 4, &gPlayer170Anim },
+    { 3, &gPlayer171Anim },
+    { 3, &gPlayer573Anim },
+    { 3, &gPlayer572Anim },
+    { 6, &gPlayer570Anim },
+    { 3, &gPlayer559Anim },
+    { 3, &gPlayer560Anim },
+    { 3, &gPlayer569Anim },
+    { 3, &gPlayer561Anim },
+    { 3, &gPlayer563Anim },
+    { 3, &gPlayer562Anim },
+    { 3, &gPlayer564Anim },
+    { 3, &gPlayer567Anim },
+    { -1, func_808524B0 },
+    { 3, &gPlayer549Anim },
+    { -1, func_80852544 },
+    { -1, func_80852564 },
+    { 3, &gPlayer491Anim },
+    { -1, func_80852608 },
+    { 3, &gPlayer163Anim },
+    { 3, &gPlayer168Anim },
+    { 3, &gPlayer315Anim },
+    { 3, &gPlayer316Anim },
+    { 3, &gPlayer174Anim },
+    { 3, &gPlayer158Anim },
+    { 3, &gPlayer160Anim },
+    { 3, &gPlayer161Anim },
 };
 
 struct_80854B18 D_80854E50[] = {
-    { 0, NULL },           { -1, func_808514C0 }, { -1, func_8085157C }, { -1, func_80851998 }, { -1, func_808519C0 },
-    { 11, NULL },          { -1, func_80852C50 }, { -1, func_80852944 }, { -1, func_80851688 }, { -1, func_80851750 },
-    { -1, func_80851828 }, { -1, func_808521B8 }, { -1, func_8085190C }, { 11, NULL },          { 11, NULL },
-    { 11, NULL },          { 18, D_80854AF0 },    { 11, NULL },          { -1, func_80851A50 }, { 12, 0x04002730 },
-    { 11, NULL },          { 0, NULL },           { -1, func_80851BE8 }, { 11, NULL },          { -1, func_80851CA4 },
-    { 11, NULL },          { 17, 0x040030A8 },    { 11, NULL },          { 11, NULL },          { 11, NULL },
-    { -1, func_80851D80 }, { -1, func_80851DEC }, { -1, func_80851E28 }, { 18, D_80854B00 },    { -1, func_808513BC },
-    { 11, NULL },          { 11, NULL },          { 11, NULL },          { 11, NULL },          { -1, func_80851ECC },
-    { -1, func_80851FB0 }, { -1, func_80852048 }, { -1, func_80852174 }, { 13, 0x04002398 },    { -1, func_80852234 },
-    { 0, NULL },           { 0, NULL },           { 11, NULL },          { -1, func_80852450 }, { -1, func_80851688 },
-    { -1, func_80852298 }, { 13, 0x040027D0 },    { -1, func_80852480 }, { 13, 0x040027C8 },    { -1, func_80852328 },
-    { 11, NULL },          { 11, NULL },          { 12, 0x04002388 },    { -1, func_80852358 }, { 11, NULL },
-    { 18, D_80854B14 },    { 11, NULL },          { 11, NULL },          { 11, NULL },          { 11, NULL },
-    { -1, func_80852388 }, { 17, 0x04002450 },    { 12, 0x04002448 },    { 12, 0x04002450 },    { 11, NULL },
-    { -1, func_808526EC }, { 17, 0x04003468 },    { -1, func_808526EC }, { 17, 0x04003468 },    { 12, 0x040027A0 },
-    { 12, 0x04002820 },    { 11, NULL },          { 12, 0x04002858 },    { 12, 0x040034D0 },    { 13, 0x040034F0 },
-    { 12, 0x040034E8 },    { 12, 0x040034A8 },    { 11, NULL },          { 11, NULL },          { 11, NULL },
-    { 11, NULL },          { -1, func_80852648 }, { 11, NULL },          { 12, 0x040034A0 },    { -1, func_808524D0 },
-    { -1, func_80852514 }, { -1, func_80852554 }, { -1, func_808525C0 }, { 11, NULL },          { 11, NULL },
-    { 11, NULL },          { -1, func_8085283C }, { -1, func_808528C8 }, { -1, func_808528C8 }, { 12, 0x04002870 },
-    { 12, 0x040027F0 },    { 12, 0x04002808 },    { 12, 0x04002450 },
+    { 0, NULL },
+    { -1, func_808514C0 },
+    { -1, func_8085157C },
+    { -1, func_80851998 },
+    { -1, func_808519C0 },
+    { 11, NULL },
+    { -1, func_80852C50 },
+    { -1, func_80852944 },
+    { -1, func_80851688 },
+    { -1, func_80851750 },
+    { -1, func_80851828 },
+    { -1, func_808521B8 },
+    { -1, func_8085190C },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { 18, D_80854AF0 },
+    { 11, NULL },
+    { -1, func_80851A50 },
+    { 12, &gPlayer135Anim },
+    { 11, NULL },
+    { 0, NULL },
+    { -1, func_80851BE8 },
+    { 11, NULL },
+    { -1, func_80851CA4 },
+    { 11, NULL },
+    { 17, &gPlayer438Anim },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { -1, func_80851D80 },
+    { -1, func_80851DEC },
+    { -1, func_80851E28 },
+    { 18, D_80854B00 },
+    { -1, func_808513BC },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { -1, func_80851ECC },
+    { -1, func_80851FB0 },
+    { -1, func_80852048 },
+    { -1, func_80852174 },
+    { 13, &gPlayer20Anim },
+    { -1, func_80852234 },
+    { 0, NULL },
+    { 0, NULL },
+    { 11, NULL },
+    { -1, func_80852450 },
+    { -1, func_80851688 },
+    { -1, func_80852298 },
+    { 13, &gPlayer155Anim },
+    { -1, func_80852480 },
+    { 13, &gPlayer154Anim },
+    { -1, func_80852328 },
+    { 11, NULL },
+    { 11, NULL },
+    { 12, &gPlayer18Anim },
+    { -1, func_80852358 },
+    { 11, NULL },
+    { 18, D_80854B14 },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { -1, func_80852388 },
+    { 17, &gPlayer43Anim },
+    { 12, &gPlayer42Anim },
+    { 12, &gPlayer43Anim },
+    { 11, NULL },
+    { -1, func_808526EC },
+    { 17, &gPlayer558Anim },
+    { -1, func_808526EC },
+    { 17, &gPlayer558Anim },
+    { 12, &gPlayer149Anim },
+    { 12, &gPlayer165Anim },
+    { 11, NULL },
+    { 12, &gPlayer172Anim },
+    { 12, &gPlayer571Anim },
+    { 13, &gPlayer575Anim },
+    { 12, &gPlayer574Anim },
+    { 12, &gPlayer566Anim },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { -1, func_80852648 },
+    { 11, NULL },
+    { 12, &gPlayer565Anim },
+    { -1, func_808524D0 },
+    { -1, func_80852514 },
+    { -1, func_80852554 },
+    { -1, func_808525C0 },
+    { 11, NULL },
+    { 11, NULL },
+    { 11, NULL },
+    { -1, func_8085283C },
+    { -1, func_808528C8 },
+    { -1, func_808528C8 },
+    { 12, &gPlayer175Anim },
+    { 12, &gPlayer159Anim },
+    { 12, &gPlayer162Anim },
+    { 12, &gPlayer43Anim },
 };
 
 void func_80850ED8(GlobalContext* globalCtx, Player* this, LinkAnimationHeader* anim) {
@@ -13187,7 +13252,7 @@ void func_80851368(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
     this->stateFlags2 |= 0x400;
     this->stateFlags1 &= ~0xC0000;
 
-    func_80832284(globalCtx, this, &D_040032F0);
+    func_80832284(globalCtx, this, &gPlayer511Anim);
 }
 
 void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
@@ -13206,9 +13271,9 @@ void func_808513BC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
         if (this->unk_84F == 1) {
-            func_80832C6C(globalCtx, this, &D_04003328);
+            func_80832C6C(globalCtx, this, &gPlayer518Anim);
         } else {
-            func_80832284(globalCtx, this, &D_04003328);
+            func_80832284(globalCtx, this, &gPlayer518Anim);
         }
     }
 
@@ -13356,8 +13421,8 @@ void func_808519C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
 // unused
 LinkAnimationHeader* D_80855190[] = {
-    0x04002720,
-    0x04002360,
+    &gPlayer133Anim,
+    &gPlayer13Anim,
 };
 
 Vec3f D_80855198 = { -1.0f, 70.0f, 20.0f };
@@ -13411,7 +13476,8 @@ void func_80851A50(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 }
 
 void func_80851B90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04002860, -(2.0f / 3.0f), 12.0f, 12.0f, ANIMMODE_ONCE, 0.0f);
+    LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer173Anim, -(2.0f / 3.0f), 12.0f, 12.0f, ANIMMODE_ONCE,
+                         0.0f);
 }
 
 struct_80832924 D_808551B4[] = {
@@ -13425,8 +13491,8 @@ void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
     if (this->unk_850 >= 180) {
         if (this->unk_850 == 180) {
-            LinkAnimation_Change(globalCtx, &this->skelAnime, &D_04003298, (2.0f / 3.0f), 10.0f,
-                                 Animation_GetLastFrame(&D_04003298), ANIMMODE_ONCE, -8.0f);
+            LinkAnimation_Change(globalCtx, &this->skelAnime, &gPlayer500Anim, (2.0f / 3.0f), 10.0f,
+                                 Animation_GetLastFrame(&gPlayer500Anim), ANIMMODE_ONCE, -8.0f);
         }
         func_80832924(this, D_808551B4);
     }
@@ -13434,7 +13500,7 @@ void func_80851BE8(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
 void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime) && (this->unk_850 == 0) && (this->actor.bgCheckFlags & 1)) {
-        func_80832264(globalCtx, this, &D_04002DB8);
+        func_80832264(globalCtx, this, &gPlayer344Anim);
         this->unk_850 = 1;
     }
 
@@ -13444,7 +13510,7 @@ void func_80851CA4(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 }
 
 void func_80851D2C(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80850F1C(globalCtx, this, &D_040030A0);
+    func_80850F1C(globalCtx, this, &gPlayer437Anim);
     func_8084B498(this);
     Player_SetModels(this, Player_ActionToModelGroup(this, this->itemActionParam));
 }
@@ -13474,17 +13540,17 @@ void func_80851E28(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 }
 
 void func_80851E64(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80833064(globalCtx, this, &D_04003318, 0x98);
+    func_80833064(globalCtx, this, &gPlayer516Anim, 0x98);
 }
 
 void func_80851E90(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_8083303C(globalCtx, this, &D_04002408, 0x9C);
+    func_8083303C(globalCtx, this, &gPlayer34Anim, 0x9C);
     func_80832698(this, NA_SE_VO_LI_GROAN);
 }
 
 void func_80851ECC(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_808330EC(globalCtx, this, &D_04002428, 0x9C);
+        func_808330EC(globalCtx, this, &gPlayer38Anim, 0x9C);
     }
 }
 
@@ -13499,7 +13565,7 @@ void func_80851F14(GlobalContext* globalCtx, Player* this, LinkAnimationHeader*
 
 void func_80851F84(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     this->actor.shape.shadowDraw = NULL;
-    func_80851134(globalCtx, this, &D_04002420);
+    func_80851134(globalCtx, this, &gPlayer37Anim);
 }
 
 struct_80832924 D_808551BC[] = {
@@ -13510,7 +13576,7 @@ struct_80832924 D_808551BC[] = {
 
 void func_80851FB0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_808330EC(globalCtx, this, &D_04002430, 0x9C);
+        func_808330EC(globalCtx, this, &gPlayer39Anim, 0x9C);
         this->unk_850 = 1;
     } else if (this->unk_850 == 0) {
         func_80832924(this, D_808551BC);
@@ -13533,7 +13599,7 @@ void func_80852048(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 }
 
 void func_80852080(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80833064(globalCtx, this, &D_04002340, 0x9D);
+    func_80833064(globalCtx, this, &gPlayer9Anim, 0x9D);
     func_80832698(this, NA_SE_VO_LI_FALL_L);
 }
 
@@ -13588,7 +13654,7 @@ void func_80852280(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
 void func_80852298(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_8083313C(globalCtx, this, &D_04002378);
+        func_8083313C(globalCtx, this, &gPlayer16Anim);
         this->unk_850 = 1;
     } else if (this->unk_850 == 0) {
         if (LinkAnimation_OnFrame(&this->skelAnime, 10.0f)) {
@@ -13603,7 +13669,7 @@ struct_80832924 D_808551E0[] = {
 };
 
 void func_80852328(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80851F14(globalCtx, this, &D_04002770, D_808551E0);
+    func_80851F14(globalCtx, this, &gPlayer143Anim, D_808551E0);
 }
 
 struct_80832924 D_808551E8[] = {
@@ -13612,12 +13678,12 @@ struct_80832924 D_808551E8[] = {
 };
 
 void func_80852358(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80851F14(globalCtx, this, &D_04002830, D_808551E8);
+    func_80851F14(globalCtx, this, &gPlayer167Anim, D_808551E8);
 }
 
 void func_80852388(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
-        func_808322A4(globalCtx, this, &D_04002468);
+        func_808322A4(globalCtx, this, &gPlayer46Anim);
         this->unk_850 = 1;
     }
 
@@ -13641,7 +13707,7 @@ struct_80832924 D_808551F0[] = {
 };
 
 void func_80852450(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80852414(globalCtx, this, &D_04002378, D_808551F0);
+    func_80852414(globalCtx, this, &gPlayer16Anim, D_808551F0);
 }
 
 struct_80832924 D_808551F8[] = {
@@ -13649,7 +13715,7 @@ struct_80832924 D_808551F8[] = {
 };
 
 void func_80852480(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
-    func_80852414(globalCtx, this, &D_040027D0, D_808551F8);
+    func_80852414(globalCtx, this, &gPlayer155Anim, D_808551F8);
 }
 
 void func_808524B0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
@@ -13677,7 +13743,7 @@ void func_80852564(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
     this->linearVelocity = 2.0f;
     this->actor.velocity.y = -1.0f;
 
-    func_80832264(globalCtx, this, &D_04002DB0);
+    func_80832264(globalCtx, this, &gPlayer343Anim);
     func_80832698(this, NA_SE_VO_LI_FALL_L);
 }
 
@@ -13693,7 +13759,7 @@ void func_808525C0(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 
 void func_80852608(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
     func_80846720(globalCtx, this, 0);
-    func_808322D0(globalCtx, this, &D_04002838);
+    func_808322D0(globalCtx, this, &gPlayer168Anim);
 }
 
 void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg2) {
@@ -13711,8 +13777,8 @@ void func_80852648(GlobalContext* globalCtx, Player* this, CsCmdActorAction* arg
 }
 
 LinkAnimationHeader* D_80855208[] = {
-    0x040034B8,
-    0x04003458,
+    &gPlayer568Anim,
+    &gPlayer556Anim,
 };
 
 Vec3s D_80855210[2][2] = {
@@ -13903,7 +13969,7 @@ s32 func_80852F38(GlobalContext* globalCtx, Player* this) {
         !(this->stateFlags3 & 0x80)) {
         func_80832564(globalCtx, this);
         func_80835C58(globalCtx, this, func_8084F308, 0);
-        func_80832264(globalCtx, this, &D_04003120);
+        func_80832264(globalCtx, this, &gPlayer453Anim);
         this->stateFlags2 |= 0x80;
         func_80832224(this);
         func_80832698(this, NA_SE_VO_LI_HELD);
@@ -13980,23 +14046,23 @@ void func_80853148(GlobalContext* globalCtx, Actor* actor) {
         } else {
             if (func_808332B8(this)) {
                 func_80836898(globalCtx, this, func_8083A2F8);
-                func_80832C6C(globalCtx, this, &D_04003328);
+                func_80832C6C(globalCtx, this, &gPlayer518Anim);
             } else if ((actor->category != ACTORCAT_NPC) || (this->heldItemActionParam == PLAYER_AP_FISHING_POLE)) {
                 func_8083A2F8(globalCtx, this);
 
                 if (!func_8008E9C4(this)) {
                     if ((actor != this->naviActor) && (actor->xzDistToPlayer < 40.0f)) {
-                        func_808322D0(globalCtx, this, &D_04002DF0);
+                        func_808322D0(globalCtx, this, &gPlayer351Anim);
                     } else {
                         func_80832284(globalCtx, this, func_80833338(this));
                     }
                 }
             } else {
                 func_80836898(globalCtx, this, func_8083A2F8);
-                func_808322D0(globalCtx, this, (actor->xzDistToPlayer < 40.0f) ? &D_04002DF0 : &D_040031A0);
+                func_808322D0(globalCtx, this, (actor->xzDistToPlayer < 40.0f) ? &gPlayer351Anim : &gPlayer469Anim);
             }
 
-            if (this->skelAnime.animation == &D_04002DF0) {
+            if (this->skelAnime.animation == &gPlayer351Anim) {
                 func_80832F54(globalCtx, this, 0x19);
             }
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
index 4bf0ee5d0..b3671e9e7 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_blast.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -28,8 +29,6 @@ EffectSsInit Effect_Ss_Blast_InitVars = {
     EffectSsBlast_Init,
 };
 
-extern Gfx D_0401A0B0[];
-
 u32 EffectSsBlast_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsBlastParams* initParams = (EffectSsBlastParams*)initParamsx;
 
@@ -37,7 +36,7 @@ u32 EffectSsBlast_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
     this->pos.y += 5.0f;
     this->velocity = initParams->velocity;
     this->accel = initParams->accel;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_0401A0B0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffShockwaveDL);
     this->life = initParams->life;
     this->draw = EffectSsBlast_Draw;
     this->update = EffectSsBlast_Update;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
index 4f4f0626d..bc4cf93d3 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_bomb.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rTexIdx regs[1]
@@ -18,15 +19,13 @@ EffectSsInit Effect_Ss_Bomb_InitVars = {
     EffectSsBomb_Init,
 };
 
-extern Gfx D_0400BF80[];
-
 u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsBombInitParams* initParams = (EffectSsBombInitParams*)initParamsx;
 
     Math_Vec3f_Copy(&this->pos, &initParams->pos);
     Math_Vec3f_Copy(&this->velocity, &initParams->velocity);
     Math_Vec3f_Copy(&this->accel, &initParams->accel);
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_0400BF80);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffBombExplosion1DL);
     this->life = 20;
     this->draw = EffectSsBomb_Draw;
     this->update = EffectSsBomb_Update;
@@ -36,11 +35,11 @@ u32 EffectSsBomb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void*
     return 1;
 }
 
-static void* sTextures[] = {
-    0x04007F80,
-    0x04008780,
-    0x04008F80,
-    0x04009780,
+static UNK_PTR sTextures[] = {
+    gEffBombExplosion1Tex,
+    gEffBombExplosion2Tex,
+    gEffBombExplosion3Tex,
+    gEffBombExplosion4Tex,
 };
 
 void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
index 06b3e1882..e97a8e36d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_bomb2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rTexIdx regs[1]
@@ -33,10 +34,6 @@ static EffectSsDrawFunc sDrawFuncs[] = {
     EffectSsBomb2_DrawLayered,
 };
 
-extern Gfx D_0400BF80[];
-extern Gfx D_0400BFE8[];
-extern Gfx D_0400C040[];
-
 u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
 
     EffectSsBomb2InitParams* initParams = (EffectSsBomb2InitParams*)initParamsx;
@@ -44,7 +41,7 @@ u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
     Math_Vec3f_Copy(&this->pos, &initParams->pos);
     Math_Vec3f_Copy(&this->velocity, &initParams->velocity);
     Math_Vec3f_Copy(&this->accel, &initParams->accel);
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_0400BF80);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffBombExplosion1DL);
     this->life = 24;
     this->update = EffectSsBomb2_Update;
     this->draw = sDrawFuncs[initParams->drawMode];
@@ -63,8 +60,9 @@ u32 EffectSsBomb2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
 
 // unused in the original game. looks like EffectSsBomb but with color
 void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) {
-    static void* textures[] = {
-        0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780,
+    static UNK_PTR textures[] = {
+        gEffBombExplosion1Tex, gEffBombExplosion2Tex, gEffBombExplosion3Tex, gEffBombExplosion4Tex,
+        gEffBombExplosion5Tex, gEffBombExplosion6Tex, gEffBombExplosion7Tex, gEffBombExplosion8Tex,
     };
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     MtxF mfTrans;
@@ -102,8 +100,9 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this)
 }
 
 void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* this) {
-    static void* textures[] = {
-        0x04007F80, 0x04008780, 0x04008F80, 0x04009780, 0x04009F80, 0x0400A780, 0x0400AF80, 0x0400B780,
+    static UNK_PTR textures[] = {
+        gEffBombExplosion1Tex, gEffBombExplosion2Tex, gEffBombExplosion3Tex, gEffBombExplosion4Tex,
+        gEffBombExplosion5Tex, gEffBombExplosion6Tex, gEffBombExplosion7Tex, gEffBombExplosion8Tex,
     };
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     MtxF mfTrans;
@@ -141,8 +140,8 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th
                             this->rPrimColorA);
             gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(textures[this->rTexIdx]));
-            gSPDisplayList(POLY_XLU_DISP++, D_0400BFE8);
-            gSPDisplayList(POLY_XLU_DISP++, D_0400C040);
+            gSPDisplayList(POLY_XLU_DISP++, gEffBombExplosion2DL);
+            gSPDisplayList(POLY_XLU_DISP++, gEffBombExplosion3DL);
 
             Matrix_MtxToMtxF(mtx2, &mtx2F);
             Matrix_Put(&mtx2F);
@@ -153,7 +152,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th
                 Matrix_Scale(layer2Scale, layer2Scale, layer2Scale, MTXMODE_APPLY);
                 gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_bomb2.c", 448),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-                gSPDisplayList(POLY_XLU_DISP++, D_0400C040);
+                gSPDisplayList(POLY_XLU_DISP++, gEffBombExplosion3DL);
                 layer2Scale -= 0.15f;
             }
         }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
index c38732cbe..906276d8d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_bubble.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 
@@ -17,17 +18,13 @@ EffectSsInit Effect_Ss_Bubble_InitVars = {
     EffectSsBubble_Init,
 };
 
-extern void* D_04055DB0;
-extern void* D_04055EB0;
-extern Gfx D_0401A160[];
-
 u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsBubbleInitParams* initParams = (EffectSsBubbleInitParams*)initParamsx;
 
     // @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro.
     // In the base game this works out because both addresses are segment 4, but it may break if
     // the addresses were changed to refer to different segments
-    this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &gEffBubble1Tex : &gEffBubble2Tex);
     this->pos.x = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.x;
     this->pos.y = (((Rand_ZeroOne() - 0.5f) * initParams->yPosRandScale) + initParams->yPosOffset) + initParams->pos.y;
     this->pos.z = ((Rand_ZeroOne() - 0.5f) * initParams->xzPosRandScale) + initParams->pos.z;
@@ -54,7 +51,7 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 150, 150, 150, 0);
     gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx);
-    gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160));
+    gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 179);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
index 06fd3fc9f..c41e49090 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_dead_db.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rTextIdx regs[1]
@@ -28,15 +29,13 @@ EffectSsInit Effect_Ss_Dead_Db_InitVars = {
     EffectSsDeadDb_Init,
 };
 
-extern Gfx D_04031FE0[];
-
 u32 EffectSsDeadDb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsDeadDbInitParams* initParams = (EffectSsDeadDbInitParams*)initParamsx;
 
     this->pos = initParams->pos;
     this->velocity = initParams->velocity;
     this->accel = initParams->accel;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04031FE0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffEnemyDeathFlameDL);
     this->life = initParams->unk_34;
     this->flags = 4;
     this->rScaleStep = initParams->scaleStep;
@@ -57,9 +56,10 @@ u32 EffectSsDeadDb_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
     return 1;
 }
 
-static void* sTextures[] = {
-    0x0402CFE0, 0x0402D7E0, 0x0402DFE0, 0x0402E7E0, 0x0402EFE0,
-    0x0402F7E0, 0x0402FFE0, 0x040307E0, 0x04030FE0, 0x040317E0,
+static UNK_PTR sTextures[] = {
+    gEffEnemyDeathFlame1Tex, gEffEnemyDeathFlame2Tex,  gEffEnemyDeathFlame3Tex, gEffEnemyDeathFlame4Tex,
+    gEffEnemyDeathFlame5Tex, gEffEnemyDeathFlame6Tex,  gEffEnemyDeathFlame7Tex, gEffEnemyDeathFlame8Tex,
+    gEffEnemyDeathFlame9Tex, gEffEnemyDeathFlame10Tex,
 };
 
 void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
index a2c365308..6e3cb0aff 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_dead_dd.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rPrimColorR regs[2]
@@ -115,7 +116,7 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
         gSPMatrix(POLY_XLU_DISP++, &D_01000000, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
         gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
                           PRIMITIVE, 0);
-        gSPDisplayList(POLY_XLU_DISP++, D_04037730);
+        gSPDisplayList(POLY_XLU_DISP++, gEffBurnMark1DL);
     }
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 259);
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
index e42ff4d6d..85ecb77ec 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_dead_ds.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rTimer regs[1]
@@ -25,8 +26,6 @@ EffectSsInit Effect_Ss_Dead_Ds_InitVars = {
     EffectSsDeadDs_Init,
 };
 
-extern Gfx D_04037730[];
-
 u32 EffectSsDeadDs_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsDeadDsInitParams* initParams = (EffectSsDeadDsInitParams*)initParamsx;
 
@@ -104,7 +103,7 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
     gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
                       PRIMITIVE, 0);
-    gSPDisplayList(POLY_XLU_DISP++, D_04037730);
+    gSPDisplayList(POLY_XLU_DISP++, gEffBurnMark1DL);
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 255);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
index 8163886a4..e7c6eb0f7 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_dt_bubble.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -30,17 +31,13 @@ EffectSsInit Effect_Ss_Dt_Bubble_InitVars = {
     EffectSsDtBubble_Init,
 };
 
-extern void* D_04055DB0;
-extern void* D_04055EB0;
-extern Gfx D_0401A160[];
-
 u32 EffectSsDtBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsDtBubbleInitParams* initParams = (EffectSsDtBubbleInitParams*)initParamsx;
 
     // @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro.
     // In the base game this works out because both addresses are segment 4, but it may break if
     // the addresses were changed to refer to different segments
-    this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &D_04055DB0 : &D_04055EB0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(Rand_ZeroOne() < 0.5f ? &gEffBubble1Tex : &gEffBubble2Tex);
     this->pos = initParams->pos;
     this->velocity = initParams->velocity;
     this->accel = initParams->accel;
@@ -92,7 +89,7 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
     gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB,
                    (this->rEnvColorA * this->life) / this->rLifespan);
     gSPSegment(POLY_XLU_DISP++, 0x08, this->gfx);
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 236);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
index ee7fc4a22..544f5c042 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_dust.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -35,8 +36,6 @@ static EffectSsUpdateFunc sUpdateFuncs[] = {
     EffectSsBlast_UpdateFire,
 };
 
-extern Gfx D_04010050[];
-
 u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     s32 randColorOffset;
     EffectSsDustInitParams* initParams = (EffectSsDustInitParams*)initParamsx;
@@ -44,7 +43,7 @@ u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void*
     Math_Vec3f_Copy(&this->pos, &initParams->pos);
     Math_Vec3f_Copy(&this->velocity, &initParams->velocity);
     Math_Vec3f_Copy(&this->accel, &initParams->accel);
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04010050);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffDustDL);
     this->life = initParams->life;
     this->update = sUpdateFuncs[initParams->updateMode];
     this->draw = EffectSsDust_Draw;
@@ -78,7 +77,7 @@ u32 EffectSsDust_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void*
 }
 
 static UNK_PTR sTextures[] = {
-    0x04051DB0, 0x040521B0, 0x040525B0, 0x040529B0, 0x04052DB0, 0x040531B0, 0x040535B0, 0x040539B0,
+    gDust1Tex, gDust2Tex, gDust3Tex, gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex,
 };
 
 void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
index 79b800378..8ce179f3f 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_en_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScaleMax regs[0]
 #define rScale regs[1]
@@ -26,9 +27,6 @@ EffectSsInit Effect_Ss_En_Fire_InitVars = {
     EffectSsEnFire_Init,
 };
 
-extern Gfx D_0404D5A0[];
-extern Gfx D_0404D4E0[];
-
 u32 EffectSsEnFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsEnFireInitParams* initParams = (EffectSsEnFireInitParams*)initParamsx;
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -97,9 +95,9 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
                                 0x20, 0x80));
 
     if (((this->rFlags & 0x7FFF) != 0) || (this->life < 18)) {
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D5A0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire2DL);
     } else {
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
 
     CLOSE_DISPS(gfxCtx, "../z_eff_en_fire.c", 213);
diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
index 07178c36c..a28f8c66d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_en_ice.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rLifespan regs[0]
 #define rYaw regs[1]
@@ -30,8 +31,6 @@ EffectSsInit Effect_Ss_En_Ice_InitVars = {
     EffectSsEnIce_Init,
 };
 
-extern Gfx D_04033818[];
-
 u32 EffectSsEnIce_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsEnIceInitParams* initParams = (EffectSsEnIceInitParams*)initParamsx;
 
@@ -129,7 +128,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB,
                     this->rPrimColorA);
     gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha);
-    gSPDisplayList(POLY_XLU_DISP++, D_04033818);
+    gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment2DL);
 
     CLOSE_DISPS(gfxCtx, "../z_eff_en_ice.c", 294);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
index b8fa5dd54..50fef5763 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_fcircle.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rUnused regs[3] // probably supposed to be an alpha
 #define rRadius regs[8]
@@ -21,8 +22,6 @@ EffectSsInit Effect_Ss_Fcircle_InitVars = {
     EffectSsFcircle_Init,
 };
 
-extern Gfx D_040184B0[];
-
 u32 EffectSsFcircle_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsFcircleInitParams* initParams = (EffectSsFcircleInitParams*)initParamsx;
 
@@ -31,7 +30,7 @@ u32 EffectSsFcircle_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
     this->vec.x = initParams->pos.x - initParams->actor->world.pos.x;
     this->vec.y = initParams->pos.y - initParams->actor->world.pos.y;
     this->vec.z = initParams->pos.z - initParams->actor->world.pos.z;
-    this->gfx = D_040184B0;
+    this->gfx = gEffFireCircleDL;
     this->life = 20;
     this->draw = EffectSsFcircle_Draw;
     this->update = EffectSsFcircle_Update;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
index 0db7f20ff..d94366e38 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_fire_tail.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]
 #define rLifespan regs[1]
@@ -29,9 +30,6 @@ EffectSsInit Effect_Ss_Fire_Tail_InitVars = {
     EffectSsFireTail_Init,
 };
 
-extern Gfx D_0404D5A0[];
-extern Gfx D_0404D4E0[];
-
 u32 EffectSsFireTail_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsFireTailInitParams* initParams = (EffectSsFireTailInitParams*)initParamsx;
 
@@ -129,9 +127,9 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
                                 (globalCtx->state.frames * -0x14) & 0x1FF, 32, 128));
 
     if (this->rType != 0) {
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D5A0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire2DL);
     } else {
-        gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+        gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
     }
 
     CLOSE_DISPS(gfxCtx, "../z_eff_fire_tail.c", 273);
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
index 407744e12..fc8644c3d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_g_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
 void EffectSsGFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
@@ -15,8 +16,6 @@ EffectSsInit Effect_Ss_G_Fire_InitVars = {
     EffectSsGFire_Init,
 };
 
-extern Gfx D_0401C220[];
-
 u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsGFireInitParams* initParams = (EffectSsGFireInitParams*)initParamsx;
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -25,7 +24,7 @@ u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
     this->pos = initParams->pos;
     this->draw = EffectSsGFire_Draw;
     this->update = EffectSsGFire_Update;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_0401C220);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffFireFootprintDL);
     this->life = 8;
     this->flags = 0;
     this->rgScale = 200;
@@ -44,8 +43,9 @@ u32 EffectSsGFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
 }
 
 void EffectSsGFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
-    void* textures[] = {
-        0x0401A220, 0x0401A620, 0x0401AA20, 0x0401AE20, 0x0401B220, 0x0401B620, 0x0401BA20, 0x0401BE20,
+    UNK_PTR textures[] = {
+        gEffFireFootprint1Tex, gEffFireFootprint2Tex, gEffFireFootprint3Tex, gEffFireFootprint4Tex,
+        gEffFireFootprint5Tex, gEffFireFootprint6Tex, gEffFireFootprint7Tex, gEffFireFootprint8Tex,
     };
     s16 texIdx = (this->rgTexIdx / 100) % 7;
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
index 381f8c77c..6392fd3fc 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_g_magma.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
 void EffectSsGMagma_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
@@ -15,8 +16,6 @@ EffectSsInit Effect_Ss_G_Magma_InitVars = {
     EffectSsGMagma_Init,
 };
 
-extern Gfx D_04024410[];
-
 u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsGMagmaInitParams* initParams = (EffectSsGMagmaInitParams*)initParamsx;
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -25,7 +24,7 @@ u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
     this->pos = initParams->pos;
     this->draw = EffectSsGMagma_Draw;
     this->update = EffectSsGMagma_Update;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04024410);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffMagmaBubbleDL);
     this->life = 16;
     this->rgScale = (s16)(Rand_ZeroOne() * 100.0f) + 200;
     this->rgTexIdx = 0;
@@ -42,8 +41,10 @@ u32 EffectSsGMagma_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
     return 1;
 }
 
-static void* sTextures[] = { 0x04023810, 0x04023990, 0x04023B10, 0x04023C90,
-                             0x04023E10, 0x04023F90, 0x04024110, 0x04024290 };
+static void* sTextures[] = {
+    gEffMagmaBubble1Tex, gEffMagmaBubble2Tex, gEffMagmaBubble3Tex, gEffMagmaBubble4Tex,
+    gEffMagmaBubble5Tex, gEffMagmaBubble6Tex, gEffMagmaBubble7Tex, gEffMagmaBubble8Tex,
+};
 
 void EffectSsGMagma_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     s16 texIdx = this->rgTexIdx / 100;
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
index 04186f3ce..483ef0157 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_g_ripple.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rWaterBoxNum regs[0]
 #define rRadius regs[1]
@@ -28,9 +29,6 @@ EffectSsInit Effect_Ss_G_Ripple_InitVars = {
     EffectSsGRipple_Init,
 };
 
-extern Gfx D_040254B0[];
-extern Gfx D_040244B0[];
-
 u32 EffectSsGRipple_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     s32 pad;
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -40,7 +38,7 @@ u32 EffectSsGRipple_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
     waterBox = NULL;
     this->velocity = this->accel = zeroVec;
     this->pos = initParams->pos;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_040254B0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffWaterRippleDL);
     this->life = initParams->life + 20;
     this->flags = 0;
     this->draw = EffectSsGRipple_Draw;
@@ -105,7 +103,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, UNK_PT
 
 void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     if (this->rLifespan == 0) {
-        EffectSsGRipple_DrawRipple(globalCtx, this, D_040244B0);
+        EffectSsGRipple_DrawRipple(globalCtx, this, gEffWaterRippleTex);
     }
 }
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
index 122b19064..7247d3bba 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_g_spk.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -28,15 +29,13 @@ EffectSsInit Effect_Ss_G_Spk_InitVars = {
     EffectSsGSpk_Init,
 };
 
-extern Gfx D_04025550[];
-
 u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsGSpkInitParams* initParams = (EffectSsGSpkInitParams*)initParamsx;
 
     Math_Vec3f_Copy(&this->pos, &initParams->pos);
     Math_Vec3f_Copy(&this->velocity, &initParams->velocity);
     Math_Vec3f_Copy(&this->accel, &initParams->accel);
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04025550);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffSparkDL);
 
     if (initParams->updateMode == 0) {
         this->life = 10;
@@ -66,11 +65,11 @@ u32 EffectSsGSpk_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void*
     return 1;
 }
 
-static void* sTextures[] = {
-    0x04055FB0,
-    0x040561B0,
-    0x040563B0,
-    0x040565B0,
+static UNK_PTR sTextures[] = {
+    gEffSpark1Tex,
+    gEffSpark2Tex,
+    gEffSpark3Tex,
+    gEffSpark4Tex,
 };
 
 void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
index e871a5765..2754f702e 100644
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_g_splash.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object bank index
 // this ends up having no effect because the texture provided does not use segment 6
@@ -19,8 +20,6 @@ EffectSsInit Effect_Ss_G_Splash_InitVars = {
     EffectSsGSplash_Init,
 };
 
-extern Gfx D_04027DF0[];
-
 u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsGSplashInitParams* initParams = (EffectSsGSplashInitParams*)initParamsx;
     Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
@@ -34,7 +33,7 @@ u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
         initParams->scale = 600;
     }
 
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04027DF0);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffWaterSplashDL);
     this->life = 8;
     this->rgScale = initParams->scale;
     this->rgTexIdx = 0;
@@ -90,8 +89,9 @@ u32 EffectSsGSplash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
     return 1;
 }
 
-static void* sTextures[] = {
-    0x040255F0, 0x04025AF0, 0x04025FF0, 0x040264F0, 0x040269F0, 0x04026EF0, 0x040273F0, 0x040278F0,
+static UNK_PTR sTextures[] = {
+    gEffWaterSplash1Tex, gEffWaterSplash2Tex, gEffWaterSplash3Tex, gEffWaterSplash4Tex,
+    gEffWaterSplash5Tex, gEffWaterSplash6Tex, gEffWaterSplash7Tex, gEffWaterSplash8Tex,
 };
 
 void EffectSsGSplash_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
index 6c3f1b378..a76fcc209 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_hahen.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPitch regs[0]
 #define rYaw regs[1]
@@ -24,9 +25,6 @@ EffectSsInit Effect_Ss_Hahen_InitVars = {
     EffectSsHahen_Init,
 };
 
-extern Gfx D_0400C0D0[];
-extern Gfx D_0400CD80[];
-
 void EffectSsHahen_CheckForObject(EffectSs* this, GlobalContext* globalCtx) {
     if (((this->rObjBankIdx = Object_GetIndex(&globalCtx->objectCtx, this->rObjId)) < 0) ||
         !Object_IsLoaded(&globalCtx->objectCtx, this->rObjBankIdx)) {
@@ -48,11 +46,11 @@ u32 EffectSsHahen_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void
         this->rObjId = initParams->objId;
         EffectSsHahen_CheckForObject(this, globalCtx);
     } else {
-        this->gfx = SEGMENTED_TO_VIRTUAL(D_0400C0D0);
+        this->gfx = SEGMENTED_TO_VIRTUAL(gEffFragments1DL);
         this->rObjId = -1;
     }
 
-    if ((this->rObjId == OBJECT_HAKA_OBJECTS) && (this->gfx == D_0400CD80)) {
+    if ((this->rObjId == OBJECT_HAKA_OBJECTS) && (this->gfx == gEffFragments2DL)) {
         this->draw = EffectSsHahen_DrawGray;
     } else {
         this->draw = EffectSsHahen_Draw;
diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
index 8f5cd55ea..863bd09f9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_hitmark.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rTexIdx regs[0]
 #define rType regs[1]
@@ -26,11 +27,13 @@ static Color_RGB8 sColors[] = {
     { 255, 255, 255 }, { 0, 255, 200 }, { 255, 255, 255 }, { 150, 0, 255 },
 };
 
-static void* sTextures[] = {
-    0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0,
-    0x0401FF70, 0x040200F0, 0x04020270, 0x040203F0, 0x04020570, 0x040206F0, 0x04020870, 0x040209F0,
-    0x04020B70, 0x04020CF0, 0x04020E70, 0x04020FF0, 0x04021170, 0x040212F0, 0x04021470, 0x040215F0,
-    0x0401F370, 0x0401F4F0, 0x0401F670, 0x0401F7F0, 0x0401F970, 0x0401FAF0, 0x0401FC70, 0x0401FDF0,
+static UNK_PTR sTextures[] = {
+    gEffHitMark1Tex,  gEffHitMark2Tex,  gEffHitMark3Tex,  gEffHitMark4Tex,  gEffHitMark5Tex,  gEffHitMark6Tex,
+    gEffHitMark7Tex,  gEffHitMark8Tex,  gEffHitMark9Tex,  gEffHitMark10Tex, gEffHitMark11Tex, gEffHitMark12Tex,
+    gEffHitMark13Tex, gEffHitMark14Tex, gEffHitMark15Tex, gEffHitMark16Tex, gEffHitMark17Tex, gEffHitMark18Tex,
+    gEffHitMark19Tex, gEffHitMark20Tex, gEffHitMark21Tex, gEffHitMark22Tex, gEffHitMark23Tex, gEffHitMark24Tex,
+    gEffHitMark1Tex,  gEffHitMark2Tex,  gEffHitMark3Tex,  gEffHitMark4Tex,  gEffHitMark5Tex,  gEffHitMark6Tex,
+    gEffHitMark7Tex,  gEffHitMark8Tex,
 };
 
 EffectSsInit Effect_Ss_HitMark_InitVars = {
@@ -42,7 +45,7 @@ u32 EffectSsHitMark_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
     s32 colorIdx;
     EffectSsHitMarkInitParams* initParams = (EffectSsHitMarkInitParams*)initParamsx;
     this->pos = initParams->pos;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_04021770);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffHitMarkDL);
 
     if (initParams->type == EFFECT_HITMARK_DUST) {
         this->life = 16;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
index 61de667e8..2d1cb502c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_ice_piece.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rLifespan regs[0]
 #define rYaw regs[1]
@@ -21,7 +22,7 @@ EffectSsInit Effect_Ss_Ice_Piece_InitVars = {
     EffectSsIcePiece_Init,
 };
 
-extern Gfx D_04033720[];
+extern Gfx gEffIceFragment1DL[];
 
 u32 EffectSsIcePiece_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsIcePieceInitParams* initParams = (EffectSsIcePieceInitParams*)initParamsx;
@@ -74,7 +75,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
     gSPSegment(POLY_XLU_DISP++, 0x08,
                Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (1 * frames) % 256, 0x20, 0x10, 1, 0, (2 * frames) % 256,
                                 0x40, 0x20));
-    gSPDisplayList(POLY_XLU_DISP++, D_04033720);
+    gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment1DL);
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ice_piece.c", 209);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
index f87064e47..aac599314 100644
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_k_fire.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rAlpha regs[0]
 #define rScroll regs[2]
@@ -22,8 +23,6 @@ EffectSsInit Effect_Ss_K_Fire_InitVars = {
     EffectSsKFire_Init,
 };
 
-extern Gfx D_0404D4E0[];
-
 u32 EffectSsKFire_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsKFireInitParams* initParams = (EffectSsKFireInitParams*)initParamsx;
 
@@ -78,7 +77,7 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
 
     gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_k_fire.c", 215),
               G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
-    gSPDisplayList(POLY_XLU_DISP++, D_0404D4E0);
+    gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
 
     CLOSE_DISPS(gfxCtx, "../z_eff_k_fire.c", 220);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
index dbf844065..41dceb770 100644
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_kirakira.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rRotSpeed regs[0]
 #define rYaw regs[1]
@@ -31,8 +32,6 @@ EffectSsInit Effect_Ss_KiraKira_InitVars = {
     EffectSsKiraKira_Init,
 };
 
-extern Gfx D_04037880[];
-
 u32 EffectSsKiraKira_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsKiraKiraInitParams* initParams = (EffectSsKiraKiraInitParams*)initParamsx;
 
@@ -42,12 +41,12 @@ u32 EffectSsKiraKira_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v
 
     if ((this->life = initParams->life) < 0) {
         this->life = -this->life;
-        this->gfx = SEGMENTED_TO_VIRTUAL(D_04037880);
+        this->gfx = SEGMENTED_TO_VIRTUAL(gEffFairySparklesDL);
         this->update = func_809AAD6C;
         this->rEnvColorA = initParams->scale;
         this->rScale = 0;
     } else {
-        this->gfx = SEGMENTED_TO_VIRTUAL(D_04037880);
+        this->gfx = SEGMENTED_TO_VIRTUAL(gEffFairySparklesDL);
 
         if (initParams->updateMode == 0) {
             this->update = func_809AABF0;
diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
index 9e1a2b325..3e229e326 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_lightning.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -28,13 +29,11 @@ EffectSsInit Effect_Ss_Lightning_InitVars = {
     EffectSsLightning_Init,
 };
 
-extern Gfx D_0402CF30[];
-
 u32 EffectSsLightning_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsLightningInitParams* initParams = (EffectSsLightningInitParams*)initParamsx;
 
     this->pos = initParams->pos;
-    this->gfx = SEGMENTED_TO_VIRTUAL(D_0402CF30);
+    this->gfx = SEGMENTED_TO_VIRTUAL(gEffLightningDL);
     this->life = initParams->life;
     this->draw = EffectSsLightning_Draw;
     this->update = EffectSsLightning_Update;
@@ -67,8 +66,9 @@ void EffectSsLightning_NewLightning(GlobalContext* globalCtx, Vec3f* pos, s16 ya
     EffectSs_Insert(globalCtx, &newLightning);
 }
 
-static void* sTextures[] = {
-    0x04029F30, 0x0402A530, 0x0402AB30, 0x0402B130, 0x0402B730, 0x0402BD30, 0x0402C330, 0x0402C930,
+static UNK_PTR sTextures[] = {
+    gEffLightning1Tex, gEffLightning2Tex, gEffLightning3Tex, gEffLightning4Tex,
+    gEffLightning5Tex, gEffLightning6Tex, gEffLightning7Tex, gEffLightning8Tex,
 };
 
 void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
index 2b0467a8a..251856139 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_sibuki.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -27,10 +28,6 @@ EffectSsInit Effect_Ss_Sibuki_InitVars = {
     EffectSsSibuki_Init,
 };
 
-extern void* D_04055EB0;
-extern void* D_04055DB0;
-extern Gfx D_0401A160[];
-
 u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsSibukiInitParams* initParams = (EffectSsSibukiInitParams*)initParamsx;
 
@@ -39,9 +36,9 @@ u32 EffectSsSibuki_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
     this->accel = initParams->accel;
 
     if (KREG(2) != 0) {
-        this->gfx = SEGMENTED_TO_VIRTUAL(&D_04055EB0);
+        this->gfx = SEGMENTED_TO_VIRTUAL(&gEffBubble2Tex);
     } else {
-        this->gfx = SEGMENTED_TO_VIRTUAL(&D_04055DB0);
+        this->gfx = SEGMENTED_TO_VIRTUAL(&gEffBubble1Tex);
     }
 
     this->life = ((s16)((Rand_ZeroOne() * (500.0f + KREG(64))) * 0.01f)) + KREG(65) + 10;
@@ -76,7 +73,7 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
     gDPSetEnvColor(POLY_OPA_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA);
     gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx);
-    gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(D_0401A160));
+    gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 198);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
index 5b41efccc..bd8277a1c 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_sibuki2.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]
 #define rPrimColorG regs[1]
@@ -26,8 +27,6 @@ EffectSsInit Effect_Ss_Sibuki2_InitVars = {
     EffectSsSibuki2_Init,
 };
 
-extern Gfx D_0401E2C0[];
-
 u32 EffectSsSibuki2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsSibuki2InitParams* initParams = (EffectSsSibuki2InitParams*)initParamsx;
 
@@ -51,8 +50,9 @@ u32 EffectSsSibuki2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
     return 1;
 }
 
-static void* sTextures[] = {
-    0x0401C2C0, 0x0401C2C0, 0x0401C6C0, 0x0401CAC0, 0x0401CEC0, 0x0401D2C0, 0x0401D6C0, 0x0401DAC0, 0x0401DEC0,
+static UNK_PTR sTextures[] = {
+    gEffUnusedBubbles1Tex, gEffUnusedBubbles1Tex, gEffUnusedBubbles2Tex, gEffUnusedBubbles3Tex, gEffUnusedBubbles4Tex,
+    gEffUnusedBubbles5Tex, gEffUnusedBubbles6Tex, gEffUnusedBubbles7Tex, gEffUnusedBubbles8Tex,
 };
 
 void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
@@ -69,7 +69,7 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
     gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, this->rEnvColorA);
     gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx]));
-    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(D_0401E2C0));
+    gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffUnusedBubblesDL));
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 198);
 }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
index 0861f45b9..6980f5981 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_stone1.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
 
 #define rReg0 regs[0]
 
@@ -24,18 +25,16 @@ typedef struct {
 } EffStoneDrawInfo;
 
 static EffStoneDrawInfo sDrawInfo[] = {
-    { 0x04029A90, { 200, 0, 0, 255 }, { 0, 0, 0, 255 } },
-    { 0x04029690, { 255, 100, 0, 255 }, { 100, 0, 0, 255 } },
-    { 0x04029290, { 255, 200, 0, 255 }, { 200, 0, 0, 255 } },
-    { 0x04028E90, { 255, 255, 0, 255 }, { 255, 0, 0, 255 } },
-    { 0x04028A90, { 255, 255, 150, 255 }, { 255, 150, 0, 255 } },
-    { 0x04028690, { 255, 255, 255, 255 }, { 255, 255, 0, 255 } },
-    { 0x04028290, { 255, 255, 255, 255 }, { 0, 255, 0, 255 } },
-    { 0x04027E90, { 255, 255, 255, 255 }, { 0, 255, 255, 255 } },
+    { gUnknownEffStone8Tex, { 200, 0, 0, 255 }, { 0, 0, 0, 255 } },
+    { gUnknownEffStone7Tex, { 255, 100, 0, 255 }, { 100, 0, 0, 255 } },
+    { gUnknownEffStone6Tex, { 255, 200, 0, 255 }, { 200, 0, 0, 255 } },
+    { gUnknownEffStone5Tex, { 255, 255, 0, 255 }, { 255, 0, 0, 255 } },
+    { gUnknownEffStone4Tex, { 255, 255, 150, 255 }, { 255, 150, 0, 255 } },
+    { gUnknownEffStone3Tex, { 255, 255, 255, 255 }, { 255, 255, 0, 255 } },
+    { gUnknownEffStone2Tex, { 255, 255, 255, 255 }, { 0, 255, 0, 255 } },
+    { gUnknownEffStone1Tex, { 255, 255, 255, 255 }, { 0, 255, 255, 255 } },
 };
 
-extern Gfx D_04029E90[];
-
 u32 EffectSsStone1_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
     EffectSsStone1InitParams* initParams = (EffectSsStone1InitParams*)initParamsx;
     Vec3f pos = initParams->pos;
@@ -70,7 +69,7 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
     gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, drawParams->primColor.r, drawParams->primColor.g, drawParams->primColor.b,
                     255);
     gDPSetEnvColor(POLY_XLU_DISP++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255);
-    gSPDisplayList(POLY_XLU_DISP++, D_04029E90);
+    gSPDisplayList(POLY_XLU_DISP++, gUnknownEffStoneDL);
 
     CLOSE_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 183);
 }
author	Zelllll <56516451+Zelllll@users.noreply.github.com>	2021-01-24 18:36:40 -0600
committer	GitHub <noreply@github.com>	2021-01-24 19:36:40 -0500
commit	20c1f4e6480b2e85a8149b04507b6b212bda8afc (patch)
tree	04e1838792ab9ce30a0b6520790c17ed3d3a5572 /src
parent	84195fcef613a9f9e9b2518294c6084097f279d7 (diff)