document: FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, replace FILEPROG_0 usage with NULL where applicable

include/enums.h

@@ -14,9 +14,9 @@
 #define SPRITE_TYPE_RGBA32 (1 << 11)
 
 enum file_progress_e {
-    FILEPROG_0_UNKNOWN,
+    FILEPROG_0_TIPTUP_MINIGAME_PROGRESS,
-    FILEPROG_1_UNKNOWN,
+    // unused
-    FILEPROG_2_UNKNOWN,
+    // unused
     FILEPROG_3_MUSIC_NOTE_TEXT,
     FILEPROG_4_MUMBO_TOKEN_TEXT,
     FILEPROG_5_BLUE_EGG_TEXT,
@@ -79,17 +79,17 @@ enum file_progress_e {
     FILEPROG_46_CCW_WITCH_SWITCH_JIGGY_PRESSED,
     FILEPROG_47_FP_WITCH_SWITCH_JIGGY_PRESSED,
     FILEPROG_48_FP_WITCH_SWITCH_ADVENT_DOOR_OPEN,
-    // {index=0x49, type="Prog", level=6, name="Pink Cauldron 1 Active"},
+    FILEPROG_49_PINK_CAULDRON_1_ACTIVE,
-    // {index=0x4A, type="Prog", level=6, name="Pink Cauldron 2 Active"},
+	FILEPROG_4A_PINK_CAULDRON_2_ACTIVE,
-    // {index=0x4B, type="Prog", level=6, name="Green Cauldron 1 Active"},
+	FILEPROG_4B_GREEN_CAULDRON_1_ACTIVE,
-    // {index=0x4C, type="Prog", level=6, name="Green Cauldron 2 Active"},
+	FILEPROG_4C_GREEN_CAULDRON_2_ACTIVE,
-    // {index=0x4D, type="Prog", level=6, name="Red Cauldron 1 Active"},
+	FILEPROG_4D_RED_CAULDRON_1_ACTIVE,
-    // {index=0x4E, type="Prog", level=6, name="Red Cauldron 2 Active"},
+	FILEPROG_4E_RED_CAULDRON_2_ACTIVE,
-    // -- 0x4F - Unused Cauldron Pair?
+	FILEPROG_4F_UNUSED_CAULDRON_1_ACTIVE,
-    // -- 0x50 - Unused Cauldron Pair?
+	FILEPROG_50_UNUSED_CAULDRON_2_ACTIVE,
-    // {index=0x51, type="Prog", level=6, name="Yellow Cauldron 1 Active"},
+	FILEPROG_51_YELLOW_CAULDRON_1_ACTIVE,
-    // {index=0x52, type="Prog", level=6, name="Yellow Cauldron 2 Active"},
+	FILEPROG_52_YELLOW_CAULDRON_2_ACTIVE,
-    FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED = 0x53,
+    FILEPROG_53_CCW_PUZZLE_PODIUM_SWITCH_PRESSED,
     FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE,
     FILEPROG_55_FF_BK_SQUARE_INSTRUCTIONS,
     FILEPROG_56_FF_PICTURE_SQUARE_INSTRUCTIONS,
@@ -110,7 +110,6 @@ enum file_progress_e {
     FILEPROG_76_CCW_PUZZLE_PIECES_PLACED = 0x76, //4 bit
     FILEPROG_7A_DOG_PUZZLE_PIECES_PLACED = 0x7A, //5 bit
     FILEPROG_7F_DOUBLE_HEALTH_PUZZLE_PIECES_PLACED = 0x7F, //3 bit
-    // {index=0x82, unknown}
     FILEPROG_82_MET_TWINKLIES = 0x82,
     FILEPROG_83_MAGIC_GET_WEAK_TEXT,
     FILEPROG_84_MAGIC_ALL_GONE_TEXT,
@@ -130,8 +129,8 @@ enum file_progress_e {
     FILEPROG_92_PAID_WALRUS_COST,
     FILEPROG_93_PAID_CROC_COST,
     FILEPROG_94_PAID_BEE_COST,
-
+    FILEPROG_95_UNKNOWN,
-    FILEPROG_96_MET_BRENTILDA = 0x96,
+    FILEPROG_96_MET_BRENTILDA,
     FILEPROG_97_ENTERED_LAIR_TEXT,
     FILEPROG_98_EXITED_LEVEL_TEXT,
     FILEPROG_99_PAST_50_NOTE_DOOR_TEXT,
@@ -225,7 +224,6 @@ enum file_progress_e {
     FILEPROG_F6_SEEN_DOOR_OF_GRUNTY_PUZZLE_PODIUM,
     FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT,
     FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE = 0xF8, //2bit
-    // FILEPROG_F8_KING_SANDYBUTT_PYRAMID_STATE = 0xF9, //2bit
 
     FILEPROG_FA_UNKNOWN = 0xFA, // Something that's set in FF
 

src/BGS/ch/code_2270.c

@@ -255,7 +255,7 @@ void func_80388FC0(Actor *this){
     ActorLocal_Tiptup *local;
 
     local = (ActorLocal_Tiptup *)&this->local;
-    fileProgressFlag_setN(FILEPROG_0_UNKNOWN, local->unkA, 2);
+    fileProgressFlag_setN(FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, local->unkA, 2);
     vector_free(local->unk4);
 }
 
@@ -291,7 +291,7 @@ void chTiptup_update(Actor *this){
         unqPtr->unk4 = vector_new(sizeof(Struct_BGS_2270_0s), 8);
         unqPtr->unk8 = 0;
         unqPtr->unk9 = 0;
-        unqPtr->unkA = fileProgressFlag_getN(FILEPROG_0_UNKNOWN, 2);
+        unqPtr->unkA = fileProgressFlag_getN(FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, 2);
         unqPtr->unkB = 0;
         unqPtr->unkC = 0.0f;
         if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){

src/core2/ba/marker.c

@@ -391,6 +391,20 @@ void __baMarker_resolveCollision(Prop *other_prop){
                     if(func_802458E0(spAC, actor, 0x87) == 0)
                         return;
                     volatileFlag_set(VOLATILE_FLAG_1E, 1);
+                    /**
+                     * This should use the following fileprog flags:
+                     * 
+                     * FILEPROG_49_PINK_CAULDRON_1_ACTIVE
+                     * FILEPROG_4A_PINK_CAULDRON_2_ACTIVE
+                     * FILEPROG_4B_GREEN_CAULDRON_1_ACTIVE
+                     * FILEPROG_4C_GREEN_CAULDRON_2_ACTIVE
+                     * FILEPROG_4D_RED_CAULDRON_1_ACTIVE
+                     * FILEPROG_4E_RED_CAULDRON_2_ACTIVE
+                     * FILEPROG_4F_UNUSED_CAULDRON_1_ACTIVE
+                     * FILEPROG_50_UNUSED_CAULDRON_2_ACTIVE
+                     * FILEPROG_51_YELLOW_CAULDRON_1_ACTIVE
+                     * FILEPROG_52_YELLOW_CAULDRON_2_ACTIVE
+                     */
                     if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){
                         actor->unk10_12 = 2;
                     }

src/core2/bs/bee.c

@@ -36,7 +36,8 @@ void func_802A0340(void){
     }
 }
 
-// bsBee_inSet
+// bsBee_inSet 
+// move_idx is probably a bs_e
 int bsbee_inSet(s32 move_idx){
     return (move_idx == 0x85) 
     || (move_idx == 0x86) 

src/core2/code_CF3E0.c

@@ -29,7 +29,7 @@ MapProgressFlagToDialogID fileProgressDialogMap[] = {
     { FILEPROG_BE_CHEATO_BLUEEGGS,                0xFA8},
     { FILEPROG_BF_CHEATO_REDFEATHERS,             0xFA9},
     { FILEPROG_C0_CHEATO_GOLDFEATHERS,            0xFAA},
-    {0x95, 0xB50},
+    { FILEPROG_95_UNKNOWN, 0xB50},
     { FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT,        0xF7B},
     { -1, -1}
 };

src/lair/code_0.c

@@ -178,12 +178,12 @@ s16 D_80393454[] = {
     FILEPROG_37_MMM_OPEN,
     FILEPROG_38_RBB_OPEN,
     FILEPROG_39_CCW_OPEN,
-    FILEPROG_0_UNKNOWN
+    NULL
 };
 
 s16 D_80393468[] = {
-    VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 
+    NULL, 
-    VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 
+    NULL, 
     VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC, 
     VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS, 
     VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP, 
@@ -191,7 +191,7 @@ s16 D_80393468[] = {
     VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM, 
     VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB, 
     VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW, 
-    VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ
+    NULL
 };
 
 s16 D_8039347C[] = {50, 180, 260, 350, 450, 640, 765, 810, 828, 846, 864, 882}; //notedoor_notes_required_to_open