diff --git a/include/assets.h b/include/assets.h
index bc25d37e..c7542f2f 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -527,7 +527,7 @@ extern u8 D_6010FA0[];
 extern EnvSettings D_6011000;
 extern f32 D_6011058[];
 extern f32 D_601115C[];
-extern u8 D_6011660[];
+extern u8 D_TEX_6011660[];
 extern Vec3s D_601170C[];
 extern u8 D_6011890[];
 extern Gfx D_6011910[];
@@ -629,7 +629,7 @@ extern f32 D_601B644[];
 extern f32 D_601B678[];
 extern u16 D_601B6C0[];
 extern f32 D_601B6C4[];
-extern f32 D_601B710[];
+extern f32 D_F32_601B710[];
 extern f32 D_601B75C[];
 extern Gfx D_601B7C0[];
 extern f32 D_601B7F8[];
@@ -706,7 +706,7 @@ extern u16 D_6025500[];
 extern Gfx D_6025B50[];
 extern u16 D_6026420[];
 extern EnvSettings D_60266D0;
-extern EnvSettings D_6026C80;
+extern EnvSettings D_ENV_6026C80;
 extern u16 D_6026C90[];
 extern u8 D_6026D70[];
 extern Gfx D_60270E0[];
@@ -827,9 +827,7 @@ extern Triangle D_6030F64[];
 extern f32 D_6030F74[];
 extern Vec3f D_6030F7C[];
 extern Triangle D_6030FC4[];
-extern Vec3f D_6030FD0[];
-extern f32 D_6031398[];
-extern f32 D_60313CC[];
+
 extern f32 D_6031400[];
 extern f32 D_603144C[];
 extern f32 D_6031480[];
