Sf_bb360, also major data import (#35)

* all sorts of imports and such

* oops

* names and such

6 files changed, 298 insertions, 88 deletions

diff --git a/include/functions.h b/include/functions.h
index e4208811..11432b8c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -75,6 +75,8 @@ void func_8001A55C(f32*, u32);
 void func_8001A838(u32 arg0);
 void func_8001ACDC(s32);
 void func_8001AE58(void);
+s32 func_8001AE78(void);
+s32 func_8001AED4(void);
 void func_8001AF40(s32 arg0);
 void func_8001D400(s32);
 void func_8001D444(u8, u16, u8, u8);
@@ -88,7 +90,7 @@ void func_8001D8F4(u8);
 void func_8001DCE0(void);
 void func_8001DECC(void);
 SPTask* func_8001DF50(void);
-
+void func_8001EE00(void);
 f32 func_8001FE60(f32);
 f64 func_8001FE6C(f64);
 s32 func_8001FE78(f32);
@@ -234,12 +236,15 @@ void func_80084370(s32);
 void func_800843FC(s32);
 void func_80084488(s32);
 void func_80084688(s32, s32);
+void func_80084B94(s32 arg0);
 void func_800857DC(f32, f32, f32, f32);
 void func_80085890(f32, f32, f32, f32);
+void func_80086110(f32 arg0, f32 arg1, s32 arg2);
 void func_80086664(f32, f32);
 void func_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5);
 void func_80087530(f32, f32, s32);
 void func_8008865C(void);
+void func_8008AD94(void);
 void func_8008B5B0(f32 x, f32 y);
 s32 func_8008B774(void);
 void func_8008BD00(u8*, s32, s32, u8);
@@ -289,11 +294,19 @@ void func_800B9358(void);
 void func_800C1ED4(void);
 void func_800C20B0(void);
 void func_800C2190(void);
+u16* func_800C2830(u16 arg0);
 u16 func_800C2890(u16*);
+s32 func_800C28DC(u16* arg0);
+s32 func_800C2928(u16* arg0);
+void func_800C295C(Gfx** arg0, u16 arg1, s32 arg2, s32 arg3);
+s32 func_800C2AF0(Gfx** arg0, u16* arg1, s32 arg2, s32 arg3, s32 arg4);
+void func_800C2D3C(Gfx** arg0, u16* arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6);
 s32 func_800C2F30(u16*, s32);
 s32 Save_Write(void);
 s32 Save_Read(void); 
 
+
+
 void func_EFFA40_80187520(s32, void*);
 
 void func_DF4260_80198310(Object_408 *);
diff --git a/include/gfx.h b/include/gfx.h
index d39ee2bd..2856cac9 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -165,23 +165,23 @@ f32 func_8009BC2C(f32 *value, f32 target, f32 scale, f32 maxStep, f32 minStep);
 f32 func_8009BD38(f32 *angle, f32 target, f32 scale, f32 maxStep, f32 minStep);
 void func_8009BEEC(Vec3f *src, Vec3f *dst, s32 mode, s32 count, f32 scale, f32 maxStep, f32 minStep);
 s32 func_8009C124(Vec3f *pos, Vec3f *target, Vec3f *rot, f32 stepSize, f32 scaleTurn, f32 maxTurn, f32 dist);
