Yes, the diving equipment (including snorkelling gear, Garuda probably doesn't distinguish between them) would need to be in a separate bag to take advantage of the additional baggage allowance.