Merge 7ab3615add into 4abd0fe720

patches/skip_sos.c

@@ -23,7 +23,7 @@ void EnTest7_Update(Actor* thisx, PlayState* play) {
 
     // @recomp Allow skipping the Song of Soaring cutscene.
     Input* input = CONTROLLER1(&play->state);
-    if (CHECK_BTN_ALL(input->press.button, BTN_A) && OWL_WARP_CS_GET_OCARINA_MODE(&this->actor) != ENTEST7_ARRIVE) {
+    if (CHECK_BTN_ANY(input->press.button, BTN_A | BTN_B) && (OWL_WARP_CS_GET_OCARINA_MODE(&this->actor) != ENTEST7_ARRIVE)) {
         func_80AF2350(thisx, play);
     }
 }