The tonal shift from a high-stakes battle to Noren waking up with heart-eyes for Ogami was actually hilarious and it makes the school scenes so much better now. I feel bad for Tenma having to watch his crush go full clingy mode on his rival but Ogami standing there looking confused while she grabbed his arm was pure comedy gold.