Proposed names for library stuff (#29)

* get this started

* linker scripts fixed

* oh god what now

* names

* the blue pill

* names, perhaps

* save

* clean out structs

* save for later again

* more names

* save, again

4 files changed, 117 insertions, 118 deletions

diff --git a/include/functions.h b/include/functions.h
index f4364785..a9dd6a5a 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -4,19 +4,19 @@
 #include "structs.h"
 #include "fox_option.h"
 
-void func_8000291C(void);
-void func_800029A8(void);
-void func_80002AF4(void);
-void func_80002BE8(void);
-void func_80002C50(void);
-void func_80002CB8(void);
-void func_8000316C(Gfx** dList);
-void func_800032B4(Gfx** dList);
-void func_800033E0(void* var_s2, void* var_s1, s32 var_s0);
-void func_800034E8(u8 arg0);
-
-void func_8000372C(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB);
-void func_800038AC(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g,
+void Controller_Init(void);
+void Controller_UpdateInput(void);
+void Controller_ReadData(void);
+void Save_ReadData(void);
+void Save_WriteData(void);
+void Controller_Rumble(void);
+void Lib_Perspective(Gfx** dList);
+void Lib_Ortho(Gfx** dList);
+void Lib_DmaRead(void* src, void* dst, s32 size);
+void Lib_FillScreen(u8 setFill);
+
+void Lights_SetOneLight(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB);
+void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g,
                    s32 col1b, s32 col2r, s32 col2g, s32 col2b, s32 ambR, s32 ambG, s32 ambB);  
 f32 Math_ModF(f32 value, f32 mod);
 void Rand_Init(void);
@@ -48,18 +48,18 @@ void Matrix_GetXYZAngles(Matrix*, Vec3f*);
 void Matrix_LookAt(Matrix*, f32, f32, f32, f32, f32, f32, f32, f32, f32, u8);
 void Matrix_SetGfxMtx(Gfx**);
 
-s32 func_80006FD8(u64 arg0, void* arg2, s32* arg3, s32 arg4);
+s32 Timer_CreateTask(u64, TimerAction, s32*, s32);
 
-void func_80006F20(void);
-void* func_80006F38(s32);
+void Memory_FreeAll(void);
+void* Memory_Allocate(s32);
 
-void func_80007068(s32* arg0, s32 arg1);
-void func_8000707C(s32* arg0, s32 arg1);
-void func_80007088(UnkStruct_func_80007088*);
-void func_800070C8(u64);
+void Timer_Increment(s32* address, s32 value);
+void Timer_SetValue(s32* address, s32 value);
+void Timer_CompleteTask(TimerTask*);
+void Timer_Wait(u64);
 
-s32 func_800071FC(SaveFile*);
-s32 func_800072E0(SaveFile*);
+s32 Save_WriteEeprom(SaveFile*);
+s32 Save_ReadEeprom(SaveFile*);
 
 void Fault_ThreadEntry(void*);
 void func_80007FE4(FrameBuffer*, u16, u16);
@@ -136,6 +136,7 @@ s64 __ll_rshift(s64, s64);
 void func_8002E3E0(Object_2F4 *arg0);
 
 void func_8002E548(void);
+void func_8002F5F4(void);
 void func_8003DAF0(void);
 void func_8003DE68(s32, s32);
 void func_80040CDC(void);
@@ -305,8 +306,8 @@ void func_800C20B0(void);
 void func_800C2190(void);
 u16 func_800C2890(u16*);
 s32 func_800C2F30(u16*, s32);
-s32 func_800C3084(void);
-s32 func_800C3194(void); 
+s32 Save_Write(void);
+s32 Save_Read(void); 
 
 void func_EFFA40_80187520(s32, void*);
 
diff --git a/include/global.h b/include/global.h
index ba9e84de..84db6612 100644
--- a/include/global.h
+++ b/include/global.h
@@ -19,13 +19,13 @@
 #include "gfx.h"
 
 typedef enum {
-    SI_MESG_10 = 10,
-    SI_MESG_11,
-    SI_MESG_12,
-    SI_MESG_13,
-    SI_MESG_14,
-    SI_MESG_15,
-    SI_MESG_16,
+    SI_READ_CONTROLLER = 10,
+    SI_READ_SAVE,
+    SI_WRITE_SAVE,
+    SI_RUMBLE,
+    SI_SAVE_FAILED,
+    SI_SAVE_SUCCESS,
+    SI_CONT_READ_DONE,
 } SerialMesg;
 
 #define MSG_QUEUE_EMPTY -1
diff --git a/include/structs.h b/include/structs.h
index 6bf4f965..6d01f618 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -33,15 +33,15 @@ typedef struct {
     /* 0xC */ s32 compFlag;
 } DmaEntry; // size = 0x10;
 
-typedef void (*unkFunc_80007088)(s32*, s32);
+typedef void (*TimerAction)(s32*, s32);
 
 typedef struct {
-    /* 0x00 */ u8 unk0;
-    /* 0x08 */ OSTimer unk8;
-    /* 0x28 */ unkFunc_80007088 unk28;
-    /* 0x2C */ s32* unk2C;
-    /* 0x30 */ s32 unk30;
-} UnkStruct_func_80007088; // size = 0x38, 0x8 aligned
+    /* 0x00 */ u8 active;
+    /* 0x08 */ OSTimer timer;
+    /* 0x28 */ TimerAction action;
+    /* 0x2C */ s32* address;
+    /* 0x30 */ s32 value;
+} TimerTask; // size = 0x38, 0x8 aligned
 
 typedef struct {
     u16 data[240 * 320];
@@ -54,7 +54,7 @@ typedef struct {
     /* bit 5 */ u8 unk_5 : 1;    
     /* bit 6 */ u8 unk_6 : 1;    
     /* bit 7 */ u8 unk_7 : 1;    
-} Save_00_SubStruct_00; // size = 0x1
+} Save_SubStruct_00; // size = 0x1
 
 typedef struct {
     /* bit 0 */ u16 unk_0 : 8;
@@ -63,10 +63,10 @@ typedef struct {
     /* bit D */ u16 unk_D : 1;
     /* bit E */ u16 unk_E : 1;
     /* bit F */ u16 unk_F : 1;
-} Save_00_SubStruct_5E; // size = 0x10
+} Save_SubStruct_5E; // size = 0x10
 