-void func_8009C320(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009C674(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009C9C8(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009CD3C(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009D0BC(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009D418(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009D6CC(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009D994(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009DC4C(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009DF14(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009E1E8(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009E4B0(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009E784(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009EA38(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009ED04(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009EFDC(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
-void func_8009F2C0(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_Flip(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_MirX(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_4bCI_MirY(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_8bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_16bIA_MirXY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
+void TextureRect_32bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale);
 void func_8009F574(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a);
 void func_8009F6CC(Vec3f *step, f32 xRot, f32 yRot, f32 stepsize);
 f32 func_8009F768(f32 rAngle);
diff --git a/include/hud.h b/include/hud.h
index 33711c6c..24ed4aeb 100644
--- a/include/hud.h
+++ b/include/hud.h
@@ -52,8 +52,6 @@ extern s32 D_1011CA0[];
 extern s32 D_1011D70[];
 extern s32 D_1011D90[];
 extern s32 D_1011E60[];
-extern s32 D_1013170[];
-extern s32 D_1013570[];
 extern s32 D_1013580[];
 extern s32 D_1013700[];
 extern s32 D_20031B0[];
diff --git a/include/sf64dma.h b/include/sf64dma.h
new file mode 100644
index 00000000..54e5505a
--- /dev/null
+++ b/include/sf64dma.h
@@ -0,0 +1,186 @@
+#ifndef SF64_DMA
+#define SF64_DMA
+
+#include "PR/ultratypes.h"
+#include "libc/stdbool.h"
+
+#define DECLARE_VRAM_SEGMENT(name) \
+    extern u8 name ## _VRAM[]; \
+    extern u8 name ## _VRAM_END[]
+
+#define DECLARE_ROM_SEGMENT(name) \
+    extern u8 name ## _ROM_START[]; \
+    extern u8 name ## _ROM_END[]
+
+#define DECLARE_TEXT_SEGMENT(name)   \
+    extern u8 name ## _TEXT_START[]; \
+    extern u8 name ## _TEXT_END[]
+
+#define DECLARE_DATA_SEGMENT(name)   \
+    extern u8 name ## _DATA_START[]; \
+    extern u8 name ## _DATA_END[]; \
+    extern u8 name ## _DATA_SIZE[]
+
+#define DECLARE_RODATA_SEGMENT(name)   \
+    extern u8 name ## _RODATA_START[]; \
+    extern u8 name ## _RODATA_END[]
+
+
+#define DECLARE_BSS_SEGMENT(name)   \
+    extern u8 name ## _BSS_START[]; \
+    extern u8 name ## _BSS_END[]
+
+#define DECLARE_SEGMENT(name) \
+    DECLARE_VRAM_SEGMENT(name); \
+    DECLARE_ROM_SEGMENT(name); \
+    DECLARE_TEXT_SEGMENT(name); \
+    DECLARE_DATA_SEGMENT(name); \
+    DECLARE_RODATA_SEGMENT(name); \
+    DECLARE_BSS_SEGMENT(name)
+
+#define SEGMENT_VRAM_START(segment) (segment ## _VRAM)
+#define SEGMENT_VRAM_END(segment)   (segment ## _VRAM_END)
+#define SEGMENT_VRAM_SIZE(segment)  ((uintptr_t)SEGMENT_VRAM_END(segment) - (uintptr_t)SEGMENT_VRAM_START(segment))
+
+#define SEGMENT_ROM_START(segment) (segment ## _ROM_START)
+#define SEGMENT_ROM_END(segment)   (segment ## _ROM_END)
+#define SEGMENT_ROM_SIZE(segment)  ((uintptr_t)SEGMENT_ROM_END(segment) - (uintptr_t)SEGMENT_ROM_START(segment))
+
+#define SEGMENT_TEXT_START(segment) (segment ## _TEXT_START)
+#define SEGMENT_TEXT_END(segment)   (segment ## _TEXT_END)
+#define SEGMENT_TEXT_SIZE(segment)  ((uintptr_t)SEGMENT_TEXT_END(segment) - (uintptr_t)SEGMENT_TEXT_START(segment))
+
+#define SEGMENT_DATA_START(segment) (segment ## _DATA_START)
+#define SEGMENT_DATA_END(segment)   (segment ## _DATA_END)
+#define SEGMENT_DATA_SIZE(segment)  ((uintptr_t)SEGMENT_DATA_END(segment) - (uintptr_t)SEGMENT_DATA_START(segment))
+#define SEGMENT_DATA_SIZE_CONST(segment) (segment ## _DATA_SIZE)
+
+#define SEGMENT_RODATA_START(segment) (segment ## _RODATA_START)
+#define SEGMENT_RODATA_END(segment)   (segment ## _RODATA_END)
+#define SEGMENT_RODATA_SIZE(segment)  ((uintptr_t)SEGMENT_RODATA_END(segment) - (uintptr_t)SEGMENT_RODATA_START(segment))
+#define SEGMENT_RODATA_SIZE_CONST(segment) (segment ## _RODATA_SIZE)
+
+#define SEGMENT_BSS_START(segment) (segment ## _BSS_START)
+#define SEGMENT_BSS_END(segment)   (segment ## _BSS_END)
+#define SEGMENT_BSS_SIZE(segment)  ((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment))
+
+typedef struct {
+    /* 0x0 */ void* start;
+    /* 0x4 */ void* end;
+} SegmentOffset; // size = 0x8
+
+typedef struct {
+    /* 0x00 */ SegmentOffset rom;
+    /* 0x08 */ SegmentOffset bss;
+    /* 0x10 */ SegmentOffset text;
+    /* 0x18 */ SegmentOffset data;
+} OverlayOffsets; // size = 0x20
+
+typedef struct {
+    /* 0x00 */ OverlayOffsets ovl;
+    /* 0x20 */ SegmentOffset assets[15];
+} OverlayInit; // size = 0x98
+
+typedef struct {
+    /* 0x0 */ void* vRomAddress;
+    /* 0x8 */ SegmentOffset pRom;
+    /* 0xC */ s32 compFlag;
+} DmaEntry; // size = 0x10;
+
+extern DmaEntry gDmaTable[]; // 178A70
+
+extern OverlayInit D_800CA3B4[1]; // sets segment 15 with no overlay
+extern OverlayInit D_800CA44C[6]; // overlay EF0260
+extern OverlayInit D_800CA7DC[1]; // EBFBE0
+extern OverlayInit D_800CA874[1]; // EBFBE0
+extern OverlayInit D_800CA90C[1]; // EBFBE0
+extern OverlayInit D_800CA9A4[1]; // EBFBE0
+extern OverlayInit D_800CAA3C[1]; // DF4260
+extern OverlayInit D_800CAAD4[2]; // E08400
+extern OverlayInit D_800CAC04[6]; // E6A810
+extern OverlayInit D_800CAF94[2]; // E08400
+extern OverlayInit D_800CB0C4[1]; // E51970
+extern OverlayInit D_800CB15C[1]; // E16C50
+extern OverlayInit D_800CB1F4[1]; // E16C50
+extern OverlayInit D_800CB28C[2]; // E51970
+extern OverlayInit D_800CB3BC[1]; // E16C50
+extern OverlayInit D_800CB454[1]; // E9F1D0
+extern OverlayInit D_800CB4EC[1]; // E16C50
+extern OverlayInit D_800CB584[1]; // E16C50
+extern OverlayInit D_800CB61C[1]; // DF4260
+extern OverlayInit D_800CB6B4[1]; // E9F1D0
+extern OverlayInit D_800CB74C[2]; // E9F1D0
+extern OverlayInit D_800CB87C[1]; // E08400
+extern OverlayInit D_800CB914[1]; // E51970
+extern OverlayInit D_800CB9AC[1]; // E51970
+extern OverlayInit D_800CBA44[2]; // E6A810
+extern OverlayInit D_800CBB74[1]; // DF4260
+extern OverlayInit D_800CBC0C[2]; // E08400
+extern OverlayInit D_800CBD3C[1]; // EFFA40
+
+DECLARE_SEGMENT(makerom);
+DECLARE_SEGMENT(main);
+DECLARE_SEGMENT(dma_table);
+DECLARE_SEGMENT(audio_seq);
+DECLARE_SEGMENT(audio_bank);
+DECLARE_SEGMENT(audio_table);
+DECLARE_SEGMENT(ast_873CB0);
+DECLARE_SEGMENT(ast_8A68C0);
+DECLARE_SEGMENT(ast_8AE0A0);
+DECLARE_SEGMENT(ast_8BFC00);
+DECLARE_SEGMENT(ast_8D99F0);
+DECLARE_SEGMENT(ast_8E1F80);
+DECLARE_SEGMENT(ast_8E92D0);
+DECLARE_SEGMENT(ast_918430);
+DECLARE_SEGMENT(ast_922730);
+DECLARE_SEGMENT(ast_92EC40);
+DECLARE_SEGMENT(ast_940AD0);
+DECLARE_SEGMENT(ast_955270);
+DECLARE_SEGMENT(ast_961CE0);
+DECLARE_SEGMENT(ast_9A1460);
+DECLARE_SEGMENT(ast_9D2FD0);
+DECLARE_SEGMENT(ast_9DD390);
+DECLARE_SEGMENT(ast_9EB5E0);
+DECLARE_SEGMENT(ast_9F4880);
+DECLARE_SEGMENT(ast_A049A0);
+DECLARE_SEGMENT(ast_A0E340);
+DECLARE_SEGMENT(ast_A1D0F0);
+DECLARE_SEGMENT(ast_A4FBB0);
+DECLARE_SEGMENT(ast_A58F60);
+DECLARE_SEGMENT(ast_A8B470);
+DECLARE_SEGMENT(ast_AB4000);
+DECLARE_SEGMENT(ast_ACF960);
+DECLARE_SEGMENT(ast_AE60A0);
+DECLARE_SEGMENT(ast_B0AA00);
+DECLARE_SEGMENT(ast_B1CA50);
+DECLARE_SEGMENT(ast_B2CA50);
+DECLARE_SEGMENT(ast_B612E0);
+DECLARE_SEGMENT(ast_B84560);
+DECLARE_SEGMENT(ast_BB11D0);
+DECLARE_SEGMENT(ast_BC23D0);
+DECLARE_SEGMENT(ast_BFA740);
+DECLARE_SEGMENT(ast_BFC510);
+DECLARE_SEGMENT(ast_C48F40);
+DECLARE_SEGMENT(ast_CA9DE0);
+DECLARE_SEGMENT(ast_CBFE70);
+DECLARE_SEGMENT(ast_CD2410);
+DECLARE_SEGMENT(ast_CDDCA0);
+DECLARE_SEGMENT(ast_CE9E70);
+DECLARE_SEGMENT(ast_D25100);
+DECLARE_SEGMENT(ast_D27600);
+DECLARE_SEGMENT(ast_D43400);
+DECLARE_SEGMENT(ast_D68480);
+DECLARE_SEGMENT(ast_D91F10);
+DECLARE_SEGMENT(ast_DDC010);
+DECLARE_SEGMENT(ast_DE5D50);
+DECLARE_SEGMENT(ovl_DF4260);
+DECLARE_SEGMENT(ovl_E08400);
+DECLARE_SEGMENT(ovl_E16C50);
+DECLARE_SEGMENT(ovl_E51970);
+DECLARE_SEGMENT(ovl_E6A810);
+DECLARE_SEGMENT(ovl_E9F1D0);
+DECLARE_SEGMENT(ovl_EBFBE0);
+DECLARE_SEGMENT(ovl_EF0260);
+DECLARE_SEGMENT(ovl_EFFA40);
+
+#endif
diff --git a/include/structs.h b/include/structs.h
index 06271b42..0d4749c3 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -1,7 +1,7 @@
 #ifndef STRUCTS_H
 #define STRUCTS_H
 
-#include "global.h"
+#include "libultra/ultra64.h"
 #include "sf64math.h"
 
 #define UNK_TYPE s32
@@ -11,25 +11,6 @@ typedef struct {
     u16* unk4;
 } UnkStruct_D_80185CBC;
 
-typedef struct {
-    /* 0x0 */ void* start;
-    /* 0x4 */ void* end;
-} SegmentOffset; // size = 0x8
-
-typedef struct {
-    /* 0x00 */ SegmentOffset rom;
-    /* 0x08 */ SegmentOffset bss;
-    /* 0x10 */ SegmentOffset text;
-    /* 0x18 */ SegmentOffset data;
-    /* 0x20 */ SegmentOffset assets[15];
-} OverlayInit; // size = 0x98
-
-typedef struct {
-    /* 0x0 */ void* vRomAddress;
-    /* 0x8 */ SegmentOffset pRom;
-    /* 0xC */ s32 compFlag;
-} DmaEntry; // size = 0x10;
-
 typedef void (*TimerAction)(s32*, s32);
 
 typedef struct {
@@ -254,7 +235,7 @@ typedef struct {
     /* 0x00 */ void (*unk_00)(Object*);
     /* 0x00 */ u8 unk_04;
     /* 0x08 */ void (*unk_08)(Object*);
-    /* 0x0C */ void* unk_0C;
+    /* 0x0C */ f32* unk_0C;
     /* 0x10 */ f32 unk_10;
     /* 0x14 */ s16 unk_14;
     /* 0x16 */ s16 unk_16;
diff --git a/include/variables.h b/include/variables.h
index b48416b3..4aa02068 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -40,11 +40,10 @@ extern OSContPad gChangedInput[4];
 extern u8 gControllerStatus[4];
 extern u32 gStopInputTimer;
 extern u8 gRumbleStatus[4];
-extern u8 D_800DD8BC[4]; // Fake symbol. Only exists as loop terminator for gRumbleStatus
-// extern OSContPad sNextInput[4];
-// extern OSContPad sPrevInput[4];
-// extern OSContStatus D_800DD8F0[4];
-// extern OSPfs D_800DD900[4];
+extern OSContPad sNextInput[4];    //
+extern OSContPad sPrevInput[4];    //
+extern OSContStatus D_800DD8F0[4]; //
+extern OSPfs D_800DD900[4];        //
 
 extern u8 gAudioThreadStack[0x1000];  // 800DDAA0
 extern OSThread gGraphicsThread;        // 800DEAA0
@@ -113,11 +112,12 @@ extern u8 D_80137E84[4];
 extern u16 gFillScreenColor;
 extern u16 gFillScreen;
 
-// extern OSThread sIdleThread; // 80138E90
-// extern u8 sIdleThreadStack[0x1000]; // 801390A0
-// extern OSThread gMainThread; // 8013A040
-// extern u8 sMainThreadStack[0x1000]; // 8013A1F0
-// extern OSThread gAudioThread; //8013B1F0
+extern u8 gUnusedStack[0x1000];
+extern OSThread sIdleThread; // 80138E90
+extern u8 sIdleThreadStack[0x1000]; // 801390A0
+extern OSThread gMainThread; // 8013A040
+extern u8 sMainThreadStack[0x1000]; // 8013A1F0
+extern OSThread gAudioThread; //8013B1F0
 
 extern Matrix* gGfxMatrix;
 extern Matrix sGfxMatrixStack[0x20];
@@ -134,36 +134,9 @@ extern OSMesg D_80156618[1];
 extern OSMesg D_8015661C[1];
 
 extern u8 D_800CA3B0;
-extern OverlayInit D_800CA3B4[1]; // sets segment 15 with no overlay
-extern OverlayInit D_800CA44C[6]; // overlay EF0260
-extern OverlayInit D_800CA7DC[1]; // EBFBE0
-extern OverlayInit D_800CA874[1]; // EBFBE0
-extern OverlayInit D_800CA90C[1]; // EBFBE0
-extern OverlayInit D_800CA9A4[1]; // EBFBE0
-extern OverlayInit D_800CAA3C[1]; // DF4260
-extern OverlayInit D_800CAAD4[2]; // E08400
-extern OverlayInit D_800CAC04[6]; // E6A810
-extern OverlayInit D_800CAF94[2]; // E08400
-extern OverlayInit D_800CB0C4[1]; // E51970
-extern OverlayInit D_800CB15C[1]; // E16C50
-extern OverlayInit D_800CB1F4[1]; // E16C50
-extern OverlayInit D_800CB28C[2]; // E51970
-extern OverlayInit D_800CB3BC[1]; // E16C50
-extern OverlayInit D_800CB454[1]; // E9F1D0
-extern OverlayInit D_800CB4EC[1]; // E16C50
-extern OverlayInit D_800CB584[1]; // E16C50
-extern OverlayInit D_800CB61C[1]; // DF4260
-extern OverlayInit D_800CB6B4[1]; // E9F1D0
-extern OverlayInit D_800CB74C[2]; // E9F1D0
-extern OverlayInit D_800CB87C[1]; // E08400
-extern OverlayInit D_800CB914[1]; // E51970
-extern OverlayInit D_800CB9AC[1]; // E51970
-extern OverlayInit D_800CBA44[2]; // E6A810
-extern OverlayInit D_800CBB74[1]; // DF4260
-extern OverlayInit D_800CBC0C[1]; // E08400
-extern OverlayInit D_800CBD3C[1]; // EFFA40
+
 extern f32 D_800CBF18[];
-extern ObjectStruct_1C D_800CC124[400];
+extern ObjectStruct_1C D_800CC124[];
 extern f32 D_800CF9B0[];
 extern Gfx* D_800CFA54[];
 extern Gfx* D_800CFAC4[];
@@ -457,7 +430,7 @@ extern s32 D_80178558;
 extern s32 D_8017855C;
 extern s32 D_80178580;
 extern s32 *D_80178710;
-extern s32 D_80178720;
+extern u16** D_80178720;
 extern s32 D_80178724;
 extern s32 D_80178728;
 extern s32 D_8017872C;
@@ -477,9 +450,8 @@ extern Gfx D_Gfx_800DBAA0[];
 extern Gfx D_Gfx_800DAC20[];
 extern Gfx D_Gfx_800D9688[];
 
-extern DmaEntry gDmaTable[]; // 178A70
-extern u8 D_80179010[][16 * 13 / 2];
-extern u16 D_8017A0F4;
+extern u8 D_80179010[24][16 * 13 / 2];
+extern u16 D_8017A0F4[];
 extern u16 D_80182544[];
 extern u16 D_80183CA8[];
 extern u16 D_80183CF0[];
@@ -549,8 +521,6 @@ extern f32 D_EBFBE0_801B9060;
 extern f32 D_EBFBE0_801B9064;
 extern s8 D_E6A810_801BA1E8;
 
-
-
 extern char D_EBFBE0_801ADA44[];
 extern s32 D_EBFBE0_801ADA84[];
 extern s32 D_EBFEB0_801ADA94;
@@ -565,6 +535,17 @@ extern u16 D_8038F080[];
 extern u16 D_8038F300[];
 extern FrameBuffer gFrameBuffers[3]; // 8038F800
 
+extern u8 D_1013170[];
+extern u16 D_1013570[];
+extern u16 D_10041C0[];
+extern u16 D_1006000[];
+extern u16 D_1006F20[];
+extern u16 D_1007E40[];
+extern u16 D_1008D60[];
+extern u16 D_1009C80[];
+extern u16 D_100ABA0[];
+extern u16 D_100C9E0[];
+extern u16 D_100E820[];
 extern u16 D_1002040[];
 extern u16 D_10050E0[];
 extern u16 D_100BAC0[];
@@ -755,6 +736,29 @@ extern u16 D_6047550[];
 extern Gfx D_6004570[];
 extern u8 D_6001B80[];
 extern u8 D_60020D0[];
+extern u16 D_6000900[];
+extern u16 D_6000B60[];
+extern u16 D_6001820[];
+extern u16 D_6001A80[];
+extern u16 D_60029A0[];
+extern u16 D_60038C0[];
+extern u16 D_60047E0[];
+extern u16 D_6005700[];
+extern u16 D_600C6A0[];
+extern u16 D_6010C20[];
+extern u16 D_6011B40[];
+extern u16 D_6014510[];
+extern u16 D_6015430[];
+extern u16 D_6018F30[];
+extern u16 D_6019E50[];
+extern u16 D_601C8E0[];
+extern u16 D_601D800[];
+extern u16 D_6020FB0[];
+extern u16 D_6021ED0[];
+extern u16 D_60245E0[];
+extern u16 D_6025500[];
+extern u16 D_6026420[];
+extern u16 D_6027340[];
 
 extern Gfx D_7007350[];
 extern Gfx D_700BB10[];
@@ -779,8 +783,38 @@ extern Gfx D_90234D0[];
 extern ObjectInit* D_C0356A4[];
 extern Gfx D_C017440[];
 
+extern u16 D_D000170[];
+extern u16 D_D001090[];
+extern u16 D_D001FB0[];
+extern u16 D_D002ED0[];
+extern u16 D_D003DF0[];
+extern u16 D_D004D10[];
+extern u16 D_D005C30[];
+extern u16 D_D006B50[];
+extern u16 D_D007A70[];
+extern u16 D_D008990[];
 extern Gfx D_D0098B0[];
 
+extern u16 D_E00E100[];
+extern u16 D_E00F020[];
+extern u16 D_E00FF40[];
+extern u16 D_E010E60[];
+
+extern u16 D_F000F20[];
+extern u16 D_F001E40[];
+extern u16 D_F002D60[];
+extern u16 D_F003C80[];
+extern u16 D_F004BA0[];
+extern u16 D_F005AC0[];
+extern u16 D_F0069E0[];
+extern u16 D_F007900[];
+extern u16 D_F008820[];
+extern u16 D_F009740[];
+extern u16 D_F00A660[];
+extern u16 D_F00B580[];
+extern u16 D_F00C4A0[];
+extern u16 D_F00D3C0[];
+extern u16 D_F00E2E0[];
 extern Gfx D_F014310[];
 extern Gfx D_F014180[];
 extern u16 D_F000000[];
@@ -789,7 +823,5 @@ extern u16 D_F001000[];
 extern u16 D_F001800[];
 extern u16 D_F002000[];
 
-
-
 #endif // VARIABLES_H