From 8edcc86049038aac6e71e534af2726f1bec77d37 Mon Sep 17 00:00:00 2001
From: EmeraldLockdown <86802223+EmeraldLoc@users.noreply.github.com>
Date: Fri, 24 Apr 2026 11:05:57 -0500
Subject: [PATCH] Fix crash when CG was loaded in main menu related to Yoshi
 (#1206)

* Fix crash when CG was loaded in main menu

* Remove now unecessary check

* This *should* undo this

* Let's try that again!

* Remove leftover code
---
 src/game/behaviors/yoshi.inc.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/game/behaviors/yoshi.inc.c b/src/game/behaviors/yoshi.inc.c
index 2764204cb..5dbc3c58b 100644
--- a/src/game/behaviors/yoshi.inc.c
+++ b/src/game/behaviors/yoshi.inc.c
@@ -270,6 +270,12 @@ void yoshi_reappear(void) {
 }
 
 void bhv_yoshi_loop(void) {
+    // sanity check main menu
+    if (gDjuiInMainMenu) {
+        yoshi_idle_loop();
+        return;
+    }
+
     switch (o->oAction) {
         case YOSHI_ACT_IDLE:
             yoshi_idle_loop();