Decompile objectiveCheckMultiroomEntered

src/include/game/game_0601b0.h

@@ -41,7 +41,7 @@ u32 func0f0654e8(void);
 u32 func0f06554c(void);
 void func0f0657a4(s32 *arg0, s8 *arg1);
 u32 func0f0657d8(void);
-u32 func0f065880(void);
+bool arrayIntersects(s16 *a, s16 *b);
 u32 func0f0658e8(void);
 u32 func0f06593c(void);
 u32 func0f0659e4(void);

src/include/game/game_066310.h

@@ -388,7 +388,7 @@ u32 func0f095bf4(void);
 u32 func0f095c04(void);
 u32 func0f095d64(void);
 void objectiveCheckRoomEntered(s32 currentroom);
-u32 func0f095fd8(void);
+void objectiveCheckMultiroomEntered(s32 arg0, s16 *requiredrooms);
 u32 func0f096088(void);
 u32 func0f096360(void);
 u32 func0f0964b4(void);

src/include/gvars/gvars.h

@@ -584,8 +584,8 @@ extern struct objective *g_Objectives[10];
 extern u32 var8009d088;
 extern u32 var8009d0b0;
 extern u32 var8009d0b4;
-extern struct objectivecriteria *var8009d0b8;
-extern u32 var8009d0bc;
+extern struct criteria_roomentered *g_RoomEnteredCriterias;
+extern struct criteria_multiroomentered *g_MultiroomEnteredCriterias;
 extern u32 var8009d0c0;
 extern u32 var8009d0d0;
 extern u32 var8009d0d8;

src/include/types.h

@@ -4678,11 +4678,19 @@ struct objective {
 	/*0x0f*/ s8 difficulties;
 };
 
-struct objectivecriteria {
+struct criteria_roomentered {
 	u32 unk00;
 	u32 pad;
 	u32 status;
-	struct objectivecriteria *next;
+	struct criteria_roomentered *next;
+};
+
+struct criteria_multiroomentered {
+	u32 unk00;
+	u32 unk04;
+	u32 pad;
+	u32 status;
+	struct criteria_multiroomentered *next;
 };
 
 #endif