diff --git a/include/fox_edisplay_assets.h b/include/fox_edisplay_assets.h
new file mode 100644
index 00000000..81652ef9
--- /dev/null
+++ b/include/fox_edisplay_assets.h
@@ -0,0 +1,151 @@
+#ifndef FOX_EDISPLAY_ASSETS_H
+#define FOX_EDISPLAY_ASSETS_H
+
+#include "global.h"
+
+extern Gfx D_6027960[];
+extern Gfx D_60273A0[];
+extern Gfx D_60183B0[];
+extern Gfx D_60121E0[];
+extern Gfx D_602A2E0[];
+extern Gfx D_602A720[];
+extern Gfx D_602B8F0[];
+extern Gfx D_602A8C0[];
+extern Gfx D_6028E70[];
+extern Gfx D_602E0A0[];
+extern Gfx D_602DE70[];
+extern Gfx D_602DC40[];
+extern Gfx D_602D830[];
+extern Gfx D_602D340[];
+extern Gfx D_6031280[];
+extern Gfx D_6031130[];
+extern Gfx D_6030850[];
+extern Gfx D_6030FD0[];
+extern Gfx D_602DD40[];
+extern Gfx D_6033AF0[];
+extern Gfx D_60186E0[];
+extern Gfx D_6024160[];
+extern Gfx D_6033290[];
+extern Gfx D_6017F10[];
+extern Gfx D_60074E0[];
+extern Gfx D_6007590[];
+extern Gfx D_6007730[];
+extern Gfx D_6005CC0[];
+extern Gfx D_60176D0[];
+extern Gfx D_6017810[];
+extern Gfx D_6017770[];
+extern Gfx D_6016D90[];
+extern Gfx D_6016E30[];
+extern Gfx D_60178B0[];
+extern Gfx D_6023690[];
+extern Gfx D_6021BB0[];
+extern Gfx D_6021C50[];
+extern Gfx D_6021CE0[];
+extern Gfx D_6021D80[];
+extern Gfx D_6016350[];
+extern Gfx D_6021E20[];
+extern Gfx D_60222A0[];
+extern Gfx D_6022BE0[];
+extern Gfx D_6022D70[];
+extern Gfx D_6022F00[];
+extern Gfx D_6020F10[];
+extern Gfx D_6021100[];
+extern Gfx D_60214B0[];
+extern Gfx D_60163E0[];
+extern Gfx D_60165D0[];
+extern Gfx D_6016880[];
+extern Gfx D_6016B50[];
+extern Gfx D_6000C40[];
+extern Gfx D_6018E80[];
+extern Gfx D_601F620[];
+extern Gfx D_601F420[];
+extern Gfx D_6018C80[];
+extern Gfx D_601F940[];
+extern Gfx D_601F260[];
+extern Gfx D_6014DB0[];
+extern Gfx D_60146D0[];
+extern Gfx D_6014B80[];
+extern Gfx D_6014470[];
+extern Gfx D_6014930[];
+extern Gfx D_60138A0[];
+extern Gfx D_60151A0[];
+extern Gfx D_600F750[];
+extern Gfx D_6015810[];
+extern Gfx D_600D4A0[];
+extern Gfx D_600D720[];
+extern Gfx D_600D810[];
+extern Gfx D_600CFF0[];
+extern Gfx D_600BD20[];
+extern Gfx D_600D390[];
+extern Gfx D_600E150[];
+extern Gfx D_6007160[];
+extern Gfx D_600D900[];
+extern Gfx D_600A8E0[];
+extern Gfx D_600A840[];
+extern Gfx D_600A480[];
+extern Gfx D_600A720[];
+extern Gfx D_600A970[];
+extern Gfx D_6007D70[];
+extern Gfx D_600A520[];
+extern Gfx D_6009990[];
+extern Gfx D_6026460[];
+extern Gfx D_60266B0[];
+extern Gfx D_6026950[];
+extern Gfx D_60276F0[];
+extern Gfx D_6027810[];
+extern Gfx D_6027330[];
+extern Gfx D_60273C0[];
+extern Gfx D_6026E30[];
+extern Gfx D_6026EC0[];
+extern Gfx D_6026DA0[];
+extern Gfx D_6026D10[];
+extern Gfx D_6026C80[];
+extern Gfx D_6026BF0[];
+extern Gfx D_6027460[];
+extern Gfx D_6026F60[];
+extern Gfx D_60040F0[];
+extern Gfx D_6027C90[];
+extern Gfx D_6027FA0[];
+extern Gfx D_6003350[];
+extern Gfx D_6028240[];
+extern Gfx D_6028550[];
+extern Gfx D_6004DB0[];
+extern Gfx D_6027930[];
+extern Gfx D_600F030[];
+extern Gfx D_60050F0[];
+extern Gfx D_60294A0[];
+extern Gfx D_60291B0[];
+extern Gfx D_60287F0[];
+extern Gfx D_6029330[];
+extern Gfx D_6029240[];
+extern Gfx D_6029790[];
+extern Gfx D_6029900[];
+extern Gfx D_6028F50[];
+extern Gfx D_60290C0[];
+extern Gfx D_6029530[];
+extern Gfx D_60296A0[];
+extern Gfx D_6028A80[];
+extern Gfx D_6028910[];
+extern Gfx D_6014FD0[];
+extern Gfx D_601EDE0[];
+extern Gfx D_601F2F0[];
+extern Gfx D_601F830[];
+extern Gfx D_601FD70[];
+extern Gfx D_601D110[];
+extern Gfx D_6023940[];
+extern Gfx D_6023D70[];
+extern Gfx D_60249C0[];
+extern Gfx D_6023EB0[];
+extern Gfx D_60249C0[];
+extern Gfx D_6023B80[];
+extern Gfx D_601B570[];
+extern Gfx D_601B710[];
+extern Gfx D_60209B0[];
+extern Gfx D_6020B70[];
+extern Gfx D_6020D50[];
+extern Gfx D_601B8F0[];
+extern Gfx D_601B3B0[];
+extern Gfx D_601B1C0[];
+extern Gfx D_6011660[];
+
+#endif
diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld
index 0e522678..6c640dae 100644
--- a/linker_scripts/us/undefined_syms.ld
+++ b/linker_scripts/us/undefined_syms.ld
@@ -919,3 +919,176 @@ D_fake_i6_80196D00 = 0x80196D00;
 D_3016CC0 = 0x03016CC0;
 D_50054B0 = 0x050054B0;
 D_7016540 = 0x07016540;