-typedef struct Save_00 {
-    /* 0x00 */ Save_00_SubStruct_00 unk_00[16];
+typedef struct{
+    /* 0x00 */ Save_SubStruct_00 unk_00[16];
     /* 0x10 */ char pad10[0x4];
     /* 0x14 */ u8 unk_14;
     /* 0x15 */ u8 unk_15;
@@ -76,24 +76,23 @@ typedef struct Save_00 {
     /* 0x36 */ u8 unk_36[10];
     /* 0x40 */ s8 unk_40[10];
     /* 0x4A */ char pad4A[0x14];
-    /* 0x5E */ Save_00_SubStruct_5E unk_5E[10][7];
+    /* 0x5E */ Save_SubStruct_5E unk_5E[10][7];
     /* 0xEA */ u8 unk_EA;
     /* 0xEB */ char padEB[0x3];
-} Save_00;
+    /* 0xEE */ char padEE[0x10];
+} SaveData; // size = 0xFE
 
 typedef struct {
-    /* 0x00 */ u8 unk_00[0xFE];
-    /* 0xFE */ u16 unk_FE;
-} Checksum;
-
-typedef union {
-    /* 0x00 */ Save_00 save_00;
-    /* 0x00 */ Checksum checksum;
-} Save; // size = 0x100
-
-typedef union {
-    Save save[2];
-    u8 raw[EEPROM_BLOCK_SIZE*EEPROM_MAXBLOCKS];
+    /* 0x00 */ union {
+        SaveData data;
+        u8 raw[sizeof(SaveData)];
+        };
+    /* 0xFE */ u16 checksum;
+} Save;
+
+typedef struct {
+    /* 0x000 */ Save save;
+    /* 0x100 */ Save backup;
 } SaveFile; // size = 0x200
 
 typedef struct {
diff --git a/include/variables.h b/include/variables.h
index 87fce7f8..922b5c8f 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -10,7 +10,7 @@ extern u8 gF3dexData;
 
 extern u8 D_8003B50[];
 extern u8 D_80046B0[];
-extern s32 D_800C45D0;
+extern s32 sGammaMode;
 extern f32 D_800C45E0[];
 
 extern Mtx gIdentityMtx; // 800C4620
@@ -18,8 +18,8 @@ extern Matrix gIdentityMatrix; //800C4660
 
 extern u8 sFaultCharIndex[];
 extern s32 sFaultCharPixelFlags[];
-extern const char* D_800C4870[];
-extern const char* D_800C48B8[];
+extern const char* sFaultCauses[];
+extern const char* sFloatExceptions[];
 
 extern Vec3f D_800C5D28;
 extern f32 D_800C5D34;
@@ -33,62 +33,61 @@ extern OSMesgQueue* D_800C7C64;
 
 extern char D_800C7C80[];
 
-extern OSContPad D_800DD880[4];
-extern OSContPad D_800DD898[4];
-extern u8 D_800DD8B0[4];
-extern s32 D_800DD8B4;
-extern u8 D_800DD8B8[4];
-extern u8 D_800DD8BC[4]; // Fake symbol. Only exists as loop terminator for D_800DD8B8
-// extern OSContPad D_800DD8C0[4];
-// extern OSContPad D_800DD8D8[4];
+extern OSContPad gCurrentInput[4];
+extern OSContPad gChangedInput[4];
+extern u8 gControllerStatus[4];
+extern s32 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 u8 gAudioThreadStack[0x1000];  // 800DDAA0
 extern OSThread gGraphicsThread;        // 800DEAA0
 extern u8 gGraphicsThreadStack[0x1000]; // 800DEC50
-extern OSThread gUnkThread3;        // 800DFC50
-extern u8 gUnkThread3Stack[0x1000]; // 800DFE00
+extern OSThread gTimerThread;        // 800DFC50
+extern u8 gTimerThreadStack[0x1000]; // 800DFE00
 extern OSThread gSerialThread;        // 800E0E00
 extern u8 gSerialThreadStack[0x1000]; // 800E0FB0
-extern u8 gUnusedStack[0x1000];
 
 extern SPTask* gCurrentTask;
-extern SPTask* D_800E1FB4[1];
-extern SPTask* D_800E1FB8[2];
-extern SPTask* D_800E1FC0[2];
-extern SPTask* D_800E1FC8[2];
+extern SPTask* sAudioTasks[1];
+extern SPTask* sGfxTasks[2];
+extern SPTask* sNewAudioTasks[1];
+extern SPTask* sNewGfxTasks[2];
 extern u32 gSegments[16]; // 800E1FD0
 extern OSMesgQueue gPiMgrCmdQueue; // 800E2010
 extern OSMesg sPiMgrCmdBuff[50]; // 800E2028
 
-extern OSMesgQueue D_800E20F0;
-extern void *D_800E2108[1];
-extern OSIoMesg D_800E2110;
+extern OSMesgQueue gDmaMsgQueue;
+extern void *sDmaMsgBuff[1];
+extern OSIoMesg gDmaIOMsg;
 extern OSMesgQueue gSerialEventQueue;
-extern void *D_800E2140[1];
+extern void *sSerialEventBuff[1];
 extern OSMesgQueue gMainThreadMsgQueue;
-extern void *D_800E2160[32];
+extern void *sMainThreadMsgBuff[32];
 extern OSMesgQueue gTaskMsgQueue;
-extern void *D_800E21F8[16];
-extern OSMesgQueue D_800E2238;
-extern void *D_800E2250[1];
-extern OSMesgQueue D_800E2258;
-extern void *D_800E2270[1];
-extern OSMesgQueue D_800E2278;
-extern void *D_800E2290[4];
-extern OSMesgQueue D_800E22A0;
-extern void *D_800E22B8[2];
+extern void *sTaskMsgBuff[16];
+extern OSMesgQueue gAudioVImsgQueue;
+extern void *sAudioVImsgBuff[1];
+extern OSMesgQueue gAudioTaskMsgQueue;
+extern void *sAudioTaskMsgBuff[1];
+extern OSMesgQueue gGfxVImsgQueue;
+extern void *sGfxVImsgBuff[4];
+extern OSMesgQueue gGfxTaskMsgQueue;
+extern void *sGfxTaskMsgBuff[2];
 extern OSMesgQueue gSerialThreadMsgQueue;
-extern void *D_800E22D8[8];
-extern OSMesgQueue D_800E22F8;
-extern void *D_800E2310[1];
-extern OSMesgQueue D_800E2318;
-extern void *D_800E2330[1];
-extern OSMesgQueue gThread7msgQueue;
-extern void *D_800E2350[16];
-extern OSMesgQueue D_800E2390;
-extern void *D_800E23A8[1];
+extern void *sSerialThreadMsgBuff[8];
+extern OSMesgQueue gControllerMsgQueue;
+extern void *sControllerMsgBuff[1];
+extern OSMesgQueue gSaveMsgQueue;
+extern void *sSaveMsgBuff[1];
+extern OSMesgQueue gTimerTaskMsgQueue;
+extern void *sTimerTaskMsgBuff[16];
+extern OSMesgQueue gTimerWaitMsgQueue;
+extern void *sTimerWaitMsgBuff[1];
 
 extern GfxPool gGfxPools[2]; // 800E23B0
 
@@ -105,26 +104,26 @@ extern s32* D_80137E74;
 
 // some sort of struct?
 extern u8 D_80137E78;
-extern u32 D_80137E7C;
-extern u8 D_80137E80;
-extern u8 D_80137E81;
+extern u32 gFrameCounter;
+extern u8 gStartNMI;
+extern u8 gStopTasks;
 extern u8 D_80137E84[4];
-extern u16 D_80137E88;
-extern u16 D_80137E8A;
-
-extern OSThread sIdleThread; // 80138E90
-extern u8 sIdleThreadStack[0x1000]; // 801390A0
-extern OSThread gMainThread; // 8013A040
-extern u8 sMainThreadStack[0x1000]; // 8013A1F0
-extern OSThread gAudioThread; //8013B1F0
-
-extern Matrix* D_8013B3C0;
-extern Matrix D_8013B3C8[0x20];
-extern Matrix* D_8013BBC8;
-extern Matrix D_8013BBD0[0x20];
-
-extern SaveFile D_80144F60;
-extern SaveFile D_80145160;
+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 Matrix* gGfxMatrix;
+extern Matrix sGfxMatrixStack[0x20];
+extern Matrix* gCalcMatrix;
+extern Matrix sCalcMatrixStack[0x20];
+
+extern SaveFile gSaveIOBuffer;
+extern SaveFile sPrevSaveData;
 extern FaultMgr gFaultMgr;
 
 extern OSMesg D_80156600[1];
@@ -464,7 +463,7 @@ extern f32 D_80178740;
 extern s32 D_80178754;
 extern s32 D_80178758;
 extern s32 D_80178768[];
-extern SaveFile D_80178870;
+extern SaveFile gSaveFile;
 
 extern u16 D_Tex_800D99F8[];
 extern u16 D_Tex_800DBA20[];
@@ -550,7 +549,7 @@ extern s32 D_EBFEB0_801ADA94;
 
 extern u8 D_80281000[0x400];
 extern u8 D_80281400[0xC00];
-extern FrameBuffer D_80282000; // z buffer
+extern FrameBuffer gZBuffer; // z buffer
 extern u8 D_802A7800;
 extern u8 D_802D7800;
 extern s32 D_80387800;