BATTLE GEAR: Rollback to shop bug discovery

Will be updated when modifications are completed