+
+// fox_edisplay
+D_6027960 = 0x06027960;
+D_60273A0 = 0x060273A0;
+D_60183B0 = 0x060183B0;
+D_60121E0 = 0x060121E0;
+D_602A2E0 = 0x0602A2E0;
+D_602B8F0 = 0x0602B8F0;
+D_602A8C0 = 0x0602A8C0;
+D_6028E70 = 0x06028E70;
+D_602E0A0 = 0x0602E0A0;
+D_602DE70 = 0x0602DE70;
+D_602DC40 = 0x0602DC40;
+D_602D830 = 0x0602D830;
+D_602D340 = 0x0602D340;
+D_6031280 = 0x06031280;
+D_6031130 = 0x06031130;
+D_6030850 = 0x06030850;
+D_602DD40 = 0x0602DD40;
+D_6033AF0 = 0x06033AF0;
+D_60186E0 = 0x060186E0;
+D_6024160 = 0x06024160;
+D_6033290 = 0x06033290;
+D_6017F10 = 0x06017F10;
+D_60074E0 = 0x060074E0;
+D_6007590 = 0x06007590;
+D_6007730 = 0x06007730;
+D_6005CC0 = 0x06005CC0;
+D_6027960 = 0x06027960;
+D_60273A0 = 0x060273A0;
+D_60183B0 = 0x060183B0;
+D_60121E0 = 0x060121E0;
+D_602A2E0 = 0x0602A2E0;
+D_602B8F0 = 0x0602B8F0;
+D_602A8C0 = 0x0602A8C0;
+D_6028E70 = 0x06028E70;
+D_602E0A0 = 0x0602E0A0;
+D_602DE70 = 0x0602DE70;
+D_602DC40 = 0x0602DC40;
+D_602D830 = 0x0602D830;
+D_602D340 = 0x0602D340;
+D_6031280 = 0x06031280;
+D_6031130 = 0x06031130;
+D_6030850 = 0x06030850;
+D_602DD40 = 0x0602DD40;
+D_6033AF0 = 0x06033AF0;
+D_60186E0 = 0x060186E0;
+D_6024160 = 0x06024160;
+D_6033290 = 0x06033290;
+D_6017F10 = 0x06017F10;
+D_60074E0 = 0x060074E0;
+D_6007590 = 0x06007590;
+D_6007730 = 0x06007730;
+D_6005CC0 = 0x06005CC0;
+D_60176D0 = 0x060176D0;
+D_6017810 = 0x06017810;
+D_6017770 = 0x06017770;
+D_6016D90 = 0x06016D90;
+D_6016E30 = 0x06016E30;
+D_60178B0 = 0x060178B0;
+D_6023690 = 0x06023690;
+D_6021BB0 = 0x06021BB0;
+D_6021C50 = 0x06021C50;
+D_6021CE0 = 0x06021CE0;
+D_6021D80 = 0x06021D80;
+D_6016350 = 0x06016350;
+D_6021E20 = 0x06021E20;
+D_60222A0 = 0x060222A0;
+D_6022BE0 = 0x06022BE0;
+D_6022D70 = 0x06022D70;
+D_6022F00 = 0x06022F00;
+D_6020F10 = 0x06020F10;
+D_6021100 = 0x06021100;
+D_60214B0 = 0x060214B0;
+D_60163E0 = 0x060163E0;
+D_60165D0 = 0x060165D0;
+D_6016880 = 0x06016880;
+D_6016B50 = 0x06016B50;
+D_6000C40 = 0x06000C40;
+D_6018E80 = 0x06018E80;
+D_601F620 = 0x0601F620;
+D_601F420 = 0x0601F420;
+D_6018C80 = 0x06018C80;
+D_601F940 = 0x0601F940;
+D_601F260 = 0x0601F260;
+D_6014DB0 = 0x06014DB0;
+D_60146D0 = 0x060146D0;
+D_6014B80 = 0x06014B80;
+D_6014470 = 0x06014470;
+D_6014930 = 0x06014930;
+D_60138A0 = 0x060138A0;
+D_60151A0 = 0x060151A0;
+D_600F750 = 0x0600F750;
+D_6015810 = 0x06015810;
+D_600D4A0 = 0x0600D4A0;
+D_600D720 = 0x0600D720;
+D_600D810 = 0x0600D810;
+D_600CFF0 = 0x0600CFF0;
+D_600BD20 = 0x0600BD20;
+D_600D390 = 0x0600D390;
+D_600E150 = 0x0600E150;
+D_6007160 = 0x06007160;
+D_600D900 = 0x0600D900;
+D_600A8E0 = 0x0600A8E0;
+D_600A840 = 0x0600A840;
+D_600A480 = 0x0600A480;
+D_600A720 = 0x0600A720;
+D_600A970 = 0x0600A970;
+D_6007D70 = 0x06007D70;
+D_600A520 = 0x0600A520;
+D_6009990 = 0x06009990;
+D_6026460 = 0x06026460;
+D_60266B0 = 0x060266B0;
+D_6026950 = 0x06026950;
+D_60276F0 = 0x060276F0;
+D_6027810 = 0x06027810;
+D_6027330 = 0x06027330;
+D_60273C0 = 0x060273C0;
+D_6026E30 = 0x06026E30;
+D_6026EC0 = 0x06026EC0;
+D_6026DA0 = 0x06026DA0;
+D_6026D10 = 0x06026D10;
+D_6026C80 = 0x06026C80;
+D_ENV_6026C80 = 0x06026C80;
+D_6026BF0 = 0x06026BF0;
+D_6027460 = 0x06027460;
+D_6026F60 = 0x06026F60;
+D_60040F0 = 0x060040F0;
+D_6027C90 = 0x06027C90;
+D_6027FA0 = 0x06027FA0;
+D_6003350 = 0x06003350;
+D_6028240 = 0x06028240;
+D_6028550 = 0x06028550;
+D_6004DB0 = 0x06004DB0;
+D_6027930 = 0x06027930;
+D_600F030 = 0x0600F030;
+D_60050F0 = 0x060050F0;
+D_60294A0 = 0x060294A0;
+D_60291B0 = 0x060291B0;
+D_60287F0 = 0x060287F0;
+D_6029330 = 0x06029330;
+D_6029240 = 0x06029240;
+D_6029790 = 0x06029790;
+D_6029900 = 0x06029900;
+D_6028F50 = 0x06028F50;
+D_60290C0 = 0x060290C0;
+D_6029530 = 0x06029530;
+D_60296A0 = 0x060296A0;
+D_6028A80 = 0x06028A80;
+D_6028910 = 0x06028910;
+D_6014FD0 = 0x06014FD0;
+D_601EDE0 = 0x0601EDE0;
+D_601F2F0 = 0x0601F2F0;
+D_601F830 = 0x0601F830;
+D_601FD70 = 0x0601FD70;
+D_601D110 = 0x0601D110;
+D_6023940 = 0x06023940;
+D_6023D70 = 0x06023D70;
+D_60249C0 = 0x060249C0;
+D_6023EB0 = 0x06023EB0;
+D_60249C0 = 0x060249C0;
+D_6023B80 = 0x06023B80;
+D_601B570 = 0x0601B570;
+D_601B710 = 0x0601B710;
+D_F32_601B710 = 0x0601B710;
+D_60209B0 = 0x060209B0;
+D_6020B70 = 0x06020B70;
+D_6020D50 = 0x06020D50;
+D_601B8F0 = 0x0601B8F0;
+D_601B3B0 = 0x0601B3B0;
+D_601B1C0 = 0x0601B1C0;
+D_6011660 = 0x06011660;
+D_TEX_6011660 = 0x06011660;
\ No newline at end of file
diff --git a/src/main/fox_A4290_colheaders.c b/src/main/fox_A4290_colheaders.c
index f54f05db..36d4e31d 100644
--- a/src/main/fox_A4290_colheaders.c
+++ b/src/main/fox_A4290_colheaders.c
@@ -3,6 +3,8 @@
 #include "variables.h"
 #include "assets.h"
 
