fox_map functions (#56)

* func_EBFBE0_80187520

* func_EBFBE0_8019E85C

* func_EBFBE0_8019E8D0

* funcs

* func_EBFBE0_801A6A24

* func_EBFBE0_801A4D0C

* func_EBFBE0_801A62FC

* names

* func_EBFBE0_801A5770

* dec

* boolean

* func_EBFBE0_801A4A38

* func_EBFBE0_8019F83C

* func_EBFBE0_8019F910

* func_EBFBE0_8019F97C

* func_EBFBE0_8019FA1C

* comment

* func_EBFBE0_8019FC04

* func_EBFBE0_8019FD1C

* func_EBFBE0_8019FF48

* func_EBFBE0_801A01A8

* func_EBFBE0_801A05B4

* func_EBFBE0_801A07E8

* func_EBFBE0_801A655C

* func_EBFBE0_801AB284

* func_EBFBE0_801AB17C

* func_EBFBE0_801AD048

* func_EBFBE0_801A914C

* func_EBFBE0_801A9EE4

* func_EBFBE0_801A9DE8

* func_EBFBE0_801A9814

* func_EBFBE0_801A25C8

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A3440

* func_EBFBE0_801A7684

* primColor

* planetId

* func_EBFBE0_801A77B0

* func_EBFBE0_801A791C

* func_EBFBE0_801A7A84

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7D3C

* progress script permissions

* func_EBFBE0_801A7F1C

* func_EBFBE0_801A74F4

* format

* func_EBFBE0_801A7230

* func_EBFBE0_801A6EC0

* func_EBFBE0_801AD718

* func_EBFBE0_801AD7EC

* func_EBFBE0_801AC80C

* func_EBFBE0_801ABF1C

* func_EBFBE0_801ABCDC

* scopes

* func_EBFBE0_801A68E4

* func_EBFBE0_801A6694

* func_EBFBE0_801A6480

* func_EBFBE0_801A6368

* func_EBFBE0_801A61B4

* LevelId

* LevelId

* func_EBFBE0_801A62FC

* level enum

* levelIDs

* enum

include/fox_option.h

@@ -173,7 +173,6 @@ extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9408;
 
 extern void* D_EBFBE0_801B68B0[];
 extern void* D_EBFBE0_801B68D4[];
-extern s32 D_EBFBE0_801B68F8;
 
 extern s32 D_EBFBE0_801B81A8[][3];
 
@@ -325,7 +324,7 @@ s32 func_EBFBE0_8019C5A0(s32*);
 s32 func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9250* arg3);
 void func_EBFBE0_8019E8D0(void);
 void func_EBFBE0_801A07E8(u8*, u8*, f32*);
-void func_EBFBE0_801AD7EC(s32, s32, u8);
+void func_EBFBE0_801AD7EC(s32, s32, s32);
 void func_EBFBE0_801A9FD4(s32);
 
 #endif

include/functions.h

@@ -195,6 +195,7 @@ s32 func_8005F9DC(Vec3f*);
 void func_80060714(s32 );
 void func_8006089C(u8 );
 void func_80060968(void);
+void func_80060D94(s32);  
 void func_80060F30(Vec3f* , u32 , s32 );
 void Object_Kill(Object*, Vec3f*);
 s32 func_80060FE4(Vec3f*, f32);

include/sf64level.h

@@ -3,6 +3,10 @@
 
 #include "structs.h"
 
+#define SAVE_SLOT_SOLAR 13
+#define SAVE_SLOT_VENOM_1 14
+#define SAVE_SLOT_VENOM_2 15
+
 typedef enum {
     LEVELTYPE_GROUND,
     LEVELTYPE_SPACE,
@@ -59,28 +63,28 @@ typedef enum {
     OVL_SETUP_LOGO = 99,
 } OverlaySetups;
 
-typedef enum {
-    LEVEL_CORNERIA,
-    LEVEL_METEO,
-    LEVEL_SECTOR_X,
-    LEVEL_AREA_6,
-    LEVEL_UNK_4,
-    LEVEL_SECTOR_Y,
-    LEVEL_VENOM_1,
-    LEVEL_SOLAR,
-    LEVEL_ZONESS,
-    LEVEL_VENOM_2,
-    LEVEL_TRAINING,
-    LEVEL_MACBETH,
-    LEVEL_TITANIA,
-    LEVEL_AQUAS,
-    LEVEL_FORTUNA,
-    LEVEL_UNK_15,
-    LEVEL_KATINA,
-    LEVEL_BOLSE,
-    LEVEL_SECTOR_Z,
-    LEVEL_VENOM_SW,
-    LEVEL_VERSUS,
+typedef enum LevelId {
+    /* 0 */ LEVEL_CORNERIA,
+    /* 1 */ LEVEL_METEO,
+    /* 2 */ LEVEL_SECTOR_X,
+    /* 3 */ LEVEL_AREA_6,
+    /* 4 */ LEVEL_UNK_4,
+    /* 5 */ LEVEL_SECTOR_Y,
+    /* 6 */ LEVEL_VENOM_1,
+    /* 7 */ LEVEL_SOLAR,
+    /* 8 */ LEVEL_ZONESS,
+    /* 9 */ LEVEL_VENOM_2,
+    /* 10 */ LEVEL_TRAINING,
+    /* 11 */ LEVEL_MACBETH,
+    /* 12 */ LEVEL_TITANIA,
+    /* 13 */ LEVEL_AQUAS,
+    /* 14 */ LEVEL_FORTUNA,
+    /* 15 */ LEVEL_UNK_15,
+    /* 16 */ LEVEL_KATINA,
+    /* 17 */ LEVEL_BOLSE,
+    /* 18 */ LEVEL_SECTOR_Z,
+    /* 19 */ LEVEL_VENOM_SW,
+    /* 80 */ LEVEL_VERSUS,
 } LevelId;
 
 typedef enum {

include/structs.h

@@ -47,7 +47,7 @@ typedef struct {
     /* bit 5 */ u8 unk_5 : 1;    
     /* bit 6 */ u8 unk_6 : 1;    
     /* bit 7 */ u8 unk_7 : 1;    
-} Save_SubStruct_00; // size = 0x1
+} PlanetData; // size = 0x1
 
 typedef struct {
     /* bit 0 */ u16 unk_0 : 8;
@@ -59,7 +59,7 @@ typedef struct {
 } Save_SubStruct_5E; // size = 0x10
 
 typedef struct{
-    /* 0x00 */ Save_SubStruct_00 unk_00[16];
+    /* 0x00 */ PlanetData planet[16];
     /* 0x10 */ char pad10[0x4];
     /* 0x14 */ u8 soundMode;
     /* 0x15 */ u8 musicVolume;

include/variables.h

@@ -494,6 +494,7 @@ extern s8 D_80177BAC;
 extern s32 D_80177BB0[7];
 //
 extern s16 D_80177BD0[4]; // up to [48]
+extern s32 D_80177BD8[];
 // 0x58
 extern u16 D_80177C30[4];
 extern UNK_TYPE D_80177C38[6];