From bff2324faea621865d65db4618bae96bc12cad38 Mon Sep 17 00:00:00 2001
From: Sonic Dreamcaster <alejandro.asenjo88@gmail.com>
Date: Sat, 7 Dec 2024 03:55:45 -0300
Subject: [PATCH] fix katina and venom briefing in level select

---
 src/mods/levelselect.c          | 2 +-
 src/overlays/ovl_menu/fox_map.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mods/levelselect.c b/src/mods/levelselect.c
index 2d8cc8a8..ad728ef1 100644
--- a/src/mods/levelselect.c
+++ b/src/mods/levelselect.c
@@ -112,7 +112,7 @@ void Map_LevelSelect(void) {
     }
 
     // Bypass briefing
-    if (CVarGetInteger("gSkipBriefing", 0) == 1) {
+    if ((CVarGetInteger("gSkipBriefing", 0) == 1) || (sCurrentPlanetId == PLANET_VENOM)) {
         if ((timer == 0) && (startLevel == 1)) {
             if ((sMapState == 2) && (sMapSubState > 0)) {
                 if (sCurrentPlanetId == PLANET_VENOM) {
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index 68e73ac5..8fd80b3f 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -4093,6 +4093,10 @@ bool Map_LevelPlayedStatus_Check(PlanetId planet) {
         case PLANET_SOLAR:
             planetSaveSlot = SAVE_SLOT_SOLAR;
             break;
+
+        default:
+            planetSaveSlot = planet;
+            break;
     }
 
     if (CVarGetInteger("gLevelSelector", 0) && gMissionNumber == 6) {
@@ -6086,7 +6090,7 @@ void Map_BriefingRadio_Update(void) {
     if ((D_menu_801CF018 > 0) && (D_menu_801CF018 != 100)) {
         Map_BriefingRadio_Draw(gCurrentRadioPortrait);
         Map_BriefingRadio_Draw(D_menu_801AF420[!D_menu_801CD940]);
-        if (CVarGetInteger("gLevelSelector", 0) && (sCurrentPlanetId == 6)) {
+        if (CVarGetInteger("gLevelSelector", 0) && (gMissionNumber == 6)) {
             return;
         }
         func_radio_800BB388();