+extern Vec3f D_6030FD0[];
+
 static Vec3f D_800D2920[16] = {
     { 1075.0f, 0.0f, 0.0f },   { 746.0f, 0.0f, -746.0f },    { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
     { 291.0f, 558.0f, 0.0f },  { 0.0f, 354.0f, -291.0f },    { 202.0f, 594.0f, 202.0f },  { 772.0f, 0.0f, 622.0f },
diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c
index 25bb74d6..1fc14957 100644
--- a/src/main/fox_edata_1C.c
+++ b/src/main/fox_edata_1C.c
@@ -1,5 +1,8 @@
 #include "global.h"
 
+extern f32 D_6031398[];
+extern f32 D_60313CC[];
+
 f32 D_800CBE70[] = {
     1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
 };
@@ -199,7 +202,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_126  */  {(void*) func_i3_801BE1FC, 1, (ObjectFunc)          NULL,       D_800CBF34,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_80_127  */  {(void*)     D_9005C80, 0, (ObjectFunc) func_i1_801924A8,        D_601B678,  1000.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_128  */  {(void*)     D_9003F50, 0, (ObjectFunc)          NULL,        D_601B6C4,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_80_129  */  {(void*)     D_900F060, 0, (ObjectFunc)          NULL,        D_601B710,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_80_129  */  {(void*)     D_900F060, 0, (ObjectFunc)          NULL,        D_F32_601B710,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_130  */  {(void*)     D_900F1D0, 0, (ObjectFunc)          NULL,        D_601B75C,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_131  */  {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C,        D_C038BD8,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_80_132  */  {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380,        D_C038A48,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c
index 3c19a1e0..8be01c7f 100644
--- a/src/main/fox_edisplay.c
+++ b/src/main/fox_edisplay.c
@@ -7,6 +7,8 @@ s32 D_801615EC;
 Matrix D_801615F0;
 WingInfo D_80161630;
 
+#include "fox_edisplay_assets.h"
+
 char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
 
 void func_800596C0(void) {
@@ -173,64 +175,44 @@ void func_8005A088(void* arg0) {
 }
 
 Gfx* D_800CFA54[] = {
-    0x06027960, 0x060273A0, 0x060183B0, 0x060121E0, 0x0602A2E0, 0x0602A720, 0x0602B8F0,
-    0x0602A8C0, 0x06028E70, 0x0602E0A0, 0x0602DE70, 0x0602DC40, 0x0602D830, 0x0602D340,
-    0x06031280, 0x06031130, 0x06030850, 0x06030FD0, 0x0602DD40, 0x06033AF0, 0x060186E0,
-    0x06024160, 0x06033290, 0x06017F10, 0x060074E0, 0x06007590, 0x06007730, 0x06005CC0,
+    D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0, D_602A8C0, D_6028E70, D_602E0A0,
+    D_602DE70, D_602DC40, D_602D830, D_602D340, D_6031280, D_6031130, D_6030850, D_6030FD0, D_602DD40, D_6033AF0,
+    D_60186E0, D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0,
 };
 Gfx* D_800CFAC4[] = {
-    0x060176D0, 0x06017810, 0x06017770, 0x06016D90, 0x06016E30, 0x060178B0,
+    D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0,
 };
 Gfx* D_800CFADC[] = {
-    0x06023690, 0x06021BB0, 0x06021C50, 0x06021CE0, 0x06021D80, 0x06016350,
-    0x06021E20, 0x060222A0, 0x06022BE0, 0x06022D70, 0x06022F00,
-};
-Gfx* D_800CFB08[] = {
-    0x06020F10,
-    0x06021100,
-    0x060214B0,
-};
-Gfx* D_800CFB14[] = {
-    0x060163E0, 0x060165D0, 0x06016880, 0x06016B50, 0x06000C40,
-};
-Gfx* D_800CFB28[] = {
-    0x06018E80, 0x0601F620, 0x0601F420, 0x06018C80, 0x0601F940, 0x0601F260,
+    D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_6016350,
+    D_6021E20, D_60222A0, D_6022BE0, D_6022D70, D_6022F00,
 };
+Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 };
+Gfx* D_800CFB14[] = { D_60163E0, D_60165D0, D_6016880, D_6016B50, D_6000C40 };
+Gfx* D_800CFB28[] = { D_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
 Gfx* D_800CFB40[] = {
-    0x06014DB0, 0x060146D0, 0x06014B80, 0x06014470, 0x06014930, 0x060138A0, 0x060151A0, 0x0600F750, 0x06015810,
+    D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810,
 };
 Gfx* D_800CFB64[] = {
-    0x0600D4A0, 0x0600D720, 0x0600D810, 0x0600CFF0, 0x0600BD20, 0x0600D390, 0x0600E150, 0x06007160, 0x0600D900,
+    D_600D4A0, D_600D720, D_600D810, D_600CFF0, D_600BD20, D_600D390, D_600E150, D_6007160, D_600D900,
 };
 Gfx* D_800CFB88[] = {
-    0x0600A8E0, 0x0600A840, 0x0600A480, 0x0600A720, 0x0600A970, 0x06007D70, 0x0600A520, 0x06009990,
+    D_600A8E0, D_600A840, D_600A480, D_600A720, D_600A970, D_6007D70, D_600A520, D_6009990,
 };
 Gfx* D_800CFBA8[] = {
-    0x06026460, 0x060266B0, 0x06026950, 0x060276F0, 0x06027810, 0x06027330, 0x060273C0, 0x06026E30,
-    0x06026EC0, 0x06026DA0, 0x06026D10, 0x06026C80, 0x06026BF0, 0x06027460, 0x06026F60,
-};
-Gfx* D_800CFBE4[] = {
-    0x060040F0, 0x06027C90, 0x06027FA0, 0x06003350, 0x06028240,
-    0x06028550, 0x06004DB0, 0x06027930, 0x0600F030, 0x060050F0,
+    D_6026460, D_60266B0, D_6026950, D_60276F0, D_6027810, D_6027330, D_60273C0, D_6026E30,
+    D_6026EC0, D_6026DA0, D_6026D10, D_6026C80, D_6026BF0, D_6027460, D_6026F60,
 };
+Gfx* D_800CFBE4[] = { D_60040F0, D_6027C90, D_6027FA0, D_6003350, D_6028240,
+                      D_6028550, D_6004DB0, D_6027930, D_600F030, D_60050F0 };
 Gfx* D_800CFC0C[] = {
-    0x060294A0, 0x060291B0, 0x060287F0, 0x06029330, 0x06029240, 0x06029790, 0x06029900,
-    0x06028F50, 0x060290C0, 0x06029530, 0x060296A0, 0x06028A80, 0x06028910,
-};
-Gfx* D_800CFC40[] = {
-    0x06014FD0,
-    0x06014FD0,
-    0x06014FD0,
-    0x06014FD0,
-};
-Gfx* D_800CFC50[] = {
-    0x0601EDE0, 0x0601F2F0, 0x0601F830, 0x0601FD70, 0x0601D110,
-};
-Gfx* D_800CFC64[] = {
-    0x06023940, 0x06023D70, 0x060249C0, 0x06023EB0, 0x060249C0, 0x06023B80,
+    D_60294A0, D_60291B0, D_60287F0, D_6029330, D_6029240, D_6029790, D_6029900,
+    D_6028F50, D_60290C0, D_6029530, D_60296A0, D_6028A80, D_6028910,
 };
+Gfx* D_800CFC40[] = { D_6014FD0, D_6014FD0, D_6014FD0, D_6014FD0 };
+Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 };
+Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 };
 Gfx* D_800CFC7C[] = {
-    0x0601B570, 0x0601B710, 0x060209B0, 0x06020B70, 0x06020D50, 0x0601B8F0, 0x0601B3B0, 0x0601B1C0, 0x06011660,
+    D_601B570, D_601B710, D_60209B0, D_6020B70, D_6020D50, D_601B8F0, D_601B3B0, D_601B1C0, D_6011660
 };
 
 void func_8005A094(Actor* actor) {
diff --git a/src/main/fox_play.c b/src/main/fox_play.c
index 2e1f3b8c..43d0bcfb 100644
--- a/src/main/fox_play.c
+++ b/src/main/fox_play.c
@@ -17,9 +17,9 @@ u8 D_800D2F6C[20] = {
 Vec3f D_800D2F80 = { -65.0f, -22.0f, -65.0f };
 Vec3f D_800D2F8C = { 65.0f, -22.0f, -65.0f };
 EnvSettings* D_800D2F98[21] = {
-    &D_6037160, &D_6026C80, &D_602A120, &D_6023F20,     &D_6028760,     &D_602E4B0, &D_6007E30,
-    &D_601F1F0, &D_60266D0, &D_C035110, &D_6006A60,     &D_6030E30_Env, &D_6005000, &D_602E540,
-    &D_600EA90, NULL,       &D_6011000, &D_600FF30_Env, &D_6006E70,     &D_6014D50, &D_302DD70,
+    &D_6037160, &D_ENV_6026C80, &D_602A120, &D_6023F20,     &D_6028760,     &D_602E4B0, &D_6007E30,
+    &D_601F1F0, &D_60266D0,     &D_C035110, &D_6006A60,     &D_6030E30_Env, &D_6005000, &D_602E540,
+    &D_600EA90, NULL,           &D_6011000, &D_600FF30_Env, &D_6006E70,     &D_6014D50, &D_302DD70,
 };
 f32 D_800D2FEC[5] = {
     0.0f, 0.5f, -0.5f, 0.5f, -0.5f,
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index a505d83b..727fe00a 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -241,11 +241,11 @@ PlanetId sPlanetList[] = {
 Gfx* D_menu_801AF824[4] = { D_604A710, D_604A400, D_604A190, D_6049F80 };
 
 Texture D_menu_801AF834[14] = {
-    { D_6007B90, 128, 28, 95.0f }, { D_60030D0, 96, 28, 110.0f },  { D_60131A0, 176, 12, 73.0f },
-    { D_6009AD0, 168, 28, 77.0f }, { D_600B9B0, 168, 28, 74.0f },  { D_6001C80, 96, 13, 106.0f },
-    { D_6011660, 176, 12, 75.0f }, { D_6010010, 112, 13, 109.0f }, { D_6017640, 112, 28, 101.0f },
-    { D_6015CE0, 96, 28, 108.0f }, { D_600E210, 160, 28, 78.0f },  { D_6014360, 176, 12, 73.0f },
-    { D_6004AC0, 168, 19, 72.0f }, { D_6006320, 104, 28, 105.0f },
+    { D_6007B90, 128, 28, 95.0f },     { D_60030D0, 96, 28, 110.0f },  { D_60131A0, 176, 12, 73.0f },
+    { D_6009AD0, 168, 28, 77.0f },     { D_600B9B0, 168, 28, 74.0f },  { D_6001C80, 96, 13, 106.0f },
+    { D_TEX_6011660, 176, 12, 75.0f }, { D_6010010, 112, 13, 109.0f }, { D_6017640, 112, 28, 101.0f },
+    { D_6015CE0, 96, 28, 108.0f },     { D_600E210, 160, 28, 78.0f },  { D_6014360, 176, 12, 73.0f },
+    { D_6004AC0, 168, 19, 72.0f },     { D_6006320, 104, 28, 105.0f },
 };
 
 Texture D_menu_801AF914[] = {